diff --git a/Shared/Coordinators/BasicAppSettingsCoordinator.swift b/Shared/Coordinators/BasicAppSettingsCoordinator.swift index 95f72bcf..2deb18ec 100644 --- a/Shared/Coordinators/BasicAppSettingsCoordinator.swift +++ b/Shared/Coordinators/BasicAppSettingsCoordinator.swift @@ -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()) diff --git a/Swiftfin tvOS/Views/BasicAppSettingsView.swift b/Swiftfin tvOS/Views/BasicAppSettingsView.swift index 19fc713b..0e606e76 100644 --- a/Swiftfin tvOS/Views/BasicAppSettingsView.swift +++ b/Swiftfin tvOS/Views/BasicAppSettingsView.swift @@ -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: { diff --git a/Swiftfin tvOS/Views/SettingsView/SettingsView.swift b/Swiftfin tvOS/Views/SettingsView/SettingsView.swift index 6e8fb2e4..ec11e449 100644 --- a/Swiftfin tvOS/Views/SettingsView/SettingsView.swift +++ b/Swiftfin tvOS/Views/SettingsView/SettingsView.swift @@ -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") } } } diff --git a/Swiftfin/Views/BasicAppSettingsView.swift b/Swiftfin/Views/BasicAppSettingsView.swift index 94308e34..70f61d75 100644 --- a/Swiftfin/Views/BasicAppSettingsView.swift +++ b/Swiftfin/Views/BasicAppSettingsView.swift @@ -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