narayana/another.im-ios
narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
fmodf 2024-10-17 19:20:03 +02:00
parent 473cf3b30b
commit 633b4fa2b0
3 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ConversationsClassic/View/Entering/WelcomeScreen.swift
View file

@ -19,6 +19,8 @@ struct WelcomeScreen: View {
.tappablePadding(.symmetric(10)) {
router.showScreen(.push) { _ in
SettingsScreen()
.environment(\.settingsParent, .welcome)
.navigationBarHidden(true)
}
}
}

1
ConversationsClassic/View/Main/MainTabScreen.swift
View file

@ -30,6 +30,7 @@ struct MainTabScreen: View {
case .settings:
SettingsScreen()
.environment(\.settingsParent, .main)
}
// Tab bar

35
ConversationsClassic/View/Main/Settings/SettingsScreen.swift
View file

@ -1,8 +1,25 @@
import SwiftUI
enum SettingsScreenParent {
case main
case welcome
}
struct SettingsScreenParentKey: EnvironmentKey {
static let defaultValue = SettingsScreenParent.main
}
extension EnvironmentValues {
var settingsParent: SettingsScreenParent {
get { self[SettingsScreenParentKey.self] }
set { self[SettingsScreenParentKey.self] = newValue }
}
}
struct SettingsScreen: View {
@EnvironmentObject var clientsStore: ClientsStore
@Environment(\.router) var router
@Environment(\.settingsParent) var parent
var body: some View {
ZStack {
@ -13,9 +30,21 @@ struct SettingsScreen: View {
// Content
VStack(spacing: 0) {
// Header
SharedNavigationBar(
centerText: .init(text: L10n.Settings.Main.title)
)
if parent == .main {
SharedNavigationBar(
centerText: .init(text: L10n.Settings.Main.title)
)
} else {
SharedNavigationBar(
leftButton: .init(
image: Image(systemName: "chevron.left"),
action: {
router.dismissScreen()
}
),
centerText: .init(text: L10n.Settings.Main.title)
)
}
// List
List {