Merge remote-tracking branch 'origin/main' into remote_db

docs/docs/photos/faq/general.md

@@ -128,3 +128,15 @@ If you create a new album on your device after the initial backup, the photos in
 
 ### What happens if I reorganize my photos in the iOS Photos app after backing up?
 Reorganizing photos in the iOS Photos app (e.g., moving photos to new albums) won’t automatically reflect in Ente. You’ll need to manually add those photos to the corresponding albums in Ente to maintain consistency.
+
+### Can I search for photos using the descriptions I’ve added?
+Yes, descriptions are searchable, making it easier to find specific photos later.
+To do this, open the photo, tap the (i) button, and enter your description.
+
+### How does the deduplication feature work on the desktop app?
+If the app finds exact duplicates, it will show them in the deduplication. When you delete a duplicate, the app keeps one copy and creates a symlink for the other duplicate. This helps save storage space.
+
+### What happens if I lose access to my email address? Can I use my recovery key to bypass email verification?
+No, the recovery key does not bypass email verification. For security reasons, we do not disable or bypass email verification unless the account owner reaches out to us and successfully verifies their identity by providing details about their account. 
+
+If you lose access to your email, please contact our support team at support@ente.io

mobile/ios/Runner/Assets.xcassets/AppIcon-dev.appiconset/Contents.json

@@ -1 +0,0 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"AppIcon-dev-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"AppIcon-dev-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"AppIcon-dev-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"AppIcon-dev-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"AppIcon-dev-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"AppIcon-dev-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"AppIcon-dev-40x40@3x.png","scale":"3x"},{"size":"50x50","idiom":"ipad","filename":"AppIcon-dev-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"AppIcon-dev-50x50@2x.png","scale":"2x"},{"size":"57x57","idiom":"iphone","filename":"AppIcon-dev-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"AppIcon-dev-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"AppIcon-dev-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"AppIcon-dev-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"AppIcon-dev-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"AppIcon-dev-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"AppIcon-dev-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"AppIcon-dev-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"AppIcon-dev-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"AppIcon-dev-40x40@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"AppIcon-dev-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"AppIcon-dev-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"AppIcon-dev-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"AppIcon-dev-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"AppIcon-dev-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"AppIcon-dev-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

mobile/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +0,0 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

mobile/ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mobile/ios/Runner/Assets.xcassets/IconDark.appiconset/Contents.json

@@ -1 +1,38 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"IconDark-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"IconDark-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"IconDark-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"IconDark-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"IconDark-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"IconDark-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"IconDark-40x40@3x.png","scale":"3x"},{"size":"50x50","idiom":"ipad","filename":"IconDark-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"IconDark-50x50@2x.png","scale":"2x"},{"size":"57x57","idiom":"iphone","filename":"IconDark-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"IconDark-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"IconDark-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"IconDark-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"IconDark-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"IconDark-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"IconDark-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"IconDark-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"IconDark-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"IconDark-40x40@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"IconDark-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"IconDark-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"IconDark-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"IconDark-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"IconDark-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"IconDark-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
+{
+  "images" : [
+    {
+      "filename" : "IconDarkAny.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "IconDarkDark.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "IconDarkTinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

mobile/ios/Runner/Assets.xcassets/IconGreen.appiconset/Contents.json

@@ -1 +1,38 @@
-{"images":[{"size":"20x20","idiom":"iphone","filename":"IconGreen-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"IconGreen-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"IconGreen-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"IconGreen-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"IconGreen-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"IconGreen-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"IconGreen-40x40@3x.png","scale":"3x"},{"size":"50x50","idiom":"ipad","filename":"IconGreen-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"IconGreen-50x50@2x.png","scale":"2x"},{"size":"57x57","idiom":"iphone","filename":"IconGreen-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"IconGreen-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"IconGreen-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"IconGreen-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"IconGreen-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"IconGreen-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"IconGreen-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"IconGreen-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"IconGreen-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"IconGreen-40x40@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"IconGreen-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"IconGreen-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"IconGreen-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"IconGreen-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"IconGreen-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"IconGreen-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
+{
+  "images" : [
+    {
+      "filename" : "IconGreenAny.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "IconGreenDark.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "IconGreenTinted.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}