fix(mobile): align iOS widget text box with widget's corners

mobile/ios/WidgetExtension/ImageWidgetView.swift

@@ -17,46 +17,62 @@ struct ImmichWidgetView: View {
   var entry: ImageEntry
 
   var body: some View {
-    if entry.image == nil {
-      Image("LaunchImage")
-        .tintedWidgetImageModifier()
-        .overlay(alignment: .bottom) {
-          if let error = entry.metadata.error?.errorDescription {
-            Text(error)
-              .minimumScaleFactor(0.25)
-              .multilineTextAlignment(.center)
-              .foregroundStyle(.secondary)
-              .fixedSize()
-              .alignmentGuide(.bottom) { dimensions in
-                // Place the text below the bottom of the image
-                dimensions[.top] - 8
-              }
-          }
-        }
+    if let image = entry.image {
+      ImmichWidgetContentView(image: image, subtitle: entry.metadata.subtitle, deepLink: entry.metadata.deepLink)
     } else {
-      ZStack(alignment: .leading) {
-        Color.clear.overlay(
-          Image(uiImage: entry.image!)
-            .resizable()
-            .tintedWidgetImageModifier()
-            .scaledToFill()
+      ImmichWidgetLoadingView(message: entry.metadata.error?.errorDescription)
+    }
+  }
+}
 
+private struct ImmichWidgetLoadingView: View {
+  let message: String?
+
+  var body: some View {
+    Image("LaunchImage")
+      .tintedWidgetImageModifier()
+      .overlay(alignment: .bottom) {
+        if let message {
+          Text(message)
+            .minimumScaleFactor(0.25)
+            .multilineTextAlignment(.center)
+            .foregroundStyle(.secondary)
+            .fixedSize()
+            .alignmentGuide(.bottom) { dimensions in
+              // Place the text below the bottom of the image
+              dimensions[.top] - 8
+            }
+        }
+      }
+  }
+}
+
+private struct ImmichWidgetContentView: View {
+  let image: UIImage
+  let subtitle: String?
+  let deepLink: URL?
+
+  var body: some View {
+    ZStack(alignment: .leading) {
+      Color.clear.overlay(
+        Image(uiImage: image)
+          .resizable()
+          .tintedWidgetImageModifier()
+          .scaledToFill()
         )
         VStack {
           Spacer()
-          if let subtitle = entry.metadata.subtitle {
+          if let subtitle = subtitle {
             Text(subtitle)
               .foregroundColor(.white)
-              .padding(8)
-              .background(Color.black.opacity(0.6))
-              .cornerRadius(8)
+              .padding(6)
+              .background(ContainerRelativeShape().fill(Color.black.opacity(0.6)))
               .font(.system(size: 16))
           }
         }
-        .padding(16)
-      }
-      .widgetURL(entry.metadata.deepLink)
-    }
+          .padding(16)
+        }
+    .widgetURL(deepLink)
   }
 }
 
@@ -69,10 +85,44 @@ struct ImmichWidgetView: View {
     let date = Date()
     ImageEntry(
       date: date,
-      image: UIImage(named: "ImmichLogo"),
+      image: UIImage(named: "LaunchImage"),
       metadata: EntryMetadata(
         subtitle: "1 year ago"
       )
     )
   }
 )
+
+#Preview(
+  as: .systemSmall,
+  widget: {
+    ImmichRandomWidget()
+  },
+  timeline: {
+    let date = Date()
+    ImageEntry(
+      date: date,
+      image: UIImage(named: "LaunchImage"),
+      metadata: EntryMetadata(
+        subtitle: "Yesterday"
+      )
+    )
+  }
+)
+
+#Preview(
+  as: .systemLarge,
+  widget: {
+    ImmichRandomWidget()
+  },
+  timeline: {
+    let date = Date()
+    ImageEntry(
+      date: date,
+      image: UIImage(named: "LaunchImage"),
+      metadata: EntryMetadata(
+        subtitle: "2000 seconds ago"
+      )
+    )
+  }
+)

server/src/schema/migrations/1784836013770-MinFacePreferenceMigration.ts

@@ -1,25 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`
-    INSERT INTO "user_metadata" ("userId", "key", "value")
-    SELECT "user"."id", 'preferences', jsonb_build_object('people', jsonb_build_object('minimumFaces', "config"."minFaces"))
-    FROM "user"
-    CROSS JOIN (
-      SELECT "value"->'machineLearning'->'facialRecognition'->'minFaces' AS "minFaces"
-      FROM "system_metadata"
-      WHERE "key" = 'system-config'
-        AND "value"->'machineLearning'->'facialRecognition'->'minFaces' IS NOT NULL
-    ) AS "config"
-    ON CONFLICT ("userId", "key") DO UPDATE
-    SET "value" = "user_metadata"."value" || jsonb_build_object(
-      'people',
-      COALESCE("user_metadata"."value"->'people', '{}'::jsonb) || (EXCLUDED."value"->'people')
-    )
-    WHERE "user_metadata"."value"->'people'->'minimumFaces' IS NULL
-  `.execute(db);
-}
-
-export async function down(): Promise<void> {
-  // not supported
-}