diff --git a/.flutter b/.flutter
index 2663184aa..603104015 160000
--- a/.flutter
+++ b/.flutter
@@ -1 +1 @@
-Subproject commit 2663184aa79047d0a33a14a3b607954f8fdd8730
+Subproject commit 603104015dd692ea3403755b55d07813d5cf8965
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 7b0990bcf..955b3b3fb 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,6 +22,6 @@ jobs:
egress-policy: audit
- name: 'Checkout Repository'
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: 'Dependency Review'
- uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
+ uses: actions/dependency-review-action@4081bf99e2866ebe428fc0477b69eb4fcda7220a # v4.4.0
diff --git a/.github/workflows/quality-check.yml b/.github/workflows/quality-check.yml
index 7265b74c5..3971f6bd7 100644
--- a/.github/workflows/quality-check.yml
+++ b/.github/workflows/quality-check.yml
@@ -23,7 +23,7 @@ jobs:
egress-policy: audit
- name: Checkout repository
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Get Flutter packages
run: scripts/pub_get_all.sh
@@ -59,17 +59,17 @@ jobs:
# Building relies on the Android Gradle plugin,
# which requires a modern Java version (not the default one).
- name: Set up JDK for Android Gradle plugin
- uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+ uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
distribution: 'temurin'
java-version: '21'
- name: Checkout repository
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+ uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}
@@ -83,6 +83,6 @@ jobs:
./flutterw build apk --profile -t lib/main_play.dart --flavor play
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+ uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 68c6ea2d4..657445e42 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,9 @@ jobs:
name: GitHub release
runs-on: ubuntu-latest
permissions:
+ attestations: write
contents: write
+ id-token: write
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -23,13 +25,13 @@ jobs:
# Building relies on the Android Gradle plugin,
# which requires a modern Java version (not the default one).
- name: Set up JDK for Android Gradle plugin
- uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+ uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
distribution: 'temurin'
java-version: '21'
- name: Checkout repository
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Get Flutter packages
run: scripts/pub_get_all.sh
@@ -72,6 +74,11 @@ jobs:
AVES_KEY_PASSWORD: ${{ secrets.AVES_KEY_PASSWORD }}
AVES_GOOGLE_API_KEY: ${{ secrets.AVES_GOOGLE_API_KEY }}
+ - name: Generate artifact attestation
+ uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
+ with:
+ subject-path: 'outputs/*'
+
- name: Create GitHub release
uses: ncipollo/release-action@2c591bcc8ecdcd2db72b97d6147f871fcd833ba5 # v1.14.0
with:
@@ -96,7 +103,7 @@ jobs:
egress-policy: audit
- name: Checkout repository
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Get appbundle from artifacts
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index 6e2676543..a88b1673d 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -36,7 +36,7 @@ jobs:
egress-policy: audit
- name: "Checkout code"
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+ uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
@@ -71,6 +71,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+ uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
sarif_file: results.sarif
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf952d08f..7b290ba4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
+## [v1.11.17] - 2024-10-30
+
+### Added
+
+- Map: create shortcut to custom region and filters
+- Video: frame stepping forward/backward
+- Video: custom playback buttons
+- English (Shavian) translation (thanks Paranoid Android)
+
+### Changed
+
+- upgraded Flutter to stable v3.24.4
+
+### Fixed
+
+- crash when loading large collection
+- Viewer: copying content URI item
+- Albums: creating album with same name as existing empty directory
+- Privacy: tagging while vaults are unlocked does not yield recent tags visible when vaults are locked
+
## [v1.11.16] - 2024-10-10
### Fixed
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2bf34a887..eb8171a4a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
plugins {
id 'com.android.application'
id 'com.google.devtools.ksp'
@@ -30,16 +28,15 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: ""
}
+kotlin {
+ jvmToolchain 17
+}
+
android {
namespace 'deckers.thibault.aves'
compileSdk 35
// cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp
- ndkVersion '26.1.10909125'
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_21
- targetCompatibility JavaVersion.VERSION_21
- }
+ ndkVersion '27.0.12077973'
defaultConfig {
applicationId packageName
@@ -133,15 +130,6 @@ android {
}
}
-tasks.withType(KotlinCompile).configureEach {
- sourceCompatibility = JavaVersion.VERSION_21
- targetCompatibility = JavaVersion.VERSION_21
-}
-
-kotlin {
- jvmToolchain(21)
-}
-
flutter {
source '../..'
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 58947842a..c12dd891b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -332,6 +332,9 @@
>("uris")
- try {
- if (!pickedUris.isNullOrEmpty()) {
- val toUri = { uriString: String -> AppAdapterHandler.getShareableUri(this@MainActivity, Uri.parse(uriString)) }
- val intent = Intent().apply {
- val firstUri = toUri(pickedUris.first())
- if (pickedUris.size == 1) {
- data = firstUri
- } else {
- clipData = ClipData.newUri(contentResolver, null, firstUri).apply {
- pickedUris.drop(1).forEach {
- addItem(ClipData.Item(toUri(it)))
- }
- }
+ if (pickedUris.isNullOrEmpty()) {
+ setResult(RESULT_CANCELED)
+ // move code triggering `Binder` call off the main thread
+ defaultScope.launch { finish() }
+ return
+ }
+
+ val toUri = { uriString: String -> AppAdapterHandler.getShareableUri(this@MainActivity, Uri.parse(uriString)) }
+ val intent = Intent().apply {
+ val firstUri = toUri(pickedUris.first())
+ if (pickedUris.size == 1) {
+ data = firstUri
+ } else {
+ clipData = ClipData.newUri(contentResolver, null, firstUri).apply {
+ pickedUris.drop(1).forEach {
+ addItem(ClipData.Item(toUri(it)))
}
- addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
- setResult(RESULT_OK, intent)
- } else {
- setResult(RESULT_CANCELED)
}
- // move code triggering `Binder` call off the main thread
- defaultScope.launch { finish() }
+ addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+ }
+ // move code triggering `Binder` call off the main thread
+ defaultScope.launch {
+ submitPickedItemsIntent(intent, result)
+ }
+ }
+
+ private fun submitPickedItemsIntent(intent: Intent, result: MethodChannel.Result) {
+ try {
+ setResult(RESULT_OK, intent)
+ finish()
} catch (e: Exception) {
- if (e is TransactionTooLargeException || e.cause is TransactionTooLargeException) {
- result.error("submitPickedItems-large", "transaction too large with ${pickedUris?.size} URIs", e)
+ setResult(RESULT_CANCELED)
+ if (e is SecurityException && intent.flags and Intent.FLAG_GRANT_WRITE_URI_PERMISSION != 0) {
+ // in some environments, providing the write flag yields a `SecurityException`:
+ // "UID XXXX does not have permission to content://XXXX"
+ // so we retry without it
+ Log.i(LOG_TAG, "retry submitting picked items without FLAG_GRANT_WRITE_URI_PERMISSION")
+ intent.flags = intent.flags and Intent.FLAG_GRANT_WRITE_URI_PERMISSION.inv()
+ submitPickedItemsIntent(intent, result)
+ } else if (e.anyCauseIs()) {
+ result.error("submitPickedItems-large", "transaction too large with ${intent.clipData?.itemCount} URIs", e)
} else {
- result.error("submitPickedItems-exception", "failed to pick ${pickedUris?.size} URIs", e)
+ result.error("submitPickedItems-exception", "failed to pick ${intent.clipData?.itemCount} URIs", e)
}
}
}
@@ -552,6 +572,7 @@ open class MainActivity : FlutterFragmentActivity() {
const val INTENT_DATA_KEY_EXPLORER_PATH = "explorerPath"
const val INTENT_DATA_KEY_FILTERS = "filters"
const val INTENT_DATA_KEY_MIME_TYPE = "mimeType"
+ const val INTENT_DATA_KEY_MIME_TYPES = "mimeTypes"
const val INTENT_DATA_KEY_PAGE = "page"
const val INTENT_DATA_KEY_QUERY = "query"
const val INTENT_DATA_KEY_SECURE_URIS = "secureUris"
@@ -566,6 +587,8 @@ open class MainActivity : FlutterFragmentActivity() {
// dart page routes
const val COLLECTION_PAGE_ROUTE_NAME = "/collection"
+ const val ENTRY_VIEWER_PAGE_ROUTE_NAME = "/viewer"
+ const val EXPLORER_PAGE_ROUTE_NAME = "/explorer"
const val MAP_PAGE_ROUTE_NAME = "/map"
const val SEARCH_PAGE_ROUTE_NAME = "/search"
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AnalysisHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AnalysisHandler.kt
index 6c940da75..0ee874058 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AnalysisHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AnalysisHandler.kt
@@ -1,5 +1,6 @@
package deckers.thibault.aves.channel.calls
+import android.app.ActivityManager
import android.content.Context
import androidx.work.ExistingWorkPolicy
import androidx.work.OneTimeWorkRequestBuilder
@@ -51,6 +52,17 @@ class AnalysisHandler(private val activity: FlutterFragmentActivity, private val
return
}
+ val activityManager: ActivityManager = activity.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+ val runningAppProcesses = activityManager.runningAppProcesses
+ if (runningAppProcesses != null) {
+ val importance = runningAppProcesses[0].importance
+ if (importance < ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+ // the app is in the background
+ result.error("startAnalysis-background", "app is in the background (process importance=$importance)", null)
+ return
+ }
+ }
+
// can be null or empty
val allEntryIds = call.argument>("entryIds")
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
index 65c3f38a3..7825e084f 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/AppAdapterHandler.kt
@@ -23,11 +23,15 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.DecodeFormat
import com.bumptech.glide.request.RequestOptions
import deckers.thibault.aves.MainActivity
+import deckers.thibault.aves.MainActivity.Companion.COLLECTION_PAGE_ROUTE_NAME
+import deckers.thibault.aves.MainActivity.Companion.ENTRY_VIEWER_PAGE_ROUTE_NAME
+import deckers.thibault.aves.MainActivity.Companion.EXPLORER_PAGE_ROUTE_NAME
import deckers.thibault.aves.MainActivity.Companion.EXTRA_KEY_EXPLORER_PATH
import deckers.thibault.aves.MainActivity.Companion.EXTRA_KEY_FILTERS_ARRAY
import deckers.thibault.aves.MainActivity.Companion.EXTRA_KEY_FILTERS_STRING
import deckers.thibault.aves.MainActivity.Companion.EXTRA_KEY_PAGE
import deckers.thibault.aves.MainActivity.Companion.EXTRA_STRING_ARRAY_SEPARATOR
+import deckers.thibault.aves.MainActivity.Companion.MAP_PAGE_ROUTE_NAME
import deckers.thibault.aves.R
import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
import deckers.thibault.aves.channel.calls.Coresult.Companion.safeSuspend
@@ -35,6 +39,7 @@ import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.utils.BitmapUtils
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.LogUtils
+import deckers.thibault.aves.utils.anyCauseIs
import deckers.thibault.aves.utils.getApplicationInfoCompat
import deckers.thibault.aves.utils.queryIntentActivitiesCompat
import io.flutter.plugin.common.MethodCall
@@ -303,7 +308,7 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
val started = safeStartActivityChooser(title, intent)
result.success(started)
} catch (e: Exception) {
- if (e is TransactionTooLargeException || e.cause is TransactionTooLargeException) {
+ if (e.anyCauseIs()) {
result.error("share-large", "transaction too large with ${uriList.size} URIs", e)
} else {
result.error("share-exception", "failed to share ${uriList.size} URIs", e)
@@ -354,12 +359,17 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
// shortcuts
private fun pinShortcut(call: MethodCall, result: MethodChannel.Result) {
+ // common arguments
val label = call.argument("label")
val iconBytes = call.argument("iconBytes")
+ val route = call.argument("route")
+ // route dependent arguments
val filters = call.argument>("filters")
- val explorerPath = call.argument("explorerPath")
- val uri = call.argument("uri")?.let { Uri.parse(it) }
- if (label == null) {
+ val explorerPath = call.argument("path")
+ val viewUri = call.argument("viewUri")?.let { Uri.parse(it) }
+ val geoUri = call.argument("geoUri")?.let { Uri.parse(it) }
+
+ if (label == null || route == null) {
result.error("pin-args", "missing arguments", null)
return
}
@@ -383,24 +393,60 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
// so that foreground is rendered at the intended scale
val supportAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
- icon = IconCompat.createWithResource(context, if (supportAdaptiveIcon) R.mipmap.ic_shortcut_collection else R.drawable.ic_shortcut_collection)
+ val resId = when (route) {
+ MAP_PAGE_ROUTE_NAME -> if (supportAdaptiveIcon) R.mipmap.ic_shortcut_map else R.drawable.ic_shortcut_map
+ else -> if (supportAdaptiveIcon) R.mipmap.ic_shortcut_collection else R.drawable.ic_shortcut_collection
+ }
+ icon = IconCompat.createWithResource(context, resId)
}
- val intent = when {
- filters != null -> Intent(Intent.ACTION_MAIN, null, context, MainActivity::class.java)
- .putExtra(EXTRA_KEY_PAGE, "/collection")
- .putExtra(EXTRA_KEY_FILTERS_ARRAY, filters.toTypedArray())
- // on API 25, `String[]` or `ArrayList` extras are null when using the shortcut
- // so we use a joined `String` as fallback
- .putExtra(EXTRA_KEY_FILTERS_STRING, filters.joinToString(EXTRA_STRING_ARRAY_SEPARATOR))
+ val intent: Intent = when (route) {
+ COLLECTION_PAGE_ROUTE_NAME -> {
+ if (filters == null) {
+ result.error("pin-filters", "collection shortcut requires filters", null)
+ return
+ }
+ Intent(Intent.ACTION_MAIN, null, context, MainActivity::class.java)
+ .putExtra(EXTRA_KEY_PAGE, route)
+ .putExtra(EXTRA_KEY_FILTERS_ARRAY, filters.toTypedArray())
+ // on API 25, `String[]` or `ArrayList` extras are null when using the shortcut
+ // so we use a joined `String` as fallback
+ .putExtra(EXTRA_KEY_FILTERS_STRING, filters.joinToString(EXTRA_STRING_ARRAY_SEPARATOR))
+ }
- explorerPath != null -> Intent(Intent.ACTION_MAIN, null, context, MainActivity::class.java)
- .putExtra(EXTRA_KEY_PAGE, "/explorer")
- .putExtra(EXTRA_KEY_EXPLORER_PATH, explorerPath)
+ ENTRY_VIEWER_PAGE_ROUTE_NAME -> {
+ if (viewUri == null) {
+ result.error("pin-viewUri", "viewer shortcut requires URI", null)
+ return
+ }
+ Intent(Intent.ACTION_VIEW, viewUri, context, MainActivity::class.java)
+ }
+
+ EXPLORER_PAGE_ROUTE_NAME -> {
+ Intent(Intent.ACTION_MAIN, null, context, MainActivity::class.java)
+ .putExtra(EXTRA_KEY_PAGE, route)
+ .putExtra(EXTRA_KEY_EXPLORER_PATH, explorerPath)
+ }
+
+ MAP_PAGE_ROUTE_NAME -> {
+ if (geoUri == null) {
+ result.error("pin-geoUri", "map shortcut requires URI", null)
+ return
+ }
+ Intent(Intent.ACTION_VIEW, geoUri, context, MainActivity::class.java).apply {
+ putExtra(EXTRA_KEY_PAGE, route)
+ // filters are optional
+ filters?.let {
+ putExtra(EXTRA_KEY_FILTERS_ARRAY, it.toTypedArray())
+ // on API 25, `String[]` or `ArrayList` extras are null when using the shortcut
+ // so we use a joined `String` as fallback
+ putExtra(EXTRA_KEY_FILTERS_STRING, it.joinToString(EXTRA_STRING_ARRAY_SEPARATOR))
+ }
+ }
+ }
- uri != null -> Intent(Intent.ACTION_VIEW, uri, context, MainActivity::class.java)
else -> {
- result.error("pin-intent", "failed to build intent", null)
+ result.error("pin-route", "unsupported shortcut route=$route", null)
return
}
}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchBytesHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchBytesHandler.kt
index 232fa09cd..8012e7d7a 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchBytesHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchBytesHandler.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
+import java.util.Date
import kotlin.math.roundToInt
class MediaFetchBytesHandler(private val context: Context) : MethodCallHandler {
@@ -44,7 +45,7 @@ class MediaFetchBytesHandler(private val context: Context) : MethodCallHandler {
val defaultSizeDip = call.argument("defaultSizeDip")?.toDouble()
val quality = call.argument("quality")
- if (uri == null || mimeType == null || dateModifiedSecs == null || rotationDegrees == null || isFlipped == null || widthDip == null || heightDip == null || defaultSizeDip == null || quality == null) {
+ if (uri == null || mimeType == null || rotationDegrees == null || isFlipped == null || widthDip == null || heightDip == null || defaultSizeDip == null || quality == null) {
result.error("getThumbnail-args", "missing arguments", null)
return
}
@@ -54,7 +55,7 @@ class MediaFetchBytesHandler(private val context: Context) : MethodCallHandler {
context = context,
uri = uri,
mimeType = mimeType,
- dateModifiedSecs = dateModifiedSecs,
+ dateModifiedSecs = dateModifiedSecs ?: (Date().time / 1000),
rotationDegrees = rotationDegrees,
isFlipped = isFlipped,
width = (widthDip * density).roundToInt(),
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/StorageHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/StorageHandler.kt
index baee7c5e8..9b2893745 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/StorageHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/StorageHandler.kt
@@ -29,6 +29,7 @@ class StorageHandler(private val context: Context) : MethodCallHandler {
when (call.method) {
"getDataUsage" -> ioScope.launch { safe(call, result, ::getDataUsage) }
"getStorageVolumes" -> ioScope.launch { safe(call, result, ::getStorageVolumes) }
+ "getCacheDirectory" -> ioScope.launch { safe(call, result, ::getCacheDirectory) }
"getUntrackedTrashPaths" -> ioScope.launch { safe(call, result, ::getUntrackedTrashPaths) }
"getUntrackedVaultPaths" -> ioScope.launch { safe(call, result, ::getUntrackedVaultPaths) }
"getVaultRoot" -> ioScope.launch { safe(call, result, ::getVaultRoot) }
@@ -122,6 +123,18 @@ class StorageHandler(private val context: Context) : MethodCallHandler {
result.success(volumes)
}
+ private fun getCacheDirectory(call: MethodCall, result: MethodChannel.Result) {
+ val external = call.argument("external")
+ if (external == null) {
+ result.error("getCacheDirectory-args", "missing arguments", null)
+ return
+ }
+
+ val dir = (if (external) context.externalCacheDir else context.cacheDir)
+ result.success(dir!!.path)
+ }
+
+
private fun getUntrackedTrashPaths(call: MethodCall, result: MethodChannel.Result) {
val knownPaths = call.argument>("knownPaths")
if (knownPaths == null) {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
index 1d6d6a60a..9734cd497 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ImageProvider.kt
@@ -137,8 +137,7 @@ abstract class ImageProvider {
"success" to false,
)
- // prevent naming with a `.` prefix as it would hide the file and remove it from the Media Store
- if (sourcePath != null && !desiredName.startsWith('.')) {
+ if (sourcePath != null) {
try {
var newFields: FieldMap = skippedFieldMap
if (!isCancelledOp()) {
@@ -570,6 +569,20 @@ abstract class ImageProvider {
}
}
+ fun createTimeStampFileName() = Date().time.toString()
+
+ private fun sanitizeDesiredFileName(desiredName: String): String {
+ var name = desiredName
+ // prevent creating hidden files
+ while (name.isNotEmpty() && name.startsWith(".")) {
+ name = name.substring(1)
+ }
+ if (name.isEmpty()) {
+ name = createTimeStampFileName()
+ }
+ return name
+ }
+
// returns available name to use, or `null` to skip it
suspend fun resolveTargetFileNameWithoutExtension(
contextWrapper: ContextWrapper,
@@ -578,18 +591,19 @@ abstract class ImageProvider {
mimeType: String,
conflictStrategy: NameConflictStrategy,
): NameConflictResolution {
- var resolvedName: String? = desiredNameWithoutExtension
+ val sanitizedNameWithoutExtension = sanitizeDesiredFileName(desiredNameWithoutExtension)
+ var resolvedName: String? = sanitizedNameWithoutExtension
var replacementFile: File? = null
val extension = extensionFor(mimeType)
- val targetFile = File(dir, "$desiredNameWithoutExtension$extension")
+ val targetFile = File(dir, "$sanitizedNameWithoutExtension$extension")
when (conflictStrategy) {
NameConflictStrategy.RENAME -> {
- var nameWithoutExtension = desiredNameWithoutExtension
+ var nameWithoutExtension = sanitizedNameWithoutExtension
var i = 0
while (File(dir, "$nameWithoutExtension$extension").exists()) {
i++
- nameWithoutExtension = "$desiredNameWithoutExtension ($i)"
+ nameWithoutExtension = "$sanitizedNameWithoutExtension ($i)"
}
resolvedName = nameWithoutExtension
}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
index f05e6991f..fc921de8c 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/MediaStoreImageProvider.kt
@@ -40,6 +40,7 @@ import java.io.FileOutputStream
import java.io.IOException
import java.io.OutputStream
import java.io.SyncFailedException
+import java.util.Date
import java.util.Locale
import java.util.concurrent.CompletableFuture
import kotlin.coroutines.Continuation
@@ -478,64 +479,62 @@ class MediaStoreImageProvider : ImageProvider() {
"success" to false,
)
- if (sourcePath != null) {
- // on API 30 we cannot get access granted directly to a volume root from its document tree,
- // but it is still less constraining to use tree document files than to rely on the Media Store
- //
- // Relying on `DocumentFile`, we can create an item via `DocumentFile.createFile()`, but:
- // - we need to scan the file to get the Media Store content URI
- // - the underlying document provider controls the new file name
- //
- // Relying on the Media Store, we can create an item via `ContentResolver.insert()`
- // with a path, and retrieve its content URI, but:
- // - the Media Store isolates content by storage volume (e.g. `MediaStore.Images.Media.getContentUri(volumeName)`)
- // - the volume name should be lower case, not exactly as the `StorageVolume` UUID
- // cf new method in API 30 `StorageVolume.getMediaStoreVolumeName()`
- // - inserting on a removable volume works on API 29, but not on API 25 nor 26 (on which API/devices does it work?)
- // - there is no documentation regarding support for usage with removable storage
- // - the Media Store only allows inserting in specific primary directories ("DCIM", "Pictures") when using scoped storage
- try {
- val appDir = when {
- toBin -> StorageUtils.trashDirFor(activity, sourcePath)
- toVault -> File(targetDir)
- else -> null
- }
- if (appDir != null) {
- effectiveTargetDir = ensureTrailingSeparator(appDir.path)
- targetDirDocFile = DocumentFileCompat.fromFile(appDir)
+ // on API 30 we cannot get access granted directly to a volume root from its document tree,
+ // but it is still less constraining to use tree document files than to rely on the Media Store
+ //
+ // Relying on `DocumentFile`, we can create an item via `DocumentFile.createFile()`, but:
+ // - we need to scan the file to get the Media Store content URI
+ // - the underlying document provider controls the new file name
+ //
+ // Relying on the Media Store, we can create an item via `ContentResolver.insert()`
+ // with a path, and retrieve its content URI, but:
+ // - the Media Store isolates content by storage volume (e.g. `MediaStore.Images.Media.getContentUri(volumeName)`)
+ // - the volume name should be lower case, not exactly as the `StorageVolume` UUID
+ // cf new method in API 30 `StorageVolume.getMediaStoreVolumeName()`
+ // - inserting on a removable volume works on API 29, but not on API 25 nor 26 (on which API/devices does it work?)
+ // - there is no documentation regarding support for usage with removable storage
+ // - the Media Store only allows inserting in specific primary directories ("DCIM", "Pictures") when using scoped storage
+ try {
+ val appDir = when {
+ toBin -> StorageUtils.trashDirFor(activity, sourcePath ?: StorageUtils.getPrimaryVolumePath(activity))
+ toVault -> File(targetDir)
+ else -> null
+ }
+ if (appDir != null) {
+ effectiveTargetDir = ensureTrailingSeparator(appDir.path)
+ targetDirDocFile = DocumentFileCompat.fromFile(appDir)
- if (toVault) {
- appDir.mkdirs()
- }
+ if (toVault) {
+ appDir.mkdirs()
}
+ }
- if (effectiveTargetDir != null) {
- val newFields = if (isCancelledOp()) skippedFieldMap else {
- val sourceFile = File(sourcePath)
- if (!sourceFile.exists() && toBin) {
- delete(activity, sourceUri, sourcePath, mimeType = mimeType)
- deletedFieldMap
- } else {
- moveSingle(
- activity = activity,
- sourceFile = sourceFile,
- sourceUri = sourceUri,
- targetDir = effectiveTargetDir,
- targetDirDocFile = targetDirDocFile,
- desiredName = desiredName ?: sourceFile.name,
- nameConflictStrategy = nameConflictStrategy,
- mimeType = mimeType,
- copy = copy,
- toBin = toBin,
- )
- }
+ if (effectiveTargetDir != null) {
+ val newFields = if (isCancelledOp()) skippedFieldMap else {
+ val sourceFile = if (sourcePath != null) File(sourcePath) else null
+ if (sourceFile != null && !sourceFile.exists() && toBin) {
+ delete(activity, sourceUri, sourcePath, mimeType = mimeType)
+ deletedFieldMap
+ } else {
+ moveSingle(
+ activity = activity,
+ sourceFile = sourceFile,
+ sourceUri = sourceUri,
+ targetDir = effectiveTargetDir,
+ targetDirDocFile = targetDirDocFile,
+ desiredName = desiredName ?: sourceFile?.name ?: sourceUri.lastPathSegment ?: createTimeStampFileName(),
+ nameConflictStrategy = nameConflictStrategy,
+ mimeType = mimeType,
+ copy = copy,
+ toBin = toBin,
+ )
}
- result["newFields"] = newFields
- result["success"] = true
}
- } catch (e: Exception) {
- Log.w(LOG_TAG, "failed to move to targetDir=$targetDir entry with sourcePath=$sourcePath", e)
+ result["newFields"] = newFields
+ result["success"] = true
}
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to move to targetDir=$targetDir entry with sourcePath=$sourcePath", e)
}
callback.onSuccess(result)
}
@@ -544,7 +543,7 @@ class MediaStoreImageProvider : ImageProvider() {
private suspend fun moveSingle(
activity: Activity,
- sourceFile: File,
+ sourceFile: File?,
sourceUri: Uri,
targetDir: String,
targetDirDocFile: DocumentFileCompat?,
@@ -554,8 +553,8 @@ class MediaStoreImageProvider : ImageProvider() {
copy: Boolean,
toBin: Boolean,
): FieldMap {
- val sourcePath = sourceFile.path
- val sourceDir = sourceFile.parent?.let { ensureTrailingSeparator(it) }
+ val sourcePath = sourceFile?.path
+ val sourceDir = sourceFile?.parent?.let { ensureTrailingSeparator(it) }
if (sourceDir == targetDir && !(copy && nameConflictStrategy == NameConflictStrategy.RENAME)) {
// nothing to do unless it's a renamed copy
return skippedFieldMap
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/ExceptionUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/ExceptionUtils.kt
new file mode 100644
index 000000000..f164c9760
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/ExceptionUtils.kt
@@ -0,0 +1,10 @@
+package deckers.thibault.aves.utils
+
+inline fun Exception.anyCauseIs(): Boolean {
+ var cause: Throwable? = this
+ while (cause != null) {
+ if (cause is T) return true
+ cause = cause.cause
+ }
+ return false
+}
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 958d8d391..478e4f4a8 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -8,4 +8,5 @@
يتم فحص الوسائط
إيقاف
Aves
+ خريطة
\ No newline at end of file
diff --git a/android/app/src/main/res/values-b+en+Shaw/strings.xml b/android/app/src/main/res/values-b+en+Shaw/strings.xml
new file mode 100644
index 000000000..f7bb920c6
--- /dev/null
+++ b/android/app/src/main/res/values-b+en+Shaw/strings.xml
@@ -0,0 +1,12 @@
+
+
+ 𐑱𐑝𐑰𐑟
+ 𐑓𐑴𐑑𐑴 𐑓𐑮𐑱𐑥
+ 𐑢𐑷𐑤𐑐𐑱𐑐𐑼
+ 𐑥𐑨𐑐
+ 𐑕𐑻𐑗
+ 𐑝𐑦𐑛𐑦𐑴𐑟
+ 𐑥𐑰𐑛𐑾 𐑕𐑒𐑨𐑯
+ 𐑕𐑒𐑨𐑯𐑦𐑙 𐑥𐑰𐑛𐑾
+ 𐑕𐑑𐑪𐑐
+
\ No newline at end of file
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index f2f20076c..2c7396d91 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -8,4 +8,5 @@
Analyse von Medien
Medien scannen
Abbrechen
+ Karte
\ No newline at end of file
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 27295a07f..c9aaf8a47 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -8,4 +8,5 @@
Aves
Median skannaus
Hae
+ Kartta
\ No newline at end of file
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 0e887b1bb..a793c012d 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -8,4 +8,5 @@
Digitalização de mídia
Digitalizando mídia
Pare
+ Mapa
\ No newline at end of file
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 9a8ac434a..a6c505626 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -8,4 +8,5 @@
Zastaviť
Skenovanie médií
Skenovanie média
+ Mapa
\ No newline at end of file
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index e516cc30b..c115ff9dc 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -8,4 +8,5 @@
Medya tarama
Medya taranıyor
Durdur
+ Harita
\ No newline at end of file
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 5d33f2d3b..60717a3ee 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -8,4 +8,5 @@
Стоп
Фоторамка
Сканування медіа
+ Мапа
\ No newline at end of file
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 367ab8dc2..96db6a481 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -8,4 +8,5 @@
Aves
Quét phương tiện
Tìm kiếm
+ Bản đồ
\ No newline at end of file
diff --git a/android/exifinterface/build.gradle b/android/exifinterface/build.gradle
index d2e62e0d5..46bfa54d8 100644
--- a/android/exifinterface/build.gradle
+++ b/android/exifinterface/build.gradle
@@ -20,8 +20,8 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_21
- targetCompatibility JavaVersion.VERSION_21
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 45181329e..81a4301fc 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index e262ed8f1..76ed740ec 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
settings.ext.kotlin_version = '1.9.24'
settings.ext.ksp_version = "$kotlin_version-1.0.20"
- settings.ext.agp_version = '8.6.1'
+ settings.ext.agp_version = '8.7.0'
includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
diff --git a/fastlane/metadata/android/en-Shaw/full_description.txt b/fastlane/metadata/android/en-Shaw/full_description.txt
new file mode 100644
index 000000000..443fb2726
--- /dev/null
+++ b/fastlane/metadata/android/en-Shaw/full_description.txt
@@ -0,0 +1,5 @@
+¡·𐑱𐑝𐑰𐑟 𐑒𐑨𐑯 𐑣𐑨𐑯𐑛𐑩𐑤 𐑷𐑤 𐑕𐑹𐑑𐑕 𐑝 𐑦𐑥𐑦𐑡𐑩𐑟 𐑯 𐑝𐑦𐑛𐑦𐑴𐑟, 𐑦𐑯𐑒𐑤𐑵𐑛𐑦𐑙 𐑘𐑹 𐑑𐑦𐑐𐑦𐑒𐑩𐑤 ⸰𐑡𐑓𐑧𐑜'𐑟 𐑯 ⸰𐑥𐑐4'𐑟, 𐑚𐑳𐑑 𐑷𐑤𐑕𐑴 𐑥𐑹 𐑦𐑜𐑟𐑪𐑑𐑦𐑒 𐑔𐑦𐑙𐑟 𐑤𐑲𐑒 𐑥𐑳𐑤𐑑𐑦-𐑐𐑱𐑡 ⸰𐑑𐑦𐑓𐑓'𐑕, ⸰𐑕𐑝𐑜'𐑟, 𐑴𐑤𐑛 ⸰𐑷𐑝𐑦'𐑟 𐑯 𐑥𐑹! 𐑦𐑑 𐑕𐑒𐑨𐑯𐑟 𐑘𐑹 𐑥𐑰𐑛𐑾 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯 𐑑 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑲 𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴𐑟, 𐑐𐑨𐑯𐑼𐑭𐑥𐑩𐑟 (⸰𐑷𐑯𐑨 𐑓𐑴𐑑𐑴 𐑕𐑓𐑽𐑟), 360° 𐑝𐑦𐑛𐑦𐑴𐑟, 𐑨𐑟 𐑢𐑧𐑤 𐑨𐑟 ⸰𐑡𐑰𐑴𐑑𐑦𐑓𐑓 𐑓𐑲𐑤𐑟.
+
+𐑯𐑨𐑝𐑦𐑜𐑱𐑖𐑩𐑯 𐑯 𐑕𐑻𐑗 𐑦𐑟 𐑩𐑯 𐑦𐑥𐑐𐑹𐑑𐑩𐑯𐑑 𐑐𐑸𐑑 𐑝 ·𐑱𐑝𐑰𐑟. 𐑞 𐑜𐑴𐑤 𐑦𐑟 𐑓 𐑿𐑟𐑼𐑟 𐑑 𐑰𐑟𐑦𐑤𐑦 𐑓𐑤𐑴 𐑓𐑮𐑪𐑥 𐑨𐑤𐑚𐑩𐑥𐑟 𐑑 𐑓𐑴𐑑𐑴𐑟 𐑑 𐑑𐑨𐑜𐑟 𐑑 𐑥𐑨𐑐𐑕, 𐑯𐑯𐑯.
+
+·𐑱𐑝𐑰𐑟 𐑦𐑯𐑑𐑦𐑜𐑮𐑱𐑑𐑕 𐑢𐑦𐑞 ·𐑨𐑯𐑛𐑮𐑶𐑛 (𐑓𐑮𐑪𐑥 ·𐑒𐑦𐑑𐑒𐑨𐑑 𐑑 ·𐑨𐑯𐑛𐑮𐑶𐑛 14, 𐑦𐑯𐑒𐑤𐑵𐑛𐑦𐑙 ·𐑨𐑯𐑛𐑮𐑶𐑛 ⸰𐑑𐑝) 𐑢𐑦𐑞 𐑓𐑰𐑗𐑼𐑟 𐑕𐑳𐑗 𐑨𐑟 𐑢𐑦𐑡𐑩𐑑𐑕, 𐑨𐑐 𐑖𐑹𐑑𐑒𐑳𐑑𐑕, 𐑕𐑒𐑮𐑰𐑯 𐑕𐑱𐑝𐑼 𐑯 𐑜𐑤𐑴𐑚𐑩𐑤 𐑕𐑻𐑗 𐑣𐑨𐑯𐑛𐑤𐑦𐑙. 𐑦𐑑 𐑷𐑤𐑕𐑴 𐑢𐑻𐑒𐑕 𐑨𐑟 𐑩 𐑥𐑰𐑛𐑾 𐑝𐑿𐑼 𐑯 𐑐𐑦𐑒𐑼.
diff --git a/fastlane/metadata/android/en-Shaw/images/featureGraphic.png b/fastlane/metadata/android/en-Shaw/images/featureGraphic.png
new file mode 100644
index 000000000..c12acf8f6
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..4970dc5fa
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/1.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..4a1e4b281
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/2.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..942667170
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/3.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..d8a82ad50
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/4.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/5.png
new file mode 100644
index 000000000..f4c597fca
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/5.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/6.png
new file mode 100644
index 000000000..7db91fac3
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/6.png differ
diff --git a/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/7.png
new file mode 100644
index 000000000..636ae49e7
Binary files /dev/null and b/fastlane/metadata/android/en-Shaw/images/phoneScreenshots/7.png differ
diff --git a/fastlane/metadata/android/en-Shaw/short_description.txt b/fastlane/metadata/android/en-Shaw/short_description.txt
new file mode 100644
index 000000000..9c2b68f1a
--- /dev/null
+++ b/fastlane/metadata/android/en-Shaw/short_description.txt
@@ -0,0 +1 @@
+𐑜𐑨𐑤𐑼𐑦 𐑯 𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩 𐑦𐑒𐑕𐑐𐑤𐑹𐑼
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/136.txt b/fastlane/metadata/android/en-US/changelogs/136.txt
new file mode 100644
index 000000000..10f3ff7c4
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/136.txt
@@ -0,0 +1,5 @@
+In v1.11.17:
+- peruse your videos frame by frame
+- create map shortcuts to filtered collections
+- enjoy the app in Shavian
+Full changelog available on GitHub
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/13601.txt b/fastlane/metadata/android/en-US/changelogs/13601.txt
new file mode 100644
index 000000000..10f3ff7c4
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13601.txt
@@ -0,0 +1,5 @@
+In v1.11.17:
+- peruse your videos frame by frame
+- create map shortcuts to filtered collections
+- enjoy the app in Shavian
+Full changelog available on GitHub
\ No newline at end of file
diff --git a/lib/geo/countries.dart b/lib/geo/countries.dart
index f2b0c32b6..eeb1db079 100644
--- a/lib/geo/countries.dart
+++ b/lib/geo/countries.dart
@@ -41,7 +41,7 @@ class CountryTopology {
return Map.fromEntries(numericMap.entries.map((kv) {
final code = _countryOfNumeric(kv.key);
return code != null ? MapEntry(code, kv.value) : null;
- }).whereNotNull());
+ }).nonNulls);
}
// returns a map of the given positions by the ISO 3166-1 numeric code of the country containing them
diff --git a/lib/geo/topojson.dart b/lib/geo/topojson.dart
index c03f7d553..94bf6bb9a 100644
--- a/lib/geo/topojson.dart
+++ b/lib/geo/topojson.dart
@@ -2,7 +2,6 @@ import 'dart:async';
import 'dart:convert';
import 'dart:isolate';
-import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
// cf https://github.com/topojson/topojson-specification
@@ -60,7 +59,7 @@ class Topology extends TopologyJsonObject {
final name = kv.key;
final geometry = Geometry.build(kv.value);
return geometry != null ? MapEntry(name, geometry) : null;
- }).whereNotNull()),
+ }).nonNulls),
arcs = (data['arcs'] as List).cast().map((arc) => arc.cast().map((position) => position.cast()).toList()).toList(),
transform = data.containsKey('transform') ? Transform.parse((data['transform'] as Map).cast()) : null,
super.parse();
@@ -238,7 +237,7 @@ class GeometryCollection extends Geometry {
final List geometries;
GeometryCollection.parse(super.data)
- : geometries = (data['geometries'] as List).cast>().map(Geometry.build).whereNotNull().toList(),
+ : geometries = (data['geometries'] as List).cast>().map(Geometry.build).nonNulls.toList(),
super.parse();
@override
diff --git a/lib/geo/uri.dart b/lib/geo/uri.dart
index 5374bc9cd..3241d0a39 100644
--- a/lib/geo/uri.dart
+++ b/lib/geo/uri.dart
@@ -1,3 +1,4 @@
+import 'package:aves/utils/math_utils.dart';
import 'package:latlong2/latlong.dart';
// e.g. `geo:44.4361283,26.1027248?z=4.0(Bucharest)`
@@ -24,3 +25,13 @@ import 'package:latlong2/latlong.dart';
}
return null;
}
+
+String toGeoUri(LatLng latLng, {double? zoom}) {
+ final latitude = roundToPrecision(latLng.latitude, decimals: 6);
+ final longitude = roundToPrecision(latLng.longitude, decimals: 6);
+ var uri = 'geo:$latitude,$longitude?q=$latitude,$longitude';
+ if (zoom != null) {
+ uri += '&z=$zoom';
+ }
+ return uri;
+}
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
index b59897d27..f55426b8b 100644
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@@ -541,8 +541,6 @@
"@settingsEnableBin": {},
"entryActionViewMotionPhotoVideo": "فتح الفيديو",
"@entryActionViewMotionPhotoVideo": {},
- "videoControlsNone": "لا شيء",
- "@videoControlsNone": {},
"otherDirectoryDescription": "دليل «{name}»",
"@otherDirectoryDescription": {
"placeholders": {
@@ -757,8 +755,6 @@
"@drawerCollectionFavourites": {},
"filterTypeRawLabel": "خام",
"@filterTypeRawLabel": {},
- "videoControlsPlaySeek": "تشغيل وتقدم للأمام/ للخلف",
- "@videoControlsPlaySeek": {},
"settingsSubtitleThemeTextAlignmentCenter": "وسط",
"@settingsSubtitleThemeTextAlignmentCenter": {},
"keepScreenOnVideoPlayback": "أثناء تشغيل الفيديو",
@@ -1031,8 +1027,6 @@
"@viewerErrorDoesNotExist": {},
"albumCamera": "الكاميرا",
"@albumCamera": {},
- "videoControlsPlay": "تشغيل",
- "@videoControlsPlay": {},
"settingsNavigationSectionTitle": "التنقل",
"@settingsNavigationSectionTitle": {},
"settingsDisplayRefreshRateModeDialogTitle": "معدل التحديث",
@@ -1544,5 +1538,11 @@
"mapStyleOpenTopoMap": "الخريطة الطبوغرافية المفتوحة",
"@mapStyleOpenTopoMap": {},
"mapAttributionOsmData": "بيانات الخريطة © [OpenStreetMap](https://www.openstreetmap.org/copyright) المساهمين",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | البلاط بواسطة [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+ "@mapAttributionOpenTopoMap": {},
+ "mapStyleOsmLiberty": "حرية خرائط OSM",
+ "@mapStyleOsmLiberty": {},
+ "mapAttributionOsmLiberty": "البلاط بواسطة [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • مُستضاف بواسطة [OSM Americana](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {}
}
diff --git a/lib/l10n/app_be.arb b/lib/l10n/app_be.arb
index fdb22ec83..c30d4cce9 100644
--- a/lib/l10n/app_be.arb
+++ b/lib/l10n/app_be.arb
@@ -257,8 +257,6 @@
"@coordinateFormatDecimal": {},
"subtitlePositionBottom": "Ніз",
"@subtitlePositionBottom": {},
- "videoControlsPlaySeek": "Прайграванне і пераход на пазіцыю",
- "@videoControlsPlaySeek": {},
"nameConflictStrategyReplace": "Замяніць",
"@nameConflictStrategyReplace": {},
"filterAspectRatioLandscapeLabel": "Ландшафтныя",
@@ -361,8 +359,6 @@
"@settingsVideoEnablePip": {},
"videoControlsPlayOutside": "Адкрыць у іншым прайгравальніку",
"@videoControlsPlayOutside": {},
- "videoControlsPlay": "Прайграванне",
- "@videoControlsPlay": {},
"videoLoopModeNever": "Ніколі",
"@videoLoopModeNever": {},
"videoLoopModeShortOnly": "Толькі для кароткіх відэа",
@@ -593,8 +589,6 @@
"@viewerInfoSearchSuggestionResolution": {},
"viewerInfoSearchSuggestionDimensions": "Памеры",
"@viewerInfoSearchSuggestionDimensions": {},
- "videoControlsNone": "Нічога",
- "@videoControlsNone": {},
"viewerErrorUnknown": "Ой!",
"@viewerErrorUnknown": {},
"viewerSetWallpaperButtonLabel": "УСТАНАВІЦЬ ШПАЛЕРЫ",
diff --git a/lib/l10n/app_ca.arb b/lib/l10n/app_ca.arb
index 057b0c748..fdf55eba1 100644
--- a/lib/l10n/app_ca.arb
+++ b/lib/l10n/app_ca.arb
@@ -240,12 +240,6 @@
"@vaultLockTypePassword": {},
"settingsVideoEnablePip": "Imatge-en-imatge",
"@settingsVideoEnablePip": {},
- "videoControlsPlay": "Reproduir",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Reproduir i retrocedeix/avança",
- "@videoControlsPlaySeek": {},
- "videoControlsNone": "Cap",
- "@videoControlsNone": {},
"viewerTransitionZoomIn": "Ampliar",
"@viewerTransitionZoomIn": {},
"viewerTransitionNone": "Cap",
diff --git a/lib/l10n/app_ckb.arb b/lib/l10n/app_ckb.arb
index 5ffd61aa5..e3ab45d5c 100644
--- a/lib/l10n/app_ckb.arb
+++ b/lib/l10n/app_ckb.arb
@@ -218,8 +218,6 @@
"@albumTierApps": {},
"entryActionViewMotionPhotoVideo": "کردنەوەی ڤیدیۆ",
"@entryActionViewMotionPhotoVideo": {},
- "videoControlsNone": "هیچیان",
- "@videoControlsNone": {},
"filterNoTitleLabel": "بێ سەرناو",
"@filterNoTitleLabel": {},
"videoPlaybackMuted": "بەبێ دەنگی لێبدە",
@@ -244,8 +242,6 @@
"@addShortcutButtonLabel": {},
"entryActionOpenMap": "لە نەرمەواڵەی نەخشە پیشانی بدە",
"@entryActionOpenMap": {},
- "videoControlsPlaySeek": "لێدان و بردنە پێش/پاش",
- "@videoControlsPlaySeek": {},
"entryActionRotateCCW": "سوڕاندن بە پێچەوانەی میلی کاتژمێر",
"@entryActionRotateCCW": {},
"viewerActionSettings": "ڕێکخستنەکان",
@@ -274,8 +270,6 @@
"@themeBrightnessBlack": {},
"videoPlaybackSkip": "بازدان",
"@videoPlaybackSkip": {},
- "videoControlsPlay": "لێدان",
- "@videoControlsPlay": {},
"entryActionShareVideoOnly": "بە تەنیا ڤیدیۆ هاوبەش بکە",
"@entryActionShareVideoOnly": {},
"applyTooltip": "جێبەجێ کردن",
diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb
index f8e370116..7d2ae8a5a 100644
--- a/lib/l10n/app_cs.arb
+++ b/lib/l10n/app_cs.arb
@@ -250,14 +250,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Vždy",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Přehrát",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Přehrávat a vyhledávat vzad/vpřed",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Otevřít jiným přehrávačem",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Žádný",
- "@videoControlsNone": {},
"coordinateFormatDms": "Stupně, minuty, vteřiny",
"@coordinateFormatDms": {},
"coordinateFormatDecimal": "Stupně s desetinnými místy",
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index abbae4e53..55cff8978 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -101,9 +101,9 @@
"@entryActionRename": {},
"entryActionRestore": "Wiederherstellen",
"@entryActionRestore": {},
- "entryActionRotateCCW": "Drehen gegen den Uhrzeigersinn",
+ "entryActionRotateCCW": "Gegen den Uhrzeigersinn drehen",
"@entryActionRotateCCW": {},
- "entryActionRotateCW": "Drehen im Uhrzeigersinn",
+ "entryActionRotateCW": "Im Uhrzeigersinn drehen",
"@entryActionRotateCW": {},
"entryActionFlip": "Horizontal spiegeln",
"@entryActionFlip": {},
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Immer",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Abspielen/Pausieren",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Abspielen/Pausieren & Sprung-Schaltflächen",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Mit anderem Video-Player öffnen",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Keine Schaltflächen",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Hybrid)",
@@ -1361,7 +1355,7 @@
"@videoActionABRepeat": {},
"videoRepeatActionSetStart": "Start festlegen",
"@videoRepeatActionSetStart": {},
- "stopTooltip": "Stop",
+ "stopTooltip": "Stoppen",
"@stopTooltip": {},
"videoRepeatActionSetEnd": "Ende festlegen",
"@videoRepeatActionSetEnd": {},
diff --git a/lib/l10n/app_el.arb b/lib/l10n/app_el.arb
index 987c39666..9e61624e3 100644
--- a/lib/l10n/app_el.arb
+++ b/lib/l10n/app_el.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Πάντα",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Αναπαραγωγή",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Αναπαραγωγή & πίσω/μπροστά",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Άνοιγμα με άλλη εφαρμογή",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Καμία επιλογή",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Hybrid)",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index d3f890e78..95df01843 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -138,6 +138,8 @@
"videoActionPlay": "Play",
"videoActionReplay10": "Seek backward 10 seconds",
"videoActionSkip10": "Seek forward 10 seconds",
+ "videoActionShowPreviousFrame": "Show previous frame",
+ "videoActionShowNextFrame": "Show next frame",
"videoActionSelectStreams": "Select tracks",
"videoActionSetSpeed": "Playback speed",
"videoActionABRepeat": "A-B repeat",
@@ -270,10 +272,7 @@
"settingsVideoEnablePip": "Picture-in-picture",
- "videoControlsPlay": "Play",
- "videoControlsPlaySeek": "Play & seek backward/forward",
"videoControlsPlayOutside": "Open with other player",
- "videoControlsNone": "None",
"videoLoopModeNever": "Never",
"videoLoopModeShortOnly": "Short videos only",
diff --git a/lib/l10n/app_en_Shaw.arb b/lib/l10n/app_en_Shaw.arb
new file mode 100644
index 000000000..65a149a47
--- /dev/null
+++ b/lib/l10n/app_en_Shaw.arb
@@ -0,0 +1,1593 @@
+{
+ "@@locale": "en_Shaw",
+ "appName": "𐑱𐑝𐑰𐑟",
+ "@appName": {},
+ "welcomeOptional": "𐑪𐑐𐑖𐑩𐑯𐑩𐑤",
+ "@welcomeOptional": {},
+ "welcomeTermsToggle": "𐑲 𐑩𐑜𐑮𐑰 𐑑 𐑞 𐑑𐑻𐑥𐑟 𐑯 𐑒𐑩𐑯𐑛𐑦𐑖𐑩𐑯𐑟",
+ "@welcomeTermsToggle": {},
+ "welcomeMessage": "𐑢𐑧𐑤𐑒𐑩𐑥 𐑑 ·𐑱𐑝𐑰𐑟",
+ "@welcomeMessage": {},
+ "timeSeconds": "{count, plural, =1{{count} 𐑕𐑧𐑒𐑩𐑯𐑛} other{{count} 𐑕𐑧𐑒𐑩𐑯𐑛𐑟}}",
+ "@timeSeconds": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "itemCount": "{count, plural, =1{{count} 𐑲𐑑𐑩𐑥} other{{count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@itemCount": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "columnCount": "{count, plural, =1{{count} 𐑒𐑪𐑤𐑩𐑥} other{{count} 𐑒𐑪𐑤𐑩𐑥𐑟}}",
+ "@columnCount": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "timeMinutes": "{count, plural, =1{{count} 𐑥𐑦𐑯𐑦𐑑} other{{count} 𐑥𐑦𐑯𐑦𐑑𐑕}}",
+ "@timeMinutes": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "timeDays": "{count, plural, =1{{count} 𐑛𐑱} other{{count} 𐑛𐑱𐑟}}",
+ "@timeDays": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "focalLength": "{length} 𐑥𐑥",
+ "@focalLength": {
+ "placeholders": {
+ "length": {
+ "type": "String",
+ "example": "5.4"
+ }
+ }
+ },
+ "applyButtonLabel": "𐑩𐑐𐑤𐑲",
+ "@applyButtonLabel": {},
+ "deleteButtonLabel": "𐑛𐑦𐑤𐑰𐑑",
+ "@deleteButtonLabel": {},
+ "nextButtonLabel": "𐑯𐑧𐑒𐑕𐑑",
+ "@nextButtonLabel": {},
+ "showButtonLabel": "𐑖𐑴",
+ "@showButtonLabel": {},
+ "hideButtonLabel": "𐑣𐑲𐑛",
+ "@hideButtonLabel": {},
+ "continueButtonLabel": "𐑒𐑩𐑯𐑑𐑦𐑯𐑿",
+ "@continueButtonLabel": {},
+ "saveCopyButtonLabel": "𐑕𐑱𐑝 𐑒𐑪𐑐𐑦",
+ "@saveCopyButtonLabel": {},
+ "applyTooltip": "𐑩𐑐𐑤𐑲",
+ "@applyTooltip": {},
+ "cancelTooltip": "𐑒𐑨𐑯𐑕𐑩𐑤",
+ "@cancelTooltip": {},
+ "changeTooltip": "𐑗𐑱𐑯𐑡",
+ "@changeTooltip": {},
+ "clearTooltip": "𐑒𐑤𐑽",
+ "@clearTooltip": {},
+ "previousTooltip": "𐑐𐑮𐑰𐑝𐑾𐑕",
+ "@previousTooltip": {},
+ "nextTooltip": "𐑯𐑧𐑒𐑕𐑑",
+ "@nextTooltip": {},
+ "showTooltip": "𐑖𐑴",
+ "@showTooltip": {},
+ "hideTooltip": "𐑣𐑲𐑛",
+ "@hideTooltip": {},
+ "actionRemove": "𐑮𐑦𐑥𐑵𐑝",
+ "@actionRemove": {},
+ "resetTooltip": "𐑮𐑰𐑕𐑧𐑑",
+ "@resetTooltip": {},
+ "saveTooltip": "𐑕𐑱𐑝",
+ "@saveTooltip": {},
+ "stopTooltip": "𐑕𐑑𐑪𐑐",
+ "@stopTooltip": {},
+ "pickTooltip": "𐑐𐑦𐑒",
+ "@pickTooltip": {},
+ "doubleBackExitMessage": "𐑑𐑨𐑐 «𐑚𐑨𐑒» 𐑩𐑜𐑧𐑯 𐑑 𐑧𐑒𐑕𐑦𐑑.",
+ "@doubleBackExitMessage": {},
+ "chipActionGoToAlbumPage": "𐑖𐑴 𐑦𐑯 ·𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@chipActionGoToAlbumPage": {},
+ "chipActionShowCollection": "𐑖𐑴 𐑦𐑯 ·𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@chipActionShowCollection": {},
+ "videoActionPlay": "𐑐𐑤𐑱",
+ "@videoActionPlay": {},
+ "viewerActionSettings": "𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@viewerActionSettings": {},
+ "slideshowActionResume": "𐑮𐑦𐑟𐑿𐑥",
+ "@slideshowActionResume": {},
+ "entryInfoActionEditLocation": "𐑧𐑛𐑦𐑑 𐑤𐑴𐑒𐑱𐑖𐑩𐑯",
+ "@entryInfoActionEditLocation": {},
+ "entryInfoActionEditTitleDescription": "𐑧𐑛𐑦𐑑 𐑑𐑲𐑑𐑩𐑤 𐑯 𐑛𐑦𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯",
+ "@entryInfoActionEditTitleDescription": {},
+ "doNotAskAgain": "𐑛𐑵 𐑯𐑪𐑑 𐑭𐑕𐑒 𐑩𐑜𐑧𐑯",
+ "@doNotAskAgain": {},
+ "sourceStateLoading": "𐑤𐑴𐑛𐑦𐑙",
+ "@sourceStateLoading": {},
+ "sourceStateCataloguing": "𐑒𐑨𐑑𐑩𐑤𐑪𐑜𐑦𐑙",
+ "@sourceStateCataloguing": {},
+ "sourceStateLocatingCountries": "𐑤𐑴𐑒𐑱𐑑𐑦𐑙 𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@sourceStateLocatingCountries": {},
+ "sourceStateLocatingPlaces": "𐑤𐑴𐑒𐑱𐑑𐑦𐑙 𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@sourceStateLocatingPlaces": {},
+ "chipActionDelete": "𐑛𐑦𐑤𐑰𐑑",
+ "@chipActionDelete": {},
+ "chipActionGoToExplorerPage": "𐑖𐑴 𐑦𐑯 ·𐑦𐑒𐑕𐑐𐑤𐑹𐑼",
+ "@chipActionGoToExplorerPage": {},
+ "chipActionGoToTagPage": "𐑖𐑴 𐑦𐑯 ·𐑑𐑨𐑜𐑟",
+ "@chipActionGoToTagPage": {},
+ "chipActionGoToPlacePage": "𐑖𐑴 𐑦𐑯 ·𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@chipActionGoToPlacePage": {},
+ "chipActionGoToCountryPage": "𐑖𐑴 𐑦𐑯 ·𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@chipActionGoToCountryPage": {},
+ "chipActionFilterOut": "𐑓𐑦𐑤𐑑𐑼 𐑬𐑑",
+ "@chipActionFilterOut": {},
+ "chipActionFilterIn": "𐑓𐑦𐑤𐑑𐑼 𐑦𐑯",
+ "@chipActionFilterIn": {},
+ "chipActionHide": "𐑣𐑲𐑛",
+ "@chipActionHide": {},
+ "chipActionLock": "𐑤𐑪𐑒",
+ "@chipActionLock": {},
+ "chipActionPin": "𐑐𐑦𐑯 𐑑 𐑑𐑪𐑐",
+ "@chipActionPin": {},
+ "chipActionUnpin": "𐑳𐑯𐑐𐑦𐑯 𐑑 𐑑𐑪𐑐",
+ "@chipActionUnpin": {},
+ "chipActionRename": "𐑮𐑰𐑯𐑱𐑥",
+ "@chipActionRename": {},
+ "chipActionSetCover": "𐑕𐑧𐑑 𐑒𐑳𐑝𐑼",
+ "@chipActionSetCover": {},
+ "chipActionShowCountryStates": "𐑖𐑴 𐑕𐑑𐑱𐑑𐑕",
+ "@chipActionShowCountryStates": {},
+ "chipActionCreateAlbum": "𐑒𐑮𐑦𐑱𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@chipActionCreateAlbum": {},
+ "chipActionCreateVault": "𐑒𐑮𐑦𐑱𐑑 𐑝𐑷𐑤𐑑",
+ "@chipActionCreateVault": {},
+ "chipActionConfigureVault": "𐑒𐑩𐑯𐑓𐑦𐑜𐑼 𐑝𐑷𐑤𐑑",
+ "@chipActionConfigureVault": {},
+ "entryActionCopyToClipboard": "𐑒𐑪𐑐𐑦 𐑑 𐑒𐑤𐑦𐑐𐑚𐑹𐑛",
+ "@entryActionCopyToClipboard": {},
+ "entryActionDelete": "𐑛𐑦𐑤𐑰𐑑",
+ "@entryActionDelete": {},
+ "entryActionConvert": "𐑒𐑪𐑯𐑝𐑻𐑑",
+ "@entryActionConvert": {},
+ "entryActionExport": "𐑦𐑒𐑕𐑐𐑹𐑑",
+ "@entryActionExport": {},
+ "entryActionInfo": "𐑦𐑯𐑓𐑴",
+ "@entryActionInfo": {},
+ "entryActionRename": "𐑮𐑰𐑯𐑱𐑥",
+ "@entryActionRename": {},
+ "entryActionRestore": "𐑮𐑦𐑕𐑑𐑹",
+ "@entryActionRestore": {},
+ "entryActionRotateCCW": "𐑮𐑴𐑑𐑱𐑑 𐑒𐑬𐑯𐑑𐑼𐑒𐑤𐑪𐑒𐑢𐑲𐑟",
+ "@entryActionRotateCCW": {},
+ "entryActionRotateCW": "𐑮𐑴𐑑𐑱𐑑 𐑒𐑤𐑪𐑒𐑢𐑲𐑟",
+ "@entryActionRotateCW": {},
+ "entryActionFlip": "𐑓𐑤𐑦𐑐 𐑣𐑪𐑮𐑦𐑟𐑪𐑯𐑑𐑩𐑤𐑦",
+ "@entryActionFlip": {},
+ "entryActionPrint": "𐑐𐑮𐑦𐑯𐑑",
+ "@entryActionPrint": {},
+ "entryActionShare": "𐑖𐑺",
+ "@entryActionShare": {},
+ "entryActionShareImageOnly": "𐑖𐑺 𐑦𐑥𐑦𐑡 𐑴𐑯𐑤𐑦",
+ "@entryActionShareImageOnly": {},
+ "entryActionShareVideoOnly": "𐑖𐑺 𐑝𐑦𐑛𐑦𐑴 𐑴𐑯𐑤𐑦",
+ "@entryActionShareVideoOnly": {},
+ "entryActionViewSource": "𐑝𐑿 𐑕𐑹𐑕",
+ "@entryActionViewSource": {},
+ "entryActionShowGeoTiffOnMap": "𐑖𐑴 𐑨𐑟 𐑥𐑨𐑐 𐑴𐑝𐑼𐑤𐑱",
+ "@entryActionShowGeoTiffOnMap": {},
+ "entryActionConvertMotionPhotoToStillImage": "𐑒𐑪𐑯𐑝𐑻𐑑 𐑑 𐑕𐑑𐑦𐑤 𐑦𐑥𐑦𐑡",
+ "@entryActionConvertMotionPhotoToStillImage": {},
+ "entryActionViewMotionPhotoVideo": "𐑴𐑐𐑩𐑯 𐑝𐑦𐑛𐑦𐑴",
+ "@entryActionViewMotionPhotoVideo": {},
+ "entryActionEdit": "𐑧𐑛𐑦𐑑",
+ "@entryActionEdit": {},
+ "entryActionOpen": "𐑴𐑐𐑩𐑯 𐑢𐑦𐑞",
+ "@entryActionOpen": {},
+ "entryActionSetAs": "𐑕𐑧𐑑 𐑨𐑟",
+ "@entryActionSetAs": {},
+ "entryActionCast": "𐑒𐑭𐑕𐑑",
+ "@entryActionCast": {},
+ "entryActionOpenMap": "𐑖𐑴 𐑦𐑯 𐑥𐑨𐑐 𐑨𐑐",
+ "@entryActionOpenMap": {},
+ "entryActionRotateScreen": "𐑮𐑴𐑑𐑱𐑑 𐑕𐑒𐑮𐑰𐑯",
+ "@entryActionRotateScreen": {},
+ "entryActionAddFavourite": "𐑨𐑛 𐑑 𐑓𐑱𐑝𐑼𐑦𐑑𐑕",
+ "@entryActionAddFavourite": {},
+ "entryActionRemoveFavourite": "𐑮𐑦𐑥𐑵𐑝 𐑓𐑮𐑪𐑥 𐑓𐑱𐑝𐑼𐑦𐑑𐑕",
+ "@entryActionRemoveFavourite": {},
+ "videoActionCaptureFrame": "𐑒𐑨𐑐𐑗𐑼 𐑓𐑮𐑱𐑥",
+ "@videoActionCaptureFrame": {},
+ "videoActionMute": "𐑥𐑿𐑑",
+ "@videoActionMute": {},
+ "videoActionUnmute": "𐑳𐑯𐑥𐑿𐑑",
+ "@videoActionUnmute": {},
+ "videoActionPause": "𐑐𐑷𐑟",
+ "@videoActionPause": {},
+ "videoActionReplay10": "𐑕𐑰𐑒 𐑚𐑨𐑒𐑢𐑼𐑛 10 𐑕𐑧𐑒𐑩𐑯𐑛𐑟",
+ "@videoActionReplay10": {},
+ "videoActionSkip10": "𐑕𐑰𐑒 𐑓𐑹𐑢𐑼𐑛 10 𐑕𐑧𐑒𐑩𐑯𐑛𐑟",
+ "@videoActionSkip10": {},
+ "videoActionSelectStreams": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑑𐑮𐑨𐑒𐑕",
+ "@videoActionSelectStreams": {},
+ "videoActionSetSpeed": "𐑐𐑤𐑱𐑚𐑨𐑒 𐑕𐑐𐑰𐑛",
+ "@videoActionSetSpeed": {},
+ "videoActionABRepeat": "𐑐–𐑚 𐑮𐑦𐑐𐑰𐑑",
+ "@videoActionABRepeat": {},
+ "videoRepeatActionSetStart": "𐑕𐑧𐑑 𐑕𐑑𐑸𐑑",
+ "@videoRepeatActionSetStart": {},
+ "videoRepeatActionSetEnd": "𐑕𐑧𐑑 𐑧𐑯𐑛",
+ "@videoRepeatActionSetEnd": {},
+ "viewerActionLock": "𐑤𐑪𐑒 𐑝𐑿𐑼",
+ "@viewerActionLock": {},
+ "viewerActionUnlock": "𐑳𐑯𐑤𐑪𐑒 𐑝𐑿𐑼",
+ "@viewerActionUnlock": {},
+ "slideshowActionShowInCollection": "𐑖𐑴 𐑦𐑯 ·𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@slideshowActionShowInCollection": {},
+ "entryInfoActionEditDate": "𐑧𐑛𐑦𐑑 𐑛𐑱𐑑 𐑯 𐑑𐑲𐑥",
+ "@entryInfoActionEditDate": {},
+ "entryInfoActionEditRating": "𐑧𐑛𐑦𐑑 𐑮𐑱𐑑𐑦𐑙",
+ "@entryInfoActionEditRating": {},
+ "entryInfoActionEditTags": "𐑧𐑛𐑦𐑑 𐑑𐑨𐑜𐑟",
+ "@entryInfoActionEditTags": {},
+ "entryInfoActionRemoveMetadata": "𐑮𐑦𐑥𐑵𐑝 𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩",
+ "@entryInfoActionRemoveMetadata": {},
+ "entryInfoActionExportMetadata": "𐑦𐑒𐑕𐑐𐑹𐑑 𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩",
+ "@entryInfoActionExportMetadata": {},
+ "entryInfoActionRemoveLocation": "𐑮𐑦𐑥𐑵𐑝 𐑤𐑴𐑒𐑱𐑖𐑩𐑯",
+ "@entryInfoActionRemoveLocation": {},
+ "editorActionTransform": "𐑑𐑮𐑨𐑯𐑕𐑓𐑹𐑥",
+ "@editorActionTransform": {},
+ "editorTransformCrop": "𐑒𐑮𐑪𐑐",
+ "@editorTransformCrop": {},
+ "editorTransformRotate": "𐑮𐑴𐑑𐑱𐑑",
+ "@editorTransformRotate": {},
+ "cropAspectRatioFree": "𐑓𐑮𐑰",
+ "@cropAspectRatioFree": {},
+ "cropAspectRatioOriginal": "𐑼𐑦𐑡𐑦𐑯𐑩𐑤",
+ "@cropAspectRatioOriginal": {},
+ "cropAspectRatioSquare": "𐑕𐑒𐑢𐑺",
+ "@cropAspectRatioSquare": {},
+ "filterAspectRatioLandscapeLabel": "𐑤𐑨𐑯𐑛𐑕𐑒𐑱𐑐",
+ "@filterAspectRatioLandscapeLabel": {},
+ "filterAspectRatioPortraitLabel": "𐑐𐑹𐑑𐑮𐑦𐑑",
+ "@filterAspectRatioPortraitLabel": {},
+ "filterBinLabel": "𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯",
+ "@filterBinLabel": {},
+ "filterFavouriteLabel": "𐑓𐑱𐑝𐑼𐑦𐑑",
+ "@filterFavouriteLabel": {},
+ "filterNoDateLabel": "𐑳𐑯𐑛𐑱𐑑𐑩𐑛",
+ "@filterNoDateLabel": {},
+ "filterNoAddressLabel": "𐑯𐑴 𐑩𐑛𐑮𐑧𐑕",
+ "@filterNoAddressLabel": {},
+ "filterLocatedLabel": "𐑤𐑴𐑒𐑱𐑑𐑩𐑛",
+ "@filterLocatedLabel": {},
+ "filterNoLocationLabel": "𐑳𐑯𐑤𐑴𐑒𐑱𐑑𐑩𐑛",
+ "@filterNoLocationLabel": {},
+ "filterNoRatingLabel": "𐑳𐑯𐑮𐑱𐑑𐑩𐑛",
+ "@filterNoRatingLabel": {},
+ "filterTaggedLabel": "𐑑𐑨𐑜𐑛",
+ "@filterTaggedLabel": {},
+ "filterNoTagLabel": "𐑳𐑯𐑑𐑨𐑜𐑛",
+ "@filterNoTagLabel": {},
+ "filterNoTitleLabel": "𐑳𐑯𐑑𐑲𐑑𐑩𐑤𐑛",
+ "@filterNoTitleLabel": {},
+ "filterOnThisDayLabel": "𐑪𐑯 𐑞𐑦𐑕 𐑛𐑱",
+ "@filterOnThisDayLabel": {},
+ "filterRecentlyAddedLabel": "𐑮𐑰𐑕𐑩𐑯𐑑𐑤𐑦 𐑨𐑛𐑩𐑛",
+ "@filterRecentlyAddedLabel": {},
+ "filterRatingRejectedLabel": "𐑮𐑦𐑡𐑧𐑒𐑑𐑩𐑛",
+ "@filterRatingRejectedLabel": {},
+ "filterTypeAnimatedLabel": "𐑨𐑯𐑦𐑥𐑱𐑑𐑩𐑛",
+ "@filterTypeAnimatedLabel": {},
+ "filterTypeMotionPhotoLabel": "𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴",
+ "@filterTypeMotionPhotoLabel": {},
+ "filterTypePanoramaLabel": "𐑐𐑨𐑯𐑼𐑭𐑥𐑩",
+ "@filterTypePanoramaLabel": {},
+ "filterTypeRawLabel": "𐑮𐑷",
+ "@filterTypeRawLabel": {},
+ "filterTypeSphericalVideoLabel": "360° 𐑝𐑦𐑛𐑦𐑴",
+ "@filterTypeSphericalVideoLabel": {},
+ "filterTypeGeotiffLabel": "⸰𐑡𐑰𐑴𐑑𐑦𐑓𐑓",
+ "@filterTypeGeotiffLabel": {},
+ "filterMimeImageLabel": "𐑦𐑥𐑦𐑡",
+ "@filterMimeImageLabel": {},
+ "filterMimeVideoLabel": "𐑝𐑦𐑛𐑦𐑴",
+ "@filterMimeVideoLabel": {},
+ "accessibilityAnimationsRemove": "𐑐𐑮𐑦𐑝𐑧𐑯𐑑 𐑕𐑒𐑮𐑰𐑯 𐑦𐑓𐑧𐑒𐑑𐑕",
+ "@accessibilityAnimationsRemove": {},
+ "accessibilityAnimationsKeep": "𐑒𐑰𐑐 𐑕𐑒𐑮𐑰𐑯 𐑦𐑓𐑧𐑒𐑑𐑕",
+ "@accessibilityAnimationsKeep": {},
+ "albumTierNew": "𐑯𐑿",
+ "@albumTierNew": {},
+ "albumTierPinned": "𐑐𐑦𐑯𐑛",
+ "@albumTierPinned": {},
+ "albumTierSpecial": "𐑒𐑪𐑥𐑩𐑯",
+ "@albumTierSpecial": {},
+ "albumTierApps": "𐑨𐑐𐑕",
+ "@albumTierApps": {},
+ "albumTierVaults": "𐑝𐑷𐑤𐑑𐑕",
+ "@albumTierVaults": {},
+ "albumTierRegular": "𐑳𐑞𐑼𐑟",
+ "@albumTierRegular": {},
+ "coordinateFormatDms": "⸰𐑛𐑥𐑕",
+ "@coordinateFormatDms": {},
+ "coordinateFormatDecimal": "𐑛𐑧𐑕𐑦𐑥𐑩𐑤 𐑛𐑦𐑜𐑮𐑰𐑟",
+ "@coordinateFormatDecimal": {},
+ "coordinateDms": "{coordinate} {direction}",
+ "@coordinateDms": {
+ "placeholders": {
+ "coordinate": {
+ "type": "String",
+ "example": "38° 41′ 47.72″"
+ },
+ "direction": {
+ "type": "String",
+ "example": "S"
+ }
+ }
+ },
+ "coordinateDmsNorth": "𐑯",
+ "@coordinateDmsNorth": {},
+ "coordinateDmsSouth": "𐑕",
+ "@coordinateDmsSouth": {},
+ "coordinateDmsEast": "𐑰",
+ "@coordinateDmsEast": {},
+ "coordinateDmsWest": "𐑢",
+ "@coordinateDmsWest": {},
+ "displayRefreshRatePreferHighest": "𐑣𐑲𐑩𐑕𐑑 𐑮𐑱𐑑",
+ "@displayRefreshRatePreferHighest": {},
+ "keepScreenOnVideoPlayback": "𐑛𐑘𐑫𐑼𐑦𐑙 𐑝𐑦𐑛𐑦𐑴 𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@keepScreenOnVideoPlayback": {},
+ "keepScreenOnViewerOnly": "𐑝𐑿𐑼 𐑐𐑱𐑡 𐑴𐑯𐑤𐑦",
+ "@keepScreenOnViewerOnly": {},
+ "lengthUnitPixel": "𐑐𐑒𐑕",
+ "@lengthUnitPixel": {},
+ "lengthUnitPercent": "%",
+ "@lengthUnitPercent": {},
+ "mapStyleGoogleNormal": "·𐑜𐑵𐑜𐑩𐑤 𐑥𐑨𐑐𐑕",
+ "@mapStyleGoogleNormal": {},
+ "mapStyleGoogleHybrid": "·𐑜𐑵𐑜𐑩𐑤 𐑥𐑨𐑐𐑕 (𐑣𐑲𐑚𐑮𐑦𐑛)",
+ "@mapStyleGoogleHybrid": {},
+ "mapStyleGoogleTerrain": "·𐑜𐑵𐑜𐑩𐑤 𐑥𐑨𐑐𐑕 (𐑑𐑼𐑱𐑯)",
+ "@mapStyleGoogleTerrain": {},
+ "mapStyleOsmLiberty": "⸰𐑴𐑕𐑥 ·𐑤𐑦𐑚𐑼𐑑𐑦",
+ "@mapStyleOsmLiberty": {},
+ "mapStyleOpenTopoMap": "·𐑴𐑐𐑩𐑯𐑑𐑪𐑐𐑩𐑥𐑨𐑐",
+ "@mapStyleOpenTopoMap": {},
+ "mapStyleOsmHot": "·𐑣𐑿𐑥𐑨𐑯𐑦𐑑𐑺𐑾𐑯 ⸰𐑴𐑕𐑥",
+ "@mapStyleOsmHot": {},
+ "maxBrightnessAlways": "𐑷𐑤𐑢𐑱𐑟",
+ "@maxBrightnessAlways": {},
+ "mapStyleStamenWatercolor": "·𐑕𐑑𐑱𐑥𐑩𐑯 𐑢𐑷𐑑𐑼𐑒𐑳𐑤𐑼",
+ "@mapStyleStamenWatercolor": {},
+ "maxBrightnessNever": "𐑯𐑧𐑝𐑼",
+ "@maxBrightnessNever": {},
+ "nameConflictStrategyRename": "𐑮𐑰𐑯𐑱𐑥",
+ "@nameConflictStrategyRename": {},
+ "nameConflictStrategyReplace": "𐑮𐑦𐑐𐑤𐑱𐑕",
+ "@nameConflictStrategyReplace": {},
+ "nameConflictStrategySkip": "𐑕𐑒𐑦𐑐",
+ "@nameConflictStrategySkip": {},
+ "overlayHistogramNone": "𐑯𐑳𐑯",
+ "@overlayHistogramNone": {},
+ "overlayHistogramRGB": "⸰𐑮𐑜𐑚",
+ "@overlayHistogramRGB": {},
+ "overlayHistogramLuminance": "𐑤𐑵𐑥𐑦𐑯𐑩𐑯𐑕",
+ "@overlayHistogramLuminance": {},
+ "subtitlePositionTop": "𐑑𐑪𐑐",
+ "@subtitlePositionTop": {},
+ "subtitlePositionBottom": "𐑚𐑪𐑑𐑩𐑥",
+ "@subtitlePositionBottom": {},
+ "themeBrightnessLight": "𐑤𐑲𐑑",
+ "@themeBrightnessLight": {},
+ "themeBrightnessDark": "𐑛𐑸𐑒",
+ "@themeBrightnessDark": {},
+ "themeBrightnessBlack": "𐑚𐑤𐑨𐑒",
+ "@themeBrightnessBlack": {},
+ "unitSystemMetric": "𐑥𐑧𐑑𐑮𐑦𐑒",
+ "@unitSystemMetric": {},
+ "unitSystemImperial": "𐑦𐑥𐑐𐑽𐑾𐑤",
+ "@unitSystemImperial": {},
+ "vaultLockTypePattern": "𐑐𐑨𐑑𐑼𐑯",
+ "@vaultLockTypePattern": {},
+ "vaultLockTypePin": "⸰𐑐𐑲𐑯",
+ "@vaultLockTypePin": {},
+ "vaultLockTypePassword": "𐑐𐑭𐑕𐑢𐑻𐑛",
+ "@vaultLockTypePassword": {},
+ "settingsVideoEnablePip": "𐑐𐑦𐑒𐑗𐑼-𐑦𐑯-𐑐𐑦𐑒𐑗𐑼",
+ "@settingsVideoEnablePip": {},
+ "videoControlsPlayOutside": "𐑴𐑐𐑩𐑯 𐑢𐑦𐑞 𐑳𐑞𐑼 𐑐𐑤𐑱𐑼",
+ "@videoControlsPlayOutside": {},
+ "videoLoopModeNever": "𐑯𐑧𐑝𐑼",
+ "@videoLoopModeNever": {},
+ "videoLoopModeShortOnly": "𐑖𐑹𐑑 𐑝𐑦𐑛𐑦𐑴𐑟 𐑴𐑯𐑤𐑦",
+ "@videoLoopModeShortOnly": {},
+ "videoLoopModeAlways": "𐑷𐑤𐑢𐑱𐑟",
+ "@videoLoopModeAlways": {},
+ "videoPlaybackSkip": "𐑕𐑒𐑦𐑐",
+ "@videoPlaybackSkip": {},
+ "videoPlaybackMuted": "𐑐𐑤𐑱 𐑥𐑿𐑑𐑩𐑛",
+ "@videoPlaybackMuted": {},
+ "videoPlaybackWithSound": "𐑐𐑤𐑱 𐑢𐑦𐑞 𐑕𐑬𐑯𐑛",
+ "@videoPlaybackWithSound": {},
+ "videoResumptionModeNever": "𐑯𐑧𐑝𐑼",
+ "@videoResumptionModeNever": {},
+ "videoResumptionModeAlways": "𐑷𐑤𐑢𐑱𐑟",
+ "@videoResumptionModeAlways": {},
+ "viewerTransitionSlide": "𐑕𐑤𐑲𐑛",
+ "@viewerTransitionSlide": {},
+ "viewerTransitionParallax": "𐑐𐑨𐑮𐑩𐑤𐑨𐑒𐑕",
+ "@viewerTransitionParallax": {},
+ "viewerTransitionFade": "𐑓𐑱𐑛",
+ "@viewerTransitionFade": {},
+ "viewerTransitionZoomIn": "𐑟𐑵𐑥 𐑦𐑯",
+ "@viewerTransitionZoomIn": {},
+ "viewerTransitionNone": "𐑯𐑳𐑯",
+ "@viewerTransitionNone": {},
+ "wallpaperTargetHome": "𐑣𐑴𐑥 𐑕𐑒𐑮𐑰𐑯",
+ "@wallpaperTargetHome": {},
+ "wallpaperTargetLock": "𐑤𐑪𐑒 𐑕𐑒𐑮𐑰𐑯",
+ "@wallpaperTargetLock": {},
+ "wallpaperTargetHomeLock": "𐑣𐑴𐑥 𐑯 𐑤𐑪𐑒 𐑕𐑒𐑮𐑰𐑯𐑟",
+ "@wallpaperTargetHomeLock": {},
+ "widgetDisplayedItemRandom": "𐑮𐑨𐑯𐑛𐑩𐑥",
+ "@widgetDisplayedItemRandom": {},
+ "widgetDisplayedItemMostRecent": "𐑥𐑴𐑕𐑑 𐑮𐑰𐑕𐑩𐑯𐑑",
+ "@widgetDisplayedItemMostRecent": {},
+ "widgetOpenPageHome": "𐑴𐑐𐑩𐑯 𐑣𐑴𐑥",
+ "@widgetOpenPageHome": {},
+ "widgetOpenPageCollection": "𐑴𐑐𐑩𐑯 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@widgetOpenPageCollection": {},
+ "widgetOpenPageViewer": "𐑴𐑐𐑩𐑯 𐑝𐑿𐑼",
+ "@widgetOpenPageViewer": {},
+ "widgetTapUpdateWidget": "𐑳𐑐𐑛𐑱𐑑 𐑢𐑦𐑡𐑩𐑑",
+ "@widgetTapUpdateWidget": {},
+ "storageVolumeDescriptionFallbackPrimary": "𐑦𐑯𐑑𐑻𐑯𐑩𐑤 𐑕𐑑𐑹𐑦𐑡",
+ "@storageVolumeDescriptionFallbackPrimary": {},
+ "storageVolumeDescriptionFallbackNonPrimary": "⸰𐑕𐑛 𐑒𐑸𐑛",
+ "@storageVolumeDescriptionFallbackNonPrimary": {},
+ "rootDirectoryDescription": "𐑮𐑵𐑑 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦",
+ "@rootDirectoryDescription": {},
+ "otherDirectoryDescription": "«{name}» 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦",
+ "@otherDirectoryDescription": {
+ "placeholders": {
+ "name": {
+ "type": "String",
+ "example": "Pictures",
+ "description": "the name of a specific directory"
+ }
+ }
+ },
+ "storageAccessDialogMessage": "𐑐𐑤𐑰𐑟 𐑕𐑦𐑤𐑧𐑒𐑑 𐑞 {directory} 𐑝 «{volume}» 𐑦𐑯 𐑞 𐑯𐑧𐑒𐑕𐑑 𐑕𐑒𐑮𐑰𐑯 𐑑 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑨𐑐 𐑨𐑒𐑕𐑧𐑕 𐑑 𐑦𐑑.",
+ "@storageAccessDialogMessage": {
+ "placeholders": {
+ "directory": {
+ "type": "String",
+ "description": "the name of a directory, using the output of `rootDirectoryDescription` or `otherDirectoryDescription`"
+ },
+ "volume": {
+ "type": "String",
+ "example": "SD card",
+ "description": "the name of a storage volume"
+ }
+ }
+ },
+ "restrictedAccessDialogMessage": "𐑞𐑦𐑕 𐑨𐑐 𐑦𐑟 𐑯𐑪𐑑 𐑩𐑤𐑬𐑛 𐑑 𐑥𐑪𐑛𐑦𐑓𐑲 𐑓𐑲𐑤𐑟 𐑦𐑯 𐑞 {directory} 𐑝 «{volume}».\n\n𐑐𐑤𐑰𐑟 𐑿𐑟 𐑩 𐑐𐑮𐑰-𐑦𐑯𐑕𐑑𐑷𐑤𐑛 𐑓𐑲𐑤 𐑥𐑨𐑯𐑦𐑡𐑼 𐑹 𐑜𐑨𐑤𐑼𐑦 𐑨𐑐 𐑑 𐑥𐑵𐑝 𐑞 𐑲𐑑𐑩𐑥𐑟 𐑑 𐑩𐑯𐑳𐑞𐑼 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦.",
+ "@restrictedAccessDialogMessage": {
+ "placeholders": {
+ "directory": {
+ "type": "String",
+ "description": "the name of a directory, using the output of `rootDirectoryDescription` or `otherDirectoryDescription`"
+ },
+ "volume": {
+ "type": "String",
+ "example": "SD card",
+ "description": "the name of a storage volume"
+ }
+ }
+ },
+ "keepScreenOnNever": "𐑯𐑧𐑝𐑼",
+ "@keepScreenOnNever": {},
+ "displayRefreshRatePreferLowest": "𐑤𐑴𐑩𐑕𐑑 𐑮𐑱𐑑",
+ "@displayRefreshRatePreferLowest": {},
+ "keepScreenOnAlways": "𐑷𐑤𐑢𐑱𐑟",
+ "@keepScreenOnAlways": {},
+ "notEnoughSpaceDialogMessage": "𐑞𐑦𐑕 𐑪𐑐𐑼𐑱𐑖𐑩𐑯 𐑯𐑰𐑛𐑟 {neededSize} 𐑝 𐑓𐑮𐑰 𐑕𐑐𐑱𐑕 𐑪𐑯 «{volume}» 𐑑 𐑒𐑩𐑥𐑐𐑤𐑰𐑑, 𐑚𐑳𐑑 𐑞𐑺 𐑦𐑟 𐑴𐑯𐑤𐑦 {freeSize} 𐑤𐑧𐑓𐑑.",
+ "@notEnoughSpaceDialogMessage": {
+ "placeholders": {
+ "neededSize": {
+ "type": "String",
+ "example": "314 MB"
+ },
+ "freeSize": {
+ "type": "String",
+ "example": "123 MB"
+ },
+ "volume": {
+ "type": "String",
+ "example": "SD card",
+ "description": "the name of a storage volume"
+ }
+ }
+ },
+ "missingSystemFilePickerDialogMessage": "𐑞 𐑕𐑦𐑕𐑑𐑩𐑥 𐑓𐑲𐑤 𐑐𐑦𐑒𐑼 𐑦𐑟 𐑥𐑦𐑕𐑦𐑙 𐑹 𐑛𐑦𐑕𐑱𐑚𐑩𐑤𐑛. 𐑐𐑤𐑰𐑟 𐑦𐑯𐑱𐑚𐑩𐑤 𐑦𐑑 𐑯 𐑑𐑮𐑲 𐑩𐑜𐑧𐑯.",
+ "@missingSystemFilePickerDialogMessage": {},
+ "nameConflictDialogSingleSourceMessage": "𐑕𐑳𐑥 𐑓𐑲𐑤𐑟 𐑦𐑯 𐑞 𐑛𐑧𐑕𐑑𐑦𐑯𐑱𐑖𐑩𐑯 𐑓𐑴𐑤𐑛𐑼 𐑣𐑨𐑝 𐑞 𐑕𐑱𐑥 𐑯𐑱𐑥.",
+ "@nameConflictDialogSingleSourceMessage": {},
+ "nameConflictDialogMultipleSourceMessage": "𐑕𐑳𐑥 𐑓𐑲𐑤𐑟 𐑣𐑨𐑝 𐑞 𐑕𐑱𐑥 𐑯𐑱𐑥.",
+ "@nameConflictDialogMultipleSourceMessage": {},
+ "addShortcutDialogLabel": "𐑖𐑹𐑑𐑒𐑳𐑑 𐑤𐑱𐑚𐑩𐑤",
+ "@addShortcutDialogLabel": {},
+ "addShortcutButtonLabel": "𐑨𐑛",
+ "@addShortcutButtonLabel": {},
+ "noMatchingAppDialogMessage": "𐑞𐑺 𐑸 𐑯𐑴 𐑨𐑐𐑕 𐑞𐑨𐑑 𐑒𐑨𐑯 𐑣𐑨𐑯𐑛𐑩𐑤 𐑞𐑦𐑕.",
+ "@noMatchingAppDialogMessage": {},
+ "binEntriesConfirmationDialogMessage": "{count, plural, =1{¿𐑥𐑵𐑝 𐑞𐑦𐑕 𐑲𐑑𐑩𐑥 𐑑 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯?} other{¿𐑥𐑵𐑝 𐑞𐑰𐑟 {count} 𐑲𐑑𐑩𐑥𐑟 𐑑 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯?}}",
+ "@binEntriesConfirmationDialogMessage": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "deleteEntriesConfirmationDialogMessage": "{count, plural, =1{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑲𐑑𐑩𐑥?} other{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑰𐑟 {count} 𐑲𐑑𐑩𐑥𐑟?}}",
+ "@deleteEntriesConfirmationDialogMessage": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "moveUndatedConfirmationDialogMessage": "¿𐑕𐑱𐑝 𐑲𐑑𐑩𐑥 𐑛𐑱𐑑𐑕 𐑚𐑦𐑓𐑹 𐑐𐑮𐑩𐑕𐑰𐑛𐑦𐑙?",
+ "@moveUndatedConfirmationDialogMessage": {},
+ "moveUndatedConfirmationDialogSetDate": "𐑕𐑱𐑝 𐑛𐑱𐑑𐑕",
+ "@moveUndatedConfirmationDialogSetDate": {},
+ "videoResumeDialogMessage": "¿𐑛𐑵 𐑿 𐑢𐑪𐑯𐑑 𐑑 𐑮𐑦𐑟𐑿𐑥 𐑨𐑑 {time}?",
+ "@videoResumeDialogMessage": {
+ "placeholders": {
+ "time": {
+ "type": "String",
+ "example": "13:37"
+ }
+ }
+ },
+ "videoStartOverButtonLabel": "𐑕𐑑𐑸𐑑 𐑴𐑝𐑼",
+ "@videoStartOverButtonLabel": {},
+ "videoResumeButtonLabel": "𐑮𐑦𐑟𐑿𐑥",
+ "@videoResumeButtonLabel": {},
+ "setCoverDialogLatest": "𐑤𐑱𐑑𐑩𐑕𐑑 𐑲𐑑𐑩𐑥",
+ "@setCoverDialogLatest": {},
+ "setCoverDialogAuto": "𐑷𐑑𐑴",
+ "@setCoverDialogAuto": {},
+ "setCoverDialogCustom": "𐑒𐑳𐑕𐑑𐑩𐑥",
+ "@setCoverDialogCustom": {},
+ "hideFilterConfirmationDialogMessage": "𐑥𐑨𐑗𐑦𐑙 𐑓𐑴𐑑𐑴𐑟 𐑯 𐑝𐑦𐑛𐑦𐑴𐑟 𐑢𐑦𐑤 𐑚𐑰 𐑣𐑦𐑛𐑩𐑯 𐑓𐑮𐑪𐑥 𐑘𐑹 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯. 𐑿 𐑒𐑨𐑯 𐑖𐑴 𐑞𐑧𐑥 𐑩𐑜𐑧𐑯 𐑓𐑮𐑪𐑥 𐑞 «𐑐𐑮𐑦𐑝𐑩𐑕𐑦» 𐑕𐑧𐑑𐑦𐑙𐑟.\n\n¿𐑸 𐑿 𐑖𐑫𐑼 𐑿 𐑢𐑪𐑯𐑑 𐑑 𐑣𐑲𐑛 𐑞𐑧𐑥?",
+ "@hideFilterConfirmationDialogMessage": {},
+ "newAlbumDialogTitle": "𐑯𐑿 𐑨𐑤𐑚𐑩𐑥",
+ "@newAlbumDialogTitle": {},
+ "newAlbumDialogNameLabel": "𐑨𐑤𐑚𐑩𐑥 𐑯𐑱𐑥",
+ "@newAlbumDialogNameLabel": {},
+ "unsupportedTypeDialogMessage": "{count, plural, =1{𐑞𐑦𐑕 𐑪𐑐𐑼𐑱𐑖𐑩𐑯 𐑦𐑟 𐑯𐑪𐑑 𐑕𐑩𐑐𐑹𐑑𐑩𐑛 𐑓 𐑲𐑑𐑩𐑥𐑟 𐑝 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑑𐑲𐑐: {types}.} other{𐑞𐑦𐑕 𐑪𐑐𐑼𐑱𐑖𐑩𐑯 𐑦𐑟 𐑯𐑪𐑑 𐑕𐑩𐑐𐑹𐑑𐑩𐑛 𐑓 𐑲𐑑𐑩𐑥𐑟 𐑝 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑑𐑲𐑐𐑕: {types}.}}",
+ "@unsupportedTypeDialogMessage": {
+ "placeholders": {
+ "count": {},
+ "types": {
+ "type": "String",
+ "example": "GIF, TIFF, MP4",
+ "description": "a list of unsupported types"
+ }
+ }
+ },
+ "newAlbumDialogNameLabelAlreadyExistsHelper": "𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦 𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑜𐑟𐑦𐑕𐑑𐑕",
+ "@newAlbumDialogNameLabelAlreadyExistsHelper": {},
+ "newAlbumDialogStorageLabel": "𐑕𐑑𐑹𐑦𐑡:",
+ "@newAlbumDialogStorageLabel": {},
+ "newVaultWarningDialogMessage": "𐑲𐑑𐑩𐑥𐑟 𐑦𐑯 𐑝𐑷𐑤𐑑𐑕 𐑸 𐑴𐑯𐑤𐑦 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑑 𐑞𐑦𐑕 𐑨𐑐 𐑯 𐑯𐑴 𐑳𐑞𐑼𐑟.\n\n𐑦𐑓 𐑿 𐑳𐑯𐑦𐑯𐑕𐑑𐑷𐑤 𐑞𐑦𐑕 𐑨𐑐, 𐑹 𐑒𐑤𐑽 𐑞𐑦𐑕 𐑨𐑐 𐑛𐑱𐑑𐑩, 𐑿 𐑢𐑦𐑤 𐑤𐑵𐑟 𐑷𐑤 𐑞𐑰𐑟 𐑲𐑑𐑩𐑥𐑟.",
+ "@newVaultWarningDialogMessage": {},
+ "newVaultDialogTitle": "𐑯𐑿 𐑝𐑷𐑤𐑑",
+ "@newVaultDialogTitle": {},
+ "configureVaultDialogTitle": "𐑒𐑩𐑯𐑓𐑦𐑜𐑼 𐑝𐑷𐑤𐑑",
+ "@configureVaultDialogTitle": {},
+ "exportEntryDialogQuality": "𐑒𐑢𐑪𐑤𐑦𐑑𐑦",
+ "@exportEntryDialogQuality": {},
+ "exportEntryDialogHeight": "𐑣𐑲𐑑",
+ "@exportEntryDialogHeight": {},
+ "durationDialogSeconds": "𐑕𐑧𐑒𐑩𐑯𐑛𐑟",
+ "@durationDialogSeconds": {},
+ "editEntryLocationDialogChooseOnMap": "𐑗𐑵𐑟 𐑪𐑯 𐑥𐑨𐑐",
+ "@editEntryLocationDialogChooseOnMap": {},
+ "editEntryLocationDialogLatitude": "𐑤𐑨𐑑𐑦𐑑𐑿𐑛",
+ "@editEntryLocationDialogLatitude": {},
+ "editEntryLocationDialogLongitude": "𐑤𐑪𐑯𐑡𐑦𐑑𐑿𐑛",
+ "@editEntryLocationDialogLongitude": {},
+ "videoStreamSelectionDialogAudio": "𐑷𐑛𐑦𐑴",
+ "@videoStreamSelectionDialogAudio": {},
+ "videoStreamSelectionDialogText": "𐑕𐑳𐑚𐑑𐑲𐑑𐑩𐑤𐑟",
+ "@videoStreamSelectionDialogText": {},
+ "aboutDataUsageExternal": "𐑦𐑒𐑕𐑑𐑻𐑯𐑩𐑤",
+ "@aboutDataUsageExternal": {},
+ "aboutTranslatorsSectionTitle": "𐑑𐑮𐑨𐑯𐑟𐑤𐑱𐑑𐑼𐑟",
+ "@aboutTranslatorsSectionTitle": {},
+ "aboutLicensesSectionTitle": "𐑴𐑐𐑩𐑯-𐑕𐑹𐑕 𐑤𐑲𐑕𐑩𐑯𐑕𐑩𐑟",
+ "@aboutLicensesSectionTitle": {},
+ "policyPageTitle": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑐𐑪𐑤𐑩𐑕𐑦",
+ "@policyPageTitle": {},
+ "collectionPageTitle": "𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@collectionPageTitle": {},
+ "collectionActionEmptyBin": "𐑧𐑥𐑐𐑑𐑦 𐑚𐑦𐑯",
+ "@collectionActionEmptyBin": {},
+ "collectionGroupAlbum": "𐑚𐑲 𐑨𐑤𐑚𐑩𐑥",
+ "@collectionGroupAlbum": {},
+ "collectionActionEdit": "𐑧𐑛𐑦𐑑",
+ "@collectionActionEdit": {},
+ "collectionDeleteFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑤𐑰𐑑 1 𐑲𐑑𐑩𐑥} other{𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑤𐑰𐑑 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionDeleteFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionMoveSuccessFeedback": "{count, plural, =1{𐑥𐑵𐑝𐑛 1 𐑲𐑑𐑩𐑥} other{𐑥𐑵𐑝𐑛 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionMoveSuccessFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "searchCollectionFieldHint": "𐑕𐑻𐑗 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@searchCollectionFieldHint": {},
+ "searchDateSectionTitle": "𐑛𐑱𐑑",
+ "@searchDateSectionTitle": {},
+ "searchAlbumsSectionTitle": "𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@searchAlbumsSectionTitle": {},
+ "searchStatesSectionTitle": "𐑕𐑑𐑱𐑑𐑕",
+ "@searchStatesSectionTitle": {},
+ "searchRatingSectionTitle": "𐑮𐑱𐑑𐑦𐑙𐑟",
+ "@searchRatingSectionTitle": {},
+ "settingsActionExport": "𐑦𐑒𐑕𐑐𐑹𐑑",
+ "@settingsActionExport": {},
+ "appExportFavourites": "𐑓𐑱𐑝𐑼𐑦𐑑𐑕",
+ "@appExportFavourites": {},
+ "setHomeCustom": "𐑒𐑳𐑕𐑑𐑩𐑥",
+ "@setHomeCustom": {},
+ "settingsKeepScreenOnDialogTitle": "𐑒𐑰𐑐 𐑕𐑒𐑮𐑰𐑯 𐑪𐑯",
+ "@settingsKeepScreenOnDialogTitle": {},
+ "settingsConfirmationDialogTitle": "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑛𐑲𐑩𐑤𐑪𐑜𐑟",
+ "@settingsConfirmationDialogTitle": {},
+ "settingsConfirmationAfterMoveToBinItems": "𐑖𐑴 𐑥𐑧𐑕𐑦𐑡 𐑭𐑓𐑑𐑼 𐑥𐑵𐑝𐑦𐑙 𐑲𐑑𐑩𐑥𐑟 𐑑 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯",
+ "@settingsConfirmationAfterMoveToBinItems": {},
+ "settingsNavigationDrawerEditorPageTitle": "𐑯𐑨𐑝𐑦𐑜𐑱𐑖𐑩𐑯 𐑥𐑧𐑯𐑿",
+ "@settingsNavigationDrawerEditorPageTitle": {},
+ "settingsThumbnailShowMotionPhotoIcon": "𐑖𐑴 𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowMotionPhotoIcon": {},
+ "settingsThumbnailOverlayTile": "𐑴𐑝𐑼𐑤𐑱",
+ "@settingsThumbnailOverlayTile": {},
+ "vaultDialogLockModeWhenScreenOff": "𐑤𐑪𐑒 𐑢𐑧𐑯 𐑕𐑒𐑮𐑰𐑯 𐑑𐑻𐑯𐑟 𐑪𐑓",
+ "@vaultDialogLockModeWhenScreenOff": {},
+ "vaultDialogLockTypeLabel": "𐑤𐑪𐑒 𐑑𐑲𐑐",
+ "@vaultDialogLockTypeLabel": {},
+ "patternDialogEnter": "𐑧𐑯𐑑𐑼 𐑐𐑨𐑑𐑼𐑯",
+ "@patternDialogEnter": {},
+ "patternDialogConfirm": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑨𐑑𐑼𐑯",
+ "@patternDialogConfirm": {},
+ "pinDialogEnter": "𐑧𐑯𐑑𐑼 ⸰𐑐𐑲𐑯",
+ "@pinDialogEnter": {},
+ "pinDialogConfirm": "𐑒𐑩𐑯𐑓𐑻𐑥 ⸰𐑐𐑲𐑯",
+ "@pinDialogConfirm": {},
+ "passwordDialogEnter": "𐑧𐑯𐑑𐑼 𐑐𐑭𐑕𐑢𐑻𐑛",
+ "@passwordDialogEnter": {},
+ "passwordDialogConfirm": "𐑒𐑩𐑯𐑓𐑻𐑥 𐑐𐑭𐑕𐑢𐑻𐑛",
+ "@passwordDialogConfirm": {},
+ "authenticateToConfigureVault": "𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑑 𐑑 𐑒𐑩𐑯𐑓𐑦𐑜𐑼 𐑝𐑷𐑤𐑑",
+ "@authenticateToConfigureVault": {},
+ "authenticateToUnlockVault": "𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑑 𐑑 𐑳𐑯𐑤𐑪𐑒 𐑝𐑷𐑤𐑑",
+ "@authenticateToUnlockVault": {},
+ "vaultBinUsageDialogMessage": "𐑕𐑳𐑥 𐑝𐑷𐑤𐑑𐑕 𐑸 𐑿𐑟𐑦𐑙 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯.",
+ "@vaultBinUsageDialogMessage": {},
+ "renameAlbumDialogLabel": "𐑯𐑿 𐑯𐑱𐑥",
+ "@renameAlbumDialogLabel": {},
+ "renameAlbumDialogLabelAlreadyExistsHelper": "𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦 𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑜𐑟𐑦𐑕𐑑𐑕",
+ "@renameAlbumDialogLabelAlreadyExistsHelper": {},
+ "renameEntrySetPageTitle": "𐑮𐑰𐑯𐑱𐑥",
+ "@renameEntrySetPageTitle": {},
+ "renameEntrySetPagePatternFieldLabel": "𐑯𐑱𐑥𐑦𐑙 𐑐𐑨𐑑𐑼𐑯",
+ "@renameEntrySetPagePatternFieldLabel": {},
+ "renameEntrySetPageInsertTooltip": "𐑦𐑯𐑕𐑻𐑑 𐑓𐑰𐑤𐑛",
+ "@renameEntrySetPageInsertTooltip": {},
+ "renameEntrySetPagePreviewSectionTitle": "𐑐𐑮𐑰𐑝𐑿",
+ "@renameEntrySetPagePreviewSectionTitle": {},
+ "renameProcessorCounter": "𐑒𐑬𐑯𐑑𐑼",
+ "@renameProcessorCounter": {},
+ "renameProcessorHash": "𐑣𐑨𐑖",
+ "@renameProcessorHash": {},
+ "renameProcessorName": "𐑯𐑱𐑥",
+ "@renameProcessorName": {},
+ "deleteSingleAlbumConfirmationDialogMessage": "{count, plural, =1{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑤𐑚𐑩𐑥 𐑯 𐑞 𐑲𐑑𐑩𐑥 𐑦𐑯 𐑦𐑑?} other{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑤𐑚𐑩𐑥 𐑯 𐑞 {count} 𐑲𐑑𐑩𐑥𐑟 𐑦𐑯 𐑦𐑑?}}",
+ "@deleteSingleAlbumConfirmationDialogMessage": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "deleteMultiAlbumConfirmationDialogMessage": "{count, plural, =1{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑰𐑟 𐑨𐑤𐑚𐑩𐑥𐑟 𐑯 𐑞 𐑲𐑑𐑩𐑥 𐑦𐑯 𐑞𐑧𐑥?} other{¿𐑛𐑦𐑤𐑰𐑑 𐑞𐑰𐑟 𐑨𐑤𐑚𐑩𐑥𐑟 𐑯 𐑞 {count} 𐑲𐑑𐑩𐑥𐑟 𐑦𐑯 𐑞𐑧𐑥?}}",
+ "@deleteMultiAlbumConfirmationDialogMessage": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "exportEntryDialogFormat": "𐑓𐑹𐑥𐑨𐑑:",
+ "@exportEntryDialogFormat": {},
+ "exportEntryDialogWidth": "𐑢𐑦𐑛𐑔",
+ "@exportEntryDialogWidth": {},
+ "exportEntryDialogWriteMetadata": "𐑮𐑲𐑑 𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩",
+ "@exportEntryDialogWriteMetadata": {},
+ "renameEntryDialogLabel": "𐑯𐑿 𐑯𐑱𐑥",
+ "@renameEntryDialogLabel": {},
+ "editEntryDialogCopyFromItem": "𐑒𐑪𐑐𐑦 𐑓𐑮𐑪𐑥 𐑳𐑞𐑼 𐑲𐑑𐑩𐑥",
+ "@editEntryDialogCopyFromItem": {},
+ "editEntryDialogTargetFieldsHeader": "𐑓𐑰𐑤𐑛𐑟 𐑑 𐑥𐑪𐑛𐑦𐑓𐑲",
+ "@editEntryDialogTargetFieldsHeader": {},
+ "editEntryDateDialogTitle": "𐑛𐑱𐑑 𐑯 𐑑𐑲𐑥",
+ "@editEntryDateDialogTitle": {},
+ "editEntryDateDialogSetCustom": "𐑕𐑧𐑑 𐑒𐑳𐑕𐑑𐑩𐑥 𐑛𐑱𐑑",
+ "@editEntryDateDialogSetCustom": {},
+ "editEntryDateDialogCopyField": "𐑒𐑪𐑐𐑦 𐑓𐑮𐑪𐑥 𐑳𐑞𐑼 𐑛𐑱𐑑",
+ "@editEntryDateDialogCopyField": {},
+ "editEntryDateDialogExtractFromTitle": "𐑦𐑒𐑕𐑑𐑮𐑨𐑒𐑑 𐑓𐑮𐑪𐑥 𐑑𐑲𐑑𐑩𐑤",
+ "@editEntryDateDialogExtractFromTitle": {},
+ "editEntryDateDialogShift": "𐑖𐑦𐑓𐑑",
+ "@editEntryDateDialogShift": {},
+ "editEntryDateDialogSourceFileModifiedDate": "𐑓𐑲𐑤 𐑥𐑪𐑛𐑦𐑓𐑲𐑛 𐑛𐑱𐑑",
+ "@editEntryDateDialogSourceFileModifiedDate": {},
+ "durationDialogHours": "𐑬𐑼𐑟",
+ "@durationDialogHours": {},
+ "durationDialogMinutes": "𐑥𐑦𐑯𐑦𐑑𐑕",
+ "@durationDialogMinutes": {},
+ "editEntryLocationDialogTitle": "𐑤𐑴𐑒𐑱𐑖𐑩𐑯",
+ "@editEntryLocationDialogTitle": {},
+ "editEntryLocationDialogSetCustom": "𐑕𐑧𐑑 𐑒𐑳𐑕𐑑𐑩𐑥 𐑤𐑴𐑒𐑱𐑖𐑩𐑯",
+ "@editEntryLocationDialogSetCustom": {},
+ "locationPickerUseThisLocationButton": "𐑿𐑟 𐑞𐑦𐑕 𐑤𐑴𐑒𐑱𐑖𐑩𐑯",
+ "@locationPickerUseThisLocationButton": {},
+ "editEntryRatingDialogTitle": "𐑮𐑱𐑑𐑦𐑙",
+ "@editEntryRatingDialogTitle": {},
+ "removeEntryMetadataDialogTitle": "𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩 𐑮𐑦𐑥𐑵𐑝𐑩𐑤",
+ "@removeEntryMetadataDialogTitle": {},
+ "removeEntryMetadataDialogMore": "𐑥𐑹",
+ "@removeEntryMetadataDialogMore": {},
+ "removeEntryMetadataMotionPhotoXmpWarningDialogMessage": "⸰𐑦𐑥𐑐 𐑦𐑟 𐑮𐑦𐑒𐑢𐑲𐑼𐑛 𐑑 𐑐𐑤𐑱 𐑞 𐑝𐑦𐑛𐑦𐑴 𐑦𐑯𐑕𐑲𐑛 𐑩 𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴.\n\n¿𐑸 𐑿 𐑖𐑫𐑼 𐑿 𐑢𐑪𐑯𐑑 𐑑 𐑮𐑦𐑥𐑵𐑝 𐑦𐑑?",
+ "@removeEntryMetadataMotionPhotoXmpWarningDialogMessage": {},
+ "videoSpeedDialogLabel": "𐑐𐑤𐑱𐑚𐑨𐑒 𐑕𐑐𐑰𐑛",
+ "@videoSpeedDialogLabel": {},
+ "videoStreamSelectionDialogVideo": "𐑝𐑦𐑛𐑦𐑴",
+ "@videoStreamSelectionDialogVideo": {},
+ "videoStreamSelectionDialogOff": "𐑪𐑓",
+ "@videoStreamSelectionDialogOff": {},
+ "videoStreamSelectionDialogTrack": "𐑑𐑮𐑨𐑒",
+ "@videoStreamSelectionDialogTrack": {},
+ "videoStreamSelectionDialogNoSelection": "𐑞𐑺 𐑸 𐑯𐑴 𐑳𐑞𐑼 𐑑𐑮𐑨𐑒𐑕.",
+ "@videoStreamSelectionDialogNoSelection": {},
+ "genericSuccessFeedback": "¡𐑛𐑳𐑯!",
+ "@genericSuccessFeedback": {},
+ "genericFailureFeedback": "𐑓𐑱𐑤𐑛",
+ "@genericFailureFeedback": {},
+ "genericDangerWarningDialogMessage": "¿𐑸 𐑿 𐑖𐑫𐑼?",
+ "@genericDangerWarningDialogMessage": {},
+ "tooManyItemsErrorDialogMessage": "𐑑𐑮𐑲 𐑩𐑜𐑧𐑯 𐑢𐑦𐑞 𐑓𐑿𐑼 𐑲𐑑𐑩𐑥𐑟.",
+ "@tooManyItemsErrorDialogMessage": {},
+ "menuActionConfigureView": "𐑝𐑿",
+ "@menuActionConfigureView": {},
+ "menuActionSelect": "𐑕𐑦𐑤𐑧𐑒𐑑",
+ "@menuActionSelect": {},
+ "menuActionSelectAll": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑷𐑤",
+ "@menuActionSelectAll": {},
+ "menuActionSelectNone": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑯𐑳𐑯",
+ "@menuActionSelectNone": {},
+ "menuActionMap": "𐑥𐑨𐑐",
+ "@menuActionMap": {},
+ "menuActionSlideshow": "𐑕𐑤𐑲𐑛𐑖𐑴",
+ "@menuActionSlideshow": {},
+ "menuActionStats": "𐑕𐑑𐑨𐑑𐑕",
+ "@menuActionStats": {},
+ "viewDialogSortSectionTitle": "𐑕𐑹𐑑",
+ "@viewDialogSortSectionTitle": {},
+ "viewDialogGroupSectionTitle": "𐑜𐑮𐑵𐑐",
+ "@viewDialogGroupSectionTitle": {},
+ "viewDialogLayoutSectionTitle": "𐑤𐑱𐑬𐑑",
+ "@viewDialogLayoutSectionTitle": {},
+ "viewDialogReverseSortOrder": "𐑮𐑦𐑝𐑻𐑕 𐑕𐑹𐑑 𐑹𐑛𐑼",
+ "@viewDialogReverseSortOrder": {},
+ "tileLayoutMosaic": "𐑥𐑴𐑟𐑱𐑦𐑒",
+ "@tileLayoutMosaic": {},
+ "tileLayoutGrid": "𐑜𐑮𐑦𐑛",
+ "@tileLayoutGrid": {},
+ "tileLayoutList": "𐑤𐑦𐑕𐑑",
+ "@tileLayoutList": {},
+ "castDialogTitle": "𐑒𐑭𐑕𐑑 𐑛𐑦𐑝𐑲𐑕𐑩𐑟",
+ "@castDialogTitle": {},
+ "coverDialogTabCover": "𐑒𐑳𐑝𐑼",
+ "@coverDialogTabCover": {},
+ "coverDialogTabApp": "𐑨𐑐",
+ "@coverDialogTabApp": {},
+ "coverDialogTabColor": "𐑒𐑳𐑤𐑼",
+ "@coverDialogTabColor": {},
+ "appPickDialogTitle": "𐑐𐑦𐑒 𐑨𐑐",
+ "@appPickDialogTitle": {},
+ "appPickDialogNone": "𐑯𐑳𐑯",
+ "@appPickDialogNone": {},
+ "aboutPageTitle": "𐑩𐑚𐑬𐑑",
+ "@aboutPageTitle": {},
+ "aboutLinkLicense": "𐑤𐑲𐑕𐑩𐑯𐑕",
+ "@aboutLinkLicense": {},
+ "aboutLinkPolicy": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦 𐑐𐑪𐑤𐑩𐑕𐑦",
+ "@aboutLinkPolicy": {},
+ "aboutBugSectionTitle": "𐑚𐑳𐑜 𐑮𐑦𐑐𐑹𐑑",
+ "@aboutBugSectionTitle": {},
+ "aboutBugSaveLogInstruction": "𐑕𐑱𐑝 𐑨𐑐 𐑤𐑪𐑜𐑟 𐑑 𐑩 𐑓𐑲𐑤",
+ "@aboutBugSaveLogInstruction": {},
+ "aboutBugCopyInfoInstruction": "𐑒𐑪𐑐𐑦 𐑕𐑦𐑕𐑑𐑩𐑥 𐑦𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯",
+ "@aboutBugCopyInfoInstruction": {},
+ "aboutBugCopyInfoButton": "𐑒𐑪𐑐𐑦",
+ "@aboutBugCopyInfoButton": {},
+ "aboutBugReportInstruction": "𐑮𐑦𐑐𐑹𐑑 𐑪𐑯 ·𐑜𐑦𐑑𐑣𐑳𐑚 𐑢𐑦𐑞 𐑞 𐑤𐑪𐑜𐑟 𐑯 𐑕𐑦𐑕𐑑𐑩𐑥 𐑦𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯",
+ "@aboutBugReportInstruction": {},
+ "aboutBugReportButton": "𐑮𐑦𐑐𐑹𐑑",
+ "@aboutBugReportButton": {},
+ "aboutDataUsageSectionTitle": "𐑛𐑱𐑑𐑩 𐑿𐑕𐑦𐑡",
+ "@aboutDataUsageSectionTitle": {},
+ "aboutDataUsageData": "𐑛𐑱𐑑𐑩",
+ "@aboutDataUsageData": {},
+ "aboutDataUsageCache": "𐑒𐑨𐑖",
+ "@aboutDataUsageCache": {},
+ "aboutDataUsageDatabase": "𐑛𐑱𐑑𐑩𐑚𐑱𐑕",
+ "@aboutDataUsageDatabase": {},
+ "aboutDataUsageMisc": "𐑥𐑦𐑕𐑤.",
+ "@aboutDataUsageMisc": {},
+ "aboutDataUsageInternal": "𐑦𐑯𐑑𐑻𐑯𐑩𐑤",
+ "@aboutDataUsageInternal": {},
+ "aboutDataUsageClearCache": "𐑒𐑤𐑽 𐑒𐑨𐑖",
+ "@aboutDataUsageClearCache": {},
+ "aboutCreditsSectionTitle": "𐑒𐑮𐑧𐑛𐑦𐑑𐑕",
+ "@aboutCreditsSectionTitle": {},
+ "aboutCreditsWorldAtlas1": "𐑞𐑦𐑕 𐑨𐑐 𐑿𐑟𐑩𐑟 𐑩 ⸰𐑑𐑪𐑐𐑩𐑡𐑕𐑪𐑯 𐑓𐑲𐑤 𐑓𐑮𐑪𐑥",
+ "@aboutCreditsWorldAtlas1": {},
+ "aboutCreditsWorldAtlas2": "𐑳𐑯𐑛𐑼 ⸰𐑦𐑕𐑒 𐑤𐑲𐑕𐑩𐑯𐑕.",
+ "@aboutCreditsWorldAtlas2": {},
+ "aboutLicensesBanner": "𐑞𐑦𐑕 𐑨𐑐 𐑿𐑟𐑩𐑟 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑴𐑐𐑩𐑯-𐑕𐑹𐑕 𐑐𐑨𐑒𐑦𐑡𐑩𐑟 𐑯 𐑤𐑲𐑚𐑮𐑼𐑦𐑟.",
+ "@aboutLicensesBanner": {},
+ "aboutLicensesAndroidLibrariesSectionTitle": "·𐑨𐑯𐑛𐑮𐑶𐑛 𐑤𐑲𐑚𐑮𐑼𐑦𐑟",
+ "@aboutLicensesAndroidLibrariesSectionTitle": {},
+ "aboutLicensesFlutterPluginsSectionTitle": "·𐑓𐑤𐑳𐑑𐑼 𐑐𐑤𐑳𐑜𐑦𐑯𐑟",
+ "@aboutLicensesFlutterPluginsSectionTitle": {},
+ "aboutLicensesFlutterPackagesSectionTitle": "·𐑓𐑤𐑳𐑑𐑼 𐑐𐑨𐑒𐑦𐑡𐑩𐑟",
+ "@aboutLicensesFlutterPackagesSectionTitle": {},
+ "aboutLicensesDartPackagesSectionTitle": "·𐑛𐑸𐑑 𐑐𐑨𐑒𐑦𐑡𐑩𐑟",
+ "@aboutLicensesDartPackagesSectionTitle": {},
+ "aboutLicensesShowAllButtonLabel": "𐑖𐑴 𐑷𐑤 𐑤𐑲𐑕𐑩𐑯𐑕𐑩𐑟",
+ "@aboutLicensesShowAllButtonLabel": {},
+ "collectionPickPageTitle": "𐑐𐑦𐑒",
+ "@collectionPickPageTitle": {},
+ "collectionSelectPageTitle": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑲𐑑𐑩𐑥𐑟",
+ "@collectionSelectPageTitle": {},
+ "collectionActionShowTitleSearch": "𐑖𐑴 𐑑𐑲𐑑𐑩𐑤 𐑓𐑦𐑤𐑑𐑼",
+ "@collectionActionShowTitleSearch": {},
+ "collectionActionHideTitleSearch": "𐑣𐑲𐑛 𐑑𐑲𐑑𐑩𐑤 𐑓𐑦𐑤𐑑𐑼",
+ "@collectionActionHideTitleSearch": {},
+ "collectionActionAddShortcut": "𐑨𐑛 𐑖𐑹𐑑𐑒𐑳𐑑",
+ "@collectionActionAddShortcut": {},
+ "collectionActionSetHome": "𐑕𐑧𐑑 𐑨𐑟 𐑣𐑴𐑥",
+ "@collectionActionSetHome": {},
+ "collectionActionCopy": "𐑒𐑪𐑐𐑦 𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@collectionActionCopy": {},
+ "collectionActionMove": "𐑥𐑵𐑝 𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@collectionActionMove": {},
+ "collectionActionRescan": "𐑮𐑰𐑕𐑒𐑨𐑯",
+ "@collectionActionRescan": {},
+ "collectionSearchTitlesHintText": "𐑕𐑻𐑗 𐑑𐑲𐑑𐑩𐑤𐑟",
+ "@collectionSearchTitlesHintText": {},
+ "collectionGroupMonth": "𐑚𐑲 𐑥𐑳𐑯𐑔",
+ "@collectionGroupMonth": {},
+ "collectionGroupDay": "𐑚𐑲 𐑛𐑱",
+ "@collectionGroupDay": {},
+ "collectionGroupNone": "𐑛𐑵 𐑯𐑪𐑑 𐑜𐑮𐑵𐑐",
+ "@collectionGroupNone": {},
+ "sectionUnknown": "𐑳𐑯𐑯𐑴𐑯",
+ "@sectionUnknown": {},
+ "dateToday": "𐑑𐑫𐑛𐑱",
+ "@dateToday": {},
+ "dateYesterday": "𐑘𐑧𐑕𐑑𐑼𐑛𐑱",
+ "@dateYesterday": {},
+ "dateThisMonth": "𐑞𐑦𐑕 𐑥𐑳𐑯𐑔",
+ "@dateThisMonth": {},
+ "collectionCopyFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑒𐑪𐑐𐑦 1 𐑲𐑑𐑩𐑥} other{𐑓𐑱𐑤𐑛 𐑑 𐑒𐑪𐑐𐑦 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionCopyFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionMoveFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑥𐑵𐑝 1 𐑲𐑑𐑩𐑥} other{𐑓𐑱𐑤𐑛 𐑑 𐑥𐑵𐑝 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionMoveFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionRenameFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑮𐑰𐑯𐑱𐑥 1 𐑲𐑑𐑩𐑥} other{𐑓𐑱𐑤𐑛 𐑑 𐑮𐑰𐑯𐑱𐑥 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionRenameFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionEditFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 1 𐑲𐑑𐑩𐑥} other{𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionEditFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionExportFailureFeedback": "{count, plural, =1{𐑓𐑱𐑤𐑛 𐑑 𐑦𐑒𐑕𐑐𐑹𐑑 1 𐑐𐑱𐑡} other{𐑓𐑱𐑤𐑛 𐑑 𐑦𐑒𐑕𐑐𐑹𐑑 {count} 𐑐𐑱𐑡𐑩𐑟}}",
+ "@collectionExportFailureFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionCopySuccessFeedback": "{count, plural, =1{𐑒𐑪𐑐𐑦𐑛 1 𐑲𐑑𐑩𐑥} other{𐑒𐑪𐑐𐑦𐑛 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionCopySuccessFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionRenameSuccessFeedback": "{count, plural, =1{𐑮𐑰𐑯𐑱𐑥𐑛 1 𐑲𐑑𐑩𐑥} other{𐑮𐑰𐑯𐑱𐑥𐑛 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionRenameSuccessFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionEditSuccessFeedback": "{count, plural, =1{𐑧𐑛𐑦𐑑𐑩𐑛 1 𐑲𐑑𐑩𐑥} other{𐑧𐑛𐑦𐑑𐑩𐑛 {count} 𐑲𐑑𐑩𐑥𐑟}}",
+ "@collectionEditSuccessFeedback": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "collectionEmptyFavourites": "𐑯𐑴 𐑓𐑱𐑝𐑼𐑦𐑑𐑕",
+ "@collectionEmptyFavourites": {},
+ "collectionEmptyVideos": "𐑯𐑴 𐑝𐑦𐑛𐑦𐑴𐑟",
+ "@collectionEmptyVideos": {},
+ "collectionEmptyImages": "𐑯𐑴 𐑦𐑥𐑦𐑡𐑩𐑟",
+ "@collectionEmptyImages": {},
+ "collectionEmptyGrantAccessButtonLabel": "𐑜𐑮𐑭𐑯𐑑 𐑨𐑒𐑕𐑧𐑕",
+ "@collectionEmptyGrantAccessButtonLabel": {},
+ "collectionSelectSectionTooltip": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑕𐑧𐑒𐑖𐑩𐑯",
+ "@collectionSelectSectionTooltip": {},
+ "collectionDeselectSectionTooltip": "𐑛𐑰𐑕𐑦𐑤𐑧𐑒𐑑 𐑕𐑧𐑒𐑖𐑩𐑯",
+ "@collectionDeselectSectionTooltip": {},
+ "drawerAboutButton": "𐑩𐑚𐑬𐑑",
+ "@drawerAboutButton": {},
+ "drawerSettingsButton": "𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@drawerSettingsButton": {},
+ "drawerCollectionAll": "𐑷𐑤 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@drawerCollectionAll": {},
+ "drawerCollectionFavourites": "𐑓𐑱𐑝𐑼𐑦𐑑𐑕",
+ "@drawerCollectionFavourites": {},
+ "drawerCollectionImages": "𐑦𐑥𐑦𐑡𐑩𐑟",
+ "@drawerCollectionImages": {},
+ "drawerCollectionVideos": "𐑝𐑦𐑛𐑦𐑴𐑟",
+ "@drawerCollectionVideos": {},
+ "drawerCollectionAnimated": "𐑨𐑯𐑦𐑥𐑱𐑑𐑩𐑛",
+ "@drawerCollectionAnimated": {},
+ "drawerCollectionMotionPhotos": "𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴𐑟",
+ "@drawerCollectionMotionPhotos": {},
+ "drawerCollectionPanoramas": "𐑐𐑨𐑯𐑼𐑭𐑥𐑩𐑟",
+ "@drawerCollectionPanoramas": {},
+ "drawerCollectionRaws": "𐑮𐑷 𐑓𐑴𐑑𐑴𐑟",
+ "@drawerCollectionRaws": {},
+ "drawerCollectionSphericalVideos": "360° 𐑝𐑦𐑛𐑦𐑴𐑟",
+ "@drawerCollectionSphericalVideos": {},
+ "drawerAlbumPage": "𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@drawerAlbumPage": {},
+ "drawerCountryPage": "𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@drawerCountryPage": {},
+ "drawerPlacePage": "𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@drawerPlacePage": {},
+ "drawerTagPage": "𐑑𐑨𐑜𐑟",
+ "@drawerTagPage": {},
+ "sortByDate": "𐑚𐑲 𐑛𐑱𐑑",
+ "@sortByDate": {},
+ "sortByName": "𐑚𐑲 𐑯𐑱𐑥",
+ "@sortByName": {},
+ "sortByItemCount": "𐑚𐑲 𐑲𐑑𐑩𐑥 𐑒𐑬𐑯𐑑",
+ "@sortByItemCount": {},
+ "sortBySize": "𐑚𐑲 𐑕𐑲𐑟",
+ "@sortBySize": {},
+ "sortByAlbumFileName": "𐑚𐑲 𐑨𐑤𐑚𐑩𐑥 𐑯 𐑓𐑲𐑤 𐑯𐑱𐑥",
+ "@sortByAlbumFileName": {},
+ "sortByRating": "𐑚𐑲 𐑮𐑱𐑑𐑦𐑙",
+ "@sortByRating": {},
+ "sortByDuration": "𐑚𐑲 𐑛𐑘𐑫𐑼𐑱𐑖𐑩𐑯",
+ "@sortByDuration": {},
+ "sortOrderNewestFirst": "𐑯𐑿𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderNewestFirst": {},
+ "sortOrderOldestFirst": "𐑴𐑤𐑛𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderOldestFirst": {},
+ "sortOrderAtoZ": "·𐑐 𐑑 ·𐑿",
+ "@sortOrderAtoZ": {},
+ "sortOrderZtoA": "·𐑿 𐑑 ·𐑐",
+ "@sortOrderZtoA": {},
+ "sortOrderHighestFirst": "𐑣𐑲𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderHighestFirst": {},
+ "sortOrderLowestFirst": "𐑤𐑴𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderLowestFirst": {},
+ "sortOrderLargestFirst": "𐑤𐑸𐑡𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderLargestFirst": {},
+ "sortOrderSmallestFirst": "𐑕𐑥𐑷𐑤𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderSmallestFirst": {},
+ "sortOrderShortestFirst": "𐑖𐑹𐑑𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderShortestFirst": {},
+ "sortOrderLongestFirst": "𐑤𐑪𐑙𐑜𐑩𐑕𐑑 𐑓𐑻𐑕𐑑",
+ "@sortOrderLongestFirst": {},
+ "albumGroupTier": "𐑚𐑲 𐑑𐑽",
+ "@albumGroupTier": {},
+ "albumGroupType": "𐑚𐑲 𐑑𐑲𐑐",
+ "@albumGroupType": {},
+ "albumGroupVolume": "𐑚𐑲 𐑕𐑑𐑹𐑦𐑡 𐑝𐑪𐑤𐑿𐑥",
+ "@albumGroupVolume": {},
+ "albumGroupNone": "𐑛𐑵 𐑯𐑪𐑑 𐑜𐑮𐑵𐑐",
+ "@albumGroupNone": {},
+ "albumMimeTypeMixed": "𐑥𐑦𐑒𐑕𐑑",
+ "@albumMimeTypeMixed": {},
+ "albumPickPageTitleCopy": "𐑒𐑪𐑐𐑦 𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@albumPickPageTitleCopy": {},
+ "albumPickPageTitleExport": "𐑦𐑒𐑕𐑐𐑹𐑑 𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@albumPickPageTitleExport": {},
+ "albumPickPageTitleMove": "𐑥𐑵𐑝 𐑑 𐑨𐑤𐑚𐑩𐑥",
+ "@albumPickPageTitleMove": {},
+ "albumPickPageTitlePick": "𐑐𐑦𐑒 𐑨𐑤𐑚𐑩𐑥",
+ "@albumPickPageTitlePick": {},
+ "albumCamera": "𐑒𐑨𐑥𐑼𐑩",
+ "@albumCamera": {},
+ "albumDownload": "𐑛𐑬𐑯𐑤𐑴𐑛",
+ "@albumDownload": {},
+ "albumScreenshots": "𐑕𐑒𐑮𐑰𐑯𐑖𐑪𐑑𐑕",
+ "@albumScreenshots": {},
+ "albumScreenRecordings": "𐑕𐑒𐑮𐑰𐑯 𐑮𐑦𐑒𐑹𐑛𐑦𐑙𐑟",
+ "@albumScreenRecordings": {},
+ "albumVideoCaptures": "𐑝𐑦𐑛𐑦𐑴 𐑒𐑨𐑐𐑗𐑼𐑟",
+ "@albumVideoCaptures": {},
+ "albumPageTitle": "𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@albumPageTitle": {},
+ "albumEmpty": "𐑯𐑴 𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@albumEmpty": {},
+ "createAlbumButtonLabel": "𐑒𐑮𐑦𐑱𐑑",
+ "@createAlbumButtonLabel": {},
+ "newFilterBanner": "𐑯𐑿",
+ "@newFilterBanner": {},
+ "countryPageTitle": "𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@countryPageTitle": {},
+ "countryEmpty": "𐑯𐑴 𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@countryEmpty": {},
+ "statePageTitle": "𐑕𐑑𐑱𐑑𐑕",
+ "@statePageTitle": {},
+ "stateEmpty": "𐑯𐑴 𐑕𐑑𐑱𐑑𐑕",
+ "@stateEmpty": {},
+ "placePageTitle": "𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@placePageTitle": {},
+ "placeEmpty": "𐑯𐑴 𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@placeEmpty": {},
+ "tagPageTitle": "𐑑𐑨𐑜𐑟",
+ "@tagPageTitle": {},
+ "tagEmpty": "𐑯𐑴 𐑑𐑨𐑜𐑟",
+ "@tagEmpty": {},
+ "binPageTitle": "𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯",
+ "@binPageTitle": {},
+ "explorerPageTitle": "𐑦𐑒𐑕𐑐𐑤𐑹𐑼",
+ "@explorerPageTitle": {},
+ "explorerActionSelectStorageVolume": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑕𐑑𐑹𐑦𐑡",
+ "@explorerActionSelectStorageVolume": {},
+ "selectStorageVolumeDialogTitle": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑕𐑑𐑹𐑦𐑡",
+ "@selectStorageVolumeDialogTitle": {},
+ "searchRecentSectionTitle": "𐑮𐑰𐑕𐑩𐑯𐑑",
+ "@searchRecentSectionTitle": {},
+ "searchCountriesSectionTitle": "𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@searchCountriesSectionTitle": {},
+ "searchPlacesSectionTitle": "𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@searchPlacesSectionTitle": {},
+ "searchTagsSectionTitle": "𐑑𐑨𐑜𐑟",
+ "@searchTagsSectionTitle": {},
+ "searchMetadataSectionTitle": "𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩",
+ "@searchMetadataSectionTitle": {},
+ "settingsPageTitle": "𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@settingsPageTitle": {},
+ "settingsSystemDefault": "𐑕𐑦𐑕𐑑𐑩𐑥 𐑛𐑦𐑓𐑷𐑤𐑑",
+ "@settingsSystemDefault": {},
+ "settingsDefault": "𐑛𐑦𐑓𐑷𐑤𐑑",
+ "@settingsDefault": {},
+ "settingsDisabled": "𐑛𐑦𐑕𐑱𐑚𐑩𐑤𐑛",
+ "@settingsDisabled": {},
+ "settingsAskEverytime": "𐑭𐑕𐑒 𐑧𐑝𐑮𐑦𐑑𐑲𐑥",
+ "@settingsAskEverytime": {},
+ "settingsModificationWarningDialogMessage": "𐑳𐑞𐑼 𐑕𐑧𐑑𐑦𐑙𐑟 𐑢𐑦𐑤 𐑚𐑰 𐑥𐑪𐑛𐑦𐑓𐑲𐑛.",
+ "@settingsModificationWarningDialogMessage": {},
+ "settingsSearchFieldLabel": "𐑕𐑻𐑗 𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@settingsSearchFieldLabel": {},
+ "settingsSearchEmpty": "𐑯𐑴 𐑥𐑨𐑗𐑦𐑙 𐑕𐑧𐑑𐑦𐑙",
+ "@settingsSearchEmpty": {},
+ "settingsActionExportDialogTitle": "𐑦𐑒𐑕𐑐𐑹𐑑",
+ "@settingsActionExportDialogTitle": {},
+ "settingsActionImport": "𐑦𐑥𐑐𐑹𐑑",
+ "@settingsActionImport": {},
+ "settingsActionImportDialogTitle": "𐑦𐑥𐑐𐑹𐑑",
+ "@settingsActionImportDialogTitle": {},
+ "appExportCovers": "𐑒𐑳𐑝𐑼𐑟",
+ "@appExportCovers": {},
+ "appExportSettings": "𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@appExportSettings": {},
+ "settingsNavigationSectionTitle": "𐑯𐑨𐑝𐑦𐑜𐑱𐑖𐑩𐑯",
+ "@settingsNavigationSectionTitle": {},
+ "settingsHomeTile": "𐑣𐑴𐑥",
+ "@settingsHomeTile": {},
+ "settingsHomeDialogTitle": "𐑣𐑴𐑥",
+ "@settingsHomeDialogTitle": {},
+ "settingsShowBottomNavigationBar": "𐑖𐑴 𐑚𐑳𐑑𐑩𐑯 𐑯𐑨𐑝𐑦𐑜𐑱𐑖𐑩𐑯 𐑚𐑸",
+ "@settingsShowBottomNavigationBar": {},
+ "settingsKeepScreenOnTile": "𐑒𐑰𐑐 𐑕𐑒𐑮𐑰𐑯 𐑪𐑯",
+ "@settingsKeepScreenOnTile": {},
+ "settingsDoubleBackExit": "𐑑𐑨𐑐 «𐑚𐑨𐑒» 𐑑𐑢𐑲𐑕 𐑑 𐑧𐑒𐑕𐑦𐑑",
+ "@settingsDoubleBackExit": {},
+ "settingsConfirmationTile": "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑛𐑲𐑩𐑤𐑪𐑜𐑟",
+ "@settingsConfirmationTile": {},
+ "settingsConfirmationBeforeDeleteItems": "𐑭𐑕𐑒 𐑚𐑦𐑓𐑹 𐑛𐑦𐑤𐑰𐑑𐑦𐑙 𐑲𐑑𐑩𐑥𐑟 𐑓𐑼𐑧𐑝𐑼",
+ "@settingsConfirmationBeforeDeleteItems": {},
+ "settingsConfirmationBeforeMoveToBinItems": "𐑭𐑕𐑒 𐑚𐑦𐑓𐑹 𐑥𐑵𐑝𐑦𐑙 𐑲𐑑𐑩𐑥𐑟 𐑑 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯",
+ "@settingsConfirmationBeforeMoveToBinItems": {},
+ "settingsConfirmationBeforeMoveUndatedItems": "𐑭𐑕𐑒 𐑚𐑦𐑓𐑹 𐑥𐑵𐑝𐑦𐑙 𐑳𐑯𐑛𐑱𐑑𐑩𐑛 𐑲𐑑𐑩𐑥𐑟",
+ "@settingsConfirmationBeforeMoveUndatedItems": {},
+ "settingsConfirmationVaultDataLoss": "𐑖𐑴 𐑝𐑷𐑤𐑑 𐑛𐑱𐑑𐑩 𐑤𐑪𐑕 𐑢𐑹𐑯𐑦𐑙",
+ "@settingsConfirmationVaultDataLoss": {},
+ "settingsNavigationDrawerTile": "𐑯𐑨𐑝𐑦𐑜𐑱𐑖𐑩𐑯 𐑥𐑧𐑯𐑿",
+ "@settingsNavigationDrawerTile": {},
+ "settingsNavigationDrawerBanner": "𐑑𐑳𐑗 𐑯 𐑣𐑴𐑤𐑛 𐑑 𐑥𐑵𐑝 𐑯 𐑮𐑰𐑹𐑛𐑼 𐑥𐑧𐑯𐑿 𐑲𐑑𐑩𐑥𐑟.",
+ "@settingsNavigationDrawerBanner": {},
+ "settingsNavigationDrawerTabTypes": "𐑑𐑲𐑐𐑕",
+ "@settingsNavigationDrawerTabTypes": {},
+ "settingsNavigationDrawerTabAlbums": "𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@settingsNavigationDrawerTabAlbums": {},
+ "settingsNavigationDrawerTabPages": "𐑐𐑱𐑡𐑩𐑟",
+ "@settingsNavigationDrawerTabPages": {},
+ "settingsNavigationDrawerAddAlbum": "𐑨𐑛 𐑨𐑤𐑚𐑩𐑥",
+ "@settingsNavigationDrawerAddAlbum": {},
+ "settingsThumbnailSectionTitle": "𐑔𐑳𐑥𐑯𐑱𐑤𐑟",
+ "@settingsThumbnailSectionTitle": {},
+ "settingsThumbnailOverlayPageTitle": "𐑴𐑝𐑼𐑤𐑱",
+ "@settingsThumbnailOverlayPageTitle": {},
+ "settingsThumbnailShowHdrIcon": "𐑖𐑴 ⸰𐑣𐑛𐑮 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowHdrIcon": {},
+ "settingsThumbnailShowFavouriteIcon": "𐑖𐑴 𐑓𐑱𐑝𐑼𐑦𐑑 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowFavouriteIcon": {},
+ "settingsThumbnailShowTagIcon": "𐑖𐑴 𐑑𐑨𐑜 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowTagIcon": {},
+ "settingsThumbnailShowLocationIcon": "𐑖𐑴 𐑤𐑴𐑒𐑱𐑖𐑩𐑯 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowLocationIcon": {},
+ "settingsThumbnailShowRating": "𐑖𐑴 𐑮𐑱𐑑𐑦𐑙",
+ "@settingsThumbnailShowRating": {},
+ "settingsThumbnailShowRawIcon": "𐑖𐑴 𐑮𐑷 𐑲𐑒𐑪𐑯",
+ "@settingsThumbnailShowRawIcon": {},
+ "settingsCollectionQuickActionEditorPageTitle": "𐑒𐑢𐑦𐑒 𐑨𐑒𐑖𐑩𐑯𐑟",
+ "@settingsCollectionQuickActionEditorPageTitle": {},
+ "settingsCollectionQuickActionTabBrowsing": "𐑚𐑮𐑬𐑟𐑦𐑙",
+ "@settingsCollectionQuickActionTabBrowsing": {},
+ "settingsCollectionQuickActionTabSelecting": "𐑕𐑦𐑤𐑧𐑒𐑑𐑦𐑙",
+ "@settingsCollectionQuickActionTabSelecting": {},
+ "settingsCollectionBrowsingQuickActionEditorBanner": "𐑑𐑳𐑗 𐑯 𐑣𐑴𐑤𐑛 𐑑 𐑥𐑵𐑝 𐑚𐑳𐑑𐑩𐑯𐑟 𐑯 𐑕𐑦𐑤𐑧𐑒𐑑 𐑢𐑦𐑗 𐑨𐑒𐑖𐑩𐑯𐑟 𐑸 𐑛𐑦𐑕𐑐𐑤𐑱𐑛 𐑢𐑧𐑯 𐑚𐑮𐑬𐑟𐑦𐑙 𐑲𐑑𐑩𐑥𐑟.",
+ "@settingsCollectionBrowsingQuickActionEditorBanner": {},
+ "settingsThumbnailShowVideoDuration": "𐑖𐑴 𐑝𐑦𐑛𐑦𐑴 𐑛𐑘𐑫𐑼𐑱𐑖𐑩𐑯",
+ "@settingsThumbnailShowVideoDuration": {},
+ "settingsCollectionQuickActionsTile": "𐑒𐑢𐑦𐑒 𐑨𐑒𐑖𐑩𐑯𐑟",
+ "@settingsCollectionQuickActionsTile": {},
+ "settingsCollectionSelectionQuickActionEditorBanner": "𐑑𐑳𐑗 𐑯 𐑣𐑴𐑤𐑛 𐑑 𐑥𐑵𐑝 𐑚𐑳𐑑𐑩𐑯𐑟 𐑯 𐑕𐑦𐑤𐑧𐑒𐑑 𐑢𐑦𐑗 𐑨𐑒𐑖𐑩𐑯𐑟 𐑸 𐑛𐑦𐑕𐑐𐑤𐑱𐑛 𐑢𐑧𐑯 𐑕𐑦𐑤𐑧𐑒𐑑𐑦𐑙 𐑲𐑑𐑩𐑥𐑟.",
+ "@settingsCollectionSelectionQuickActionEditorBanner": {},
+ "settingsCollectionBurstPatternsTile": "𐑚𐑻𐑕𐑑 𐑐𐑨𐑑𐑼𐑯𐑟",
+ "@settingsCollectionBurstPatternsTile": {},
+ "settingsCollectionBurstPatternsNone": "𐑯𐑳𐑯",
+ "@settingsCollectionBurstPatternsNone": {},
+ "settingsViewerSectionTitle": "𐑝𐑿𐑼",
+ "@settingsViewerSectionTitle": {},
+ "settingsViewerGestureSideTapNext": "𐑑𐑨𐑐 𐑪𐑯 𐑕𐑒𐑮𐑰𐑯 𐑧𐑡𐑩𐑟 𐑑 𐑖𐑴 𐑐𐑮𐑰𐑝𐑾𐑕/𐑯𐑧𐑒𐑕𐑑 𐑲𐑑𐑩𐑥",
+ "@settingsViewerGestureSideTapNext": {},
+ "settingsViewerUseCutout": "𐑿𐑟 𐑒𐑳𐑑𐑬𐑑 𐑺𐑾",
+ "@settingsViewerUseCutout": {},
+ "settingsViewerMaximumBrightness": "𐑥𐑨𐑒𐑕𐑦𐑥𐑩𐑥 𐑚𐑮𐑲𐑑𐑯𐑩𐑕",
+ "@settingsViewerMaximumBrightness": {},
+ "settingsMotionPhotoAutoPlay": "𐑷𐑑𐑴 𐑐𐑤𐑱 𐑥𐑴𐑖𐑩𐑯 𐑓𐑴𐑑𐑴𐑟",
+ "@settingsMotionPhotoAutoPlay": {},
+ "settingsImageBackground": "𐑦𐑥𐑦𐑡 𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛",
+ "@settingsImageBackground": {},
+ "settingsViewerQuickActionEditorBanner": "𐑑𐑳𐑗 𐑯 𐑣𐑴𐑤𐑛 𐑑 𐑥𐑵𐑝 𐑚𐑳𐑑𐑩𐑯𐑟 𐑯 𐑕𐑦𐑤𐑧𐑒𐑑 𐑢𐑦𐑗 𐑨𐑒𐑖𐑩𐑯𐑟 𐑸 𐑛𐑦𐑕𐑐𐑤𐑱𐑛 𐑦𐑯 𐑞 𐑝𐑿𐑼.",
+ "@settingsViewerQuickActionEditorBanner": {},
+ "settingsViewerQuickActionEditorDisplayedButtonsSectionTitle": "𐑛𐑦𐑕𐑐𐑤𐑱𐑛 𐑚𐑳𐑑𐑩𐑯𐑟",
+ "@settingsViewerQuickActionEditorDisplayedButtonsSectionTitle": {},
+ "settingsViewerQuickActionsTile": "𐑒𐑢𐑦𐑒 𐑨𐑒𐑖𐑩𐑯𐑟",
+ "@settingsViewerQuickActionsTile": {},
+ "settingsViewerQuickActionEditorPageTitle": "𐑒𐑢𐑦𐑒 𐑨𐑒𐑖𐑩𐑯𐑟",
+ "@settingsViewerQuickActionEditorPageTitle": {},
+ "settingsViewerQuickActionEditorAvailableButtonsSectionTitle": "𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑚𐑳𐑑𐑩𐑯𐑟",
+ "@settingsViewerQuickActionEditorAvailableButtonsSectionTitle": {},
+ "settingsViewerQuickActionEmpty": "𐑯𐑴 𐑚𐑳𐑑𐑩𐑯𐑟",
+ "@settingsViewerQuickActionEmpty": {},
+ "settingsViewerOverlayTile": "𐑴𐑝𐑼𐑤𐑱",
+ "@settingsViewerOverlayTile": {},
+ "settingsViewerOverlayPageTitle": "𐑴𐑝𐑼𐑤𐑱",
+ "@settingsViewerOverlayPageTitle": {},
+ "settingsViewerShowOverlayOnOpening": "𐑖𐑴 𐑪𐑯 𐑴𐑐𐑩𐑯𐑦𐑙",
+ "@settingsViewerShowOverlayOnOpening": {},
+ "settingsViewerShowHistogram": "𐑖𐑴 𐑣𐑦𐑕𐑑𐑩𐑜𐑮𐑨𐑥",
+ "@settingsViewerShowHistogram": {},
+ "settingsViewerShowMinimap": "𐑖𐑴 𐑥𐑦𐑯𐑦𐑥𐑨𐑐",
+ "@settingsViewerShowMinimap": {},
+ "settingsViewerShowInformation": "𐑖𐑴 𐑦𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯",
+ "@settingsViewerShowInformation": {},
+ "filePickerUseThisFolder": "𐑿𐑟 𐑞𐑦𐑕 𐑓𐑴𐑤𐑛𐑼",
+ "@filePickerUseThisFolder": {},
+ "settingsViewerShowInformationSubtitle": "𐑖𐑴 𐑑𐑲𐑑𐑩𐑤, 𐑛𐑱𐑑, 𐑤𐑴𐑒𐑱𐑖𐑩𐑯, 𐑯𐑯𐑯",
+ "@settingsViewerShowInformationSubtitle": {},
+ "settingsViewerShowOverlayThumbnails": "𐑖𐑴 𐑔𐑳𐑥𐑯𐑱𐑤𐑟",
+ "@settingsViewerShowOverlayThumbnails": {},
+ "settingsViewerEnableOverlayBlurEffect": "𐑚𐑤𐑻 𐑦𐑓𐑧𐑒𐑑",
+ "@settingsViewerEnableOverlayBlurEffect": {},
+ "statsTopStatesSectionTitle": "𐑑𐑪𐑐 𐑕𐑑𐑱𐑑𐑕",
+ "@statsTopStatesSectionTitle": {},
+ "statsTopTagsSectionTitle": "𐑑𐑪𐑐 𐑑𐑨𐑜𐑟",
+ "@statsTopTagsSectionTitle": {},
+ "viewerErrorDoesNotExist": "𐑞 𐑓𐑲𐑤 𐑯𐑴 𐑤𐑪𐑙𐑜𐑼 𐑦𐑜𐑟𐑦𐑕𐑑𐑕.",
+ "@viewerErrorDoesNotExist": {},
+ "statsTopAlbumsSectionTitle": "𐑑𐑪𐑐 𐑨𐑤𐑚𐑩𐑥𐑟",
+ "@statsTopAlbumsSectionTitle": {},
+ "viewerOpenPanoramaButtonLabel": "𐑴𐑐𐑩𐑯 𐑐𐑨𐑯𐑼𐑭𐑥𐑩",
+ "@viewerOpenPanoramaButtonLabel": {},
+ "viewerSetWallpaperButtonLabel": "𐑕𐑧𐑑 𐑢𐑷𐑤𐑐𐑱𐑐𐑼",
+ "@viewerSetWallpaperButtonLabel": {},
+ "viewerInfoPageTitle": "𐑦𐑯𐑓𐑴",
+ "@viewerInfoPageTitle": {},
+ "mapAttributionOpenTopoMap": "[⸰𐑖𐑮𐑑𐑥](https://www.earthdata.nasa.gov/sensors/srtm) | 𐑑𐑲𐑤𐑟 𐑚𐑲 [·𐑴𐑐𐑩𐑯𐑑𐑪𐑐𐑩𐑥𐑨𐑐](https://opentopomap.org), [⸰𐑒𐑒 𐑚𐑲-𐑖𐑩](https://creativecommons.org/licenses/by-sa/3.0)",
+ "@mapAttributionOpenTopoMap": {},
+ "mapAttributionOsmHot": "𐑑𐑲𐑤𐑟 𐑚𐑲 [⸰𐑣𐑴𐑑](https://www.hotosm.org) • 𐑣𐑴𐑕𐑑𐑩𐑛 𐑚𐑲 [⸰𐑴𐑕𐑥 ·𐑓𐑮𐑭𐑯𐑕](https://openstreetmap.fr)",
+ "@mapAttributionOsmHot": {},
+ "mapAttributionStamen": "𐑑𐑲𐑤𐑟 𐑚𐑲 [·𐑕𐑑𐑱𐑥𐑩𐑯 𐑛𐑦𐑟𐑲𐑯](https://stamen.com), [⸰𐑒𐑒 𐑚𐑲 3.0](https://creativecommons.org/licenses/by/3.0)",
+ "@mapAttributionStamen": {},
+ "settingsViewerShowShootingDetails": "𐑖𐑴 𐑖𐑵𐑑𐑦𐑙 𐑛𐑰𐑑𐑱𐑤𐑟",
+ "@settingsViewerShowShootingDetails": {},
+ "settingsViewerShowDescription": "𐑖𐑴 𐑛𐑦𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯",
+ "@settingsViewerShowDescription": {},
+ "settingsViewerSlideshowTile": "𐑕𐑤𐑲𐑛𐑖𐑴",
+ "@settingsViewerSlideshowTile": {},
+ "settingsViewerSlideshowPageTitle": "𐑕𐑤𐑲𐑛𐑖𐑴",
+ "@settingsViewerSlideshowPageTitle": {},
+ "settingsViewerShowRatingTags": "𐑖𐑴 𐑮𐑱𐑑𐑦𐑙 𐑯 𐑑𐑨𐑜𐑟",
+ "@settingsViewerShowRatingTags": {},
+ "settingsSlideshowRepeat": "𐑮𐑦𐑐𐑰𐑑",
+ "@settingsSlideshowRepeat": {},
+ "settingsSlideshowShuffle": "𐑖𐑳𐑓𐑩𐑤",
+ "@settingsSlideshowShuffle": {},
+ "settingsSlideshowFillScreen": "𐑓𐑦𐑤 𐑕𐑒𐑮𐑰𐑯",
+ "@settingsSlideshowFillScreen": {},
+ "settingsSlideshowAnimatedZoomEffect": "𐑨𐑯𐑦𐑥𐑱𐑑𐑩𐑛 𐑟𐑵𐑥 𐑦𐑓𐑧𐑒𐑑",
+ "@settingsSlideshowAnimatedZoomEffect": {},
+ "settingsSlideshowTransitionTile": "𐑑𐑮𐑨𐑯𐑟𐑦𐑖𐑩𐑯",
+ "@settingsSlideshowTransitionTile": {},
+ "settingsSlideshowIntervalTile": "𐑦𐑯𐑑𐑼𐑝𐑩𐑤",
+ "@settingsSlideshowIntervalTile": {},
+ "settingsSlideshowVideoPlaybackTile": "𐑝𐑦𐑛𐑦𐑴 𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsSlideshowVideoPlaybackTile": {},
+ "settingsSlideshowVideoPlaybackDialogTitle": "𐑝𐑦𐑛𐑦𐑴 𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsSlideshowVideoPlaybackDialogTitle": {},
+ "settingsVideoPageTitle": "𐑝𐑦𐑛𐑦𐑴 𐑕𐑧𐑑𐑦𐑙𐑟",
+ "@settingsVideoPageTitle": {},
+ "settingsVideoSectionTitle": "𐑝𐑦𐑛𐑦𐑴",
+ "@settingsVideoSectionTitle": {},
+ "settingsVideoShowVideos": "𐑖𐑴 𐑝𐑦𐑛𐑦𐑴𐑟",
+ "@settingsVideoShowVideos": {},
+ "settingsVideoPlaybackTile": "𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsVideoPlaybackTile": {},
+ "settingsVideoPlaybackPageTitle": "𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsVideoPlaybackPageTitle": {},
+ "settingsVideoEnableHardwareAcceleration": "𐑣𐑸𐑛𐑢𐑺 𐑩𐑒𐑕𐑧𐑤𐑼𐑱𐑖𐑩𐑯",
+ "@settingsVideoEnableHardwareAcceleration": {},
+ "settingsVideoAutoPlay": "𐑷𐑑𐑴 𐑐𐑤𐑱",
+ "@settingsVideoAutoPlay": {},
+ "settingsVideoLoopModeTile": "𐑤𐑵𐑐 𐑥𐑴𐑛",
+ "@settingsVideoLoopModeTile": {},
+ "settingsVideoLoopModeDialogTitle": "𐑤𐑵𐑐 𐑥𐑴𐑛",
+ "@settingsVideoLoopModeDialogTitle": {},
+ "settingsVideoResumptionModeTile": "𐑮𐑦𐑟𐑿𐑥 𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsVideoResumptionModeTile": {},
+ "settingsVideoResumptionModeDialogTitle": "𐑮𐑦𐑟𐑿𐑥 𐑐𐑤𐑱𐑚𐑨𐑒",
+ "@settingsVideoResumptionModeDialogTitle": {},
+ "settingsVideoBackgroundMode": "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑥𐑴𐑛",
+ "@settingsVideoBackgroundMode": {},
+ "settingsVideoBackgroundModeDialogTitle": "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑥𐑴𐑛",
+ "@settingsVideoBackgroundModeDialogTitle": {},
+ "settingsVideoControlsTile": "𐑒𐑩𐑯𐑑𐑮𐑴𐑤𐑟",
+ "@settingsVideoControlsTile": {},
+ "settingsVideoControlsPageTitle": "𐑒𐑩𐑯𐑑𐑮𐑴𐑤𐑟",
+ "@settingsVideoControlsPageTitle": {},
+ "settingsVideoButtonsTile": "𐑚𐑳𐑑𐑩𐑯𐑟",
+ "@settingsVideoButtonsTile": {},
+ "settingsVideoGestureDoubleTapTogglePlay": "𐑛𐑳𐑚𐑩𐑤 𐑑𐑨𐑐 𐑑 𐑐𐑤𐑱/𐑐𐑷𐑟",
+ "@settingsVideoGestureDoubleTapTogglePlay": {},
+ "settingsVideoGestureSideDoubleTapSeek": "𐑛𐑳𐑚𐑩𐑤 𐑑𐑨𐑐 𐑪𐑯 𐑕𐑒𐑮𐑰𐑯 𐑧𐑡𐑩𐑟 𐑑 𐑕𐑰𐑒 𐑚𐑨𐑒𐑢𐑼𐑛/𐑓𐑹𐑢𐑼𐑛",
+ "@settingsVideoGestureSideDoubleTapSeek": {},
+ "settingsVideoGestureVerticalDragBrightnessVolume": "𐑕𐑢𐑲𐑐 𐑳𐑐 𐑹 𐑛𐑬𐑯 𐑑 𐑩𐑡𐑳𐑕𐑑 𐑚𐑮𐑲𐑑𐑯𐑩𐑕/𐑝𐑪𐑤𐑿𐑥",
+ "@settingsVideoGestureVerticalDragBrightnessVolume": {},
+ "settingsSubtitleThemeTile": "𐑕𐑳𐑚𐑑𐑲𐑑𐑩𐑤𐑟",
+ "@settingsSubtitleThemeTile": {},
+ "settingsSubtitleThemePageTitle": "𐑕𐑳𐑚𐑑𐑲𐑑𐑩𐑤𐑟",
+ "@settingsSubtitleThemePageTitle": {},
+ "settingsSubtitleThemeSample": "𐑞𐑦𐑕 𐑦𐑟 𐑩 𐑕𐑭𐑥𐑐𐑩𐑤.",
+ "@settingsSubtitleThemeSample": {},
+ "settingsSubtitleThemeTextAlignmentTile": "𐑑𐑧𐑒𐑕𐑑 𐑩𐑤𐑲𐑯𐑥𐑩𐑯𐑑",
+ "@settingsSubtitleThemeTextAlignmentTile": {},
+ "settingsSubtitleThemeTextAlignmentDialogTitle": "𐑑𐑧𐑒𐑕𐑑 𐑩𐑤𐑲𐑯𐑥𐑩𐑯𐑑",
+ "@settingsSubtitleThemeTextAlignmentDialogTitle": {},
+ "settingsSubtitleThemeTextPositionTile": "𐑑𐑧𐑒𐑕𐑑 𐑐𐑩𐑟𐑦𐑖𐑩𐑯",
+ "@settingsSubtitleThemeTextPositionTile": {},
+ "settingsSubtitleThemeTextPositionDialogTitle": "𐑑𐑧𐑒𐑕𐑑 𐑐𐑩𐑟𐑦𐑖𐑩𐑯",
+ "@settingsSubtitleThemeTextPositionDialogTitle": {},
+ "settingsSubtitleThemeTextSize": "𐑑𐑧𐑒𐑕𐑑 𐑕𐑲𐑟",
+ "@settingsSubtitleThemeTextSize": {},
+ "settingsSubtitleThemeShowOutline": "𐑖𐑴 𐑬𐑑𐑤𐑲𐑯 𐑯 𐑖𐑨𐑛𐑴",
+ "@settingsSubtitleThemeShowOutline": {},
+ "settingsSubtitleThemeTextColor": "𐑑𐑧𐑒𐑕𐑑 𐑒𐑳𐑤𐑼",
+ "@settingsSubtitleThemeTextColor": {},
+ "settingsSubtitleThemeTextOpacity": "𐑑𐑧𐑒𐑕𐑑 𐑴𐑐𐑨𐑕𐑦𐑑𐑦",
+ "@settingsSubtitleThemeTextOpacity": {},
+ "settingsSubtitleThemeBackgroundColor": "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑒𐑳𐑤𐑼",
+ "@settingsSubtitleThemeBackgroundColor": {},
+ "settingsSubtitleThemeBackgroundOpacity": "𐑚𐑨𐑒𐑜𐑮𐑬𐑯𐑛 𐑴𐑐𐑨𐑕𐑦𐑑𐑦",
+ "@settingsSubtitleThemeBackgroundOpacity": {},
+ "settingsSubtitleThemeTextAlignmentLeft": "𐑤𐑧𐑓𐑑",
+ "@settingsSubtitleThemeTextAlignmentLeft": {},
+ "settingsSubtitleThemeTextAlignmentCenter": "𐑕𐑧𐑯𐑑𐑼",
+ "@settingsSubtitleThemeTextAlignmentCenter": {},
+ "settingsSubtitleThemeTextAlignmentRight": "𐑮𐑲𐑑",
+ "@settingsSubtitleThemeTextAlignmentRight": {},
+ "settingsPrivacySectionTitle": "𐑐𐑮𐑦𐑝𐑩𐑕𐑦",
+ "@settingsPrivacySectionTitle": {},
+ "settingsAllowInstalledAppAccess": "𐑩𐑤𐑬 𐑨𐑒𐑕𐑧𐑕 𐑑 𐑨𐑐 𐑦𐑯𐑝𐑩𐑯𐑑𐑼𐑦",
+ "@settingsAllowInstalledAppAccess": {},
+ "settingsAllowInstalledAppAccessSubtitle": "𐑿𐑟𐑛 𐑑 𐑦𐑥𐑐𐑮𐑵𐑝 𐑨𐑤𐑚𐑩𐑥 𐑛𐑦𐑕𐑐𐑤𐑱",
+ "@settingsAllowInstalledAppAccessSubtitle": {},
+ "settingsAllowErrorReporting": "𐑩𐑤𐑬 𐑩𐑯𐑪𐑯𐑦𐑥𐑩𐑕 𐑧𐑮𐑼 𐑮𐑦𐑐𐑹𐑑𐑦𐑙",
+ "@settingsAllowErrorReporting": {},
+ "settingsSaveSearchHistory": "𐑕𐑱𐑝 𐑕𐑻𐑗 𐑣𐑦𐑕𐑑𐑼𐑦",
+ "@settingsSaveSearchHistory": {},
+ "settingsEnableBin": "𐑿𐑟 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯",
+ "@settingsEnableBin": {},
+ "settingsEnableBinSubtitle": "𐑒𐑰𐑐 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑲𐑑𐑩𐑥𐑟 𐑓 30 𐑛𐑱𐑟",
+ "@settingsEnableBinSubtitle": {},
+ "settingsDisablingBinWarningDialogMessage": "𐑲𐑑𐑩𐑥𐑟 𐑦𐑯 𐑞 𐑮𐑰𐑕𐑲𐑒𐑩𐑤 𐑚𐑦𐑯 𐑢𐑦𐑤 𐑚𐑰 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑓𐑼𐑧𐑝𐑼.",
+ "@settingsDisablingBinWarningDialogMessage": {},
+ "settingsAllowMediaManagement": "𐑩𐑤𐑬 𐑥𐑰𐑛𐑾 𐑥𐑨𐑯𐑦𐑡𐑥𐑩𐑯𐑑",
+ "@settingsAllowMediaManagement": {},
+ "settingsHiddenItemsTile": "𐑣𐑦𐑛𐑩𐑯 𐑲𐑑𐑩𐑥𐑟",
+ "@settingsHiddenItemsTile": {},
+ "settingsHiddenItemsPageTitle": "𐑣𐑦𐑛𐑩𐑯 𐑲𐑑𐑩𐑥𐑟",
+ "@settingsHiddenItemsPageTitle": {},
+ "settingsHiddenFiltersBanner": "𐑓𐑴𐑑𐑴𐑟 𐑯 𐑝𐑦𐑛𐑦𐑴𐑟 𐑥𐑨𐑗𐑦𐑙 𐑣𐑦𐑛𐑩𐑯 𐑓𐑦𐑤𐑑𐑼𐑟 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑩𐑐𐑽 𐑦𐑯 𐑘𐑹 𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯.",
+ "@settingsHiddenFiltersBanner": {},
+ "settingsHiddenFiltersEmpty": "𐑯𐑴 𐑣𐑦𐑛𐑩𐑯 𐑓𐑦𐑤𐑑𐑼𐑟",
+ "@settingsHiddenFiltersEmpty": {},
+ "settingsStorageAccessTile": "𐑕𐑑𐑹𐑦𐑡 𐑨𐑒𐑕𐑧𐑕",
+ "@settingsStorageAccessTile": {},
+ "settingsStorageAccessPageTitle": "𐑕𐑑𐑹𐑦𐑡 𐑨𐑒𐑕𐑧𐑕",
+ "@settingsStorageAccessPageTitle": {},
+ "settingsStorageAccessEmpty": "𐑯𐑴 𐑨𐑒𐑕𐑧𐑕 𐑜𐑮𐑭𐑯𐑑𐑕",
+ "@settingsStorageAccessEmpty": {},
+ "settingsStorageAccessRevokeTooltip": "𐑮𐑦𐑝𐑴𐑒",
+ "@settingsStorageAccessRevokeTooltip": {},
+ "settingsAccessibilitySectionTitle": "𐑩𐑒𐑕𐑧𐑕𐑩𐑚𐑦𐑤𐑦𐑑𐑦",
+ "@settingsAccessibilitySectionTitle": {},
+ "settingsRemoveAnimationsTile": "𐑮𐑦𐑥𐑵𐑝 𐑨𐑯𐑦𐑥𐑱𐑖𐑩𐑯𐑟",
+ "@settingsRemoveAnimationsTile": {},
+ "settingsStorageAccessBanner": "𐑕𐑳𐑥 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦𐑟 𐑮𐑦𐑒𐑢𐑲𐑼 𐑩𐑯 𐑦𐑒𐑕𐑐𐑤𐑦𐑕𐑦𐑑 𐑨𐑒𐑕𐑧𐑕 𐑜𐑮𐑭𐑯𐑑 𐑑 𐑥𐑪𐑛𐑦𐑓𐑲 𐑓𐑲𐑤𐑟 𐑦𐑯 𐑞𐑧𐑥. 𐑿 𐑒𐑨𐑯 𐑮𐑦𐑝𐑿 𐑣𐑽 𐑛𐑦𐑮𐑧𐑒𐑑𐑼𐑦𐑟 𐑑 𐑢𐑦𐑗 𐑿 𐑐𐑮𐑰𐑝𐑾𐑕𐑤𐑦 𐑜𐑱𐑝 𐑨𐑒𐑕𐑧𐑕.",
+ "@settingsStorageAccessBanner": {},
+ "settingsRemoveAnimationsDialogTitle": "𐑮𐑦𐑥𐑵𐑝 𐑨𐑯𐑦𐑥𐑱𐑖𐑩𐑯𐑟",
+ "@settingsRemoveAnimationsDialogTitle": {},
+ "settingsTimeToTakeActionTile": "𐑑𐑲𐑥 𐑑 𐑑𐑱𐑒 𐑨𐑒𐑖𐑩𐑯",
+ "@settingsTimeToTakeActionTile": {},
+ "settingsAccessibilityShowPinchGestureAlternatives": "𐑖𐑴 𐑥𐑳𐑤𐑑𐑦-𐑑𐑳𐑗 𐑡𐑧𐑕𐑗𐑼 𐑷𐑤𐑑𐑻𐑯𐑩𐑑𐑦𐑝𐑟",
+ "@settingsAccessibilityShowPinchGestureAlternatives": {},
+ "settingsDisplaySectionTitle": "𐑛𐑦𐑕𐑐𐑤𐑱",
+ "@settingsDisplaySectionTitle": {},
+ "settingsThemeBrightnessTile": "𐑔𐑰𐑥",
+ "@settingsThemeBrightnessTile": {},
+ "settingsThemeBrightnessDialogTitle": "𐑔𐑰𐑥",
+ "@settingsThemeBrightnessDialogTitle": {},
+ "settingsThemeColorHighlights": "𐑒𐑳𐑤𐑼 𐑣𐑲𐑤𐑲𐑑𐑕",
+ "@settingsThemeColorHighlights": {},
+ "settingsThemeEnableDynamicColor": "𐑛𐑲𐑯𐑨𐑥𐑦𐑒 𐑒𐑳𐑤𐑼",
+ "@settingsThemeEnableDynamicColor": {},
+ "settingsDisplayRefreshRateModeTile": "𐑛𐑦𐑕𐑐𐑤𐑱 𐑮𐑦𐑓𐑮𐑧𐑖 𐑮𐑱𐑑",
+ "@settingsDisplayRefreshRateModeTile": {},
+ "settingsDisplayRefreshRateModeDialogTitle": "𐑮𐑦𐑓𐑮𐑧𐑖 𐑮𐑱𐑑",
+ "@settingsDisplayRefreshRateModeDialogTitle": {},
+ "settingsDisplayUseTvInterface": "·𐑨𐑯𐑛𐑮𐑶𐑛 ⸰𐑑𐑝 𐑦𐑯𐑑𐑼𐑓𐑱𐑕",
+ "@settingsDisplayUseTvInterface": {},
+ "settingsLanguageTile": "𐑤𐑨𐑙𐑜𐑢𐑦𐑡",
+ "@settingsLanguageTile": {},
+ "settingsLanguagePageTitle": "𐑤𐑨𐑙𐑜𐑢𐑦𐑡",
+ "@settingsLanguagePageTitle": {},
+ "settingsCoordinateFormatTile": "𐑒𐑴𐑹𐑛𐑦𐑯𐑩𐑑 𐑓𐑹𐑥𐑨𐑑",
+ "@settingsCoordinateFormatTile": {},
+ "settingsCoordinateFormatDialogTitle": "𐑒𐑴𐑹𐑛𐑦𐑯𐑩𐑑 𐑓𐑹𐑥𐑨𐑑",
+ "@settingsCoordinateFormatDialogTitle": {},
+ "settingsUnitSystemTile": "𐑿𐑯𐑦𐑑𐑕",
+ "@settingsUnitSystemTile": {},
+ "settingsUnitSystemDialogTitle": "𐑿𐑯𐑦𐑑𐑕",
+ "@settingsUnitSystemDialogTitle": {},
+ "settingsForceWesternArabicNumeralsTile": "𐑓𐑹𐑕 ·𐑨𐑮𐑩𐑚𐑦𐑒 𐑯𐑿𐑥𐑼𐑩𐑤𐑟",
+ "@settingsForceWesternArabicNumeralsTile": {},
+ "settingsScreenSaverPageTitle": "𐑕𐑒𐑮𐑰𐑯 𐑕𐑱𐑝𐑼",
+ "@settingsScreenSaverPageTitle": {},
+ "settingsLanguageSectionTitle": "𐑤𐑨𐑙𐑜𐑢𐑦𐑡 𐑯 𐑓𐑹𐑥𐑨𐑑𐑕",
+ "@settingsLanguageSectionTitle": {},
+ "settingsWidgetPageTitle": "𐑓𐑴𐑑𐑴 𐑓𐑮𐑱𐑥",
+ "@settingsWidgetPageTitle": {},
+ "settingsWidgetShowOutline": "𐑬𐑑𐑤𐑲𐑯",
+ "@settingsWidgetShowOutline": {},
+ "settingsWidgetOpenPage": "𐑢𐑧𐑯 𐑑𐑨𐑐𐑦𐑙 𐑪𐑯 𐑞 𐑢𐑦𐑡𐑩𐑑",
+ "@settingsWidgetOpenPage": {},
+ "settingsWidgetDisplayedItem": "𐑛𐑦𐑕𐑐𐑤𐑱𐑛 𐑲𐑑𐑩𐑥",
+ "@settingsWidgetDisplayedItem": {},
+ "settingsCollectionTile": "𐑒𐑩𐑤𐑧𐑒𐑖𐑩𐑯",
+ "@settingsCollectionTile": {},
+ "statsPageTitle": "𐑕𐑑𐑨𐑑𐑕",
+ "@statsPageTitle": {},
+ "statsWithGps": "{count, plural, =1{1 𐑲𐑑𐑩𐑥 𐑢𐑦𐑞 𐑤𐑴𐑒𐑱𐑖𐑩𐑯} other{{count} 𐑲𐑑𐑩𐑥𐑟 𐑢𐑦𐑞 𐑤𐑴𐑒𐑱𐑖𐑩𐑯}}",
+ "@statsWithGps": {
+ "placeholders": {
+ "count": {
+ "format": "decimalPattern"
+ }
+ }
+ },
+ "statsTopCountriesSectionTitle": "𐑑𐑪𐑐 𐑒𐑳𐑯𐑑𐑮𐑦𐑟",
+ "@statsTopCountriesSectionTitle": {},
+ "statsTopPlacesSectionTitle": "𐑑𐑪𐑐 𐑐𐑤𐑱𐑕𐑩𐑟",
+ "@statsTopPlacesSectionTitle": {},
+ "viewerErrorUnknown": "¡𐑵𐑐𐑕!",
+ "@viewerErrorUnknown": {},
+ "viewerInfoBackToViewerTooltip": "𐑚𐑨𐑒 𐑑 𐑝𐑿𐑼",
+ "@viewerInfoBackToViewerTooltip": {},
+ "viewerInfoUnknown": "𐑳𐑯𐑯𐑴𐑯",
+ "@viewerInfoUnknown": {},
+ "viewerInfoLabelDescription": "𐑛𐑦𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯",
+ "@viewerInfoLabelDescription": {},
+ "viewerInfoLabelTitle": "𐑑𐑲𐑑𐑩𐑤",
+ "@viewerInfoLabelTitle": {},
+ "viewerInfoLabelDate": "𐑛𐑱𐑑",
+ "@viewerInfoLabelDate": {},
+ "viewerInfoLabelResolution": "𐑮𐑧𐑟𐑩𐑤𐑵𐑖𐑩𐑯",
+ "@viewerInfoLabelResolution": {},
+ "viewerInfoLabelSize": "𐑕𐑲𐑟",
+ "@viewerInfoLabelSize": {},
+ "viewerInfoLabelUri": "⸰𐑿𐑮𐑲",
+ "@viewerInfoLabelUri": {},
+ "viewerInfoLabelPath": "𐑐𐑭𐑔",
+ "@viewerInfoLabelPath": {},
+ "viewerInfoLabelDuration": "𐑛𐑘𐑫𐑼𐑱𐑖𐑩𐑯",
+ "@viewerInfoLabelDuration": {},
+ "viewerInfoLabelOwner": "𐑴𐑯𐑼",
+ "@viewerInfoLabelOwner": {},
+ "viewerInfoLabelCoordinates": "𐑒𐑴𐑹𐑛𐑦𐑯𐑩𐑑𐑕",
+ "@viewerInfoLabelCoordinates": {},
+ "viewerInfoLabelAddress": "𐑩𐑛𐑮𐑧𐑕",
+ "@viewerInfoLabelAddress": {},
+ "mapStyleDialogTitle": "𐑥𐑨𐑐 𐑕𐑑𐑲𐑤",
+ "@mapStyleDialogTitle": {},
+ "mapStyleTooltip": "𐑕𐑦𐑤𐑧𐑒𐑑 𐑥𐑨𐑐 𐑕𐑑𐑲𐑤",
+ "@mapStyleTooltip": {},
+ "mapZoomInTooltip": "𐑟𐑵𐑥 𐑦𐑯",
+ "@mapZoomInTooltip": {},
+ "mapZoomOutTooltip": "𐑟𐑵𐑥 𐑬𐑑",
+ "@mapZoomOutTooltip": {},
+ "mapPointNorthUpTooltip": "𐑐𐑶𐑯𐑑 𐑯𐑹𐑔 𐑳𐑐",
+ "@mapPointNorthUpTooltip": {},
+ "mapAttributionOsmData": "𐑥𐑨𐑐 𐑛𐑱𐑑𐑩 © [·𐑴𐑐𐑩𐑯𐑕𐑑𐑮𐑰𐑑𐑥𐑨𐑐](https://www.openstreetmap.org/copyright) 𐑒𐑩𐑯𐑑𐑮𐑦𐑚𐑘𐑩𐑑𐑼𐑟",
+ "@mapAttributionOsmData": {},
+ "mapAttributionOsmLiberty": "𐑑𐑲𐑤𐑟 𐑚𐑲 [·𐑴𐑐𐑩𐑯𐑥𐑨𐑐𐑑𐑲𐑤𐑟](https://www.openmaptiles.org), [⸰𐑒𐑒 𐑚𐑲](https://creativecommons.org/licenses/by/4.0) • 𐑣𐑴𐑕𐑑𐑩𐑛 𐑚𐑲 [⸰𐑴𐑕𐑥 ·𐑩𐑥𐑧𐑮𐑦𐑒𐑭𐑯𐑩](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {},
+ "openMapPageTooltip": "𐑝𐑿 𐑪𐑯 ·𐑥𐑨𐑐 𐑐𐑱𐑡",
+ "@openMapPageTooltip": {},
+ "mapEmptyRegion": "𐑯𐑴 𐑦𐑥𐑦𐑡𐑩𐑟 𐑦𐑯 𐑞𐑦𐑕 𐑮𐑰𐑡𐑩𐑯",
+ "@mapEmptyRegion": {},
+ "viewerInfoOpenLinkText": "𐑴𐑐𐑩𐑯",
+ "@viewerInfoOpenLinkText": {},
+ "viewerInfoViewXmlLinkText": "𐑝𐑿 ⸰𐑦𐑥𐑤",
+ "@viewerInfoViewXmlLinkText": {},
+ "viewerInfoSearchFieldLabel": "𐑕𐑻𐑗 𐑥𐑧𐑑𐑩𐑛𐑱𐑑𐑩",
+ "@viewerInfoSearchFieldLabel": {},
+ "viewerInfoOpenEmbeddedFailureFeedback": "𐑓𐑱𐑤𐑛 𐑑 𐑦𐑒𐑕𐑑𐑮𐑨𐑒𐑑 𐑦𐑥𐑚𐑧𐑛𐑩𐑛 𐑛𐑱𐑑𐑩",
+ "@viewerInfoOpenEmbeddedFailureFeedback": {},
+ "viewerInfoSearchEmpty": "𐑯𐑴 𐑥𐑨𐑗𐑦𐑙 𐑒𐑰𐑟",
+ "@viewerInfoSearchEmpty": {},
+ "viewerInfoSearchSuggestionDescription": "𐑛𐑦𐑕𐑒𐑮𐑦𐑐𐑖𐑩𐑯",
+ "@viewerInfoSearchSuggestionDescription": {},
+ "viewerInfoSearchSuggestionDimensions": "𐑛𐑦𐑥𐑧𐑯𐑖𐑩𐑯𐑟",
+ "@viewerInfoSearchSuggestionDimensions": {},
+ "viewerInfoSearchSuggestionResolution": "𐑮𐑧𐑟𐑩𐑤𐑵𐑖𐑩𐑯",
+ "@viewerInfoSearchSuggestionResolution": {},
+ "viewerInfoSearchSuggestionDate": "𐑛𐑱𐑑 𐑯 𐑑𐑲𐑥",
+ "@viewerInfoSearchSuggestionDate": {},
+ "viewerInfoSearchSuggestionRights": "𐑮𐑲𐑑𐑕",
+ "@viewerInfoSearchSuggestionRights": {},
+ "wallpaperUseScrollEffect": "𐑿𐑟 𐑕𐑒𐑮𐑴𐑤 𐑦𐑓𐑧𐑒𐑑 𐑪𐑯 𐑣𐑴𐑥 𐑕𐑒𐑮𐑰𐑯",
+ "@wallpaperUseScrollEffect": {},
+ "tagEditorPageTitle": "𐑧𐑛𐑦𐑑 𐑑𐑨𐑜𐑟",
+ "@tagEditorPageTitle": {},
+ "tagEditorPageNewTagFieldLabel": "𐑯𐑿 𐑑𐑨𐑜",
+ "@tagEditorPageNewTagFieldLabel": {},
+ "tagEditorPageAddTagTooltip": "𐑨𐑛 𐑑𐑨𐑜",
+ "@tagEditorPageAddTagTooltip": {},
+ "tagEditorSectionRecent": "𐑮𐑰𐑕𐑩𐑯𐑑",
+ "@tagEditorSectionRecent": {},
+ "tagEditorSectionPlaceholders": "𐑐𐑤𐑱𐑕𐑣𐑴𐑤𐑛𐑼𐑟",
+ "@tagEditorSectionPlaceholders": {},
+ "tagEditorDiscardDialogMessage": "¿𐑛𐑵 𐑿 𐑢𐑪𐑯𐑑 𐑑 𐑛𐑦𐑕𐑒𐑸𐑛 𐑗𐑱𐑯𐑡𐑩𐑟?",
+ "@tagEditorDiscardDialogMessage": {},
+ "tagPlaceholderCountry": "𐑒𐑳𐑯𐑑𐑮𐑦",
+ "@tagPlaceholderCountry": {},
+ "tagPlaceholderState": "𐑕𐑑𐑱𐑑",
+ "@tagPlaceholderState": {},
+ "tagPlaceholderPlace": "𐑐𐑤𐑱𐑕",
+ "@tagPlaceholderPlace": {},
+ "panoramaEnableSensorControl": "𐑦𐑯𐑱𐑚𐑩𐑤 𐑕𐑧𐑯𐑕𐑼 𐑒𐑩𐑯𐑑𐑮𐑴𐑤",
+ "@panoramaEnableSensorControl": {},
+ "panoramaDisableSensorControl": "𐑛𐑦𐑕𐑱𐑚𐑩𐑤 𐑕𐑧𐑯𐑕𐑼 𐑒𐑩𐑯𐑑𐑮𐑴𐑤",
+ "@panoramaDisableSensorControl": {},
+ "sourceViewerPageTitle": "𐑕𐑹𐑕",
+ "@sourceViewerPageTitle": {},
+ "filePickerShowHiddenFiles": "𐑖𐑴 𐑣𐑦𐑛𐑩𐑯 𐑓𐑲𐑤𐑟",
+ "@filePickerShowHiddenFiles": {},
+ "filePickerDoNotShowHiddenFiles": "𐑛𐑴𐑯'𐑑 𐑖𐑴 𐑣𐑦𐑛𐑩𐑯 𐑓𐑲𐑤𐑟",
+ "@filePickerDoNotShowHiddenFiles": {},
+ "filePickerOpenFrom": "𐑴𐑐𐑩𐑯 𐑓𐑮𐑪𐑥",
+ "@filePickerOpenFrom": {},
+ "filePickerNoItems": "𐑯𐑴 𐑲𐑑𐑩𐑥𐑟",
+ "@filePickerNoItems": {},
+ "videoActionShowPreviousFrame": "𐑖𐑴 𐑐𐑮𐑰𐑝𐑾𐑕 𐑓𐑮𐑱𐑥",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "𐑖𐑴 𐑯𐑧𐑒𐑕𐑑 𐑓𐑮𐑱𐑥",
+ "@videoActionShowNextFrame": {}
+}
diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb
index 8567db5ab..af2c69363 100644
--- a/lib/l10n/app_es.arb
+++ b/lib/l10n/app_es.arb
@@ -217,12 +217,6 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Siempre",
"@videoLoopModeAlways": {},
- "videoControlsNone": "Ninguno",
- "@videoControlsNone": {},
- "videoControlsPlay": "Reproducir",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Reproducir y buscar",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Reproducir externamente",
"@videoControlsPlayOutside": {},
"mapStyleGoogleNormal": "Google Maps",
@@ -1392,5 +1386,9 @@
"mapAttributionOsmLiberty": "Mosaicos por [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Alojado por [OSM Americana](https://tile.ourmap.us)",
"@mapAttributionOsmLiberty": {},
"mapStyleOsmLiberty": "OSM Liberty",
- "@mapStyleOsmLiberty": {}
+ "@mapStyleOsmLiberty": {},
+ "videoActionShowPreviousFrame": "Mostrar fotograma anterior",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Mostrar fotograma siguiente",
+ "@videoActionShowNextFrame": {}
}
diff --git a/lib/l10n/app_eu.arb b/lib/l10n/app_eu.arb
index d69479c8e..30a34e155 100644
--- a/lib/l10n/app_eu.arb
+++ b/lib/l10n/app_eu.arb
@@ -236,8 +236,6 @@
"@entryActionViewSource": {},
"unitSystemMetric": "Metriko",
"@unitSystemMetric": {},
- "videoControlsPlay": "Erreproduzitu",
- "@videoControlsPlay": {},
"entryActionShowGeoTiffOnMap": "Erakutsi gainjarritako mapa bezala",
"@entryActionShowGeoTiffOnMap": {},
"coordinateFormatDms": "DMS (Dokumentuak kudeatzeko sistema)",
@@ -271,12 +269,8 @@
"@videoLoopModeNever": {},
"videoLoopModeShortOnly": "Bideo laburrak soilik",
"@videoLoopModeShortOnly": {},
- "videoControlsPlaySeek": "Erreproduzitu eta aurrera edo atzera egin",
- "@videoControlsPlaySeek": {},
"nameConflictStrategySkip": "Jauzi",
"@nameConflictStrategySkip": {},
- "videoControlsNone": "Bat ere ez",
- "@videoControlsNone": {},
"keepScreenOnNever": "Inoiz",
"@keepScreenOnNever": {},
"nameConflictStrategyReplace": "Ordezkatu",
diff --git a/lib/l10n/app_fa.arb b/lib/l10n/app_fa.arb
index d3b38f5ef..e3e097cf1 100644
--- a/lib/l10n/app_fa.arb
+++ b/lib/l10n/app_fa.arb
@@ -232,8 +232,6 @@
"@filterTypeMotionPhotoLabel": {},
"unitSystemImperial": "مایلی",
"@unitSystemImperial": {},
- "videoControlsPlaySeek": "پخش، برگشت به عقب، جلو رفتن",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "باز کردن با برنامهای دیگر",
"@videoControlsPlayOutside": {},
"videoLoopModeShortOnly": "فقط برای ویدئو های کوتاه",
@@ -252,8 +250,6 @@
"@menuActionStats": {},
"exportEntryDialogWidth": "عرض",
"@exportEntryDialogWidth": {},
- "videoControlsPlay": "پخش",
- "@videoControlsPlay": {},
"mapZoomInTooltip": "بزرگ نمایی",
"@mapZoomInTooltip": {},
"chipActionFilterOut": "پاککردن از پالایش",
@@ -417,8 +413,6 @@
"@filterAspectRatioPortraitLabel": {},
"filterTypeGeotiffLabel": "GeoTIFF",
"@filterTypeGeotiffLabel": {},
- "videoControlsNone": "هیچکدام",
- "@videoControlsNone": {},
"otherDirectoryDescription": "شاخهٔ «{name}»",
"@otherDirectoryDescription": {
"placeholders": {
diff --git a/lib/l10n/app_fi.arb b/lib/l10n/app_fi.arb
index 8e7910a83..c86a03d1a 100644
--- a/lib/l10n/app_fi.arb
+++ b/lib/l10n/app_fi.arb
@@ -376,14 +376,8 @@
"@vaultLockTypePassword": {},
"settingsVideoEnablePip": "Kuva kuvassa",
"@settingsVideoEnablePip": {},
- "videoControlsPlay": "Toista",
- "@videoControlsPlay": {},
"videoControlsPlayOutside": "Avaa toisella soittimella",
"@videoControlsPlayOutside": {},
- "videoControlsPlaySeek": "Toista & selaa eteen/taakse",
- "@videoControlsPlaySeek": {},
- "videoControlsNone": "Ei mitään",
- "@videoControlsNone": {},
"videoLoopModeNever": "Ei koskaan",
"@videoLoopModeNever": {},
"videoLoopModeShortOnly": "Vain lyhyissä videoissa",
diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb
index c6602e0ae..8380f1809 100644
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Toujours",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Lecture",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Lecture & déplacement",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Ouvrir avec un autre lecteur",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Aucun",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Satellite)",
@@ -1392,5 +1386,9 @@
"mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Fond de carte par [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
"@mapAttributionOpenTopoMap": {},
"mapAttributionOsmData": "Données © les contributeurs d’[OpenStreetMap](https://www.openstreetmap.org/copyright)",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "videoActionShowNextFrame": "Montrer l’image suivante",
+ "@videoActionShowNextFrame": {},
+ "videoActionShowPreviousFrame": "Montrer l’image précédente",
+ "@videoActionShowPreviousFrame": {}
}
diff --git a/lib/l10n/app_gl.arb b/lib/l10n/app_gl.arb
index c1a34ee9c..936b628cb 100644
--- a/lib/l10n/app_gl.arb
+++ b/lib/l10n/app_gl.arb
@@ -273,18 +273,12 @@
"@unitSystemMetric": {},
"unitSystemImperial": "Imperial",
"@unitSystemImperial": {},
- "videoControlsPlay": "Reproducir",
- "@videoControlsPlay": {},
"videoLoopModeNever": "Nunca",
"@videoLoopModeNever": {},
"videoLoopModeAlways": "Sempre",
"@videoLoopModeAlways": {},
- "videoControlsPlaySeek": "Reprroduce e busca cara atrás/adelante",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Abrir con outro xogador",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Ningún",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"videoLoopModeShortOnly": "Só vídeos curtos",
diff --git a/lib/l10n/app_hi.arb b/lib/l10n/app_hi.arb
index fee20d0aa..c027bc9ca 100644
--- a/lib/l10n/app_hi.arb
+++ b/lib/l10n/app_hi.arb
@@ -266,8 +266,6 @@
"@themeBrightnessDark": {},
"themeBrightnessBlack": "काला",
"@themeBrightnessBlack": {},
- "videoControlsPlaySeek": "पिछड़े / आगे की तलाश करें",
- "@videoControlsPlaySeek": {},
"mapStyleOsmHot": "Humanitarian OSM",
"@mapStyleOsmHot": {},
"filterAspectRatioPortraitLabel": "पोर्ट्रेट",
@@ -439,12 +437,8 @@
"@authenticateToUnlockVault": {},
"settingsVideoEnablePip": "पिक्चर-इन-पिक्चर",
"@settingsVideoEnablePip": {},
- "videoControlsPlay": "चलाएं",
- "@videoControlsPlay": {},
"videoControlsPlayOutside": "अन्य प्लेयर के साथ खोलें",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "कोई नहीं",
- "@videoControlsNone": {},
"videoLoopModeShortOnly": "केवल लघु वीडियो",
"@videoLoopModeShortOnly": {},
"videoPlaybackWithSound": "ध्वनि के साथ चलाए",
diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb
index b6534f246..313641c08 100644
--- a/lib/l10n/app_hu.arb
+++ b/lib/l10n/app_hu.arb
@@ -67,10 +67,6 @@
"@themeBrightnessDark": {},
"vaultLockTypePassword": "Jelszó",
"@vaultLockTypePassword": {},
- "videoControlsPlay": "Lejátszás",
- "@videoControlsPlay": {},
- "videoControlsNone": "Nincs",
- "@videoControlsNone": {},
"videoLoopModeAlways": "Mindig",
"@videoLoopModeAlways": {},
"viewerTransitionNone": "Nincs",
@@ -913,8 +909,6 @@
"@accessibilityAnimationsKeep": {},
"keepScreenOnViewerOnly": "Csak a megtekintőnél",
"@keepScreenOnViewerOnly": {},
- "videoControlsPlaySeek": "Lejátszás és ugrás vissza/előre",
- "@videoControlsPlaySeek": {},
"viewerTransitionSlide": "Csúsztatás",
"@viewerTransitionSlide": {},
"viewerTransitionFade": "Áttünés",
diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb
index 22b5ae442..38d90b999 100644
--- a/lib/l10n/app_id.arb
+++ b/lib/l10n/app_id.arb
@@ -225,14 +225,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Selalu",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Putar",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Putar dan cari",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Buka dengan pemutar lain",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Tidak ada",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Hybrid)",
@@ -1392,5 +1386,9 @@
"mapStyleOsmLiberty": "OSM Liberty",
"@mapStyleOsmLiberty": {},
"mapAttributionOsmLiberty": "Ubin oleh [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Disediakan oleh [OSM Americana](https://tile.ourmap.us)",
- "@mapAttributionOsmLiberty": {}
+ "@mapAttributionOsmLiberty": {},
+ "videoActionShowPreviousFrame": "Tampilkan bingkai sebelumnya",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Tampilkan bingkai berikutnya",
+ "@videoActionShowNextFrame": {}
}
diff --git a/lib/l10n/app_is.arb b/lib/l10n/app_is.arb
index 991b394c4..ed5136344 100644
--- a/lib/l10n/app_is.arb
+++ b/lib/l10n/app_is.arb
@@ -463,8 +463,6 @@
"@settingsEnableBin": {},
"entryActionViewMotionPhotoVideo": "Opna myndskeið",
"@entryActionViewMotionPhotoVideo": {},
- "videoControlsNone": "Ekkert",
- "@videoControlsNone": {},
"otherDirectoryDescription": "„{name}“ möppu",
"@otherDirectoryDescription": {
"placeholders": {
@@ -673,8 +671,6 @@
"@drawerCollectionFavourites": {},
"filterTypeRawLabel": "RAW",
"@filterTypeRawLabel": {},
- "videoControlsPlaySeek": "Spila og leita afturábak/áfram",
- "@videoControlsPlaySeek": {},
"settingsSubtitleThemeTextAlignmentCenter": "Miðjað",
"@settingsSubtitleThemeTextAlignmentCenter": {},
"keepScreenOnVideoPlayback": "Á meðan myndskeið er í spilun",
@@ -918,8 +914,6 @@
"@viewerErrorDoesNotExist": {},
"albumCamera": "Myndavél",
"@albumCamera": {},
- "videoControlsPlay": "Afspilun",
- "@videoControlsPlay": {},
"settingsNavigationSectionTitle": "Flakk",
"@settingsNavigationSectionTitle": {},
"settingsDisplayRefreshRateModeDialogTitle": "Uppfærslutíðni",
diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb
index 57aacabfd..563943a31 100644
--- a/lib/l10n/app_it.arb
+++ b/lib/l10n/app_it.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Sempre",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Riproduci",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Riproduci e cerca avanti/indietro",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Apri con un altro lettore",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Nessuno",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Ibrido)",
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
index 574fbca5b..38065cee7 100644
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@@ -217,14 +217,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "常にループ再生",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "再生",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "再生＆早送り/早戻し",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "他のプレイヤーで開く",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "なし",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google マップ",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google マップ（ハイブリッド）",
diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb
index b424a0834..b046e0674 100644
--- a/lib/l10n/app_ko.arb
+++ b/lib/l10n/app_ko.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "항상 반복",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "재생",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "재생 및 앞뒤로 가기",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "다른 앱에서 열기",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "없음",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google 지도",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google 지도 (위성)",
@@ -1392,5 +1386,9 @@
"mapAttributionOsmLiberty": "타일 [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • 호스팅 [OSM Americana](https://tile.ourmap.us)",
"@mapAttributionOsmLiberty": {},
"mapStyleOsmLiberty": "OSM Liberty",
- "@mapStyleOsmLiberty": {}
+ "@mapStyleOsmLiberty": {},
+ "videoActionShowNextFrame": "다음 프레임 보기",
+ "@videoActionShowNextFrame": {},
+ "videoActionShowPreviousFrame": "이전 프레임 보기",
+ "@videoActionShowPreviousFrame": {}
}
diff --git a/lib/l10n/app_lt.arb b/lib/l10n/app_lt.arb
index f46f64c72..fb053e921 100644
--- a/lib/l10n/app_lt.arb
+++ b/lib/l10n/app_lt.arb
@@ -139,8 +139,6 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Visada",
"@videoLoopModeAlways": {},
- "videoControlsNone": "Jokie",
- "@videoControlsNone": {},
"keepScreenOnNever": "Niekada",
"@keepScreenOnNever": {},
"keepScreenOnAlways": "Visada",
@@ -935,10 +933,6 @@
"@filterNoLocationLabel": {},
"filterMimeImageLabel": "Paveikslėlis",
"@filterMimeImageLabel": {},
- "videoControlsPlay": "Groti",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Groti ir peršokti pirmyn/atgal",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Atidaryti su kitu grotuvu",
"@videoControlsPlayOutside": {},
"mapStyleGoogleNormal": "Google Maps",
diff --git a/lib/l10n/app_my.arb b/lib/l10n/app_my.arb
index 6dd6f843d..a57bb2fd6 100644
--- a/lib/l10n/app_my.arb
+++ b/lib/l10n/app_my.arb
@@ -464,8 +464,6 @@
"@vaultLockTypePattern": {},
"videoControlsPlayOutside": "တခြား player နဲ့ဖွင့်တဲ့ခလုတ်",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "ဘာမှမထား",
- "@videoControlsNone": {},
"videoLoopModeNever": "ဘယ်တော့မှမလုပ်ပါနှင့်",
"@videoLoopModeNever": {},
"videoLoopModeShortOnly": "ဗီဒီယိုအတိုလေးတွေတွင်သာ",
@@ -494,10 +492,6 @@
"@keepScreenOnNever": {},
"keepScreenOnVideoPlayback": "ဗီဒီယိုကြည့်နေသည့်အချိန်အတွင်း",
"@keepScreenOnVideoPlayback": {},
- "videoControlsPlay": "ဖွင့်တဲ့ခလုတ်",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "ဖွင့်တဲ့ခလုတ်နဲ့ အရှေ့/အနောက်သွားတဲ့ ခလုတ်",
- "@videoControlsPlaySeek": {},
"videoPlaybackSkip": "ကျော်လိုက်ပါ",
"@videoPlaybackSkip": {},
"viewerTransitionFade": "မှိန်သွားခြင်း",
diff --git a/lib/l10n/app_nb.arb b/lib/l10n/app_nb.arb
index 6b6ad73ce..0229a61aa 100644
--- a/lib/l10n/app_nb.arb
+++ b/lib/l10n/app_nb.arb
@@ -457,14 +457,8 @@
"@albumTierApps": {},
"videoLoopModeShortOnly": "Kun korte videoer",
"@videoLoopModeShortOnly": {},
- "videoControlsPlay": "Spill",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Spill og blafre forover/bakover",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Åpne med annen avspiller",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Ingen",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"videoPlaybackSkip": "Hopp over",
diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb
index f39770a5c..dc244329c 100644
--- a/lib/l10n/app_nl.arb
+++ b/lib/l10n/app_nl.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Altijd",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Afspelen",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Speel & zoek terug/vooruit",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Met andere speler openen",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Geen",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Hybride)",
@@ -1001,7 +995,7 @@
"@settingsUnitSystemDialogTitle": {},
"settingsScreenSaverPageTitle": "Schermbeveiliging",
"@settingsScreenSaverPageTitle": {},
- "settingsWidgetPageTitle": "Foto Lijstje",
+ "settingsWidgetPageTitle": "Fotolijst",
"@settingsWidgetPageTitle": {},
"settingsWidgetShowOutline": "Contour",
"@settingsWidgetShowOutline": {},
@@ -1394,5 +1388,9 @@
"mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Tegels van [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
"@mapAttributionOpenTopoMap": {},
"mapAttributionOsmData": "Kaartgegevens © [OpenStreetMap](https://www.openstreetmap.org/copyright) bijdragers",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "videoActionShowNextFrame": "Volgend frame weergeven",
+ "@videoActionShowNextFrame": {},
+ "videoActionShowPreviousFrame": "Vorig frame weergeven",
+ "@videoActionShowPreviousFrame": {}
}
diff --git a/lib/l10n/app_nn.arb b/lib/l10n/app_nn.arb
index 61d158406..087ee16d3 100644
--- a/lib/l10n/app_nn.arb
+++ b/lib/l10n/app_nn.arb
@@ -236,12 +236,8 @@
"@videoLoopModeNever": {},
"videoLoopModeAlways": "På",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Spel av",
- "@videoControlsPlay": {},
"videoControlsPlayOutside": "Opne med ein ytre avspelar",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Ingen",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (hybrid)",
@@ -329,8 +325,6 @@
},
"unitSystemMetric": "Metrisk",
"@unitSystemMetric": {},
- "videoControlsPlaySeek": "Spel av, spol framover/bakover",
- "@videoControlsPlaySeek": {},
"mapStyleStamenWatercolor": "Stamen Watercolor (vassfarge)",
"@mapStyleStamenWatercolor": {},
"viewerTransitionNone": "Ingen",
diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb
index a37a1d5ae..292b5637a 100644
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@@ -211,8 +211,6 @@
"@filterAspectRatioPortraitLabel": {},
"filterNoAddressLabel": "Brak adresu",
"@filterNoAddressLabel": {},
- "videoControlsPlaySeek": "Odtwórz oraz przeszukuj",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Odtwórz innym odtwarzaczem",
"@videoControlsPlayOutside": {},
"mapStyleGoogleNormal": "Mapy Google",
@@ -325,8 +323,6 @@
"@unitSystemImperial": {},
"videoLoopModeNever": "Nigdy",
"@videoLoopModeNever": {},
- "videoControlsNone": "Brak",
- "@videoControlsNone": {},
"accessibilityAnimationsRemove": "Zapobiegaj efektom ekranu",
"@accessibilityAnimationsRemove": {},
"accessibilityAnimationsKeep": "Zachowaj efekty ekranu",
@@ -355,8 +351,6 @@
"@coordinateDmsWest": {},
"unitSystemMetric": "Metryczne",
"@unitSystemMetric": {},
- "videoControlsPlay": "Odtwórz",
- "@videoControlsPlay": {},
"albumTierPinned": "Przypięty",
"@albumTierPinned": {},
"videoResumeButtonLabel": "WZNÓW",
@@ -1550,5 +1544,9 @@
"mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Kafelki od [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
"@mapAttributionOpenTopoMap": {},
"mapAttributionOsmData": "Dane mapy © [OpenStreetMap](https://www.openstreetmap.org/copyright) współtwórcy",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "videoActionShowPreviousFrame": "Pokaż poprzednią klatkę",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Pokaż kolejną klatkę",
+ "@videoActionShowNextFrame": {}
}
diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb
index c582cccb5..2814a863d 100644
--- a/lib/l10n/app_pt.arb
+++ b/lib/l10n/app_pt.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Sempre",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Começar",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Começar e procurar",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Abrir com outro player",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Nenhum",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Híbrido)",
@@ -993,9 +987,9 @@
"@settingsDisplayRefreshRateModeDialogTitle": {},
"settingsLanguageSectionTitle": "Idioma e Formatos",
"@settingsLanguageSectionTitle": {},
- "settingsLanguageTile": "Língua",
+ "settingsLanguageTile": "Idioma",
"@settingsLanguageTile": {},
- "settingsLanguagePageTitle": "Língua",
+ "settingsLanguagePageTitle": "Idioma",
"@settingsLanguagePageTitle": {},
"settingsCoordinateFormatTile": "Formato de coordenadas",
"@settingsCoordinateFormatTile": {},
@@ -1384,5 +1378,13 @@
"setHomeCustom": "Personalizada",
"@setHomeCustom": {},
"mapAttributionOsmData": "Dados do mapa © [OpenStreetMap](https://www.openstreetmap.org/copyright) colaboradores",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "mapStyleOpenTopoMap": "OpenTopoMap",
+ "@mapStyleOpenTopoMap": {},
+ "mapStyleOsmLiberty": "OSM Liberty",
+ "@mapStyleOsmLiberty": {},
+ "mapAttributionOsmLiberty": "Blocos por [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Hospedado por [OSM Americana](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {},
+ "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Blocos por [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+ "@mapAttributionOpenTopoMap": {}
}
diff --git a/lib/l10n/app_ro.arb b/lib/l10n/app_ro.arb
index 91f029a15..eebc0111b 100644
--- a/lib/l10n/app_ro.arb
+++ b/lib/l10n/app_ro.arb
@@ -237,14 +237,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Mereu",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Redă",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Redați și căutați înapoi/înainte",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Deschide cu alt player",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Nici unul",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Hărți Google",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Hărți Google (hibrid)",
diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb
index 76766e645..ce3230d0f 100644
--- a/lib/l10n/app_ru.arb
+++ b/lib/l10n/app_ru.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Всегда",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Воспроизведение",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Воспроизведение и переход на позицию",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Открыть в другом видеоплеере",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Ничего",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Карты",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Карты (Гибридный)",
@@ -1388,5 +1382,13 @@
"mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Плитки от [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
"@mapAttributionOpenTopoMap": {},
"mapAttributionOsmData": "Данные карты © [openstreetmap](https://www.openstreetmap.org/copyright) участники",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "videoActionShowPreviousFrame": "Показать предыдущий кадр",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Показать следующий кадр",
+ "@videoActionShowNextFrame": {},
+ "mapStyleOsmLiberty": "OSM Liberty",
+ "@mapStyleOsmLiberty": {},
+ "mapAttributionOsmLiberty": "Tiles by [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Hosted by [OSM Americana](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {}
}
diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb
index e512e0adb..1aa743de2 100644
--- a/lib/l10n/app_sk.arb
+++ b/lib/l10n/app_sk.arb
@@ -270,10 +270,6 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Vždy",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Spustiť",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Spustiť & pretočiť dozadu/dopredu",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Otvoriť v inom prehrávači",
"@videoControlsPlayOutside": {},
"mapStyleGoogleNormal": "Google mapy",
@@ -286,8 +282,6 @@
"@mapStyleStamenWatercolor": {},
"nameConflictStrategyRename": "Premenovať",
"@nameConflictStrategyRename": {},
- "videoControlsNone": "Žiadne",
- "@videoControlsNone": {},
"nameConflictStrategyReplace": "Nahradiť",
"@nameConflictStrategyReplace": {},
"keepScreenOnNever": "Nikdy",
@@ -1544,5 +1538,11 @@
"explorerPageTitle": "Prieskumník",
"@explorerPageTitle": {},
"mapAttributionOsmData": "Údaje máp © [OpenStreetMap](https://www.openstreetmap.org/copyright) prispievatelia",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) Dlaždice podľa [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+ "@mapAttributionOpenTopoMap": {},
+ "mapStyleOsmLiberty": "OSM Slobody",
+ "@mapStyleOsmLiberty": {},
+ "mapAttributionOsmLiberty": "Dlaždice podľa [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Hostovaný [OSM Americana](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {}
}
diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb
index 5ff46b075..05d0693a5 100644
--- a/lib/l10n/app_sv.arb
+++ b/lib/l10n/app_sv.arb
@@ -375,14 +375,8 @@
"@vaultLockTypePassword": {},
"settingsVideoEnablePip": "Bild-i-bild",
"@settingsVideoEnablePip": {},
- "videoControlsPlay": "Spela",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Spela & spola bakåt/framåt",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Öppna med annan spelare",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Inga",
- "@videoControlsNone": {},
"videoLoopModeNever": "Aldrig",
"@videoLoopModeNever": {},
"videoLoopModeShortOnly": "Bara korta videor",
@@ -1572,5 +1566,9 @@
"mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Brickor av [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
"@mapAttributionOpenTopoMap": {},
"mapAttributionOsmData": "Kartdata © [OpenStreetMap](https://www.openstreetmap.org/copyright) bidragsgivare",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "videoActionShowPreviousFrame": "Visa föregående bildruta",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Visa nästa bildruta",
+ "@videoActionShowNextFrame": {}
}
diff --git a/lib/l10n/app_th.arb b/lib/l10n/app_th.arb
index 0de204c5d..74d639b8c 100644
--- a/lib/l10n/app_th.arb
+++ b/lib/l10n/app_th.arb
@@ -167,14 +167,8 @@
"@unitSystemImperial": {},
"videoLoopModeShortOnly": "เฉพาะคลิปสั้น",
"@videoLoopModeShortOnly": {},
- "videoControlsPlay": "เล่น",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "เล่นและกรอหลัง/หน้า",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "เปิดด้วยตัวเล่นอื่น",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "ไม่มี",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Maps",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Maps (Hybrid)",
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
index 5857ccc49..22b9df042 100644
--- a/lib/l10n/app_tr.arb
+++ b/lib/l10n/app_tr.arb
@@ -211,14 +211,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "Her zaman",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Oynat",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "Oynat ve ileri/geri git",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "Başka bir oynatıcı ile aç",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Hiçbiri",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Haritalar",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Haritalar (Hibrit)",
diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb
index ec55d158a..faa04d9d2 100644
--- a/lib/l10n/app_uk.arb
+++ b/lib/l10n/app_uk.arb
@@ -209,12 +209,8 @@
"@videoLoopModeNever": {},
"videoLoopModeAlways": "Завжди",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "Відтворити",
- "@videoControlsPlay": {},
"videoControlsPlayOutside": "Відкрити в іншому відеоплеєрі",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "Нічого",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google Карти",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google Карти (Гібрид)",
@@ -715,8 +711,6 @@
"@filterTypeAnimatedLabel": {},
"videoLoopModeShortOnly": "Тільки короткі відео",
"@videoLoopModeShortOnly": {},
- "videoControlsPlaySeek": "Відтворити та перемотати назад/вперед",
- "@videoControlsPlaySeek": {},
"mapStyleStamenWatercolor": "Stamen Watercolor",
"@mapStyleStamenWatercolor": {},
"widgetOpenPageCollection": "Відкрити колекцію",
@@ -1542,5 +1536,17 @@
"sortOrderLongestFirst": "Спершу найдовше",
"@sortOrderLongestFirst": {},
"mapAttributionOsmData": "Картографічні дані © [OpenStreetMap](https://www.openstreetmap.org/copyright) помічники",
- "@mapAttributionOsmData": {}
+ "@mapAttributionOsmData": {},
+ "mapStyleOsmLiberty": "OSM Liberty",
+ "@mapStyleOsmLiberty": {},
+ "mapStyleOpenTopoMap": "OpenTopoMap",
+ "@mapStyleOpenTopoMap": {},
+ "mapAttributionOsmLiberty": "Плитки від [OpenMapTiles](https://www.openmaptiles.org/), [CC BY](http://creativecommons.org/licenses/by/4.0) • Розміщено на [OSM Americana](https://tile.ourmap.us)",
+ "@mapAttributionOsmLiberty": {},
+ "mapAttributionOpenTopoMap": "[SRTM](https://www.earthdata.nasa.gov/sensors/srtm) | Плитки від [OpenTopoMap](https://opentopomap.org/), [CC BY-SA](https://creativecommons.org/licenses/by-sa/3.0/)",
+ "@mapAttributionOpenTopoMap": {},
+ "videoActionShowPreviousFrame": "Показати попередній кадр",
+ "@videoActionShowPreviousFrame": {},
+ "videoActionShowNextFrame": "Показати наступний кадр",
+ "@videoActionShowNextFrame": {}
}
diff --git a/lib/l10n/app_vi.arb b/lib/l10n/app_vi.arb
index cb9f13382..ec82c7aef 100644
--- a/lib/l10n/app_vi.arb
+++ b/lib/l10n/app_vi.arb
@@ -633,8 +633,6 @@
"@patternDialogEnter": {},
"settingsEnableBin": "Dùng thùng rác",
"@settingsEnableBin": {},
- "videoControlsNone": "Không có",
- "@videoControlsNone": {},
"otherDirectoryDescription": "“{name}” thư mục",
"@otherDirectoryDescription": {
"placeholders": {
@@ -833,8 +831,6 @@
"@drawerCollectionFavourites": {},
"filterTypeRawLabel": "RAW",
"@filterTypeRawLabel": {},
- "videoControlsPlaySeek": "Phát & kéo lùi lại/tiến tới",
- "@videoControlsPlaySeek": {},
"settingsSubtitleThemeTextAlignmentCenter": "Trung tâm",
"@settingsSubtitleThemeTextAlignmentCenter": {},
"keepScreenOnVideoPlayback": "Khi phát lại video",
@@ -1077,8 +1073,6 @@
"@viewerErrorDoesNotExist": {},
"albumCamera": "Máy Ảnh",
"@albumCamera": {},
- "videoControlsPlay": "Phát",
- "@videoControlsPlay": {},
"settingsNavigationSectionTitle": "Điều hướng",
"@settingsNavigationSectionTitle": {},
"settingsDisplayRefreshRateModeDialogTitle": "Tốc độ làm mới",
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index bedeeccb5..59046c3c6 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -229,14 +229,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "始终",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "播放",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "播放和步进/步退",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "用其他播放器打开",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "无",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google 地图",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleHybrid": "Google 地图 (卫星图像)",
diff --git a/lib/l10n/app_zh_Hant.arb b/lib/l10n/app_zh_Hant.arb
index e63949190..a700f4080 100644
--- a/lib/l10n/app_zh_Hant.arb
+++ b/lib/l10n/app_zh_Hant.arb
@@ -205,14 +205,8 @@
"@videoLoopModeShortOnly": {},
"videoLoopModeAlways": "總是",
"@videoLoopModeAlways": {},
- "videoControlsPlay": "播放",
- "@videoControlsPlay": {},
- "videoControlsPlaySeek": "播放和後退/前進",
- "@videoControlsPlaySeek": {},
"videoControlsPlayOutside": "用其他播放器打開",
"@videoControlsPlayOutside": {},
- "videoControlsNone": "無",
- "@videoControlsNone": {},
"mapStyleGoogleNormal": "Google 地圖",
"@mapStyleGoogleNormal": {},
"mapStyleGoogleTerrain": "Google 地圖 (地形)",
diff --git a/lib/model/app/contributors.dart b/lib/model/app/contributors.dart
index de0461704..191d22cbf 100644
--- a/lib/model/app/contributors.dart
+++ b/lib/model/app/contributors.dart
@@ -69,7 +69,7 @@ class Contributors {
Contributor('Henning Bunk', 'henningtbunk@gmail.com'),
Contributor('Samirah Ail', 'samiratalzahrani@gmail.com'),
Contributor('Salih Ail', 'rrrfff444@gmail.com'),
- Contributor('nasreddineloukriz', 'nasreddineloukriz@gmail.com'),
+ Contributor('Nasreddine Loukriz', 'nasreddineloukriz@gmail.com'),
Contributor('Mohamed Zeroug', 'mzeroug19@gmail.com'),
Contributor('ssantos', 'ssantos@web.de'),
Contributor('Сергій', 'sergiy.goncharuk.1@gmail.com'),
@@ -102,8 +102,14 @@ class Contributors {
Contributor('Taufan', 'taufanxxx@gmail.com'),
Contributor('Leo Aaua Felix', 'g00g7el@gmail.com'),
Contributor('-J-', 'heyj0e@tuta.io'),
- Contributor('bittin1ddc447d824349b2', 'bittin@reimu.nl'),
+ Contributor('bittin', 'bittin@reimu.nl'),
Contributor('splice11', 'trenchedgrandpa@protonmail.com'),
+ Contributor('Ihor Hordiichuk', 'igor_ck@outlook.com'),
+ Contributor('João Palmeiro', 'joaommpalmeiro@gmail.com'),
+ Contributor('Whoever4976', 'wolffjonas47@gmail.com'),
+ Contributor('Your Average Code', 'neumeiersi91358@th-nuernberg.de'),
+ Contributor('Paranoid Android', 'f.cherdzhiev@innopolis.university'),
+ Contributor('Noah Kenzie Rodriguez-Beus', 'noahbeus@protonmail.com'),
// Contributor('Alvi Khan', 'aveenalvi@gmail.com'), // Bengali
// Contributor('Htet Oo Hlaing', 'htetoh2006@outlook.com'), // Burmese
// Contributor('Khant', 'khant@users.noreply.hosted.weblate.org'), // Burmese
diff --git a/lib/model/app_inventory.dart b/lib/model/app_inventory.dart
index 22705a135..273216cd8 100644
--- a/lib/model/app_inventory.dart
+++ b/lib/model/app_inventory.dart
@@ -71,7 +71,7 @@ class Package {
currentLabel,
englishLabel,
...ownedDirs,
- ].whereNotNull().map(normalizePotentialDir).toSet();
+ ].nonNulls.map(normalizePotentialDir).toSet();
static String normalizePotentialDir(String dir) {
return dir.replaceAll('_', ' ').trim().toLowerCase();
diff --git a/lib/model/covers.dart b/lib/model/covers.dart
index 288a19f0a..231d8effc 100644
--- a/lib/model/covers.dart
+++ b/lib/model/covers.dart
@@ -146,7 +146,7 @@ class Covers {
if (colorValue != null) 'color': colorValue,
};
})
- .whereNotNull()
+ .nonNulls
.toList();
return jsonList.isNotEmpty ? jsonList : null;
}
diff --git a/lib/model/db/db.dart b/lib/model/db/db.dart
index 2fa2b0b17..0798e9e6f 100644
--- a/lib/model/db/db.dart
+++ b/lib/model/db/db.dart
@@ -115,7 +115,7 @@ abstract class LocalMediaDb {
Future> loadAllVideoPlayback();
- Future loadVideoPlayback(int? id);
+ Future loadVideoPlayback(int id);
Future addVideoPlayback(Set rows);
diff --git a/lib/model/db/db_sqflite.dart b/lib/model/db/db_sqflite.dart
index 77bc690be..5bfb18d3a 100644
--- a/lib/model/db/db_sqflite.dart
+++ b/lib/model/db/db_sqflite.dart
@@ -31,6 +31,7 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
static const trashTable = 'trash';
static const videoPlaybackTable = 'videoPlayback';
+ static const _queryCursorBufferSize = 1000;
static int _lastId = 0;
@override
@@ -180,6 +181,7 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
whereArgs.add(origin);
}
+ final entries = {};
if (directory != null) {
final separator = pContext.separator;
if (!directory.endsWith(separator)) {
@@ -188,21 +190,25 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
where = '${where != null ? '$where AND ' : ''}path LIKE ?';
whereArgs.add('$directory%');
- final rows = await _db.query(entryTable, where: where, whereArgs: whereArgs);
+ final cursor = await _db.queryCursor(entryTable, where: where, whereArgs: whereArgs, bufferSize: _queryCursorBufferSize);
final dirLength = directory.length;
- return rows
- .whereNot((row) {
- // skip entries in subfolders
- final path = row['path'] as String?;
- return path == null || path.substring(dirLength).contains(separator);
- })
- .map(AvesEntry.fromMap)
- .toSet();
+ while (await cursor.moveNext()) {
+ final row = cursor.current;
+ // skip entries in subfolders
+ final path = row['path'] as String?;
+ if (path != null && !path.substring(dirLength).contains(separator)) {
+ entries.add(AvesEntry.fromMap(row));
+ }
+ }
+ } else {
+ final cursor = await _db.queryCursor(entryTable, where: where, whereArgs: whereArgs, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ entries.add(AvesEntry.fromMap(cursor.current));
+ }
}
- final rows = await _db.query(entryTable, where: where, whereArgs: whereArgs);
- return rows.map(AvesEntry.fromMap).toSet();
+ return entries;
}
@override
@@ -278,8 +284,13 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadDates() async {
- final rows = await _db.query(dateTakenTable);
- return Map.fromEntries(rows.map((map) => MapEntry(map['id'] as int, (map['dateMillis'] ?? 0) as int)));
+ final result = {};
+ final cursor = await _db.queryCursor(dateTakenTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ final row = cursor.current;
+ result[row['id'] as int] = row['dateMillis'] as int? ?? 0;
+ }
+ return result;
}
// catalog metadata
@@ -292,8 +303,12 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadCatalogMetadata() async {
- final rows = await _db.query(metadataTable);
- return rows.map(CatalogMetadata.fromMap).toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(metadataTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(CatalogMetadata.fromMap(cursor.current));
+ }
+ return result;
}
@override
@@ -351,8 +366,12 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAddresses() async {
- final rows = await _db.query(addressTable);
- return rows.map(AddressDetails.fromMap).toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(addressTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(AddressDetails.fromMap(cursor.current));
+ }
+ return result;
}
@override
@@ -395,8 +414,12 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAllVaults() async {
- final rows = await _db.query(vaultTable);
- return rows.map(VaultDetails.fromMap).toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(vaultTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(VaultDetails.fromMap(cursor.current));
+ }
+ return result;
}
@override
@@ -443,8 +466,12 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAllTrashDetails() async {
- final rows = await _db.query(trashTable);
- return rows.map(TrashDetails.fromMap).toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(trashTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(TrashDetails.fromMap(cursor.current));
+ }
+ return result;
}
@override
@@ -474,8 +501,12 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAllFavourites() async {
- final rows = await _db.query(favouriteTable);
- return rows.map(FavouriteRow.fromMap).toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(favouriteTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(FavouriteRow.fromMap(cursor.current));
+ }
+ return result;
}
@override
@@ -524,8 +555,15 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAllCovers() async {
- final rows = await _db.query(coverTable);
- return rows.map(CoverRow.fromMap).whereNotNull().toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(coverTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ final row = CoverRow.fromMap(cursor.current);
+ if (row != null) {
+ result.add(row);
+ }
+ }
+ return result;
}
@override
@@ -587,14 +625,19 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
@override
Future> loadAllVideoPlayback() async {
- final rows = await _db.query(videoPlaybackTable);
- return rows.map(VideoPlaybackRow.fromMap).whereNotNull().toSet();
+ final result = {};
+ final cursor = await _db.queryCursor(videoPlaybackTable, bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ final row = VideoPlaybackRow.fromMap(cursor.current);
+ if (row != null) {
+ result.add(row);
+ }
+ }
+ return result;
}
@override
- Future loadVideoPlayback(int? id) async {
- if (id == null) return null;
-
+ Future loadVideoPlayback(int id) async {
final rows = await _db.query(videoPlaybackTable, where: 'id = ?', whereArgs: [id]);
if (rows.isEmpty) return null;
@@ -631,11 +674,13 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
// convenience methods
Future> _getByIds(Set ids, String table, T Function(Map row) mapRow) async {
- if (ids.isEmpty) return {};
- final rows = await _db.query(
- table,
- where: 'id IN (${ids.join(',')})',
- );
- return rows.map(mapRow).toSet();
+ final result = {};
+ if (ids.isNotEmpty) {
+ final cursor = await _db.queryCursor(table, where: 'id IN (${ids.join(',')})', bufferSize: _queryCursorBufferSize);
+ while (await cursor.moveNext()) {
+ result.add(mapRow(cursor.current));
+ }
+ }
+ return result;
}
}
diff --git a/lib/model/db/db_sqflite_upgrade.dart b/lib/model/db/db_sqflite_upgrade.dart
index 69c4055b8..d9b902698 100644
--- a/lib/model/db/db_sqflite_upgrade.dart
+++ b/lib/model/db/db_sqflite_upgrade.dart
@@ -1,5 +1,4 @@
import 'package:aves/model/db/db_sqflite.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
import 'package:sqflite/sqflite.dart';
@@ -338,11 +337,11 @@ class LocalMediaDbUpgrader {
// clean duplicates introduced before Aves v1.7.1
final duplicatedContentIdRows = await db.query(entryTable, columns: ['contentId'], groupBy: 'contentId', having: 'COUNT(id) > 1 AND contentId IS NOT NULL');
- final duplicatedContentIds = duplicatedContentIdRows.map((row) => row['contentId'] as int?).whereNotNull().toSet();
+ final duplicatedContentIds = duplicatedContentIdRows.map((row) => row['contentId'] as int?).nonNulls.toSet();
final duplicateIds = {};
await Future.forEach(duplicatedContentIds, (contentId) async {
final rows = await db.query(entryTable, columns: ['id'], where: 'contentId = ?', whereArgs: [contentId]);
- final ids = rows.map((row) => row['id'] as int?).whereNotNull().toList()..sort();
+ final ids = rows.map((row) => row['id'] as int?).nonNulls.toList()..sort();
if (ids.length > 1) {
ids.removeAt(0);
duplicateIds.addAll(ids);
diff --git a/lib/model/entry/entry.dart b/lib/model/entry/entry.dart
index 8d1e3c3d2..0a3f6ab98 100644
--- a/lib/model/entry/entry.dart
+++ b/lib/model/entry/entry.dart
@@ -12,8 +12,8 @@ import 'package:aves/theme/format.dart';
import 'package:aves/utils/time_utils.dart';
import 'package:aves_model/aves_model.dart';
import 'package:aves_utils/aves_utils.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
+import 'package:leak_tracker/leak_tracker.dart';
enum EntryDataType { basic, aspectRatio, catalog, address, references }
@@ -73,7 +73,7 @@ class AvesEntry with AvesEntryBase {
this.stackedEntries,
}) : id = id ?? 0 {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectCreated(
+ LeakTracking.dispatchObjectCreated(
library: 'aves',
className: '$AvesEntry',
object: this,
@@ -189,7 +189,7 @@ class AvesEntry with AvesEntryBase {
void dispose() {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectDisposed(object: this);
+ LeakTracking.dispatchObjectDisposed(object: this);
}
visualChangeNotifier.dispose();
metadataChangeNotifier.dispose();
@@ -392,7 +392,7 @@ class AvesEntry with AvesEntryBase {
_addressDetails?.countryName,
_addressDetails?.adminArea,
_addressDetails?.locality,
- }.whereNotNull().where((v) => v.isNotEmpty).join(', ');
+ }.nonNulls.where((v) => v.isNotEmpty).join(', ');
}
Future applyNewFields(Map newFields, {required bool persist}) async {
@@ -461,17 +461,17 @@ class AvesEntry with AvesEntryBase {
}
Future delete() {
- final completer = Completer();
+ final opCompleter = Completer();
mediaEditService.delete(entries: {this}).listen(
- (event) => completer.complete(event.success && !event.skipped),
- onError: completer.completeError,
+ (event) => opCompleter.complete(event.success && !event.skipped),
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) {
- completer.complete(false);
+ if (!opCompleter.isCompleted) {
+ opCompleter.complete(false);
}
},
);
- return completer.future;
+ return opCompleter.future;
}
// when the MIME type or the image itself changed (e.g. after rotation)
diff --git a/lib/model/entry/extensions/info.dart b/lib/model/entry/extensions/info.dart
index 0b2f9deda..5c001d865 100644
--- a/lib/model/entry/extensions/info.dart
+++ b/lib/model/entry/extensions/info.dart
@@ -141,7 +141,7 @@ extension ExtraAvesEntryInfo on AvesEntry {
final rawTags = formatCount.map((key, value) {
final count = value.length;
// remove duplicate names, so number of displayed names may not match displayed count
- final names = value.whereNotNull().toSet().toList()..sort(compareAsciiUpperCase);
+ final names = value.nonNulls.toSet().toList()..sort(compareAsciiUpperCase);
return MapEntry(key, '$count items: ${names.join(', ')}');
});
directories.add(MetadataDirectory('Attachments', _toSortedTags(rawTags)));
@@ -157,7 +157,7 @@ extension ExtraAvesEntryInfo on AvesEntry {
if (value.isEmpty) return null;
final tagName = tagKV.key as String;
return MapEntry(tagName, value);
- }).whereNotNull()));
+ }).nonNulls));
return tags;
}
}
diff --git a/lib/model/favourites.dart b/lib/model/favourites.dart
index 19c85c78c..b54bff4ef 100644
--- a/lib/model/favourites.dart
+++ b/lib/model/favourites.dart
@@ -12,7 +12,9 @@ final Favourites favourites = Favourites._private();
class Favourites with ChangeNotifier {
Set _rows = {};
- Favourites._private();
+ Favourites._private() {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
+ }
Future init() async {
_rows = await localMediaDb.loadAllFavourites();
@@ -58,7 +60,7 @@ class Favourites with ChangeNotifier {
Map>? export(CollectionSource source) {
final visibleEntries = source.visibleEntries;
final ids = favourites.all;
- final paths = visibleEntries.where((entry) => ids.contains(entry.id)).map((entry) => entry.path).whereNotNull().toSet();
+ final paths = visibleEntries.where((entry) => ids.contains(entry.id)).map((entry) => entry.path).nonNulls.toSet();
final byVolume = groupBy(paths, androidFileUtils.getStorageVolume);
final jsonMap = Map.fromEntries(byVolume.entries.map((kv) {
final volume = kv.key?.path;
@@ -66,7 +68,7 @@ class Favourites with ChangeNotifier {
final rootLength = volume.length;
final relativePaths = kv.value.map((v) => v.substring(rootLength)).toList();
return MapEntry(volume, relativePaths);
- }).whereNotNull());
+ }).nonNulls);
return jsonMap.isNotEmpty ? jsonMap : null;
}
diff --git a/lib/model/filters/or.dart b/lib/model/filters/or.dart
index 2b6c8d83f..ea4876e3d 100644
--- a/lib/model/filters/or.dart
+++ b/lib/model/filters/or.dart
@@ -35,7 +35,7 @@ class OrFilter extends CollectionFilter {
factory OrFilter.fromMap(Map json) {
return OrFilter(
- (json['filters'] as List).cast().map(CollectionFilter.fromJson).whereNotNull().toSet(),
+ (json['filters'] as List).cast().map(CollectionFilter.fromJson).nonNulls.toSet(),
reversed: json['reversed'] ?? false,
);
}
diff --git a/lib/model/highlight.dart b/lib/model/highlight.dart
index 7a9c94de0..2d372eb4a 100644
--- a/lib/model/highlight.dart
+++ b/lib/model/highlight.dart
@@ -5,6 +5,10 @@ import 'package:flutter/painting.dart';
class HighlightInfo extends ChangeNotifier {
final EventBus eventBus = EventBus();
+ HighlightInfo() {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
+ }
+
void trackItem(
T? item, {
TrackPredicate? predicate,
diff --git a/lib/model/multipage.dart b/lib/model/multipage.dart
index b8dcbb0aa..ceec4592b 100644
--- a/lib/model/multipage.dart
+++ b/lib/model/multipage.dart
@@ -4,6 +4,7 @@ import 'package:aves/ref/mime_types.dart';
import 'package:aves/services/common/services.dart';
import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
+import 'package:leak_tracker/leak_tracker.dart';
class MultiPageInfo {
final AvesEntry mainEntry;
@@ -18,7 +19,7 @@ class MultiPageInfo {
required List pages,
}) : _pages = pages {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectCreated(
+ LeakTracking.dispatchObjectCreated(
library: 'aves',
className: '$MultiPageInfo',
object: this,
@@ -44,7 +45,7 @@ class MultiPageInfo {
void dispose() {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectDisposed(object: this);
+ LeakTracking.dispatchObjectDisposed(object: this);
}
_transientEntries.forEach((entry) => entry.dispose());
}
diff --git a/lib/model/naming_pattern.dart b/lib/model/naming_pattern.dart
index 2305f94c2..24882eeb9 100644
--- a/lib/model/naming_pattern.dart
+++ b/lib/model/naming_pattern.dart
@@ -210,7 +210,7 @@ class MetadataFieldNamingProcessor extends NamingProcessor {
}
@override
- Set getRequiredFields() => {field}.whereNotNull().toSet();
+ Set getRequiredFields() => {field}.nonNulls.toSet();
@override
String? process(AvesEntry entry, int index, Map fieldValues) {
@@ -268,7 +268,7 @@ class HashNamingProcessor extends NamingProcessor {
}
@override
- Set getRequiredFields() => {function}.whereNotNull().toSet();
+ Set getRequiredFields() => {function}.nonNulls.toSet();
@override
String? process(AvesEntry entry, int index, Map fieldValues) {
diff --git a/lib/model/query.dart b/lib/model/query.dart
index 518d6941f..fa468f129 100644
--- a/lib/model/query.dart
+++ b/lib/model/query.dart
@@ -9,6 +9,7 @@ class Query extends ChangeNotifier {
final StreamController _enabledStreamController = StreamController.broadcast();
Query({required bool enabled, required String? initialValue}) {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
_enabled = enabled;
if (initialValue != null && initialValue.isNotEmpty) {
_enabled = true;
diff --git a/lib/model/selection.dart b/lib/model/selection.dart
index b49ffdc0d..fbb6014b7 100644
--- a/lib/model/selection.dart
+++ b/lib/model/selection.dart
@@ -9,6 +9,10 @@ class Selection extends ChangeNotifier {
Set get selectedItems => _selectedItems;
+ Selection() {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
+ }
+
void browse() {
if (!_isSelecting) return;
_isSelecting = false;
diff --git a/lib/model/settings/modules/app.dart b/lib/model/settings/modules/app.dart
index 60f968d21..2b9caa141 100644
--- a/lib/model/settings/modules/app.dart
+++ b/lib/model/settings/modules/app.dart
@@ -1,13 +1,17 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/settings/defaults.dart';
+import 'package:aves/model/vaults/vaults.dart';
import 'package:aves/widgets/aves_app.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/widgets.dart';
mixin AppSettings on SettingsAccess {
static const int recentFilterHistoryMax = 20;
+ void initAppSettings() {
+ vaults.addListener(_onVaultsChanged);
+ }
+
bool get hasAcceptedTerms => getBool(SettingKeys.hasAcceptedTermsKey) ?? SettingsDefaults.hasAcceptedTerms;
set hasAcceptedTerms(bool newValue) => set(SettingKeys.hasAcceptedTermsKey, newValue);
@@ -99,15 +103,32 @@ mixin AppSettings on SettingsAccess {
set entryRenamingPattern(String newValue) => set(SettingKeys.entryRenamingPatternKey, newValue);
- List? get topEntryIds => getStringList(SettingKeys.topEntryIdsKey)?.map(int.tryParse).whereNotNull().toList();
+ List? get topEntryIds => getStringList(SettingKeys.topEntryIdsKey)?.map(int.tryParse).nonNulls.toList();
- set topEntryIds(List? newValue) => set(SettingKeys.topEntryIdsKey, newValue?.map((id) => id.toString()).whereNotNull().toList());
+ set topEntryIds(List? newValue) => set(SettingKeys.topEntryIdsKey, newValue?.map((id) => id.toString()).nonNulls.toList());
List get recentDestinationAlbums => getStringList(SettingKeys.recentDestinationAlbumsKey) ?? [];
set recentDestinationAlbums(List newValue) => set(SettingKeys.recentDestinationAlbumsKey, newValue.take(recentFilterHistoryMax).toList());
- List get recentTags => (getStringList(SettingKeys.recentTagsKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toList();
+ // recent tags
+
+ List get _recentTags => (getStringList(SettingKeys.recentTagsKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toList();
+
+ set _recentTags(List newValue) => set(SettingKeys.recentTagsKey, newValue.take(recentFilterHistoryMax).map((filter) => filter.toJson()).toList());
+
+ // when vaults are unlocked, recent tags are transient and not persisted
+ List? _protectedRecentTags;
+
+ List get recentTags => vaults.needProtection ? _protectedRecentTags ?? List.of(_recentTags) : _recentTags;
+
+ set recentTags(List newValue) {
+ if (vaults.needProtection) {
+ _protectedRecentTags = newValue;
+ } else {
+ _recentTags = newValue;
+ }
+ }
- set recentTags(List newValue) => set(SettingKeys.recentTagsKey, newValue.take(recentFilterHistoryMax).map((filter) => filter.toJson()).toList());
+ void _onVaultsChanged() => _protectedRecentTags = null;
}
diff --git a/lib/model/settings/modules/filter_grids.dart b/lib/model/settings/modules/filter_grids.dart
index 4fa6482c5..d2a7064f7 100644
--- a/lib/model/settings/modules/filter_grids.dart
+++ b/lib/model/settings/modules/filter_grids.dart
@@ -1,7 +1,6 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/settings/defaults.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
mixin FilterGridsSettings on SettingsAccess {
AlbumChipGroupFactor get albumGroupFactor => getEnumOrDefault(SettingKeys.albumGroupFactorKey, SettingsDefaults.albumGroupFactor, AlbumChipGroupFactor.values);
@@ -48,7 +47,7 @@ mixin FilterGridsSettings on SettingsAccess {
set tagSortReverse(bool newValue) => set(SettingKeys.tagSortReverseKey, newValue);
- Set get pinnedFilters => (getStringList(SettingKeys.pinnedFiltersKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set get pinnedFilters => (getStringList(SettingKeys.pinnedFiltersKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
set pinnedFilters(Set newValue) => set(SettingKeys.pinnedFiltersKey, newValue.map((filter) => filter.toJson()).toList());
diff --git a/lib/model/settings/modules/navigation.dart b/lib/model/settings/modules/navigation.dart
index a2c6969a5..2f6eca490 100644
--- a/lib/model/settings/modules/navigation.dart
+++ b/lib/model/settings/modules/navigation.dart
@@ -1,7 +1,6 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/settings/defaults.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
mixin NavigationSettings on SettingsAccess {
bool get mustBackTwiceToExit => getBool(SettingKeys.mustBackTwiceToExitKey) ?? SettingsDefaults.mustBackTwiceToExit;
@@ -14,7 +13,7 @@ mixin NavigationSettings on SettingsAccess {
HomePageSetting get homePage => getEnumOrDefault(SettingKeys.homePageKey, SettingsDefaults.homePage, HomePageSetting.values);
- Set get homeCustomCollection => (getStringList(SettingKeys.homeCustomCollectionKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set get homeCustomCollection => (getStringList(SettingKeys.homeCustomCollectionKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
String? get homeCustomExplorerPath => getString(SettingKeys.homeCustomExplorerPathKey);
diff --git a/lib/model/settings/modules/privacy.dart b/lib/model/settings/modules/privacy.dart
index c9c2ff926..a6408b826 100644
--- a/lib/model/settings/modules/privacy.dart
+++ b/lib/model/settings/modules/privacy.dart
@@ -1,10 +1,9 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/settings/modules/search.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
mixin PrivacySettings on SettingsAccess, SearchSettings {
- Set get hiddenFilters => (getStringList(SettingKeys.hiddenFiltersKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set get hiddenFilters => (getStringList(SettingKeys.hiddenFiltersKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
set hiddenFilters(Set newValue) => set(SettingKeys.hiddenFiltersKey, newValue.map((filter) => filter.toJson()).toList());
@@ -24,7 +23,7 @@ mixin PrivacySettings on SettingsAccess, SearchSettings {
hiddenFilters = _hiddenFilters;
}
- Set get deactivatedHiddenFilters => (getStringList(SettingKeys.deactivatedHiddenFiltersKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set get deactivatedHiddenFilters => (getStringList(SettingKeys.deactivatedHiddenFiltersKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
set deactivatedHiddenFilters(Set newValue) => set(SettingKeys.deactivatedHiddenFiltersKey, newValue.map((filter) => filter.toJson()).toList());
diff --git a/lib/model/settings/modules/search.dart b/lib/model/settings/modules/search.dart
index a6dba9bee..3a5ff94cb 100644
--- a/lib/model/settings/modules/search.dart
+++ b/lib/model/settings/modules/search.dart
@@ -1,14 +1,13 @@
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/settings/defaults.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
mixin SearchSettings on SettingsAccess {
bool get saveSearchHistory => getBool(SettingKeys.saveSearchHistoryKey) ?? SettingsDefaults.saveSearchHistory;
set saveSearchHistory(bool newValue) => set(SettingKeys.saveSearchHistoryKey, newValue);
- List get searchHistory => (getStringList(SettingKeys.searchHistoryKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toList();
+ List get searchHistory => (getStringList(SettingKeys.searchHistoryKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toList();
set searchHistory(List newValue) => set(SettingKeys.searchHistoryKey, newValue.map((filter) => filter.toJson()).toList());
}
diff --git a/lib/model/settings/settings.dart b/lib/model/settings/settings.dart
index e9e1ff4fa..40804ec4f 100644
--- a/lib/model/settings/settings.dart
+++ b/lib/model/settings/settings.dart
@@ -33,8 +33,8 @@ import 'package:aves_utils/aves_utils.dart';
import 'package:aves_video/aves_video.dart';
import 'package:collection/collection.dart';
import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
import 'package:latlong2/latlong.dart';
final Settings settings = Settings._private();
@@ -56,7 +56,9 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
@override
SettingsStore get store => settingsStore;
- Settings._private();
+ Settings._private() {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
+ }
Future init({required bool monitorPlatformSettings}) async {
await store.init();
@@ -67,6 +69,7 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
..clear();
_subscriptions.add(_platformSettingsChangeChannel.receiveBroadcastStream().listen((event) => _onPlatformSettingsChanged(event as Map?)));
}
+ initAppSettings();
}
Future reload() => store.reload();
@@ -130,7 +133,7 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
viewerGestureSideTapNext = false;
viewerUseCutout = true;
videoBackgroundMode = VideoBackgroundMode.disabled;
- videoControls = VideoControls.none;
+ videoControlActions = [];
videoGestureDoubleTapTogglePlay = false;
videoGestureSideDoubleTapSeek = false;
enableBin = false;
@@ -243,7 +246,7 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
set screenSaverInterval(int newValue) => set(SettingKeys.screenSaverIntervalKey, newValue);
- Set get screenSaverCollectionFilters => (getStringList(SettingKeys.screenSaverCollectionFiltersKey) ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set get screenSaverCollectionFilters => (getStringList(SettingKeys.screenSaverCollectionFiltersKey) ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
set screenSaverCollectionFilters(Set newValue) => set(SettingKeys.screenSaverCollectionFiltersKey, newValue.map((filter) => filter.toJson()).toList());
@@ -287,7 +290,7 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
void setWidgetShape(int widgetId, WidgetShape newValue) => set('${SettingKeys.widgetShapePrefixKey}$widgetId', newValue.toString());
- Set getWidgetCollectionFilters(int widgetId) => (getStringList('${SettingKeys.widgetCollectionFiltersPrefixKey}$widgetId') ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ Set getWidgetCollectionFilters(int widgetId) => (getStringList('${SettingKeys.widgetCollectionFiltersPrefixKey}$widgetId') ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
void setWidgetCollectionFilters(int widgetId, Set newValue) => set('${SettingKeys.widgetCollectionFiltersPrefixKey}$widgetId', newValue.map((filter) => filter.toJson()).toList());
@@ -456,7 +459,6 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
case SettingKeys.videoBackgroundModeKey:
case SettingKeys.videoLoopModeKey:
case SettingKeys.videoResumptionModeKey:
- case SettingKeys.videoControlsKey:
case SettingKeys.subtitleTextAlignmentKey:
case SettingKeys.subtitleTextPositionKey:
case SettingKeys.tagEditorExpandedSectionKey:
@@ -487,6 +489,7 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
case SettingKeys.collectionBrowsingQuickActionsKey:
case SettingKeys.collectionSelectionQuickActionsKey:
case SettingKeys.viewerQuickActionsKey:
+ case SettingKeys.videoControlActionsKey:
case SettingKeys.screenSaverCollectionFiltersKey:
if (newValue is List) {
store.setStringList(key, newValue.cast());
diff --git a/lib/model/source/album.dart b/lib/model/source/album.dart
index cf9bbc565..859d4ad5c 100644
--- a/lib/model/source/album.dart
+++ b/lib/model/source/album.dart
@@ -71,7 +71,7 @@ mixin AlbumMixin on SourceBase {
void addDirectories({required Set albums, bool notify = true}) {
if (!_directories.containsAll(albums)) {
- _directories.addAll(albums.whereNotNull());
+ _directories.addAll(albums.nonNulls);
_onAlbumChanged(notify: notify);
}
}
@@ -119,7 +119,7 @@ mixin AlbumMixin on SourceBase {
} else {
directories ??= {};
if (entries != null) {
- directories.addAll(entries.map((entry) => entry.directory).whereNotNull());
+ directories.addAll(entries.map((entry) => entry.directory).nonNulls);
}
directories.forEach((directory) {
_filterEntryCountMap.remove(directory);
@@ -202,7 +202,7 @@ mixin AlbumMixin on SourceBase {
return dirPath;
}
- final otherAlbumsOnDevice = _directories.whereNotNull().where((item) => item != dirPath).map((v) => v.toLowerCase()).toSet();
+ final otherAlbumsOnDevice = _directories.nonNulls.where((item) => item != dirPath).map((v) => v.toLowerCase()).toSet();
final uniqueNameInDevice = unique(dirPath, otherAlbumsOnDevice);
if (uniqueNameInDevice.length <= relativeDir.length) {
return uniqueNameInDevice;
diff --git a/lib/model/source/analysis_controller.dart b/lib/model/source/analysis_controller.dart
index cf7288180..1efde196f 100644
--- a/lib/model/source/analysis_controller.dart
+++ b/lib/model/source/analysis_controller.dart
@@ -1,4 +1,5 @@
import 'package:flutter/foundation.dart';
+import 'package:leak_tracker/leak_tracker.dart';
class AnalysisController {
final bool canStartService, force;
@@ -15,7 +16,7 @@ class AnalysisController {
this.progressOffset = 0,
}) {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectCreated(
+ LeakTracking.dispatchObjectCreated(
library: 'aves',
className: '$AnalysisController',
object: this,
@@ -25,7 +26,7 @@ class AnalysisController {
void dispose() {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectDisposed(object: this);
+ LeakTracking.dispatchObjectDisposed(object: this);
}
_stopSignal.dispose();
}
diff --git a/lib/model/source/collection_lens.dart b/lib/model/source/collection_lens.dart
index d0f8d88f0..f7976bdca 100644
--- a/lib/model/source/collection_lens.dart
+++ b/lib/model/source/collection_lens.dart
@@ -54,11 +54,12 @@ class CollectionLens with ChangeNotifier {
this.stackDevelopedRaws = true,
this.fixedSort = false,
this.fixedSelection,
- }) : filters = (filters ?? {}).whereNotNull().toSet(),
+ }) : filters = (filters ?? {}).nonNulls.toSet(),
burstPatterns = settings.collectionBurstPatterns,
sectionFactor = settings.collectionSectionFactor,
sortFactor = settings.collectionSortFactor,
sortReverse = settings.collectionSortReverse {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
id ??= hashCode;
if (listenToSource) {
final sourceEvents = source.eventBus;
diff --git a/lib/model/source/collection_source.dart b/lib/model/source/collection_source.dart
index 54650baa3..6ea63b1b2 100644
--- a/lib/model/source/collection_source.dart
+++ b/lib/model/source/collection_source.dart
@@ -30,8 +30,9 @@ import 'package:aves_model/aves_model.dart';
import 'package:collection/collection.dart';
import 'package:event_bus/event_bus.dart';
import 'package:flutter/foundation.dart';
+import 'package:leak_tracker/leak_tracker.dart';
-enum SourceScope { none, album, full }
+typedef SourceScope = Set?;
mixin SourceBase {
EventBus get eventBus;
@@ -62,9 +63,11 @@ mixin SourceBase {
}
abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, PlaceMixin, StateMixin, LocationMixin, TagMixin, TrashMixin {
+ static const fullScope = {};
+
CollectionSource() {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectCreated(
+ LeakTracking.dispatchObjectCreated(
library: 'aves',
className: '$CollectionSource',
object: this,
@@ -74,22 +77,20 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
settings.updateStream.where((event) => event.key == SettingKeys.hiddenFiltersKey).listen((event) {
final oldValue = event.oldValue;
if (oldValue is List?) {
- final oldHiddenFilters = (oldValue ?? []).map(CollectionFilter.fromJson).whereNotNull().toSet();
+ final oldHiddenFilters = (oldValue ?? []).map(CollectionFilter.fromJson).nonNulls.toSet();
final newlyVisibleFilters = oldHiddenFilters.whereNot(settings.hiddenFilters.contains).toSet();
_onFilterVisibilityChanged(newlyVisibleFilters);
}
});
- vaults.addListener(() {
- final newlyVisibleFilters = vaults.vaultDirectories.whereNot(vaults.isLocked).map((v) => AlbumFilter(v, null)).toSet();
- _onFilterVisibilityChanged(newlyVisibleFilters);
- });
+ vaults.addListener(_onVaultsChanged);
}
@mustCallSuper
void dispose() {
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectDisposed(object: this);
+ LeakTracking.dispatchObjectDisposed(object: this);
}
+ vaults.removeListener(_onVaultsChanged);
_rawEntries.forEach((v) => v.dispose());
}
@@ -337,7 +338,7 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
final existingEntry = _rawEntries.firstWhereOrNull((entry) => entry.path == targetPath && !entry.trashed);
return existingEntry?.uri;
})
- .whereNotNull()
+ .nonNulls
.toSet();
await removeEntries(replacedUris, includeTrash: false);
@@ -367,8 +368,8 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
}
});
await localMediaDb.insertEntries(movedEntries);
- await localMediaDb.saveCatalogMetadata(movedEntries.map((entry) => entry.catalogMetadata).whereNotNull().toSet());
- await localMediaDb.saveAddresses(movedEntries.map((entry) => entry.addressDetails).whereNotNull().toSet());
+ await localMediaDb.saveCatalogMetadata(movedEntries.map((entry) => entry.catalogMetadata).nonNulls.toSet());
+ await localMediaDb.saveAddresses(movedEntries.map((entry) => entry.addressDetails).nonNulls.toSet());
} else {
await Future.forEach(movedOps, (movedOp) async {
final newFields = movedOp.newFields;
@@ -393,7 +394,7 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
addEntries(movedEntries);
case MoveType.move:
case MoveType.export:
- cleanEmptyAlbums(fromAlbums.whereNotNull().toSet());
+ cleanEmptyAlbums(fromAlbums.nonNulls.toSet());
addDirectories(albums: destinationAlbums);
case MoveType.toBin:
case MoveType.fromBin:
@@ -427,11 +428,13 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
eventBus.fire(EntryMovedEvent(MoveType.move, movedEntries));
}
- SourceScope get scope => SourceScope.none;
+ SourceScope get loadedScope;
+
+ SourceScope get targetScope;
Future init({
+ required SourceScope scope,
AnalysisController? analysisController,
- AlbumFilter? albumFilter,
bool loadTopEntriesFirst = false,
});
@@ -593,6 +596,11 @@ abstract class CollectionSource with SourceBase, AlbumMixin, CountryMixin, Place
analyze(null, entries: candidateEntries);
}
}
+
+ void _onVaultsChanged() {
+ final newlyVisibleFilters = vaults.vaultDirectories.whereNot(vaults.isLocked).map((v) => AlbumFilter(v, null)).toSet();
+ _onFilterVisibilityChanged(newlyVisibleFilters);
+ }
}
class AspectRatioChangedEvent {}
diff --git a/lib/model/source/location/country.dart b/lib/model/source/location/country.dart
index a8128dc43..bf1b7264a 100644
--- a/lib/model/source/location/country.dart
+++ b/lib/model/source/location/country.dart
@@ -23,7 +23,7 @@ mixin CountryMixin on SourceBase {
} else {
countryCodes ??= {};
if (entries != null) {
- countryCodes.addAll(entries.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.countryCode).whereNotNull());
+ countryCodes.addAll(entries.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.countryCode).nonNulls);
}
countryCodes.forEach((countryCode) {
_filterEntryCountMap.remove(countryCode);
diff --git a/lib/model/source/location/location.dart b/lib/model/source/location/location.dart
index bfa00b1fb..d2af8780c 100644
--- a/lib/model/source/location/location.dart
+++ b/lib/model/source/location/location.dart
@@ -152,9 +152,9 @@ mixin LocationMixin on CountryMixin, StateMixin {
}
void updateLocations() {
- final locations = visibleEntries.map((entry) => entry.addressDetails).whereNotNull().toList();
+ final locations = visibleEntries.map((entry) => entry.addressDetails).nonNulls.toList();
- final updatedPlaces = locations.map((address) => address.place).whereNotNull().where((v) => v.isNotEmpty).toSet().toList()..sort(compareAsciiUpperCase);
+ final updatedPlaces = locations.map((address) => address.place).nonNulls.where((v) => v.isNotEmpty).toSet().toList()..sort(compareAsciiUpperCase);
if (!listEquals(updatedPlaces, sortedPlaces)) {
sortedPlaces = List.unmodifiable(updatedPlaces);
eventBus.fire(PlacesChangedEvent());
@@ -195,7 +195,7 @@ mixin LocationMixin on CountryMixin, StateMixin {
final code = getCode(address);
if (code == null || code.isEmpty) return null;
return MapEntry(code, getName(address));
- }).whereNotNull());
+ }).nonNulls);
return namesByCode.entries.map((kv) {
final code = kv.key;
final name = kv.value;
diff --git a/lib/model/source/location/place.dart b/lib/model/source/location/place.dart
index aad3f9824..3b518a182 100644
--- a/lib/model/source/location/place.dart
+++ b/lib/model/source/location/place.dart
@@ -23,7 +23,7 @@ mixin PlaceMixin on SourceBase {
} else {
places ??= {};
if (entries != null) {
- places.addAll(entries.map((entry) => entry.addressDetails?.place).whereNotNull());
+ places.addAll(entries.map((entry) => entry.addressDetails?.place).nonNulls);
}
places.forEach((place) {
_filterEntryCountMap.remove(place);
diff --git a/lib/model/source/location/state.dart b/lib/model/source/location/state.dart
index 67ce98bda..bfadc9568 100644
--- a/lib/model/source/location/state.dart
+++ b/lib/model/source/location/state.dart
@@ -23,7 +23,7 @@ mixin StateMixin on SourceBase {
} else {
stateCodes ??= {};
if (entries != null) {
- stateCodes.addAll(entries.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.stateCode).whereNotNull());
+ stateCodes.addAll(entries.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.stateCode).nonNulls);
}
stateCodes.forEach((stateCode) {
_filterEntryCountMap.remove(stateCode);
diff --git a/lib/model/source/media_store_source.dart b/lib/model/source/media_store_source.dart
index 4b3f12e08..88acbcaed 100644
--- a/lib/model/source/media_store_source.dart
+++ b/lib/model/source/media_store_source.dart
@@ -21,33 +21,33 @@ class MediaStoreSource extends CollectionSource {
final Debouncer _changeDebouncer = Debouncer(delay: ADurations.mediaContentChangeDebounceDelay);
final Set _changedUris = {};
int? _lastGeneration;
- SourceScope _scope = SourceScope.none;
+ SourceScope _loadedScope, _targetScope;
bool _canAnalyze = true;
+ Future? _essentialLoader;
@override
set canAnalyze(bool enabled) => _canAnalyze = enabled;
@override
- SourceScope get scope => _scope;
+ SourceScope get loadedScope => _loadedScope;
+
+ @override
+ SourceScope get targetScope => _targetScope;
@override
Future init({
+ required SourceScope scope,
AnalysisController? analysisController,
- AlbumFilter? albumFilter,
bool loadTopEntriesFirst = false,
}) async {
- await reportService.log('$runtimeType init album=${albumFilter?.album}');
- if (_scope == SourceScope.none) {
- await _loadEssentials();
- }
- if (_scope != SourceScope.full) {
- _scope = albumFilter != null ? SourceScope.album : SourceScope.full;
- }
+ _targetScope = scope;
+ await reportService.log('$runtimeType init target scope=$scope');
+ _essentialLoader ??= _loadEssentials();
+ await _essentialLoader;
addDirectories(albums: settings.pinnedFilters.whereType().map((v) => v.album).toSet());
await updateGeneration();
unawaited(_loadEntries(
analysisController: analysisController,
- directory: albumFilter?.album,
loadTopEntriesFirst: loadTopEntriesFirst,
));
}
@@ -63,8 +63,7 @@ class MediaStoreSource extends CollectionSource {
if (currentTimeZoneOffset != null) {
final catalogTimeZoneOffset = settings.catalogTimeZoneRawOffsetMillis;
if (currentTimeZoneOffset != catalogTimeZoneOffset) {
- // clear catalog metadata to get correct date/times when moving to a different time zone
- debugPrint('$runtimeType clear catalog metadata to get correct date/times');
+ unawaited(reportService.log('Time zone offset change: $currentTimeZoneOffset -> $catalogTimeZoneOffset. Clear catalog metadata to get correct date/times.'));
await localMediaDb.clearDates();
await localMediaDb.clearCatalogMetadata();
settings.catalogTimeZoneRawOffsetMillis = currentTimeZoneOffset;
@@ -76,14 +75,16 @@ class MediaStoreSource extends CollectionSource {
Future _loadEntries({
AnalysisController? analysisController,
- String? directory,
required bool loadTopEntriesFirst,
}) async {
- unawaited(reportService.log('$runtimeType load start'));
+ unawaited(reportService.log('$runtimeType load (known) start'));
final stopwatch = Stopwatch()..start();
state = SourceState.loading;
clearEntries();
+ final scopeAlbumFilters = _targetScope?.whereType();
+ final scopeDirectory = scopeAlbumFilters != null && scopeAlbumFilters.length == 1 ? scopeAlbumFilters.first.album : null;
+
final Set topEntries = {};
if (loadTopEntriesFirst) {
final topIds = settings.topEntryIds?.toSet();
@@ -95,7 +96,7 @@ class MediaStoreSource extends CollectionSource {
}
debugPrint('$runtimeType load ${stopwatch.elapsed} fetch known entries');
- final knownEntries = await localMediaDb.loadEntries(origin: EntryOrigins.mediaStoreContent, directory: directory);
+ final knownEntries = await localMediaDb.loadEntries(origin: EntryOrigins.mediaStoreContent, directory: scopeDirectory);
final knownLiveEntries = knownEntries.where((entry) => !entry.trashed).toSet();
debugPrint('$runtimeType load ${stopwatch.elapsed} check obsolete entries');
@@ -114,18 +115,20 @@ class MediaStoreSource extends CollectionSource {
// add entries without notifying, so that the collection is not refreshed
// with items that may be hidden right away because of their metadata
addEntries(knownEntries, notify: false);
+ // but use album notification without waiting for cataloguing
+ // so that it is more reactive when picking an album in view mode
+ notifyAlbumsChanged();
- await _loadVaultEntries(directory);
+ await _loadVaultEntries(scopeDirectory);
debugPrint('$runtimeType load ${stopwatch.elapsed} load metadata');
- if (directory != null) {
+ if (scopeDirectory != null) {
final ids = knownLiveEntries.map((entry) => entry.id).toSet();
await loadCatalogMetadata(ids: ids);
await loadAddresses(ids: ids);
} else {
await loadCatalogMetadata();
await loadAddresses();
- updateDerivedFilters();
// trash
await loadTrashDetails();
@@ -139,6 +142,7 @@ class MediaStoreSource extends CollectionSource {
onError: (error) => debugPrint('failed to evict expired trash error=$error'),
));
}
+ updateDerivedFilters();
// clean up obsolete entries
if (removedEntries.isNotEmpty) {
@@ -146,20 +150,30 @@ class MediaStoreSource extends CollectionSource {
await localMediaDb.removeIds(removedEntries.map((entry) => entry.id).toSet());
}
- // verify paths because some apps move files without updating their `last modified date`
- debugPrint('$runtimeType load ${stopwatch.elapsed} check obsolete paths');
- final knownPathByContentId = Map.fromEntries(knownLiveEntries.map((entry) => MapEntry(entry.contentId, entry.path)));
- final movedContentIds = (await mediaStoreService.checkObsoletePaths(knownPathByContentId)).toSet();
- movedContentIds.forEach((contentId) {
- // make obsolete by resetting its modified date
- knownDateByContentId[contentId] = 0;
- });
+ _loadedScope = _targetScope;
+ unawaited(reportService.log('$runtimeType load (known) done in ${stopwatch.elapsed.inSeconds}s for ${knownEntries.length} known, ${removedEntries.length} removed'));
- if (!_canAnalyze) {
+ if (_canAnalyze) {
// it can discover new entries only if it can analyze them
+ await _loadNewEntries(
+ analysisController: analysisController,
+ directory: scopeDirectory,
+ knownLiveEntries: knownLiveEntries,
+ knownDateByContentId: knownDateByContentId,
+ );
+ } else {
state = SourceState.ready;
- return;
}
+ }
+
+ Future _loadNewEntries({
+ required AnalysisController? analysisController,
+ required String? directory,
+ required Set knownLiveEntries,
+ required Map knownDateByContentId,
+ }) async {
+ unawaited(reportService.log('$runtimeType load (new) start'));
+ final stopwatch = Stopwatch()..start();
// items to add to the collection
final newEntries = {};
@@ -170,8 +184,18 @@ class MediaStoreSource extends CollectionSource {
newEntries.addAll(await recoverUntrackedTrashItems());
}
+ // verify paths because some apps move files without updating their `last modified date`
+ debugPrint('$runtimeType load ${stopwatch.elapsed} check obsolete paths');
+ final knownPathByContentId = Map.fromEntries(knownLiveEntries.map((entry) => MapEntry(entry.contentId, entry.path)));
+ final movedContentIds = (await mediaStoreService.checkObsoletePaths(knownPathByContentId)).toSet();
+ movedContentIds.forEach((contentId) {
+ // make obsolete by resetting its modified date
+ knownDateByContentId[contentId] = 0;
+ });
+
// fetch new & modified entries
debugPrint('$runtimeType load ${stopwatch.elapsed} fetch new entries');
+ final knownContentIds = knownDateByContentId.keys.toSet();
mediaStoreService.getEntries(knownDateByContentId, directory: directory).listen(
(entry) {
// when discovering modified entry with known content ID,
@@ -220,7 +244,7 @@ class MediaStoreSource extends CollectionSource {
// so we manually notify change for potential home screen filters
notifyAlbumsChanged();
- unawaited(reportService.log('$runtimeType load done in ${stopwatch.elapsed.inSeconds}s for ${knownEntries.length} known, ${newEntries.length} new, ${removedEntries.length} removed'));
+ unawaited(reportService.log('$runtimeType load (new) done in ${stopwatch.elapsed.inSeconds}s for ${newEntries.length} new entries'));
},
onError: (error) => debugPrint('$runtimeType stream error=$error'),
);
@@ -233,7 +257,7 @@ class MediaStoreSource extends CollectionSource {
// sometimes yields an entry with its temporary path: `/data/sec/camera/!@#$%^..._temp.jpg`
@override
Future> refreshUris(Set changedUris, {AnalysisController? analysisController}) async {
- if (_scope == SourceScope.none || !canRefresh || !isReady) return changedUris;
+ if (!canRefresh || _essentialLoader == null || !isReady) return changedUris;
state = SourceState.loading;
@@ -246,11 +270,11 @@ class MediaStoreSource extends CollectionSource {
final contentId = int.tryParse(idString);
if (contentId == null) return null;
return MapEntry(contentId, uri);
- }).whereNotNull());
+ }).nonNulls);
// clean up obsolete entries
final obsoleteContentIds = (await mediaStoreService.checkObsoleteContentIds(changedUriByContentId.keys.toList())).toSet();
- final obsoleteUris = obsoleteContentIds.map((contentId) => changedUriByContentId[contentId]).whereNotNull().toSet();
+ final obsoleteUris = obsoleteContentIds.map((contentId) => changedUriByContentId[contentId]).nonNulls.toSet();
await removeEntries(obsoleteUris, includeTrash: false);
obsoleteContentIds.forEach(changedUriByContentId.remove);
diff --git a/lib/model/source/trash.dart b/lib/model/source/trash.dart
index 03062d80d..f3107cbf5 100644
--- a/lib/model/source/trash.dart
+++ b/lib/model/source/trash.dart
@@ -24,24 +24,24 @@ mixin TrashMixin on SourceBase {
if (expiredEntries.isEmpty) return {};
final processed = {};
- final completer = Completer>();
+ final opCompleter = Completer>();
mediaEditService.delete(entries: expiredEntries).listen(
processed.add,
- onError: completer.completeError,
+ onError: opCompleter.completeError,
onDone: () async {
final successOps = processed.where((e) => e.success).toSet();
final deletedOps = successOps.where((e) => !e.skipped).toSet();
final deletedUris = deletedOps.map((event) => event.uri).toSet();
- completer.complete(deletedUris);
+ opCompleter.complete(deletedUris);
},
);
- return await completer.future;
+ return await opCompleter.future;
}
Future> recoverUntrackedTrashItems() async {
final newEntries = {};
- final knownPaths = allEntries.map((v) => v.trashDetails?.path).whereNotNull().toSet();
+ final knownPaths = allEntries.map((v) => v.trashDetails?.path).nonNulls.toSet();
final untrackedPaths = await storageService.getUntrackedTrashPaths(knownPaths);
if (untrackedPaths.isNotEmpty) {
debugPrint('Recovering ${untrackedPaths.length} untracked bin items');
diff --git a/lib/model/vaults/vaults.dart b/lib/model/vaults/vaults.dart
index 651f08614..a621c2952 100644
--- a/lib/model/vaults/vaults.dart
+++ b/lib/model/vaults/vaults.dart
@@ -8,6 +8,7 @@ import 'package:aves/model/vaults/details.dart';
import 'package:aves/services/common/services.dart';
import 'package:aves_screen_state/aves_screen_state.dart';
import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
@@ -20,7 +21,9 @@ class Vaults extends ChangeNotifier {
static const _fileScheme = 'file';
- Vaults._private();
+ Vaults._private() {
+ if (kFlutterMemoryAllocationsEnabled) ChangeNotifier.maybeDispatchObjectCreation(this);
+ }
Future init() async {
_rows = await localMediaDb.loadAllVaults();
@@ -53,7 +56,7 @@ class Vaults extends ChangeNotifier {
}
Future remove(Set dirPaths) async {
- final details = dirPaths.map(detailsForPath).whereNotNull().toSet();
+ final details = dirPaths.map(detailsForPath).nonNulls.toSet();
if (details.isEmpty) return;
await localMediaDb.removeVaults(details);
@@ -160,7 +163,7 @@ class Vaults extends ChangeNotifier {
final vaultName = detailsForPath(dirPath)?.name;
if (vaultName == null) return newEntries;
- final knownPaths = source.allEntries.where((v) => v.origin == EntryOrigins.vault && v.directory == dirPath).map((v) => v.path).whereNotNull().toSet();
+ final knownPaths = source.allEntries.where((v) => v.origin == EntryOrigins.vault && v.directory == dirPath).map((v) => v.path).nonNulls.toSet();
final untrackedPaths = await storageService.getUntrackedVaultPaths(vaultName, knownPaths);
if (untrackedPaths.isNotEmpty) {
debugPrint('Recovering ${untrackedPaths.length} untracked vault items');
@@ -181,8 +184,10 @@ class Vaults extends ChangeNotifier {
void _onScreenOff() => lock(all.where((v) => v.autoLockScreenOff).map((v) => v.path).toSet());
+ bool get needProtection => _unlockedDirPaths.isNotEmpty;
+
void _onLockStateChanged() {
- windowService.secureScreen(_unlockedDirPaths.isNotEmpty);
+ windowService.secureScreen(needProtection);
notifyListeners();
}
}
diff --git a/lib/ref/metadata/xmp.dart b/lib/ref/metadata/xmp.dart
index 3e8df1d77..311d7a4f7 100644
--- a/lib/ref/metadata/xmp.dart
+++ b/lib/ref/metadata/xmp.dart
@@ -38,6 +38,7 @@ class XmpNamespaces {
static const gFocus = 'http://ns.google.com/photos/1.0/focus/';
static const gImage = 'http://ns.google.com/photos/1.0/image/';
static const gPano = 'http://ns.google.com/photos/1.0/panorama/';
+ static const gPhotoScan = 'http://ns.google.com/photos/1.0/photoscan/';
static const gSpherical = 'http://ns.google.com/videos/1.0/spherical/';
static const gettyImagesGift = 'http://xmp.gettyimages.com/gift/1.0/';
static const gimp210 = 'http://www.gimp.org/ns/2.10/';
diff --git a/lib/services/analysis_service.dart b/lib/services/analysis_service.dart
index f06263480..693199a96 100644
--- a/lib/services/analysis_service.dart
+++ b/lib/services/analysis_service.dart
@@ -5,6 +5,7 @@ import 'package:aves/l10n/l10n.dart';
import 'package:aves/model/device.dart';
import 'package:aves/model/settings/settings.dart';
import 'package:aves/model/source/analysis_controller.dart';
+import 'package:aves/model/source/collection_source.dart';
import 'package:aves/model/source/media_store_source.dart';
import 'package:aves/services/common/services.dart';
import 'package:aves/utils/android_file_utils.dart';
@@ -13,6 +14,7 @@ import 'package:aves_model/aves_model.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
+import 'package:leak_tracker/leak_tracker.dart';
import 'package:permission_handler/permission_handler.dart';
class AnalysisService {
@@ -99,7 +101,7 @@ class Analyzer with WidgetsBindingObserver {
Analyzer() {
debugPrint('$runtimeType create');
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectCreated(
+ LeakTracking.dispatchObjectCreated(
library: 'aves',
className: '$Analyzer',
object: this,
@@ -113,7 +115,7 @@ class Analyzer with WidgetsBindingObserver {
void dispose() {
debugPrint('$runtimeType dispose');
if (kFlutterMemoryAllocationsEnabled) {
- FlutterMemoryAllocations.instance.dispatchObjectDisposed(object: this);
+ LeakTracking.dispatchObjectDisposed(object: this);
}
_stopUpdateTimer();
_controller?.dispose();
@@ -147,7 +149,7 @@ class Analyzer with WidgetsBindingObserver {
settings.systemLocalesFallback = await deviceService.getLocales();
_l10n = await AppLocalizations.delegate.load(settings.appliedLocale);
_serviceStateNotifier.value = AnalyzerState.running;
- await _source.init(analysisController: _controller);
+ await _source.init(scope: CollectionSource.fullScope, analysisController: _controller);
_notificationUpdateTimer = Timer.periodic(notificationUpdateInterval, (_) async {
if (!isRunning) return;
diff --git a/lib/services/app_service.dart b/lib/services/app_service.dart
index 705cc9b2d..9bfb04dc2 100644
--- a/lib/services/app_service.dart
+++ b/lib/services/app_service.dart
@@ -1,11 +1,11 @@
import 'dart:async';
+import 'package:aves/geo/uri.dart';
import 'package:aves/model/app_inventory.dart';
import 'package:aves/model/entry/entry.dart';
import 'package:aves/model/entry/extensions/props.dart';
import 'package:aves/model/filters/filters.dart';
import 'package:aves/services/common/services.dart';
-import 'package:aves/utils/math_utils.dart';
import 'package:collection/collection.dart';
import 'package:flutter/services.dart';
import 'package:latlong2/latlong.dart';
@@ -30,7 +30,15 @@ abstract class AppService {
Future shareSingle(String uri, String mimeType);
- Future pinToHomeScreen(String label, AvesEntry? coverEntry, {Set? filters, String? explorerPath, String? uri});
+ Future pinToHomeScreen(
+ String label,
+ AvesEntry? coverEntry, {
+ required String route,
+ Set? filters,
+ String? path,
+ String? viewUri,
+ String? geoUri,
+ });
}
class PlatformAppService implements AppService {
@@ -96,21 +104,21 @@ class PlatformAppService implements AppService {
@override
Future> edit(String uri, String mimeType) async {
try {
- final completer = Completer();
+ final opCompleter = Completer();
_stream.receiveBroadcastStream({
'op': 'edit',
'uri': uri,
'mimeType': mimeType,
}).listen(
- (data) => completer.complete(data as Map?),
- onError: completer.completeError,
+ (data) => opCompleter.complete(data as Map?),
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) completer.complete({'error': 'cancelled'});
+ if (!opCompleter.isCompleted) opCompleter.complete({'error': 'cancelled'});
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- final result = await completer.future;
+ final result = await opCompleter.future;
if (result == null) return {'error': 'cancelled'};
return result.cast();
} on PlatformException catch (e, stack) {
@@ -138,13 +146,9 @@ class PlatformAppService implements AppService {
@override
Future openMap(LatLng latLng) async {
- final latitude = roundToPrecision(latLng.latitude, decimals: 6);
- final longitude = roundToPrecision(latLng.longitude, decimals: 6);
- final geoUri = 'geo:$latitude,$longitude?q=$latitude,$longitude';
-
try {
final result = await _platform.invokeMethod('openMap', {
- 'geoUri': geoUri,
+ 'geoUri': toGeoUri(latLng),
});
if (result != null) return result as bool;
} on PlatformException catch (e, stack) {
@@ -203,7 +207,15 @@ class PlatformAppService implements AppService {
// app shortcuts
@override
- Future pinToHomeScreen(String label, AvesEntry? coverEntry, {Set? filters, String? explorerPath, String? uri}) async {
+ Future pinToHomeScreen(
+ String label,
+ AvesEntry? coverEntry, {
+ required String route,
+ Set? filters,
+ String? path,
+ String? viewUri,
+ String? geoUri,
+ }) async {
Uint8List? iconBytes;
if (coverEntry != null) {
final size = coverEntry.isVideo ? 0.0 : 256.0;
@@ -221,9 +233,11 @@ class PlatformAppService implements AppService {
await _platform.invokeMethod('pinShortcut', {
'label': label,
'iconBytes': iconBytes,
+ 'route': route,
'filters': filters?.map((filter) => filter.toJson()).toList(),
- 'explorerPath': explorerPath,
- 'uri': uri,
+ 'path': path,
+ 'viewUri': viewUri,
+ 'geoUri': geoUri,
});
} on PlatformException catch (e, stack) {
await reportService.recordError(e, stack);
diff --git a/lib/services/common/service_policy.dart b/lib/services/common/service_policy.dart
index e2535533d..1b53ccc75 100644
--- a/lib/services/common/service_policy.dart
+++ b/lib/services/common/service_policy.dart
@@ -24,32 +24,32 @@ class ServicePolicy {
int priority = ServiceCallPriority.normal,
Object? key,
}) {
- Completer completer;
+ Completer taskCompleter;
_Task task;
key ??= platformCall.hashCode;
final toResume = _paused.remove(key);
if (toResume != null) {
priority = toResume.$1;
task = toResume.$2 as _Task;
- completer = task.completer;
+ taskCompleter = task.completer;
} else {
- completer = Completer();
+ taskCompleter = Completer();
task = _Task(
() async {
try {
- completer.complete(await platformCall());
+ taskCompleter.complete(await platformCall());
} catch (error, stack) {
- completer.completeError(error, stack);
+ taskCompleter.completeError(error, stack);
}
_runningQueue.remove(key);
_pickNext();
},
- completer,
+ taskCompleter,
);
}
_getQueue(priority)[key] = task;
_pickNext();
- return completer.future;
+ return taskCompleter.future;
}
Future? resume(Object key) {
diff --git a/lib/services/intent_service.dart b/lib/services/intent_service.dart
index 51f18940a..9a750d668 100644
--- a/lib/services/intent_service.dart
+++ b/lib/services/intent_service.dart
@@ -3,7 +3,6 @@ import 'dart:async';
import 'package:aves/model/filters/filters.dart';
import 'package:aves/services/app_service.dart';
import 'package:aves/services/common/services.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/services.dart';
import 'package:streams_channel/streams_channel.dart';
@@ -48,23 +47,23 @@ class IntentService {
static Future?> pickCollectionFilters(Set? initialFilters) async {
try {
- final completer = Completer?>();
+ final opCompleter = Completer?>();
_stream.receiveBroadcastStream({
'op': 'pickCollectionFilters',
'initialFilters': initialFilters?.map((filter) => filter.toJson()).toList(),
}).listen(
(data) {
- final result = (data as List?)?.cast().map(CollectionFilter.fromJson).whereNotNull().toSet();
- completer.complete(result);
+ final result = (data as List?)?.cast().map(CollectionFilter.fromJson).nonNulls.toSet();
+ opCompleter.complete(result);
},
- onError: completer.completeError,
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) completer.complete(null);
+ if (!opCompleter.isCompleted) opCompleter.complete(null);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
await reportService.recordError(e, stack);
}
diff --git a/lib/services/media/media_fetch_service.dart b/lib/services/media/media_fetch_service.dart
index 756e1d58e..bdbcca44a 100644
--- a/lib/services/media/media_fetch_service.dart
+++ b/lib/services/media/media_fetch_service.dart
@@ -120,7 +120,7 @@ class PlatformMediaFetchService implements MediaFetchService {
BytesReceivedCallback? onBytesReceived,
}) async {
try {
- final completer = Completer.sync();
+ final opCompleter = Completer();
final sink = OutputBuffer();
var bytesReceived = 0;
_byteStream.receiveBroadcastStream({
@@ -139,20 +139,20 @@ class PlatformMediaFetchService implements MediaFetchService {
try {
onBytesReceived(bytesReceived, sizeBytes);
} catch (error, stack) {
- completer.completeError(error, stack);
+ opCompleter.completeError(error, stack);
return;
}
}
},
- onError: completer.completeError,
+ onError: opCompleter.completeError,
onDone: () {
sink.close();
- completer.complete(sink.bytes);
+ opCompleter.complete(sink.bytes);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
if (_isUnknownVisual(mimeType)) {
await reportService.recordError(e, stack);
diff --git a/lib/services/metadata/metadata_edit_service.dart b/lib/services/metadata/metadata_edit_service.dart
index 463698ac2..7317e55e8 100644
--- a/lib/services/metadata/metadata_edit_service.dart
+++ b/lib/services/metadata/metadata_edit_service.dart
@@ -7,7 +7,6 @@ import 'package:aves/model/metadata/date_modifier.dart';
import 'package:aves/services/common/services.dart';
import 'package:aves_model/aves_model.dart';
import 'package:aves_report/aves_report.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:stack_trace/stack_trace.dart';
@@ -65,7 +64,7 @@ class PlatformMetadataEditService implements MetadataEditService {
'entry': entry.toPlatformEntryMap(),
'dateMillis': modifier.setDateTime?.millisecondsSinceEpoch,
'shiftSeconds': modifier.shiftSeconds,
- 'fields': modifier.fields.where((v) => v.type == MetadataType.exif).map((v) => v.toPlatform).whereNotNull().toList(),
+ 'fields': modifier.fields.where((v) => v.type == MetadataType.exif).map((v) => v.toPlatform).nonNulls.toList(),
});
if (result != null) return (result as Map).cast();
} on PlatformException catch (e, stack) {
diff --git a/lib/services/metadata/svg_metadata_service.dart b/lib/services/metadata/svg_metadata_service.dart
index 0567b1908..f7055f98f 100644
--- a/lib/services/metadata/svg_metadata_service.dart
+++ b/lib/services/metadata/svg_metadata_service.dart
@@ -82,7 +82,7 @@ class SvgMetadataService {
..._textElements.map((name) {
final value = root.getElement(name)?.innerText;
return value != null ? MapEntry(formatKey(name), value) : null;
- }).whereNotNull(),
+ }).nonNulls,
]);
final metadata = root.getElement(_metadataElement);
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
index c97206cda..62589161b 100644
--- a/lib/services/storage_service.dart
+++ b/lib/services/storage_service.dart
@@ -12,6 +12,8 @@ abstract class StorageService {
Future> getStorageVolumes();
+ Future getExternalCacheDirectory();
+
Future> getUntrackedTrashPaths(Iterable knownPaths);
Future> getUntrackedVaultPaths(String vaultName, Iterable knownPaths);
@@ -79,6 +81,19 @@ class PlatformStorageService implements StorageService {
return {};
}
+ @override
+ Future getExternalCacheDirectory() async {
+ try {
+ final result = await _platform.invokeMethod('getCacheDirectory', {
+ 'external': true,
+ });
+ return result as String;
+ } on PlatformException catch (e, stack) {
+ await reportService.recordError(e, stack);
+ }
+ return '';
+ }
+
@override
Future> getUntrackedTrashPaths(Iterable knownPaths) async {
try {
@@ -250,20 +265,20 @@ class PlatformStorageService implements StorageService {
@override
Future requestDirectoryAccess(String path) async {
try {
- final completer = Completer();
+ final opCompleter = Completer();
_stream.receiveBroadcastStream({
'op': 'requestDirectoryAccess',
'path': path,
}).listen(
- (data) => completer.complete(data as bool),
- onError: completer.completeError,
+ (data) => opCompleter.complete(data as bool),
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) completer.complete(false);
+ if (!opCompleter.isCompleted) opCompleter.complete(false);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
await reportService.recordError(e, stack);
}
@@ -274,21 +289,21 @@ class PlatformStorageService implements StorageService {
@override
Future requestMediaFileAccess(List uris, List mimeTypes) async {
try {
- final completer = Completer();
+ final opCompleter = Completer();
_stream.receiveBroadcastStream({
'op': 'requestMediaFileAccess',
'uris': uris,
'mimeTypes': mimeTypes,
}).listen(
- (data) => completer.complete(data as bool),
- onError: completer.completeError,
+ (data) => opCompleter.complete(data as bool),
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) completer.complete(false);
+ if (!opCompleter.isCompleted) opCompleter.complete(false);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
final message = e.message;
// mute issue in the specific case when an item:
@@ -305,22 +320,22 @@ class PlatformStorageService implements StorageService {
@override
Future createFile(String name, String mimeType, Uint8List bytes) async {
try {
- final completer = Completer();
+ final opCompleter = Completer();
_stream.receiveBroadcastStream({
'op': 'createFile',
'name': name,
'mimeType': mimeType,
'bytes': bytes,
}).listen(
- (data) => completer.complete(data as bool?),
- onError: completer.completeError,
+ (data) => opCompleter.complete(data as bool?),
+ onError: opCompleter.completeError,
onDone: () {
- if (!completer.isCompleted) completer.complete(false);
+ if (!opCompleter.isCompleted) opCompleter.complete(false);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
await reportService.recordError(e, stack);
}
@@ -330,7 +345,7 @@ class PlatformStorageService implements StorageService {
@override
Future openFile([String? mimeType]) async {
try {
- final completer = Completer.sync();
+ final opCompleter = Completer();
final sink = OutputBuffer();
_stream.receiveBroadcastStream({
'op': 'openFile',
@@ -340,15 +355,15 @@ class PlatformStorageService implements StorageService {
final chunk = data as Uint8List;
sink.add(chunk);
},
- onError: completer.completeError,
+ onError: opCompleter.completeError,
onDone: () {
sink.close();
- completer.complete(sink.bytes);
+ opCompleter.complete(sink.bytes);
},
cancelOnError: true,
);
// `await` here, so that `completeError` will be caught below
- return await completer.future;
+ return await opCompleter.future;
} on PlatformException catch (e, stack) {
await reportService.recordError(e, stack);
}
diff --git a/lib/theme/icons.dart b/lib/theme/icons.dart
index 485ffa8e2..f947b079a 100644
--- a/lib/theme/icons.dart
+++ b/lib/theme/icons.dart
@@ -19,11 +19,6 @@ class AIcons {
static const checked = Icons.done_outlined;
static final count = MdiIcons.counter;
static const counter = Icons.plus_one_outlined;
- static const date = Icons.calendar_today_outlined;
- static const dateByDay = Icons.today_outlined;
- static const dateByMonth = Icons.calendar_month_outlined;
- static const dateRecent = Icons.today_outlined;
- static const dateUndated = Icons.event_busy_outlined;
static const description = Icons.description_outlined;
static const descriptionUntitled = Icons.comments_disabled_outlined;
static const disc = Icons.fiber_manual_record;
@@ -32,7 +27,6 @@ class AIcons {
static const error = Icons.error_outline;
static const explorer = Icons.account_tree_outlined;
static const folder = Icons.folder_outlined;
- static const geoBounds = Icons.public_outlined;
static final github = MdiIcons.github;
static const home = Icons.home_outlined;
@@ -43,11 +37,6 @@ class AIcons {
static const language = Icons.translate_outlined;
static final legal = MdiIcons.scaleBalance;
- static const location = Icons.place_outlined;
- static const locationUnlocated = Icons.location_off_outlined;
- static const country = Icons.flag_outlined;
- static const state = Icons.flag_outlined;
- static const place = Icons.place_outlined;
static const mimeType = Icons.code_outlined;
static const name = Icons.abc_outlined;
static const newTier = Icons.fiber_new_outlined;
@@ -76,6 +65,19 @@ class AIcons {
static const volumeMin = Icons.volume_mute_outlined;
static const volumeMax = Icons.volume_up_outlined;
+ // time/space
+ static const date = Icons.calendar_today_outlined;
+ static const dateByDay = Icons.today_outlined;
+ static const dateByMonth = Icons.calendar_month_outlined;
+ static const dateRecent = Icons.today_outlined;
+ static const dateUndated = Icons.event_busy_outlined;
+ static const geoBounds = Icons.public_outlined;
+ static const location = Icons.place_outlined;
+ static const locationUnlocated = Icons.location_off_outlined;
+ static const country = Icons.flag_outlined;
+ static const state = Icons.flag_outlined;
+ static const place = Icons.place_outlined;
+
// view
static const group = Icons.group_work_outlined;
static const layout = Icons.grid_view_outlined;
@@ -91,7 +93,6 @@ class AIcons {
static const add = Icons.add_circle_outline;
static const addShortcut = Icons.add_to_home_screen_outlined;
static const cancel = Icons.cancel_outlined;
- static const captureFrame = Icons.screenshot_outlined;
static const cast = Icons.cast_outlined;
static const clear = Icons.clear_outlined;
static const clipboard = Icons.content_copy_outlined;
@@ -117,23 +118,16 @@ class AIcons {
static const map = Icons.map_outlined;
static const more = Icons.more_horiz_outlined;
static final move = MdiIcons.fileMoveOutline;
- static const mute = Icons.volume_off_outlined;
- static const unmute = Icons.volume_up_outlined;
static const rename = Icons.abc_outlined;
static const openOutside = Icons.open_in_new_outlined;
- static final openVideo = MdiIcons.moviePlayOutline;
+ static final openVideoPlayer = MdiIcons.openInApp;
+ static final openVideoPart = MdiIcons.moviePlayOutline;
static const pin = Icons.push_pin_outlined;
static final unpin = MdiIcons.pinOffOutline;
- static const play = Icons.play_arrow;
- static const pause = Icons.pause;
static const print = Icons.print_outlined;
static const refresh = Icons.refresh_outlined;
- static const repeat = Icons.repeat_outlined;
- static final repeatOff = MdiIcons.repeatOff;
- static const replay10 = Icons.replay_10_outlined;
static final resetBounds = MdiIcons.rayStartEnd;
static const reverse = Icons.invert_colors_outlined;
- static const skip10 = Icons.forward_10_outlined;
static const reset = Icons.restart_alt_outlined;
static const restore = Icons.restore_outlined;
static const rotateLeft = Icons.rotate_left_outlined;
@@ -141,23 +135,21 @@ class AIcons {
static const rotateScreen = Icons.screen_rotation_outlined;
static const search = Icons.search_outlined;
static const select = Icons.select_all_outlined;
- static const selectStreams = Icons.translate_outlined;
static const setAs = Icons.wallpaper_outlined;
static final setBoundEnd = MdiIcons.rayEnd;
static final setBoundStart = MdiIcons.rayStart;
static final setCover = MdiIcons.imageEditOutline;
static const share = Icons.share_outlined;
static const show = Icons.visibility_outlined;
- static final showFullscreen = MdiIcons.arrowExpand;
+ static final showFullscreenArrows = MdiIcons.arrowExpand;
+ static const showFullscreenCorners = Icons.fullscreen_outlined;
static const slideshow = Icons.slideshow_outlined;
- static const speed = Icons.speed_outlined;
static const stats = Icons.donut_small_outlined;
- static const vaultLock = Icons.lock_outline;
+ static const vaultLock = Icons.lock_outlined;
static const vaultAdd = Icons.enhanced_encryption_outlined;
static final vaultConfigure = MdiIcons.shieldLockOutline;
- static const videoSettings = Icons.video_settings_outlined;
static const view = Icons.grid_view_outlined;
- static const viewerLock = Icons.lock_outline;
+ static const viewerLock = Icons.lock_outlined;
static const viewerUnlock = Icons.lock_open_outlined;
static const zoomIn = Icons.add_outlined;
static const zoomOut = Icons.remove_outlined;
@@ -168,6 +160,23 @@ class AIcons {
static const previous = Icons.chevron_left_outlined;
static const next = Icons.chevron_right_outlined;
+ // video actions
+ // `play` and `pause` icon should be consistent with `AnimatedIcons.play_pause`
+ static const play = Icons.play_arrow;
+ static const pause = Icons.pause;
+ static const previousFrame = Icons.skip_previous_outlined;
+ static const nextFrame = Icons.skip_next_outlined;
+ static const replay10 = Icons.replay_10_outlined;
+ static const skip10 = Icons.forward_10_outlined;
+ static const mute = Icons.volume_off_outlined;
+ static const unmute = Icons.volume_up_outlined;
+ static const captureFrame = Icons.screenshot_outlined;
+ static const repeat = Icons.repeat_outlined;
+ static final repeatOff = MdiIcons.repeatOff;
+ static const selectStreams = Icons.translate_outlined;
+ static const setSpeed = Icons.speed_outlined;
+ static const videoSettings = Icons.video_settings_outlined;
+
// editor
static const transform = Icons.crop_rotate_outlined;
static const aspectRatioFree = Icons.crop_free_outlined;
@@ -182,7 +191,7 @@ class AIcons {
static const downloadAlbum = Icons.file_download;
static const screenshotAlbum = Icons.screenshot_outlined;
static const recordingAlbum = Icons.smartphone_outlined;
- static const locked = Icons.lock_outline;
+ static const locked = Icons.lock_outlined;
static const unlocked = Icons.lock_open_outlined;
// thumbnail overlay
@@ -193,8 +202,8 @@ class AIcons {
static const multiPage = Icons.burst_mode_outlined;
static const panorama = Icons.vrpano_outlined;
static const sphericalVideo = Icons.threesixty_outlined;
- static const videoThumb = Icons.play_circle_outline;
- static const selected = Icons.check_circle_outline;
+ static const videoThumb = Icons.play_circle_outlined;
+ static const selected = Icons.check_circle_outlined;
static const unselected = Icons.radio_button_unchecked;
// Material Icons references to make constant instances of `IconData`
diff --git a/lib/theme/themes.dart b/lib/theme/themes.dart
index f1d14873b..843fad424 100644
--- a/lib/theme/themes.dart
+++ b/lib/theme/themes.dart
@@ -41,11 +41,11 @@ class Themes {
static Color _schemeThirdLayer(ColorScheme colors) => _isDarkTheme(colors) ? colors.surfaceContainerHighest : colors.surfaceContainerHigh;
- static Color _unselectedWidgetColor(ColorScheme colors) => colors.onSurface.withOpacity(0.6);
+ static Color _unselectedWidgetColor(ColorScheme colors) => colors.onSurface.withAlpha((255.0 * .6).round());
static Color backgroundTextColor(BuildContext context) {
final colors = Theme.of(context).colorScheme;
- return Color.alphaBlend(colors.surfaceTint, colors.onSurface).withOpacity(.5);
+ return Color.alphaBlend(colors.surfaceTint, colors.onSurface).withAlpha((255.0 * .5).round());
}
static final _typography = Typography.material2021(platform: TargetPlatform.android);
@@ -98,7 +98,7 @@ class Themes {
// adapted from M3 defaults
final TextStyle style = textTheme.labelLarge!;
if (states.contains(WidgetState.disabled)) {
- return style.apply(color: colors.onSurface.withOpacity(0.38));
+ return style.apply(color: colors.onSurface.withAlpha((255.0 * .38).round()));
}
return style.apply(color: colors.onSurface);
}),
@@ -118,12 +118,12 @@ class Themes {
fillColor: WidgetStateProperty.resolveWith((states) {
if (states.contains(WidgetState.selected)) {
if (states.contains(WidgetState.disabled)) {
- return colors.onSurface.withOpacity(0.38);
+ return colors.onSurface.withAlpha((255.0 * .38).round());
}
return colors.primary;
}
if (states.contains(WidgetState.disabled)) {
- return colors.onSurface.withOpacity(0.38);
+ return colors.onSurface.withAlpha((255.0 * .38).round());
}
if (states.contains(WidgetState.pressed)) {
return colors.onSurface;
@@ -139,7 +139,7 @@ class Themes {
);
static SliderThemeData _sliderTheme(ColorScheme colors) => SliderThemeData(
- inactiveTrackColor: colors.primary.withOpacity(0.24),
+ inactiveTrackColor: colors.primary.withAlpha((255.0 * .24).round()),
);
static SnackBarThemeData _snackBarTheme(ColorScheme colors) => SnackBarThemeData(
diff --git a/lib/utils/android_file_utils.dart b/lib/utils/android_file_utils.dart
index b11f2f1d7..12b277132 100644
--- a/lib/utils/android_file_utils.dart
+++ b/lib/utils/android_file_utils.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
import 'package:aves/model/app_inventory.dart';
import 'package:aves/model/vaults/vaults.dart';
import 'package:aves/services/common/services.dart';
@@ -7,8 +9,6 @@ import 'package:flutter/foundation.dart';
final AndroidFileUtils androidFileUtils = AndroidFileUtils._private();
-enum _State { uninitialized, initializing, initialized }
-
class AndroidFileUtils {
// cf https://developer.android.com/reference/android/content/ContentResolver#SCHEME_CONTENT
static const contentScheme = 'content';
@@ -29,16 +29,13 @@ class AndroidFileUtils {
late final String dcimPath, downloadPath, moviesPath, picturesPath, avesVideoCapturesPath;
late final Set videoCapturesPaths;
Set storageVolumes = {};
- _State _initialized = _State.uninitialized;
+ Future? _loader;
AndroidFileUtils._private();
Future init() async {
- if (_initialized == _State.uninitialized) {
- _initialized = _State.initializing;
- await _doInit();
- _initialized = _State.initialized;
- }
+ _loader ??= _doInit();
+ await _loader;
}
Future _doInit() async {
diff --git a/lib/utils/collection_utils.dart b/lib/utils/collection_utils.dart
index 88c7b2ca1..0da1d0a58 100644
--- a/lib/utils/collection_utils.dart
+++ b/lib/utils/collection_utils.dart
@@ -1,4 +1,4 @@
-import 'package:collection/collection.dart';
+
extension ExtraList on List {
bool replace(E old, E newItem) {
@@ -11,7 +11,7 @@ extension ExtraList on List {
}
extension ExtraMapNullableKey on Map {
- Map whereNotNullKey() => {for (var v in keys.whereNotNull()) v: this[v] as V};
+ Map whereNotNullKey() => {for (var v in keys.nonNulls) v: this[v] as V};
}
extension ExtraMapNullableValue on Map {
@@ -19,7 +19,7 @@ extension ExtraMapNullableValue on Map {
}
extension ExtraMapNullableKeyValue on Map {
- Map whereNotNullKey() => {for (var v in keys.whereNotNull()) v: this[v]};
+ Map whereNotNullKey() => {for (var v in keys.nonNulls) v: this[v]};
Map whereNotNullValue() => {for (var kv in entries.where((kv) => kv.value != null)) kv.key: kv.value as V};
}
diff --git a/lib/view/src/actions/entry.dart b/lib/view/src/actions/entry.dart
index 1c6809511..edf094590 100644
--- a/lib/view/src/actions/entry.dart
+++ b/lib/view/src/actions/entry.dart
@@ -43,9 +43,12 @@ extension ExtraEntryActionView on EntryAction {
l10n.videoActionPlay,
EntryAction.videoReplay10 => l10n.videoActionReplay10,
EntryAction.videoSkip10 => l10n.videoActionSkip10,
+ EntryAction.videoShowPreviousFrame => l10n.videoActionShowPreviousFrame,
+ EntryAction.videoShowNextFrame => l10n.videoActionShowNextFrame,
// external
EntryAction.edit => l10n.entryActionEdit,
- EntryAction.open || EntryAction.openVideo => l10n.entryActionOpen,
+ EntryAction.open => l10n.entryActionOpen,
+ EntryAction.openVideoPlayer => l10n.videoControlsPlayOutside,
EntryAction.openMap => l10n.entryActionOpenMap,
EntryAction.setAs => l10n.entryActionSetAs,
EntryAction.cast => l10n.entryActionCast,
@@ -110,7 +113,7 @@ extension ExtraEntryActionView on EntryAction {
// different data depending on toggle state
AIcons.mute,
EntryAction.videoSelectStreams => AIcons.selectStreams,
- EntryAction.videoSetSpeed => AIcons.speed,
+ EntryAction.videoSetSpeed => AIcons.setSpeed,
EntryAction.videoABRepeat => AIcons.repeat,
EntryAction.videoSettings => AIcons.videoSettings,
EntryAction.videoTogglePlay =>
@@ -118,9 +121,12 @@ extension ExtraEntryActionView on EntryAction {
AIcons.play,
EntryAction.videoReplay10 => AIcons.replay10,
EntryAction.videoSkip10 => AIcons.skip10,
+ EntryAction.videoShowPreviousFrame => AIcons.previousFrame,
+ EntryAction.videoShowNextFrame => AIcons.nextFrame,
// external
EntryAction.edit => AIcons.edit,
- EntryAction.open || EntryAction.openVideo => AIcons.openOutside,
+ EntryAction.open => AIcons.openOutside,
+ EntryAction.openVideoPlayer => AIcons.openVideoPlayer,
EntryAction.openMap => AIcons.map,
EntryAction.setAs => AIcons.setAs,
EntryAction.cast => AIcons.cast,
@@ -138,7 +144,7 @@ extension ExtraEntryActionView on EntryAction {
EntryAction.showGeoTiffOnMap => AIcons.map,
// metadata / motion photo
EntryAction.convertMotionPhotoToStillImage => AIcons.convertToStillImage,
- EntryAction.viewMotionPhotoVideo => AIcons.openVideo,
+ EntryAction.viewMotionPhotoVideo => AIcons.openVideoPart,
// debug
EntryAction.debug => AIcons.debug,
};
diff --git a/lib/view/src/actions/map.dart b/lib/view/src/actions/map.dart
index c4d22a684..5e521a09f 100644
--- a/lib/view/src/actions/map.dart
+++ b/lib/view/src/actions/map.dart
@@ -11,6 +11,7 @@ extension ExtraMapActionView on MapAction {
MapAction.openMapApp => l10n.entryActionOpenMap,
MapAction.zoomIn => l10n.mapZoomInTooltip,
MapAction.zoomOut => l10n.mapZoomOutTooltip,
+ MapAction.addShortcut => l10n.collectionActionAddShortcut,
};
}
@@ -22,6 +23,7 @@ extension ExtraMapActionView on MapAction {
MapAction.openMapApp => AIcons.openOutside,
MapAction.zoomIn => AIcons.zoomIn,
MapAction.zoomOut => AIcons.zoomOut,
+ MapAction.addShortcut => AIcons.addShortcut,
};
}
}
diff --git a/lib/view/src/settings/enums.dart b/lib/view/src/settings/enums.dart
index 64c41c1d5..10854be4c 100644
--- a/lib/view/src/settings/enums.dart
+++ b/lib/view/src/settings/enums.dart
@@ -174,18 +174,6 @@ extension ExtraVideoBackgroundModeView on VideoBackgroundMode {
}
}
-extension ExtraVideoControlsView on VideoControls {
- String getName(BuildContext context) {
- final l10n = context.l10n;
- return switch (this) {
- VideoControls.play => l10n.videoControlsPlay,
- VideoControls.playSeek => l10n.videoControlsPlaySeek,
- VideoControls.playOutside => l10n.videoControlsPlayOutside,
- VideoControls.none => l10n.videoControlsNone,
- };
- }
-}
-
extension ExtraVideoLoopModeView on VideoLoopMode {
String getName(BuildContext context) {
final l10n = context.l10n;
diff --git a/lib/view/src/xmp.dart b/lib/view/src/xmp.dart
index 447abb097..46129e320 100644
--- a/lib/view/src/xmp.dart
+++ b/lib/view/src/xmp.dart
@@ -35,6 +35,7 @@ class XmpNamespaceView {
XmpNamespaces.gImage: 'Google Image',
XmpNamespaces.gPano: 'Google Panorama',
XmpNamespaces.gSpherical: 'Google Spherical',
+ XmpNamespaces.gPhotoScan: 'Google PhotoScan',
XmpNamespaces.gettyImagesGift: 'Getty Images',
XmpNamespaces.gimp210: 'GIMP 2.10',
XmpNamespaces.gimpXmp: 'GIMP',
diff --git a/lib/widget_common.dart b/lib/widget_common.dart
index f9b357c85..c915fecd9 100644
--- a/lib/widget_common.dart
+++ b/lib/widget_common.dart
@@ -97,7 +97,7 @@ Future _getWidgetEntry(int widgetId, bool reuseEntry) async {
}
});
source.canAnalyze = false;
- await source.init();
+ await source.init(scope: filters);
await readyCompleter.future;
final entries = CollectionLens(source: source, filters: filters).sortedEntries;
diff --git a/lib/widgets/about/about_tv_page.dart b/lib/widgets/about/about_tv_page.dart
index 4e01d8e43..d61590307 100644
--- a/lib/widgets/about/about_tv_page.dart
+++ b/lib/widgets/about/about_tv_page.dart
@@ -103,7 +103,7 @@ class _ContentState extends State<_Content> {
return ListTile(
title: DefaultTextStyle(
style: theme.textTheme.bodyLarge!.copyWith(
- color: isSelected ? colors.primary : colors.onSurface.withOpacity(0.64),
+ color: isSelected ? colors.primary : colors.onSurface.withAlpha((255.0 * .64).round()),
),
child: _getTitle(_Section.values[index]),
),
diff --git a/lib/widgets/about/translators.dart b/lib/widgets/about/translators.dart
index 37e4641bf..9bfe976e2 100644
--- a/lib/widgets/about/translators.dart
+++ b/lib/widgets/about/translators.dart
@@ -62,19 +62,19 @@ class _RandomTextSpanHighlighterState extends State<_RandomTextSpanHighlighter>
final color = widget.color;
_baseStyle = TextStyle(
- color: color.withOpacity(.7),
+ color: color.withAlpha((255.0 * .7).round()),
shadows: [
Shadow(
- color: color.withOpacity(0),
+ color: color.withAlpha(0),
blurRadius: 0,
)
],
);
final highlightStyle = TextStyle(
- color: color.withOpacity(1),
+ color: color.withAlpha(255),
shadows: [
Shadow(
- color: color.withOpacity(1),
+ color: color.withAlpha(255),
blurRadius: 3,
)
],
diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart
index c0c6903c9..3b15aab04 100644
--- a/lib/widgets/aves_app.dart
+++ b/lib/widgets/aves_app.dart
@@ -49,7 +49,7 @@ import 'package:event_bus/event_bus.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_localization_nn/flutter_localization_nn.dart';
+import 'package:flutter_localizations_plus/flutter_localizations_plus.dart';
import 'package:intl/intl.dart';
import 'package:latlong2/latlong.dart';
import 'package:overlay_support/overlay_support.dart';
@@ -305,8 +305,10 @@ class _AvesAppState extends State with WidgetsBindingObserver {
themeMode: themeBrightness.appThemeMode,
locale: settingsLocale,
localizationsDelegates: const [
- ...AppLocalizations.localizationsDelegates,
+ // order matters for resolution of sublocales (e.g. `en_Shaw` before `en`)
+ ...LocalizationsEnShaw.delegates,
...LocalizationsNn.delegates,
+ ...AppLocalizations.localizationsDelegates,
],
supportedLocales: AvesApp.supportedLocales,
scrollBehavior: AvesScrollBehavior(),
@@ -564,9 +566,9 @@ class _AvesAppState extends State with WidgetsBindingObserver {
switch (settings.maxBrightness) {
case MaxBrightness.never:
case MaxBrightness.viewerOnly:
- AvesApp.screenBrightness?.resetScreenBrightness();
+ AvesApp.screenBrightness?.resetApplicationScreenBrightness();
case MaxBrightness.always:
- AvesApp.screenBrightness?.setScreenBrightness(1);
+ AvesApp.screenBrightness?.setApplicationScreenBrightness(1);
}
}
@@ -655,7 +657,7 @@ class _AvesAppState extends State with WidgetsBindingObserver {
final shouldReset = _exitedMainByPop;
_exitedMainByPop = false;
- if (!shouldReset && (intentData ?? {}).values.whereNotNull().isEmpty) {
+ if (!shouldReset && (intentData ?? {}).values.nonNulls.isEmpty) {
reportService.log('Relaunch');
return;
}
@@ -683,11 +685,9 @@ class _AvesAppState extends State with WidgetsBindingObserver {
Future _onAnalysisCompletion() async {
debugPrint('Analysis completed');
- if (_mediaStoreSource.scope != SourceScope.none) {
- await _mediaStoreSource.loadCatalogMetadata();
- await _mediaStoreSource.loadAddresses();
- _mediaStoreSource.updateDerivedFilters();
- }
+ await _mediaStoreSource.loadCatalogMetadata();
+ await _mediaStoreSource.loadAddresses();
+ _mediaStoreSource.updateDerivedFilters();
}
void _onError(String? error) => reportService.recordError(error, null);
diff --git a/lib/widgets/collection/app_bar.dart b/lib/widgets/collection/app_bar.dart
index 31d53e01c..388ac7b7a 100644
--- a/lib/widgets/collection/app_bar.dart
+++ b/lib/widgets/collection/app_bar.dart
@@ -36,7 +36,6 @@ import 'package:aves/widgets/dialogs/tile_view_dialog.dart';
import 'package:aves/widgets/filter_grids/common/action_delegates/chip.dart';
import 'package:aves/widgets/search/search_delegate.dart';
import 'package:aves_model/aves_model.dart';
-import 'package:collection/collection.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:provider/provider.dart';
@@ -357,7 +356,7 @@ class _CollectionAppBarState extends State with SingleTickerPr
return [
...EntrySetActions.general,
...isSelecting ? EntrySetActions.pageSelection : EntrySetActions.pageBrowsing,
- ].whereNotNull().where(isVisible).map((action) {
+ ].nonNulls.where(isVisible).map((action) {
final enabled = canApply(action);
return CaptionedButton(
iconButtonBuilder: (context, focusNode) => _buildButtonIcon(
diff --git a/lib/widgets/collection/collection_grid.dart b/lib/widgets/collection/collection_grid.dart
index 352d61a93..874f9004a 100644
--- a/lib/widgets/collection/collection_grid.dart
+++ b/lib/widgets/collection/collection_grid.dart
@@ -249,6 +249,11 @@ class _CollectionGridContentState extends State<_CollectionGridContent> {
Future _goToViewer(CollectionLens collection, AvesEntry entry) async {
// track viewer entry for dynamic hero placeholder
final viewerEntryNotifier = context.read();
+
+ // prevent navigating again to the same entry until fully back,
+ // as a workaround for the hero pop/push diversion animation issue
+ // (cf `ThumbnailImage` `Hero` usage)
+ if (viewerEntryNotifier.value == entry) return;
WidgetsBinding.instance.addPostFrameCallback((_) => viewerEntryNotifier.value = entry);
final selection = context.read>();
@@ -421,7 +426,7 @@ class _CollectionScaler extends StatelessWidget {
),
mosaicItemBuilder: (index, targetExtent) => DecoratedBox(
decoration: BoxDecoration(
- color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withOpacity(.9),
+ color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withAlpha((255.0 * .9).round()),
border: Border.all(
color: borderColor,
width: borderWidth,
@@ -498,7 +503,7 @@ class _CollectionScrollViewState extends State<_CollectionScrollView> with Widge
_checkingStoragePermission = false;
_isStoragePermissionGranted.then((granted) {
if (granted) {
- widget.collection.source.init();
+ widget.collection.source.init(scope: CollectionSource.fullScope);
}
});
}
diff --git a/lib/widgets/collection/entry_set_action_delegate.dart b/lib/widgets/collection/entry_set_action_delegate.dart
index e9cf454bd..72fe2cf4a 100644
--- a/lib/widgets/collection/entry_set_action_delegate.dart
+++ b/lib/widgets/collection/entry_set_action_delegate.dart
@@ -26,6 +26,7 @@ import 'package:aves/theme/durations.dart';
import 'package:aves/theme/themes.dart';
import 'package:aves/utils/collection_utils.dart';
import 'package:aves/utils/mime_utils.dart';
+import 'package:aves/widgets/collection/collection_page.dart';
import 'package:aves/widgets/common/action_mixins/entry_editor.dart';
import 'package:aves/widgets/common/action_mixins/entry_storage.dart';
import 'package:aves/widgets/common/action_mixins/feedback.dart';
@@ -168,7 +169,7 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
}
void onActionSelected(BuildContext context, EntrySetAction action) {
- reportService.log('$action');
+ reportService.log('$runtimeType handles $action');
switch (action) {
// general
case EntrySetAction.configureView:
@@ -301,7 +302,7 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
final l10n = context.l10n;
final source = context.read();
- final storageDirs = entries.map((e) => e.storageDirectory).whereNotNull().toSet();
+ final storageDirs = entries.map((e) => e.storageDirectory).nonNulls.toSet();
final todoCount = entries.length;
if (!await showSkippableConfirmationDialog(
@@ -309,7 +310,9 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
type: ConfirmationDialog.deleteForever,
message: l10n.deleteEntriesConfirmationDialogMessage(todoCount),
confirmationButtonLabel: l10n.deleteButtonLabel,
- )) return;
+ )) {
+ return;
+ }
if (!await checkStoragePermissionForAlbums(context, storageDirs, entries: entries)) return;
@@ -407,14 +410,14 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
Future> Function(AvesEntry entry) op, {
bool showResult = true,
}) async {
- final selectionDirs = todoItems.map((e) => e.directory).whereNotNull().toSet();
+ final selectionDirs = todoItems.map((e) => e.directory).nonNulls.toSet();
final todoCount = todoItems.length;
if (!await checkStoragePermissionForAlbums(context, selectionDirs, entries: todoItems)) return;
Set obsoleteTags = todoItems.expand((entry) => entry.tags).toSet();
- Set obsoleteCountryCodes = todoItems.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.countryCode).whereNotNull().toSet();
- Set obsoleteStateCodes = todoItems.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.stateCode).whereNotNull().toSet();
+ Set obsoleteCountryCodes = todoItems.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.countryCode).nonNulls.toSet();
+ Set obsoleteStateCodes = todoItems.where((entry) => entry.hasAddress).map((entry) => entry.addressDetails?.stateCode).nonNulls.toSet();
final dataTypes = {};
final source = context.read();
@@ -746,7 +749,7 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware
final (coverEntry, name) = result;
if (name.isEmpty) return;
- await appService.pinToHomeScreen(name, coverEntry, filters: filters);
+ await appService.pinToHomeScreen(name, coverEntry, route: CollectionPage.routeName, filters: filters);
if (!device.showPinShortcutFeedback) {
showFeedback(context, FeedbackType.info, context.l10n.genericSuccessFeedback);
}
diff --git a/lib/widgets/common/action_controls/quick_choosers/common/button.dart b/lib/widgets/common/action_controls/quick_choosers/common/button.dart
index 5925099b7..8ada58a26 100644
--- a/lib/widgets/common/action_controls/quick_choosers/common/button.dart
+++ b/lib/widgets/common/action_controls/quick_choosers/common/button.dart
@@ -99,12 +99,10 @@ abstract class ChooserQuickButtonState