tvOS version in basic app settings

This commit is contained in:
Ethan Pippin 2022-01-20 22:57:40 -07:00
parent 0b171c97a8
commit e1763390cc
4 changed files with 48 additions and 29 deletions

View File

@ -16,14 +16,14 @@ final class BasicAppSettingsCoordinator: NavigationCoordinatable {
@Root
var start = makeStart
@Route(.push)
var about = makeAbout
@Route(.push)
var about = makeAbout
@ViewBuilder
func makeAbout() -> some View {
AboutView()
}
@ViewBuilder
func makeAbout() -> some View {
AboutView()
}
@ViewBuilder
func makeStart() -> some View {
BasicAppSettingsView(viewModel: BasicAppSettingsViewModel())

View File

@ -24,16 +24,31 @@ struct BasicAppSettingsView: View {
var body: some View {
Form {
Section {
Picker(L10n.appearance, selection: $appAppearance) {
ForEach(self.viewModel.appearances, id: \.self) { appearance in
Text(appearance.localizedName).tag(appearance.rawValue)
Button {} label: {
HStack {
Text("Version")
Spacer()
Text("\(UIApplication.appVersion ?? "--") (\(UIApplication.bundleVersion ?? "--"))")
.foregroundColor(.secondary)
}
}
} header: {
L10n.accessibility.text
Text("About")
}
// TODO: Implement once design is theme appearance friendly
// Section {
// Picker(L10n.appearance, selection: $appAppearance) {
// ForEach(self.viewModel.appearances, id: \.self) { appearance in
// Text(appearance.localizedName).tag(appearance.rawValue)
// }
// }
// } header: {
// L10n.accessibility.text
// }
Button {
resetTapped = true
} label: {

View File

@ -160,13 +160,17 @@ struct SettingsView: View {
}
}
Button {} label: {
HStack {
Text("Version")
Spacer()
Text("\(UIApplication.appVersion ?? "--") (\(UIApplication.bundleVersion ?? "--"))")
.foregroundColor(.secondary)
Section {
Button {} label: {
HStack {
Text("Version")
Spacer()
Text("\(UIApplication.appVersion ?? "--") (\(UIApplication.bundleVersion ?? "--"))")
.foregroundColor(.secondary)
}
}
} header: {
Text("About")
}
}
}

View File

@ -30,18 +30,18 @@ struct BasicAppSettingsView: View {
var body: some View {
Form {
Button {
basicAppSettingsRouter.route(to: \.about)
} label: {
HStack {
Text("About")
.foregroundColor(.primary)
Spacer()
Image(systemName: "chevron.right")
}
}
Button {
basicAppSettingsRouter.route(to: \.about)
} label: {
HStack {
Text("About")
.foregroundColor(.primary)
Spacer()
Image(systemName: "chevron.right")
}
}
Section {
Picker(L10n.appearance, selection: $appAppearance) {
ForEach(self.viewModel.appearances, id: \.self) { appearance in