Merge pull request #1083 from planetary-social/swiftui/navigation_colors

Update colors of navigation bar and tab bars

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - Fixed an issue where room names would not show up in the connected peers list.
+- Update the color palette used in the navigation bars and the main tab bar. #1059
 - Added new redesigned Discover screen. #587
 - Publish announcement messages of newly registered room aliases on the SSB log. #899
 

Resources/Assets.xcassets/Colors/unselectedTab.colorset/Contents.json → Resources/Assets.xcassets/New Colors/navigationbar-bg.colorset/Contents.json

@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x51",
-          "green" : "0x51",
-          "red" : "0x51"
+          "blue" : "0xF4",
+          "green" : "0xF5",
+          "red" : "0xFC"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xA6",
-          "green" : "0x88",
-          "red" : "0x9A"
+          "blue" : "0x51",
+          "green" : "0x22",
+          "red" : "0x33"
         }
       },
       "idiom" : "universal"

Resources/Assets.xcassets/tab-icon-channels-selected.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Channels--selected@1x.png",
+      "filename" : "Topics_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@1x-1.png",
+      "filename" : "Topics_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Channels--selected@2x.png",
+      "filename" : "Topics_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@2x-1.png",
+      "filename" : "Topics_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Channels--selected@3x.png",
+      "filename" : "Topics_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--selected@3x-1.png",
+      "filename" : "Topics_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Resources/Assets.xcassets/tab-icon-channels.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Channels--default@1x.png",
+      "filename" : "Topics_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@1x-1.png",
+      "filename" : "Topics_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Channels[email protected]",
+      "filename" : "Topics_light[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@2x-1.png",
+      "filename" : "Topics_dark--[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Channels[email protected]",
+      "filename" : "Topics_light[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Channels--default@3x-1.png",
+      "filename" : "Topics_dark--[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     }

Resources/Assets.xcassets/tab-icon-directory-selected.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Network--selected@1x.png",
+      "filename" : "Network_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity.png",
+      "filename" : "Network_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Network--selected@2x.png",
+      "filename" : "Network_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity@2x.png",
+      "filename" : "Network_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Network--selected@3x.png",
+      "filename" : "Network_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Activity@3x.png",
+      "filename" : "Network_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

Resources/Assets.xcassets/tab-icon-directory.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Network--default@1x.png",
+      "filename" : "Network_light--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@1x-1.png",
+      "filename" : "Network_dark--default.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Network[email protected]",
+      "filename" : "Network_light[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@2x-1.png",
+      "filename" : "Network_dark--[email protected]",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Network[email protected]",
+      "filename" : "Network_light[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Network--default@3x-1.png",
+      "filename" : "Network_dark--[email protected]",
       "idiom" : "universal",
       "scale" : "3x"
     }

Resources/Assets.xcassets/tab-icon-everyone-selected.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Light - Search--selected@1x.png",
+      "filename" : "Discover_light--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
@@ -12,12 +12,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@1x-1.png",
+      "filename" : "Discover_dark--active.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Light - Search--selected@2x.png",
+      "filename" : "Discover_light--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
@@ -28,12 +28,12 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@2x-1.png",
+      "filename" : "Discover_dark--active@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Light - Search--selected@3x.png",
+      "filename" : "Discover_light--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     },
@@ -44,7 +44,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Light - Search--selected@3x-1.png",
+      "filename" : "Discover_dark--active@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }