COF-20 starts the glassmorphism take over

CoffeeTracker/CoffeeTracker/Assets.xcassets/Background.imageset/Contents.json

@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "light.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

CoffeeTracker/CoffeeTracker/Beans/BeanDetailView.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct BeanDetailView: View {
+    @Environment(\.colorScheme) private var colorScheme
+
     @State private var showEditView = false
 
     var bean: BeanModel
@@ -47,9 +49,9 @@ struct BeanDetailView: View {
                 Spacer()
                 Button(action: {showEditView.toggle()}) {
                     Image(systemName: SFSymbols.pencil)
-                }
+                }.foregroundColor(colorScheme == .dark ? .white : .accentColor)
             }.padding()
-                .background(.thinMaterial)
+                .background(.thickMaterial)
                 .cornerRadius(10, corners: [.bottomLeft, .bottomRight])
                 .sheet(isPresented: $showEditView) {
                     showEditView = false
@@ -67,10 +69,10 @@ struct BeanDetailView: View {
     }
 }
 
-//struct BeanDetailView_Previews: PreviewProvider {
-//    static var previews: some View {
-//        NavigationView {
-//            BeanDetailView(bean: testRoast)
-//        }
-//    }
-//}
+struct BeanDetailView_Previews: PreviewProvider {
+    static var previews: some View {
+        NavigationView {
+            BeanDetailView(bean: testRoast)
+        }
+    }
+}

CoffeeTracker/CoffeeTracker/Beans/BeanRowView.swift

@@ -9,6 +9,8 @@ import Foundation
 import SwiftUI
 
 struct BeanRowView: View {
+    @Environment(\.colorScheme) private var colorScheme
+
     @State private var showingDetails = false
 
     var bean: BeanModel
@@ -28,6 +30,7 @@ struct BeanRowView: View {
                 Image(uiImage: bean.image)
                     .resizable()
                     .aspectRatio(contentMode: .fit)
+                    .cornerRadius(10)
                     .frame(width: 100, height: 100, alignment: .center)
                 VStack(alignment: .leading, spacing: 5) {
                     HStack(alignment: .top) {
@@ -48,24 +51,44 @@ struct BeanRowView: View {
                         .font(.footnote)
                 }
             }
-            .padding(.horizontal)
+            .foregroundColor(colorScheme == .dark ? .black : .primary)
+            .padding(.leading, 10)
+            .padding(.trailing)
             if showingDetails {
                 BeanDetailView(bean: bean)
+                    .foregroundColor(colorScheme == .dark ? .black : .primary)
             }
 
-        }.padding(.top, 10)
-            .padding(.bottom, showingDetails ? 0 : 10)
-            .background(Color.bone)
+        }.padding(.top, 0)
+            .padding(.bottom, 0)
+            .background(colorScheme == .dark ? .primary : .secondary)
+            .background(.thinMaterial)
             .cornerRadius(10)
+            .overlay(
+                RoundedRectangle(cornerRadius: 10)
+                    .stroke(.tertiary, lineWidth: 0.5)
+            )
+            .shadow(radius: 2)
             .gesture(tap)
 //            .animation(.default, value: showingDetails)
     }
 }
 
 struct BeanRowView_Previews: PreviewProvider {
     static var previews: some View {
-        VStack {
-            BeanRowView(bean: testRoast)
+        ZStack {
+            Image("Background")
+                .resizable()
+                .ignoresSafeArea()
+            ScrollView {
+                BeanRowView(bean: testRoast)
+                    .padding(.vertical, 5)
+                    .padding(.horizontal)
+                BeanRowView(bean: testRoast)
+                    .padding(.vertical, 5)
+                    .padding(.horizontal)
+            }
         }
+        .preferredColorScheme(.dark)
     }
 }

CoffeeTracker/CoffeeTracker/Beans/BeansCollectionView.swift

@@ -8,31 +8,61 @@
 import SwiftUI
 
 struct BeansCollectionView: View {
+    @Environment(\.colorScheme) private var colorScheme
     @Environment(\.managedObjectContext) private var viewContext
     @EnvironmentObject var beansOO: BeansCollectionViewOO
 
     @State private var search: String = ""
 
     var body: some View {
-        VStack(alignment: .leading) {
-            Text("Beans")
-                .font(.largeTitle)
-                .padding()
+        ZStack(alignment: .top) {
             ScrollView {
                 HStack {
                     Spacer()
+                        .frame(height: 100)
                 }
+#if DEBUG
+                ForEach([testRoast, lightRoast, mediumRoast], id: \.self) { bean in
+                    BeanRowView(bean: bean)
+                        .padding(.vertical, 5)
+                        .padding(.horizontal)
+                }
+#else
                 ForEach(beansOO.beans, id: \.self) { bean in
                     BeanRowView(bean: bean)
-                        .padding()
+                        .padding(.vertical, 5)
+                        .padding(.horizontal)
                 }
+#endif
             }
+            Group {
+                GeometryReader { geometry in
+                    HStack(alignment: .bottom) {
+                        Text("Beans")
+                            .font(.largeTitle)
+                            .bold()
+                            .padding(.top, 10)
+                            .padding(.leading)
+                        Spacer()
+                    }
+                    .frame(height: geometry.safeAreaInsets.top+80)
+                    .background(.ultraThinMaterial)
+                    .cornerRadius(10, corners: .bottomLeft)
+                    .cornerRadius(10, corners: .bottomRight)
+                    .edgesIgnoringSafeArea(.top)
+                }
+            }.shadow(radius: 2)
         }
     }
 }
 
 struct BeansCollectionView_Previews: PreviewProvider {
     static var previews: some View {
-        BeansCollectionView()
+        ZStack {
+            Image("Background")
+                .resizable()
+                .ignoresSafeArea()
+            BeansCollectionView()
+        }.preferredColorScheme(.dark)
     }
 }

CoffeeTracker/CoffeeTracker/Beans/NewBeansView.swift

@@ -140,7 +140,7 @@ struct NewBeansView: View {
 
             }.padding()
             Spacer()
-        }.background(.ultraThickMaterial).sheet(isPresented: $showingPhotoPicker) {
+        }.background(.thinMaterial).sheet(isPresented: $showingPhotoPicker) {
             ImagePicker(selectedImage: $beans.image, isImageSelected: $isImageSelected)
         }
     }

