mirror of
https://github.com/neon443/NearFuture.git
synced 2026-03-11 14:56:15 +00:00
haptic on tab selection, remove divider
This commit is contained in:
@@ -22,9 +22,10 @@ enum Tab {
|
|||||||
struct ContentView: View {
|
struct ContentView: View {
|
||||||
@StateObject var viewModel: EventViewModel
|
@StateObject var viewModel: EventViewModel
|
||||||
@StateObject var settingsModel: SettingsViewModel
|
@StateObject var settingsModel: SettingsViewModel
|
||||||
|
@State var selection: Tab = .home
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
TabView {
|
TabView(selection: $selection) {
|
||||||
HomeView(viewModel: viewModel, settingsModel: settingsModel)
|
HomeView(viewModel: viewModel, settingsModel: settingsModel)
|
||||||
.tabItem {
|
.tabItem {
|
||||||
Label("Home", systemImage: "house")
|
Label("Home", systemImage: "house")
|
||||||
@@ -46,6 +47,11 @@ struct ContentView: View {
|
|||||||
}
|
}
|
||||||
.tag(Tab.settings)
|
.tag(Tab.settings)
|
||||||
}
|
}
|
||||||
|
.apply {
|
||||||
|
if #available(iOS 17, *) {
|
||||||
|
$0.sensoryFeedback(.impact(weight: .heavy, intensity: 1), trigger: selection)
|
||||||
|
}
|
||||||
|
}
|
||||||
.sheet(isPresented: $settingsModel.settings.showWhatsNew) {
|
.sheet(isPresented: $settingsModel.settings.showWhatsNew) {
|
||||||
WhatsNewView(settingsModel: settingsModel)
|
WhatsNewView(settingsModel: settingsModel)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ struct HomeView: View {
|
|||||||
EventListView(viewModel: viewModel, event: event)
|
EventListView(viewModel: viewModel, event: event)
|
||||||
.transition(.moveAndFade)
|
.transition(.moveAndFade)
|
||||||
.id(event.complete)
|
.id(event.complete)
|
||||||
Divider()
|
|
||||||
}
|
}
|
||||||
.padding(.horizontal)
|
.padding(.horizontal)
|
||||||
if filteredEvents.isEmpty {
|
if filteredEvents.isEmpty {
|
||||||
|
|||||||
Reference in New Issue
Block a user