mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-02 07:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move settings tab and profile tab around

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-26 07:34:29 +01:00
parent 0f412ab309
commit 43ac56302e
16 changed files with 50 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
IceCubesApp/App/AppRouter.swift
View file

@ -74,6 +74,9 @@ extension View {
case let .statusEditHistory(status):
StatusEditHistoryView(statusId: status)
.withEnvironments()
case .settings:
SettingsTabs(popToRootTab: .constant(.settings))
.withEnvironments()
}
}
}
@ -84,5 +87,6 @@ extension View {
.environmentObject(CurrentInstance.shared)
.environmentObject(Theme.shared)
.environmentObject(AppAccountsManager.shared)
.applyTheme(Theme.shared)
}
}

9
IceCubesApp/App/Tabs/ProfileTab.swift
View file

@ -21,13 +21,6 @@ struct ProfileTab: View {
AccountDetailView(account: account)
.withAppRouter()
.withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
.toolbar {
if UIDevice.current.userInterfaceIdiom != .pad {
ToolbarItem(placement: .navigationBarLeading) {
AppAccountsSelectorView(routerPath: routerPath)
}
}
}
.toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
.id(currentAccount.account?.id)
} else {
@ -37,7 +30,7 @@ struct ProfileTab: View {
}
}
.onChange(of: $popToRootTab.wrappedValue) { popToRootTab in
if popToRootTab == .messages {
if popToRootTab == .profile {
routerPath.path = []
}
}

6
IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
View file

@ -22,12 +22,6 @@ struct AccountSettingsView: View {
var body: some View {
Form {
Section {
NavigationLink(value: RouterDestinations.accountDetailWithAccount(account: account)) {
Label("See Profile", systemImage: "person.crop.circle")
}
}
.listRowBackground(theme.primaryBackgroundColor)
Section {
Label("Edit profile", systemImage: "pencil")
.onTapGesture {

11
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -8,6 +8,8 @@ import SwiftUI
import Timeline
struct SettingsTabs: View {
@Environment(\.dismiss) private var dismiss
@EnvironmentObject private var pushNotifications: PushNotificationsService
@EnvironmentObject private var preferences: UserPreferences
@EnvironmentObject private var client: Client
@ -34,6 +36,15 @@ struct SettingsTabs: View {
.navigationTitle(Text("settings.title"))
.navigationBarTitleDisplayMode(.inline)
.toolbarBackground(theme.primaryBackgroundColor.opacity(0.50), for: .navigationBar)
.toolbar {
if UIDevice.current.userInterfaceIdiom == .phone {
ToolbarItem {
Button("action.done") {
dismiss()
}
}
}
}
.withAppRouter()
.withSheetDestinations(sheetDestinations: $routerPath.presentedSheet)
}

14
IceCubesApp/App/Tabs/Tabs.swift
View file

@ -21,7 +21,7 @@ enum Tab: Int, Identifiable, Hashable {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
return [.timeline, .trending, .federated, .local, .notifications, .mentions, .explore, .messages, .settings]
} else {
return [.timeline, .notifications, .explore, .messages, .settings]
return [.timeline, .notifications, .explore, .messages, .profile]
}
}
@ -46,7 +46,9 @@ enum Tab: Int, Identifiable, Hashable {
MessagesTab(popToRootTab: popToRootTab)
case .settings:
SettingsTabs(popToRootTab: popToRootTab)
case .other, .profile:
case .profile:
ProfileTab(popToRootTab: popToRootTab)
case .other:
EmptyView()
}
}
@ -72,7 +74,9 @@ enum Tab: Int, Identifiable, Hashable {
Label("tab.messages", systemImage: iconName)
case .settings:
Label("tab.settings", systemImage: iconName)
case .other, .profile:
case .profile:
Label("tab.profile", systemImage: iconName)
case .other:
EmptyView()
}
}
@ -97,7 +101,9 @@ enum Tab: Int, Identifiable, Hashable {
return "tray"
case .settings:
return "gear"
case .other, .profile:
case .profile:
return "person.crop.circle"
case .other:
return ""
}
}

1
IceCubesApp/Resources/Localization/de.lproj/Localizable.strings
View file

@ -129,6 +129,7 @@
"tab.settings" = "Einstellungen";
"tab.timeline" = "Timeline";
"tab.trending" = "Im Trend";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ ist eine gültige Instanz";

1
IceCubesApp/Resources/Localization/en.lproj/Localizable.strings
View file

@ -132,6 +132,7 @@
"tab.settings" = "Settings";
"tab.timeline" = "Timeline";
"tab.trending" = "Trending";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ is a valid instance";

1
IceCubesApp/Resources/Localization/es.lproj/Localizable.strings
View file

@ -132,6 +132,7 @@
"tab.settings" = "Ajustes";
"tab.timeline" = "Cronología";
"tab.trending" = "Tendencias";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ es una instancia válida";

1
IceCubesApp/Resources/Localization/it.lproj/Localizable.strings
View file

@ -129,6 +129,7 @@
"tab.settings" = "Impostazioni";
"tab.timeline" = "Timeline";
"tab.trending" = "Trending";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ è un'istanza valida";

1
IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings
View file

@ -115,6 +115,7 @@
"tab.settings" = "設定";
"tab.timeline" = "タイムライン";
"tab.trending" = "トレンド";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ は有効なインスタンスです";

1
IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings
View file

@ -129,6 +129,7 @@
"tab.settings" = "Instellingen";
"tab.timeline" = "Tijdlijn";
"tab.trending" = "Trending";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ is een geldige instantie";

1
IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings
View file

@ -119,6 +119,7 @@
"tab.settings" = "Ayarlar";
"tab.timeline" = "Zaman Dilimi";
"tab.trending" = "Yükselişte";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ geçerli bir oluşum";

1
IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings
View file

@ -130,6 +130,7 @@
"tab.settings" = "设置";
"tab.timeline" = "时间线";
"tab.trending" = "当下流行";
"tab.profile" = "Profile";
// MARK: Timeline
"timeline.%@-is-valid" = "%@ 是一个可用的服务器";

6
Packages/Account/Sources/Account/AccountDetailView.swift
View file

@ -524,7 +524,11 @@ public struct AccountDetailView: View {
}
}
} label: {
Image(systemName: "ellipsis.circle.fill")
if scrollOffset < -40 {
Image(systemName: "ellipsis.circle")
} else {
Image(systemName: "ellipsis.circle.fill")
}
}
}
}

9
Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
View file

@ -101,6 +101,15 @@ public struct AppAccountsSelectorView: View {
Label("app-account.button.add", systemImage: "person.badge.plus")
}
}
if UIDevice.current.userInterfaceIdiom == .phone {
Divider()
Button {
routerPath.presentedSheet = .settings
} label: {
Label("tab.settings", systemImage: "gear")
}
}
}
private func refreshAccounts() {

3
Packages/Env/Sources/Env/Router.swift
View file

@ -29,10 +29,11 @@ public enum SheetDestinations: Identifiable {
case addAccount
case addRemoteLocalTimeline
case statusEditHistory(status: String)
case settings
public var id: String {
switch self {
case .editStatusEditor, .newStatusEditor, .replyToStatusEditor, .quoteStatusEditor, .mentionStatusEditor:
case .editStatusEditor, .newStatusEditor, .replyToStatusEditor, .quoteStatusEditor, .mentionStatusEditor, .settings:
return "statusEditor"
case .listEdit:
return "listEdit"