-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(App): improve
AppView (previously MainView)
- Loading branch information
1 parent
50167bc
commit f2b16e0
Showing
3 changed files
with
151 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| import ConfigurationFeature | ||
| import SwiftUI | ||
| import ComposableArchitecture | ||
| import Combine | ||
| import SwiftClockUI | ||
| import RenaudJennyAboutView | ||
|
|
||
| struct AppView: View { | ||
| struct ViewState: Equatable { | ||
| var date: Date | ||
| var time: String? | ||
| var recognizedUtterance: String? | ||
| var clockStyle: ClockStyle | ||
| var clockConfiguration: ClockConfiguration | ||
| var isConfigurationPresented: Bool | ||
| var isAboutPresented: Bool | ||
|
|
||
| init(_ state: App.State) { | ||
| date = state.date | ||
| time = state.tellTime | ||
| recognizedUtterance = state.speechRecognizer.utterance | ||
| clockStyle = state.configuration.clockStyle | ||
| clockConfiguration = state.configuration.clock | ||
| isConfigurationPresented = state.configuration.isPresented | ||
| isAboutPresented = state.isAboutPresented | ||
| } | ||
| } | ||
|
|
||
| @Environment(\.verticalSizeClass) var verticalSizeClass: UserInterfaceSizeClass? | ||
| @Environment(\.horizontalSizeClass) var horizontalSizeClass: UserInterfaceSizeClass? | ||
|
|
||
| let store: StoreOf<App> | ||
|
|
||
| var body: some View { | ||
| WithViewStore(store.stateless) { viewStore in | ||
| NavigationView { | ||
| content | ||
| .navigationBarTitle("Tell Time") | ||
| .padding() | ||
| } | ||
| .navigationViewStyle(StackNavigationViewStyle()) | ||
| .onAppear { viewStore.send(.appStarted) } | ||
| } | ||
| } | ||
|
|
||
| private var content: some View { | ||
| WithViewStore(store, observe: ViewState.init) { viewStore in | ||
| VStack { | ||
| if verticalSizeClass == .regular && horizontalSizeClass == .compact { | ||
| Spacer() | ||
| clockView | ||
| Spacer() | ||
| timeText | ||
| Spacer() | ||
| DateSelector(store: store) | ||
| Spacer() | ||
| Buttons(store: store) | ||
| } else if verticalSizeClass == .compact { | ||
| HStack { | ||
| clockView(viewStore: viewStore).padding() | ||
| VStack { | ||
| timeText(viewStore: viewStore) | ||
| Spacer() | ||
| DateSelector(store: store) | ||
| Spacer() | ||
| Buttons(store: store) | ||
| } | ||
| } | ||
| } else { | ||
| VStack { | ||
| clockView(viewStore: viewStore).padding() | ||
| VStack { | ||
| timeText(viewStore: viewStore) | ||
| DateSelector(store: store) | ||
| } | ||
| HStack { | ||
| Spacer() | ||
| Buttons(store: store) | ||
| Spacer() | ||
| } | ||
| } | ||
| } | ||
| navigationLinks(viewStore: viewStore) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var clockView: some View { | ||
| WithViewStore(store, observe: ViewState.init) { viewStore in | ||
| ClockView() | ||
| .environment(\.clockDate, viewStore.binding(get: \.date, send: App.Action.setDate)) | ||
| .environment(\.clockStyle, viewStore.clockStyle) | ||
| .environment(\.clockConfiguration, viewStore.clockConfiguration) | ||
| } | ||
| } | ||
|
|
||
| private var timeText: some View { | ||
| WithViewStore(store, observe: { $0.tellTime }) { viewStore in | ||
| viewStore.state.map { time in | ||
| Text(time) | ||
| .font(.title2) | ||
| .foregroundColor(.red) | ||
| .padding() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private var navigationLinks: some View { | ||
| WithViewStore(store, observe: ViewState.init) { viewStore in | ||
| VStack { | ||
| NavigationLink( | ||
| destination: ConfigurationView(store: store.scope( | ||
| state: \.configuration, | ||
| action: { App.Action.configuration($0) } | ||
| )), | ||
| isActive: viewStore.binding(get: \.isConfigurationPresented, send: App.Action.configuration(.hide)), | ||
| label: EmptyView.init | ||
| ) | ||
| NavigationLink( | ||
| destination: AboutView(appId: "id1496541173") { | ||
| Image(uiImage: #imageLiteral(resourceName: "Logo")).shadow(radius: 5) | ||
| }, | ||
| isActive: viewStore.binding(get: \.isAboutPresented, send: App.Action.hideAbout), | ||
| label: EmptyView.init | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #if DEBUG | ||
| struct AppView_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| Group { | ||
| AppView(store: .preview) | ||
| AppView(store: .preview) | ||
| .previewLayout(.fixed(width: 800, height: 400)) | ||
| .preferredColorScheme(.dark) | ||
| .environment(\.horizontalSizeClass, .compact) | ||
| .environment(\.verticalSizeClass, .compact) | ||
| AppView(store: .preview) | ||
| .previewLayout(.fixed(width: 1600, height: 1000)) | ||
| .environment(\.locale, Locale(identifier: "fr_FR")) | ||
| } | ||
| } | ||
| } | ||
| #endif |
This file was deleted.
Oops, something went wrong.