[ios] Made dark appearance colors actually dark and match the system more

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>

iphone/Maps/Bridging/BridgeControllers.swift

@@ -33,6 +33,6 @@ class SettingsBridgeController: UIHostingController<SettingsView> {
 class ProfileBridgeController: UIHostingController<ProfileView> {
     required init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder, rootView: ProfileView())
-        self.view.tintColor = .alternativeAccent
+        self.view.tintColor = .toolbarAccent
     }
 }

iphone/Maps/Core/Theme/Colors.swift

@@ -63,7 +63,7 @@ class DayColors: IColors {
 class NightColors: IColors {
   var clear = UIColor.clear
   var primaryDark = UIColor(25, 30, 35, alpha100)
-  var primary =  UIColor(45, 50, 55, alpha100)
+  var primary = UIColor.accent
   var secondary =  UIColor(0x25, 0x28, 0x2b, alpha100)
   // Light green color
   var primaryLight = UIColor(65, 70, 75, alpha100)
@@ -71,7 +71,7 @@ class NightColors: IColors {
   var tabBarButtonBackground = UIColor(60, 64, 68, alpha70)
   var downloadBadgeBackground = UIColor(230, 70, 60, alpha100)
   // Background color && press color
-  var pressBackground = UIColor(50, 54, 58, alpha100)
+  var pressBackground = UIColor(28, 28, 30, alpha100)
   // Red color (use for status closed in place page)
   var red =  UIColor(230, 70, 60, alpha100)
   var errorPink = UIColor(246, 60, 51, alpha26)
@@ -88,7 +88,7 @@ class NightColors: IColors {
   var blackHintText =  UIColor(255, 255, 255, alpha30)
   var blackDividers =  UIColor(255, 255, 255, alpha08)
   var solidDividers = UIColor(84, 86, 90, alpha100)
-  var white =  UIColor(60, 64, 68, alpha100)
+  var white =  UIColor(34, 34, 36, alpha100)
   var whitePrimaryText = UIColor(255, 255, 255, alpha87)
   var whitePrimaryTextHighlighted = UIColor(255, 255, 255, alpha30)
   var whiteSecondaryText =  UIColor(0, 0, 0, alpha70)

iphone/Maps/Images.xcassets/Accent Color.colorset/Contents.json

@@ -11,24 +11,6 @@
         }
       },
       "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "color-space" : "srgb",
-        "components" : {
-          "alpha" : "1.000",
-          "blue" : "0.482",
-          "green" : "0.737",
-          "red" : "0.486"
-        }
-      },
-      "idiom" : "universal"
     }
   ],
   "info" : {

iphone/Maps/Images.xcassets/Alternative Accent Color.colorset/Contents.json

@@ -5,9 +5,27 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.788",
-          "green" : "0.875",
-          "red" : "0.784"
+          "blue" : "0.247",
+          "green" : "0.396",
+          "red" : "0.216"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.482",
+          "green" : "0.737",
+          "red" : "0.486"
         }
       },
       "idiom" : "universal"

iphone/Maps/Images.xcassets/Interface/Toolbar Accent Color.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.788",
+          "green" : "0.875",
+          "red" : "0.784"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iphone/Maps/UI/Routing/RoutingOptionsView.swift

@@ -76,6 +76,6 @@ struct RoutingOptionsView: View {
         .onChange(of: shouldAvoidMotorwaysWhileRouting) { changedShouldAvoidMotorwaysWhileRouting in
             Settings.shouldAvoidMotorwaysWhileRouting = changedShouldAvoidMotorwaysWhileRouting
         }
-        .accentColor(.alternativeAccent)
+        .accentColor(.toolbarAccent)
     }
 }

iphone/Maps/UI/Search/TableView/MWMSearchCommonCell.mm

@@ -29,12 +29,13 @@
   [self.openLabel setHidden:result.openStatusText.length == 0];
   [self setStyleNameAndApply:@"Background"];
   [self.iconImageView setStyleNameAndApply:@"BlueBackground"];
-  self.iconImageView.image = [UIImage imageNamed:result.iconImageName];
+  self.iconImageView.image = [[UIImage imageNamed:result.iconImageName] imageWithTintColor:UIColor.white];
   self.separatorInset = UIEdgeInsetsMake(0, kSearchCellSeparatorInset, 0, 0);
 }
 
 - (void)layoutSubviews {
   [super layoutSubviews];
+  self.iconImageView.image = [self.iconImageView.image imageWithTintColor:UIColor.white];
   [self.iconImageView.layer setCornerRadius:self.iconImageView.height / 2];
 }
 

iphone/Maps/UI/Settings/Profile/ExistingProfileView.swift

@@ -132,6 +132,7 @@ struct ExistingProfileView: View {
                         } label: {
                             Text("osm_profile_remove")
                                 .lineLimit(1)
+                                .foregroundStyle(.alternativeAccent)
                                 .frame(maxWidth: .infinity)
                         }
                         .buttonStyle(BorderedButtonStyle())
@@ -146,6 +147,7 @@ struct ExistingProfileView: View {
                     } label: {
                         Text("osm_more_about")
                             .lineLimit(1)
+                            .foregroundStyle(.alternativeAccent)
                             .frame(maxWidth: .infinity)
                     }
                     .buttonStyle(BorderedButtonStyle())

iphone/Maps/UI/Settings/Profile/NoExistingProfileView.swift

@@ -32,6 +32,7 @@ struct NoExistingProfileView: View {
                             .padding(.top, 6)
                         
                         Text("osm_profile_explanation")
+                            .tint(.alternativeAccent)
                     }
                 }
                 .padding(.bottom)
@@ -67,6 +68,7 @@ struct NoExistingProfileView: View {
                     } label: {
                         Text("osm_profile_register")
                             .lineLimit(1)
+                            .foregroundStyle(.alternativeAccent)
                             .frame(maxWidth: .infinity)
                     }
                     .buttonStyle(BorderedButtonStyle())

iphone/Maps/UI/Settings/SettingsNavigationView.swift

@@ -102,6 +102,7 @@ struct SettingsNavigationView: View {
                             .frame(maxWidth: .infinity)
                     }
                     .buttonStyle(BorderedButtonStyle())
+                    .foregroundStyle(.alternativeAccent)
                     .padding([.top, .bottom])
                     .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
                 }

iphone/Maps/UI/Settings/SettingsView.swift

@@ -310,6 +310,6 @@ struct SettingsView: View {
         .onReceive(Settings.syncStatePublisher) { syncState in
             isSyncPossible = syncState.isAvailable
         }
-        .accentColor(.alternativeAccent)
+        .accentColor(.toolbarAccent)
     }
 }