Merge branch 'main' into fix_memory_bottom_icons

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Manual Build
+name: Manual build
 
 on:
   workflow_dispatch: # Enable manual run only
@@ -55,4 +55,11 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: release-checksum
-          path: build/app/outputs/flutter-apk/checksum
+          path: build/app/outputs/flutter-apk/sha256sum
+
+      # Create a pre-release
+      - uses: ncipollo/release-action@v1
+        with:
+          artifacts: "build/app/outputs/flutter-apk/ente.apk,build/app/outputs/flutter-apk/sha256sum"
+          token: ${{ secrets.GITHUB_TOKEN }}
+          prerelease: true

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "plugins/clip_ggml"]
 	path = plugins/clip_ggml
 	url = https://github.com/ente-io/clip-ggml.git
+[submodule "thirdparty/isar"]
+	path = thirdparty/isar
+	url = https://github.com/isar/isar

lib/l10n/intl_nl.arb

@@ -406,6 +406,15 @@
   },
   "photoGridSize": "Foto raster grootte",
   "manageDeviceStorage": "Apparaatopslag beheren",
+  "machineLearning": "Machine Learning",
+  "magicSearch": "Magische zoekfunctie",
+  "magicSearchDescription": "Houd er rekening mee dat dit zal resulteren in een hoger internet- en batterijverbruik totdat alle items zijn geïndexeerd.",
+  "loadingModel": "Modellen downloaden...",
+  "waitingForWifi": "Wachten op WiFi...",
+  "status": "Status",
+  "indexedItems": "Geïndexeerde bestanden",
+  "pendingItems": "Bestanden in behandeling",
+  "clearIndexes": "Index wissen",
   "selectFoldersForBackup": "Selecteer mappen voor back-up",
   "selectedFoldersWillBeEncryptedAndBackedUp": "Geselecteerde mappen worden versleuteld en geback-upt",
   "unselectAll": "Deselecteer alles",
@@ -696,6 +705,21 @@
   "deleteEmptyAlbumsWithQuestionMark": "Lege albums verwijderen?",
   "deleteAlbumsDialogBody": "Hiermee worden alle lege albums verwijderd. Dit is handig wanneer je rommel in je albumlijst wilt verminderen.",
   "deleteProgress": "Verwijderen van {currentlyDeleting} / {totalCount}",
+  "genericProgress": "Verwerken van {currentlyProcessing} / {totalCount}",
+  "@genericProgress": {
+    "description": "Generic progress text to display when processing multiple items",
+    "type": "text",
+    "placeholders": {
+      "currentlyProcessing": {
+        "example": "1",
+        "type": "int"
+      },
+      "totalCount": {
+        "example": "10",
+        "type": "int"
+      }
+    }
+  },
   "permanentlyDelete": "Permanent verwijderen",
   "canOnlyCreateLinkForFilesOwnedByYou": "Kan alleen een link maken voor bestanden die van u zijn",
   "publicLinkCreated": "Publieke link aangemaakt",
@@ -823,7 +847,6 @@
   "clubByFileName": "Samenvoegen op bestandsnaam",
   "count": "Aantal",
   "totalSize": "Totale grootte",
-  "time": "Tijd",
   "longpressOnAnItemToViewInFullscreen": "Houd een bestand lang ingedrukt om te bekijken op volledig scherm",
   "decryptingVideo": "Video ontsleutelen...",
   "authToViewYourMemories": "Graag verifiëren om uw herinneringen te bekijken",
@@ -1159,9 +1182,10 @@
   "signOutOtherBody": "Als je denkt dat iemand je wachtwoord zou kunnen kennen, kun je alle andere apparaten die je account gebruiken dwingen om uit te loggen.",
   "signOutOtherDevices": "Log uit op andere apparaten",
   "doNotSignOut": "Niet uitloggen",
-  "editLocation": "Edit location",
-  "selectALocation": "Select a location",
-  "selectALocationFirst": "Select a location first",
-  "changeLocationOfSelectedItems": "Change location of selected items?",
-  "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente"
+  "editLocation": "Locatie bewerken",
+  "selectALocation": "Selecteer een locatie",
+  "selectALocationFirst": "Selecteer eerst een locatie",
+  "changeLocationOfSelectedItems": "Locatie van geselecteerde items wijzigen?",
+  "editsToLocationWillOnlyBeSeenWithinEnte": "Bewerkte locatie wordt alleen gezien binnen Ente",
+  "cleanUncategorized": "Ongecategoriseerd opschonen"
 }

lib/models/search/search_types.dart

@@ -1,3 +1,5 @@
+import "dart:async";
+
 import "package:flutter/material.dart";
 import "package:logging/logging.dart";
 import "package:photos/core/event_bus.dart";
@@ -211,9 +213,11 @@ extension SectionTypeExtensions on SectionType {
               try {
                 final Collection c =
                     await CollectionsService.instance.createAlbum(text);
-                await routeToPage(
-                  context,
-                  CollectionPage(CollectionWithThumbnail(c, null)),
+                unawaited(
+                  routeToPage(
+                    context,
+                    CollectionPage(CollectionWithThumbnail(c, null)),
+                  ),
                 );
               } catch (e, s) {
                 Logger("CreateNewAlbumIcon")

scripts/build_isar.sh

@@ -0,0 +1,17 @@
+# TODO: add `rustup@1.25.2` to `srclibs`
+# TODO: verify if `gcc-multilib` or `libc-dev` is needed
+$$rustup$$/rustup-init.sh -y
+source $HOME/.cargo/env
+cd thirdparty/isar/
+bash tool/build_android.sh x86
+bash tool/build_android.sh x64
+bash tool/build_android.sh armv7
+bash tool/build_android.sh arm64
+mv libisar_android_arm64.so libisar.so
+mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/
+mv libisar_android_armv7.so libisar.so
+mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/
+mv libisar_android_x64.so libisar.so
+mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86_64/
+mv libisar_android_x86.so libisar.so
+mv libisar.so $PUB_CACHE/hosted/pub.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86/