feat: light mode support (#75)

* Added support for light mode * Update search textbox * Removed unused background color * update launch screen
joeldavidw · Nov 10, 2024 · f3ead92 · f3ead92
1 parent 891306c
commit f3ead92
Show file tree

Hide file tree

Showing 22 changed files with 59 additions and 65 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/Chronos/Assets.xcassets/Colors/AccentColor.colorset/Contents.json 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
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Chronos/Launch Screen.storyboard b/Chronos/Launch Screen.storyboard
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -24,7 +25,7 @@
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                        <color key="backgroundColor" red="0.047058823529411764" green="0.0039215686274509803" blue="0.12549019607843137" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="TWl-Jm-eUa" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="ZrU-eJ-DKE"/>
                             <constraint firstItem="TWl-Jm-eUa" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="t9e-3T-vX6"/>
@@ -38,5 +39,8 @@
     </scenes>
     <resources>
         <image name="Logo" width="512" height="512"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ struct PrivacyView: View { @@
                 Spacer()
             }
             .edgesIgnoringSafeArea(.all)
-            .background(Color(red: 0.04, green: 0, blue: 0.11))
         }
     }
@@ Expand Down @@