CoffeeTracker/CoffeeTracker/CoffeeTrackerMain.swift

@@ -14,15 +14,22 @@ struct CoffeeTrackerMain: View {
 
     var body: some View {
         ZStack(alignment: .bottomTrailing) {
+            Image("Background")
+                .resizable()
+                .ignoresSafeArea()
             BeansCollectionView()
             if showButtons {
                 NewBeansView(showForm: $showButtons)
                     .opacity(showButtons ? 1 : 0)
             }
             Button(action: {showButtons.toggle()}) {
                 Image(systemName: SFSymbols.plus)
+                    .font(.largeTitle)
+                    .background(Circle()
+                        .fill(showButtons ? Color.red : Color.sage)
+                        .frame(width: 60, height: 60))
                     .padding(12)
-                    .background(Circle().fill(showButtons ? Color.red : Color.sage)).shadow(radius: 8, x: 4, y: 4)
+                    .shadow(radius: 8, x: 4, y: 4)
                     .rotationEffect(Angle.degrees(showButtons ? 45 : 0))
             }.padding(20)
             .tint(.white)

CoffeeTracker/CoffeeTracker/Fixtures/BeanFixtures.swift

@@ -14,22 +14,25 @@ var lightRoast = BeanModel(name: "Verona Blend",
                             roaster: "Starbucks",
                             roastedOn: Date.now,
                             boughtOn: Date.now,
-                           notes: "", image: UIImage())
+                           notes: "",
+                           image: UIImage(systemName: SFSymbols.photo)!)
 
 var mediumRoast = BeanModel(name: "20th Anniversary Blend",
                              style: "Medium",
                              buyAgain: false,
                              roaster: "Summermoon",
                              roastedOn: Date.now,
                              boughtOn: Date.now,
-                             notes: "I like it a lot", image: UIImage())
+                             notes: "I like it a lot",
+                            image: UIImage(systemName: SFSymbols.photo)!)
 
 var testRoast = BeanModel(name: "Swiftly Brewed",
                            style: "Light",
                            buyAgain: true,
                            roaster: "Apple Inc",
                            roastedOn: Date.now,
                            boughtOn: Date.now,
-                           notes: "Sold in Maegan's hopes and dreams",  image: UIImage())
+                           notes: "Sold in Maegan's hopes and dreams",
+                          image: UIImage(systemName: SFSymbols.photo)!)
 
 let allRoasts = [lightRoast, mediumRoast, testRoast]