diff --git a/Chronos.xcodeproj/project.pbxproj b/Chronos.xcodeproj/project.pbxproj index 7f1bde5..35e8357 100644 --- a/Chronos.xcodeproj/project.pbxproj +++ b/Chronos.xcodeproj/project.pbxproj @@ -879,9 +879,8 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard"; INFOPLIST_KEY_UIStatusBarHidden = YES; - INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDarkContent; + INFOPLIST_KEY_UIStatusBarStyle = ""; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UIUserInterfaceStyle = Dark; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -917,7 +916,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Chronos/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = "Chronos Dev Release"; + INFOPLIST_KEY_CFBundleDisplayName = "Chronos Dev Debug"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; INFOPLIST_KEY_NSCameraUsageDescription = "Access to camera is need to scan QR codes"; INFOPLIST_KEY_NSFaceIDUsageDescription = "To unlock the app"; @@ -926,9 +925,8 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard"; INFOPLIST_KEY_UIStatusBarHidden = YES; - INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDarkContent; + INFOPLIST_KEY_UIStatusBarStyle = ""; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UIUserInterfaceStyle = Dark; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1243,7 +1241,7 @@ ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = Chronos/Info.plist; - INFOPLIST_KEY_CFBundleDisplayName = Chronos; + INFOPLIST_KEY_CFBundleDisplayName = "Chronos Dev Debug"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; INFOPLIST_KEY_NSCameraUsageDescription = "Access to camera is need to scan QR codes"; INFOPLIST_KEY_NSFaceIDUsageDescription = "To unlock the app"; @@ -1252,9 +1250,8 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard"; INFOPLIST_KEY_UIStatusBarHidden = YES; - INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleDarkContent; + INFOPLIST_KEY_UIStatusBarStyle = ""; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UIUserInterfaceStyle = Dark; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/Chronos/App/ChronosApp.swift b/Chronos/App/ChronosApp.swift index 75237dd..846edc1 100644 --- a/Chronos/App/ChronosApp.swift +++ b/Chronos/App/ChronosApp.swift @@ -10,7 +10,6 @@ struct ChronosApp: SwiftUI.App { WindowGroup { ContentView() .environmentObject(LoginStatus()) - .background(Color(red: 0.04, green: 0, blue: 0.11)) } } } diff --git a/Chronos/App/Login/PasswordLoginView.swift b/Chronos/App/Login/PasswordLoginView.swift index 0ecdeee..2199184 100644 --- a/Chronos/App/Login/PasswordLoginView.swift +++ b/Chronos/App/Login/PasswordLoginView.swift @@ -69,13 +69,11 @@ struct PasswordLoginView: View { if !loginPressed { Text("Login") .bold() - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) .disabled(loginPressed) } else { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -85,7 +83,6 @@ struct PasswordLoginView: View { } .padding(16) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity) - .background(Color(red: 0.04, green: 0, blue: 0.11).ignoresSafeArea()) .navigationTitle("Welcome Back") .onAppear { focusedField = .password diff --git a/Chronos/App/Misc/PasswordReminder.swift b/Chronos/App/Misc/PasswordReminder.swift index de1c09a..3d09d2b 100644 --- a/Chronos/App/Misc/PasswordReminder.swift +++ b/Chronos/App/Misc/PasswordReminder.swift @@ -66,13 +66,11 @@ struct PasswordReminderView: View { if !verifyPressed { Text("Verify") .bold() - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) .disabled(verifyPressed) } else { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -92,7 +90,6 @@ struct PasswordReminderView: View { } .padding(16) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity) - .background(Color(red: 0.04, green: 0, blue: 0.11).ignoresSafeArea()) .navigationTitle("Password Reminder") .navigationBarTitleDisplayMode(.inline) .onAppear { diff --git a/Chronos/App/Onboarding/BiometricsSetupView.swift b/Chronos/App/Onboarding/BiometricsSetupView.swift index 8506c09..f49004e 100644 --- a/Chronos/App/Onboarding/BiometricsSetupView.swift +++ b/Chronos/App/Onboarding/BiometricsSetupView.swift @@ -33,7 +33,6 @@ struct BiometricsSetupView: View { stateOnboardingCompleted = true } label: { Text("Enable Biometrics") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) @@ -56,7 +55,7 @@ struct BiometricsSetupView: View { .padding(.vertical, 32) .padding(.horizontal, 24) .navigationTitle("Biometrics") - .background(Color(red: 0.04, green: 0, blue: 0.11)) + .navigationBarTitleDisplayMode(.inline) .navigationBarBackButtonHidden() } diff --git a/Chronos/App/Onboarding/PasswordSetupView.swift b/Chronos/App/Onboarding/PasswordSetupView.swift index bcf12dd..d0d56da 100644 --- a/Chronos/App/Onboarding/PasswordSetupView.swift +++ b/Chronos/App/Onboarding/PasswordSetupView.swift @@ -86,13 +86,11 @@ struct PasswordSetupView: View { } label: { if !isEncrypting { Text("Next") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } else { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -104,7 +102,6 @@ struct PasswordSetupView: View { .padding(.vertical, 32) .padding(.horizontal, 24) } - .background(Color(red: 0.04, green: 0, blue: 0.11).ignoresSafeArea()) .navigationTitle("Setup") .navigationBarTitleDisplayMode(.inline) .navigationDestination(isPresented: $nextBtnPressed) { diff --git a/Chronos/App/Onboarding/Restore/RestoreBackupView.swift b/Chronos/App/Onboarding/Restore/RestoreBackupView.swift index f299169..8a855b2 100644 --- a/Chronos/App/Onboarding/Restore/RestoreBackupView.swift +++ b/Chronos/App/Onboarding/Restore/RestoreBackupView.swift @@ -68,13 +68,11 @@ struct RestoreBackupView: View { } label: { if !restoreBtnPressed { Text("Next") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } else { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -88,7 +86,6 @@ struct RestoreBackupView: View { .navigationDestination(isPresented: $passwordVerified) { BiometricsSetupView() } - .background(Color(red: 0.04, green: 0, blue: 0.11).ignoresSafeArea()) .onAppear { focusedField = .password } diff --git a/Chronos/App/Onboarding/StorageSetupView.swift b/Chronos/App/Onboarding/StorageSetupView.swift index b8e6df1..b7cf228 100644 --- a/Chronos/App/Onboarding/StorageSetupView.swift +++ b/Chronos/App/Onboarding/StorageSetupView.swift @@ -37,7 +37,6 @@ struct StorageSetupView: View { if iCloudSyncLastAttempt == 0 { Button {} label: { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -49,7 +48,6 @@ struct StorageSetupView: View { showICloudUnavailableDialog = true }) { Text("iCloud Unavailable") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) @@ -70,7 +68,6 @@ struct StorageSetupView: View { } } label: { Text("Enable iCloud") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) @@ -135,7 +132,6 @@ struct StorageSetupView: View { } .padding(.vertical, 32) .padding([.horizontal], 24) - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationTitle("Storage") .navigationBarTitleDisplayMode(.inline) .navigationDestination(isPresented: $nextBtnPressed) { diff --git a/Chronos/App/Onboarding/VaultSetupView.swift b/Chronos/App/Onboarding/VaultSetupView.swift index 0a5c025..d587ca5 100644 --- a/Chronos/App/Onboarding/VaultSetupView.swift +++ b/Chronos/App/Onboarding/VaultSetupView.swift @@ -44,13 +44,11 @@ struct VaultSetupView: View { } label: { if !isCreatingVault { Text("Next") - .foregroundStyle(Color(red: 0.04, green: 0, blue: 0.11)) .bold() .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } else { ProgressView() - .tint(Color(red: 0.04, green: 0, blue: 0.11)) .frame(minWidth: 0, maxWidth: .infinity) .frame(height: 32) } @@ -60,7 +58,6 @@ struct VaultSetupView: View { } .padding(.vertical, 32) .padding(.horizontal, 24) - .background(Color(red: 0.04, green: 0, blue: 0.11).ignoresSafeArea()) .navigationTitle("Online Vault") .navigationBarTitleDisplayMode(.inline) .navigationDestination(isPresented: $nextBtnPressed) { diff --git a/Chronos/App/Onboarding/WelcomeView.swift b/Chronos/App/Onboarding/WelcomeView.swift index b1bf04f..6532c01 100644 --- a/Chronos/App/Onboarding/WelcomeView.swift +++ b/Chronos/App/Onboarding/WelcomeView.swift @@ -74,7 +74,6 @@ struct WelcomeView: View { } .padding([.horizontal], 24) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity) - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationBarTitleDisplayMode(.inline) .navigationDestination(isPresented: $getStartedPressed) { StorageSetupView() diff --git a/Chronos/App/Privacy/PrivacyView.swift b/Chronos/App/Privacy/PrivacyView.swift index b40a31b..8e0ef4b 100644 --- a/Chronos/App/Privacy/PrivacyView.swift +++ b/Chronos/App/Privacy/PrivacyView.swift @@ -14,7 +14,6 @@ struct PrivacyView: View { Spacer() } .edgesIgnoringSafeArea(.all) - .background(Color(red: 0.04, green: 0, blue: 0.11)) } } diff --git a/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportConfirmPasswordView.swift b/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportConfirmPasswordView.swift index 6694516..d244629 100644 --- a/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportConfirmPasswordView.swift +++ b/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportConfirmPasswordView.swift @@ -53,7 +53,6 @@ struct EncryptedExportConfirmPasswordView: View { } .padding([.horizontal], 24) .navigationTitle("Encrypted Export") - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationBarTitleDisplayMode(.inline) .navigationBarItems(trailing: Button { diff --git a/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportPasswordView.swift b/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportPasswordView.swift index ad0a8e7..547d682 100644 --- a/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportPasswordView.swift +++ b/Chronos/App/Tabs/Settings/Export/EncryptedExport/EncryptedExportPasswordView.swift @@ -47,7 +47,6 @@ struct EncryptedExportPasswordView: View { } .padding([.horizontal], 24) .navigationTitle("Encrypted Export") - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationBarTitleDisplayMode(.inline) .scrollIndicators(.never) .navigationBarItems(trailing: Button("Next", action: { diff --git a/Chronos/App/Tabs/Settings/Export/ExportSelectionView.swift b/Chronos/App/Tabs/Settings/Export/ExportSelectionView.swift index 7621ac7..3e8e7b4 100644 --- a/Chronos/App/Tabs/Settings/Export/ExportSelectionView.swift +++ b/Chronos/App/Tabs/Settings/Export/ExportSelectionView.swift @@ -78,7 +78,6 @@ struct ExportSelectionView: View { .navigationTitle("Export Selection") .padding([.horizontal], 24) .padding([.bottom], 32) - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationBarTitleDisplayMode(.inline) } } diff --git a/Chronos/App/Tabs/Settings/Import/ImportSourceListView.swift b/Chronos/App/Tabs/Settings/Import/ImportSourceListView.swift index 8a91179..21e605f 100644 --- a/Chronos/App/Tabs/Settings/Import/ImportSourceListView.swift +++ b/Chronos/App/Tabs/Settings/Import/ImportSourceListView.swift @@ -48,7 +48,6 @@ struct ImportSourceListView: View { ImportSourceDetailView(importSource: importSource) } label: { Text(importSource.name) - .fontWeight(.semibold) } } } diff --git a/Chronos/App/Tabs/Settings/SettingsTab.swift b/Chronos/App/Tabs/Settings/SettingsTab.swift index ddccdcd..52a2e5f 100644 --- a/Chronos/App/Tabs/Settings/SettingsTab.swift +++ b/Chronos/App/Tabs/Settings/SettingsTab.swift @@ -166,8 +166,6 @@ struct SettingsTab: View { } .listSectionSpacing(8) } - .scrollContentBackground(.hidden) - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationTitle("Settings") .navigationBarTitleDisplayMode(.inline) .confirmationDialog("Log Out", isPresented: $showLogoutConfirmation, titleVisibility: .visible) { diff --git a/Chronos/App/Tabs/Tokens/Row/TokenRowView.swift b/Chronos/App/Tabs/Tokens/Row/TokenRowView.swift index 3205b4d..b18d5c2 100644 --- a/Chronos/App/Tabs/Tokens/Row/TokenRowView.swift +++ b/Chronos/App/Tabs/Tokens/Row/TokenRowView.swift @@ -84,7 +84,6 @@ struct TokenRowView: View { } .contentShape(Rectangle()) .padding(CGFloat(4)) - .listRowBackground(Color(red: 0.04, green: 0, blue: 0.11)) .onTapGesture { if !stateTapToRevealEnabled { if token.isValid { diff --git a/Chronos/App/Tabs/Tokens/TokensTab.swift b/Chronos/App/Tabs/Tokens/TokensTab.swift index ed7d33e..a02f377 100644 --- a/Chronos/App/Tabs/Tokens/TokensTab.swift +++ b/Chronos/App/Tabs/Tokens/TokensTab.swift @@ -85,12 +85,11 @@ struct TokensTab: View { } } .listStyle(.plain) - .background(Color(red: 0.04, green: 0, blue: 0.11)) .navigationTitle("Tokens") .navigationBarTitleDisplayMode(.inline) - .searchable(text: $searchQuery, prompt: Text("Search tokens")) + .searchable(text: $searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: Text("Search tokens")) .toolbar { - ToolbarContent() +// ToolbarContent() } .overlay( EmptyStateView() diff --git a/Chronos/Assets.xcassets/AccentColor.colorset/Contents.json b/Chronos/Assets.xcassets/AccentColor.colorset/Contents.json deleted file mode 100644 index b4721d2..0000000 --- a/Chronos/Assets.xcassets/AccentColor.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0.741", - "green" : "0.949", - "red" : "0.455" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Chronos/Assets.xcassets/Colors/AccentColor.colorset/Contents.json b/Chronos/Assets.xcassets/Colors/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..2be7bf5 --- /dev/null +++ b/Chronos/Assets.xcassets/Colors/AccentColor.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "153", + "green" : "196", + "red" : "85" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.741", + "green" : "0.949", + "red" : "0.455" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Chronos/Assets.xcassets/Colors/Contents.json b/Chronos/Assets.xcassets/Colors/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Chronos/Assets.xcassets/Colors/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Chronos/Launch Screen.storyboard b/Chronos/Launch Screen.storyboard index 285fe6b..fc06b14 100644 --- a/Chronos/Launch Screen.storyboard +++ b/Chronos/Launch Screen.storyboard @@ -1,9 +1,10 @@ - + - + + @@ -24,7 +25,7 @@ - + @@ -38,5 +39,8 @@ + + +