Updates to app colour scheme

lukebettridge · Jul 8, 2021 · 79bdc08 · 79bdc08
1 parent 2a17133
commit 79bdc08
Show file tree

Hide file tree

Showing 38 changed files with 213 additions and 131 deletions.
diff --git a/Pod.xcodeproj/project.pbxproj b/Pod.xcodeproj/project.pbxproj
@@ -1111,13 +1111,14 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Pod/Preview Content\"";
 				DEVELOPMENT_TEAM = GPM4PVH4B9;
+				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Pod/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.4;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = uk.co.lukebettridge.pod;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1139,13 +1140,14 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"Pod/Preview Content\"";
 				DEVELOPMENT_TEAM = GPM4PVH4B9;
+				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = Pod/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.4;
+				MARKETING_VERSION = 1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = uk.co.lukebettridge.pod;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Pod/Assets.xcassets/AccentColor.colorset/Contents.json b/Pod/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x9C",
-          "green" : "0xBD",
-          "red" : "0xD5"
+          "blue" : "0.584",
+          "green" : "0.680",
+          "red" : "0.776"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x87",
-          "green" : "0xAA",
-          "red" : "0xE6"
+          "blue" : "0.259",
+          "green" : "0.471",
+          "red" : "0.820"
         }
       },
       "idiom" : "universal"

