demo improvements

Author: stevensJourney

Demo/GRDB Demo/GRDB Demo.xcodeproj/project.pbxproj

@@ -437,7 +437,17 @@
 				DEVELOPMENT_TEAM = ZGT7463CVJ;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = NO;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = NO;
+				ENABLE_RESOURCE_ACCESS_BLUETOOTH = NO;
+				ENABLE_RESOURCE_ACCESS_CALENDARS = NO;
+				ENABLE_RESOURCE_ACCESS_CAMERA = NO;
+				ENABLE_RESOURCE_ACCESS_CONTACTS = NO;
+				ENABLE_RESOURCE_ACCESS_LOCATION = NO;
+				ENABLE_RESOURCE_ACCESS_PRINTING = NO;
+				ENABLE_RESOURCE_ACCESS_USB = NO;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
@@ -481,7 +491,17 @@
 				DEVELOPMENT_TEAM = ZGT7463CVJ;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = NO;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_RESOURCE_ACCESS_AUDIO_INPUT = NO;
+				ENABLE_RESOURCE_ACCESS_BLUETOOTH = NO;
+				ENABLE_RESOURCE_ACCESS_CALENDARS = NO;
+				ENABLE_RESOURCE_ACCESS_CAMERA = NO;
+				ENABLE_RESOURCE_ACCESS_CONTACTS = NO;
+				ENABLE_RESOURCE_ACCESS_LOCATION = NO;
+				ENABLE_RESOURCE_ACCESS_PRINTING = NO;
+				ENABLE_RESOURCE_ACCESS_USB = NO;
 				ENABLE_USER_SELECTED_FILES = readonly;
 				GENERATE_INFOPLIST_FILE = YES;
 				"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;

Demo/GRDB Demo/GRDB Demo/Data/Todo.swift

@@ -6,7 +6,7 @@ import PowerSync
 let todosTable = Table(
     name: "todos",
     columns: [
-        .text("name"),
+        .text("description"),
         .text("list_id"),
         // Conversion should automatically be handled by GRDB
         .integer("completed"),
@@ -16,7 +16,7 @@ let todosTable = Table(
 
 struct Todo: Codable, Equatable, Identifiable, FetchableRecord, PersistableRecord {
     var id: String
-    var name: String
+    var description: String
     var listId: String
     var isCompleted: Bool
     var completedAt: Date?
@@ -25,15 +25,15 @@ struct Todo: Codable, Equatable, Identifiable, FetchableRecord, PersistableRecor
 
     enum CodingKeys: String, CodingKey {
         case id
-        case name
+        case description
         case listId = "list_id"
         case isCompleted = "completed"
         case completedAt = "completed_at"
     }
 
     enum Columns {
         static let id = Column(CodingKeys.id)
-        static let name = Column(CodingKeys.name)
+        static let description = Column(CodingKeys.description)
         static let listId = Column(CodingKeys.listId)
         static let isCompleted = Column(CodingKeys.isCompleted)
         static let completedAt = Column(CodingKeys.completedAt)

Demo/GRDB Demo/GRDB Demo/Models/TodosViewModel.swift

@@ -12,7 +12,7 @@ struct ListsTodosRequest: ValueObservationQueryable {
     func fetch(_ database: Database) throws -> [Todo] {
         try Todo
             .filter(Todo.Columns.listId == list.id)
-            .order(Todo.Columns.name)
+            .order(Todo.Columns.description)
             .order(Todo.Columns.isCompleted)
             .fetchAll(database)
     }
@@ -36,7 +36,7 @@ class TodoViewModel {
             try grdb.write { database in
                 try Todo(
                     id: UUID().uuidString,
-                    name: name,
+                    description: name,
                     listId: listId,
                     isCompleted: false
                 ).insert(database)

Demo/GRDB Demo/GRDB Demo/Screens/StatusIndicatorView.swift

@@ -9,20 +9,27 @@ struct StatusIndicatorView<Content: View>: View {
     }
 
     @State var statusImageName: String = "wifi.slash"
-    @State private var showErrorAlert = false
+    @State var directionStatusImageName: String?
 
     let content: () -> Content
 
     var body: some View {
         content()
             .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
+                ToolbarItem(placement: .automatic) {
                     Button {
-                        if powerSync.currentStatus.anyError != nil {
-                            showErrorAlert = true
+                        if let error = powerSync.currentStatus.anyError {
+                            viewModels.errorViewModel.report("\(error)")
                         }
                     } label: {
-                        Image(systemName: statusImageName)
+                        ZStack {
+                            // Network status
+                            Image(systemName: statusImageName)
+                            // Upload/Download status
+                            if let name = directionStatusImageName {
+                                Image(systemName: name)
+                            }
+                        }
                     }
                     .contextMenu {
                         if powerSync.currentStatus.connected || powerSync.currentStatus.connecting {
@@ -43,13 +50,6 @@ struct StatusIndicatorView<Content: View>: View {
                     }
                 }
             }
-            .alert(isPresented: $showErrorAlert) {
-                Alert(
-                    title: Text("Error"),
-                    message: Text(String("\(powerSync.currentStatus.anyError ?? "Unknown error")")),
-                    dismissButton: .default(Text("OK"))
-                )
-            }
             .task {
                 do {
                     for try await status in powerSync.currentStatus.asFlow() {
@@ -62,6 +62,14 @@ struct StatusIndicatorView<Content: View>: View {
                         } else {
                             statusImageName = "wifi.slash"
                         }
+
+                        if status.downloading {
+                            directionStatusImageName = "chevron.down.2"
+                        } else if status.uploading {
+                            directionStatusImageName = "chevron.up.2"
+                        } else {
+                            directionStatusImageName = nil
+                        }
                     }
                 } catch {
                     print("Could not monitor status")

Demo/GRDB Demo/GRDB Demo/Screens/signin/SigninScreen.swift

@@ -38,8 +38,10 @@ struct SigninScreen: View {
                 VStack(spacing: 16) {
                     TextField("Email", text: $email)
                         .textFieldStyle(RoundedBorderTextFieldStyle())
+                    #if os (iOS) || os (tvOS) || targetEnvironment(macCatalyst)
                         .autocapitalization(.none)
                         .keyboardType(.emailAddress)
+                    #endif
                         .focused($emailFieldFocused)
 
                     SecureField("Password", text: $password)

Demo/GRDB Demo/GRDB Demo/Screens/todos/TodoItemView.swift

@@ -16,7 +16,7 @@ struct TodoItemView: View {
     var body: some View {
         VStack {
             HStack {
-                Text(todo.name).font(.title)
+                Text(todo.description).font(.title)
                 Spacer()
                 Button {
                     try? viewModels.todoViewModel.toggleCompleted(todo: todo)