diff --git a/Pod/Assets.xcassets/Color.colorset/Contents.json b/Pod/Assets.xcassets/Color.colorset/Contents.json
diff --git a/Pod/Assets.xcassets/PrimaryBackground.colorset/Contents.json b/Pod/Assets.xcassets/PrimaryBackground.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.980",
+          "green" : "0.973",
+          "red" : "0.973"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.078",
+          "green" : "0.059",
+          "red" : "0.047"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Pod/Assets.xcassets/SecondaryBackground.colorset/Contents.json b/Pod/Assets.xcassets/SecondaryBackground.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.129",
+          "green" : "0.098",
+          "red" : "0.078"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Pod/Views/Collection/Collection.swift b/Pod/Views/Collection/Collection.swift
@@ -22,9 +22,16 @@ struct Collection: View {
             VStack {
                 if vm.isLoading {
                     ProgressView()
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 } else if collectionItems.count > 0 {
                     ScrollView(.vertical) {
-                        VStack(spacing: 10) {
+                        VStack(spacing: 15) {
+                            Text("You have \(collectionItems.reduce(0) { $0 + $1.quantity }) capsules in your collection.")
+                                .font(.caption2)
+                                .foregroundColor(.gray)
+                                .padding(.top, -16)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+
                             Section(header: HStack {
                                 Text("Favorites").font(.title2).fontWeight(.semibold)
                                 Spacer()
@@ -51,23 +58,19 @@ struct Collection: View {
                                     CollectionRow(collectionItem, pod: pod)
                                 }
                             }
-
-                            Text("You have \(collectionItems.reduce(0) { $0 + $1.quantity }) capsules in your collection.")
-                                .font(.caption2)
-                                .foregroundColor(.gray)
-                                .padding(.top, 4)
                         }
                         .padding()
                         .padding(.bottom, 30)
                     }
-                    .background(
-                        Color(colorScheme == .dark ? UIColor.systemBackground : UIColor.secondarySystemBackground)
-                            .edgesIgnoringSafeArea(.all)
-                    )
                 } else {
                     CollectionEmpty()
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
                 }
             }
+            .background(
+                Color("PrimaryBackground")
+                    .edgesIgnoringSafeArea(.all)
+            )
             .navigationBarTitle("My Collection")
         }
         .onAppear {

diff --git a/Pod/Views/Collection/CollectionRow.swift b/Pod/Views/Collection/CollectionRow.swift
@@ -34,7 +34,7 @@ struct CollectionRow: View {
                     .resizable()
                     .background(pod.color)
                     .frame(width: 55, height: 55)
-                    .clipShape(RoundedRectangle(cornerRadius: 10))
+                    .clipShape(RoundedRectangle(cornerRadius: 12.5))
 
                 VStack(alignment: .leading) {
                     HStack(alignment: .center, spacing: 5) {
@@ -67,17 +67,15 @@ struct CollectionRow: View {
                 Spacer()
 
                 Image(systemName: "chevron.forward")
-                    .font(Font.headline.weight(.light))
-                    .foregroundColor(.gray)
+                    .font(Font.subheadline.weight(.light))
+                    .foregroundColor(.accentColor)
             }
         }
+        .padding(.horizontal, 13.5)
         .padding(.vertical, 12)
-        .padding(.horizontal, 15)
         .background(
-            RoundedRectangle(cornerRadius: 10)
-                .fill(
-                    colorScheme == .dark ? Color(UIColor.secondarySystemBackground) : Color.white
-                )
+            RoundedRectangle(cornerRadius: 15)
+                .fill(Color("SecondaryBackground"))
         )
         .opacity(collectionItem.quantity > 0 ? 1 : 0.5)
         .contextMenu {

diff --git a/Pod/Views/Collection/Favourites/FavouritesEmpty.swift b/Pod/Views/Collection/Favourites/FavouritesEmpty.swift
@@ -14,7 +14,7 @@ struct FavouritesEmpty: View {
         VStack(spacing: 5) {
             Image(systemName: "star.fill")
                 .font(Font.system(size: 50).weight(.light))
-                .foregroundColor(Color(UIColor.systemGray5))
+                .foregroundColor(Color(UIColor.systemGray4))
                 .padding(.bottom, 5)
             Text("You have no favorites")
                 .font(.headline)
@@ -30,10 +30,8 @@ struct FavouritesEmpty: View {
         .padding(.top, 18.5)
         .padding(.bottom, 21)
         .background(
-            RoundedRectangle(cornerRadius: 10)
-                .fill(
-                    colorScheme == .dark ? Color(UIColor.secondarySystemBackground) : Color.white
-                )
+            RoundedRectangle(cornerRadius: 15)
+                .fill(Color("SecondaryBackground"))
         )
     }
 }
diff --git a/Pod/Views/Collection/Favourites/FavouritesRow.swift b/Pod/Views/Collection/Favourites/FavouritesRow.swift
@@ -17,7 +17,7 @@ struct FavouritesRow: View {
                 .resizable()
                 .background(pod.color)
                 .frame(width: 40, height: 40)
-                .clipShape(RoundedRectangle(cornerRadius: 6))
+                .clipShape(RoundedRectangle(cornerRadius: 8))
             HStack(spacing: 5) {
             Text((pod.name ?? "").uppercased())
                 .font(.custom("FSLucasPro-SemiBd", size: 16))
@@ -38,5 +38,6 @@ struct FavouritesRow: View {
             }
         }
         .padding(.vertical, 2.5)
+        .listRowBackground(Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Collection/Favourites/FavouritesView.swift b/Pod/Views/Collection/Favourites/FavouritesView.swift
@@ -22,6 +22,7 @@ struct FavouritesView: View {
                     }
                 }
             }
+            .background(Color("PrimaryBackground").edgesIgnoringSafeArea(.all))
             .navigationBarTitle("Edit Favorites", displayMode: .inline)
             .navigationBarItems(
                 trailing: Button(action: exit) { Text("Done") }

diff --git a/Pod/Views/ContentView.swift b/Pod/Views/ContentView.swift
@@ -22,19 +22,19 @@ struct ContentView: View {
                 TabView {
                     Collection()
                         .tabItem {
-                            Image(systemName: "person.crop.square.fill")
+                            Image(systemName: "books.vertical.fill")
                             Text("Collection")
                         }
                     Explore()
                         .tabItem {
-                            Image(systemName: "square.grid.2x2.fill")
+                            Image(systemName: "mail.stack.fill")
                             Text("Explore")
                         }
                     Spacer()
                     Trends()
                         .tabItem {
-                            Image(systemName: "chart.bar.fill")
-                            Text("Trends")
+                            Image(systemName: "clock.arrow.circlepath")
+                            Text("History")
                         }
                     Settings()
                         .tabItem {

diff --git a/Pod/Views/Explore/Browse/Browse.swift b/Pod/Views/Explore/Browse/Browse.swift
@@ -49,6 +49,7 @@ struct Browse: View {
         VStack {
             if vm.isLoading || browseVM.isLoading {
                 ProgressView()
+                    .frame(maxWidth: .infinity, maxHeight: .infinity)
             } else {
                 ScrollView(.vertical) {
                     VStack {
@@ -76,14 +77,15 @@ struct Browse: View {
                 }
             }
         }
+        .background(Color("PrimaryBackground").edgesIgnoringSafeArea(.all))
         .navigationBarTitle(title)
         .navigationBarItems(
             trailing:
                 Button(action: {
                     vm.openSheet(.filter, filter: $filter)
                 }) {
                     Image(systemName: "line.horizontal.3.decrease.circle\(filter.active ? ".fill" : "")")
-                        .font(.title2)
+                        .font(.headline)
                 }
         )
         .introspectNavigationController { UINavigationController in

diff --git a/Pod/Views/Explore/Browse/Filter/FilterAvailable/FilterAvailableRow.swift b/Pod/Views/Explore/Browse/Filter/FilterAvailable/FilterAvailableRow.swift
@@ -17,6 +17,6 @@ struct FilterAvailableRow: View {
             .font(.subheadline)
             .foregroundColor(selected ? .white : colorScheme == .dark ? .primary : .gray)
             .frame(width: 114, height: 40)
-            .background(selected ? Color.accentColor : Color(colorScheme == .dark ? UIColor.secondarySystemBackground : UIColor.systemBackground))
+            .background(selected ? Color.accentColor : Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Explore/Browse/Filter/FilterCup/FilterCupRow.swift b/Pod/Views/Explore/Browse/Filter/FilterCup/FilterCupRow.swift
@@ -31,6 +31,6 @@ struct FilterCupRow: View {
         .padding(.top, 7)
         .padding(.horizontal, 10)
         .frame(width: 65, height: 60)
-        .background(selected ? Color.accentColor : Color(colorScheme == .dark ? UIColor.secondarySystemBackground : UIColor.systemBackground))
+        .background(selected ? Color.accentColor : Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Explore/Browse/Filter/FilterDecaffeinated/FilterDecaffeinatedRow.swift b/Pod/Views/Explore/Browse/Filter/FilterDecaffeinated/FilterDecaffeinatedRow.swift
@@ -17,6 +17,6 @@ struct FilterDecaffeinatedRow: View {
             .font(.subheadline)
             .foregroundColor(selected ? .white : colorScheme == .dark ? .primary : .gray)
             .frame(width: 114, height: 40)
-            .background(selected ? Color.accentColor : Color(colorScheme == .dark ? UIColor.secondarySystemBackground : UIColor.systemBackground))
+            .background(selected ? Color.accentColor : Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Explore/Browse/Filter/FilterIntensity/FilterIntensityRow.swift b/Pod/Views/Explore/Browse/Filter/FilterIntensity/FilterIntensityRow.swift
@@ -20,6 +20,6 @@ struct FilterIntensityRow: View {
         .foregroundColor(selected ? .white : colorScheme == .dark ? .primary : .gray)
         .opacity(disabled && !selected ? colorScheme == .dark ? 0.2 : 0.4 : 1)
         .frame(width: 45, height: 45)
-        .background(selected ? Color.accentColor : Color(colorScheme == .dark ? UIColor.secondarySystemBackground : UIColor.systemBackground))
+        .background(selected ? Color.accentColor : Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Explore/Browse/Filter/FilterRating/FilterRatingRow.swift b/Pod/Views/Explore/Browse/Filter/FilterRating/FilterRatingRow.swift
@@ -20,6 +20,6 @@ struct FilterRatingRow: View {
         .foregroundColor(selected ? .white : colorScheme == .dark ? .primary : .gray)
         .opacity(disabled && !selected ? colorScheme == .dark ? 0.2 : 0.4 : 1)
         .frame(width: 45, height: 45)
-        .background(selected ? Color.accentColor : Color(colorScheme == .dark ? UIColor.secondarySystemBackground : UIColor.systemBackground))
+        .background(selected ? Color.accentColor : Color("SecondaryBackground"))
     }
 }
diff --git a/Pod/Views/Explore/Browse/Filter/FilterView.swift b/Pod/Views/Explore/Browse/Filter/FilterView.swift
@@ -123,7 +123,7 @@ struct FilterView: View {
                         disabled: !isDirty
                     )
                 }
-                .background(Color(colorScheme == .dark ? UIColor.systemBackground : UIColor.secondarySystemBackground).edgesIgnoringSafeArea(.all))
+                .background(Color("PrimaryBackground").edgesIgnoringSafeArea(.all))
             }
             .navigationBarTitle("Filter")
         }