diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 3b4fc72b1..555bbde2e 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -15,7 +15,7 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: stable
- flutter-version: '1.22.5'
+ flutter-version: '1.22.6'
- name: Clone the repository.
uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e4bd20b5c..d35450f7f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
- uses: subosito/flutter-action@v1
with:
channel: stable
- flutter-version: '1.22.5'
+ flutter-version: '1.22.6'
# Workaround for this Android Gradle Plugin issue (supposedly fixed in AGP 4.1):
# https://issuetracker.google.com/issues/144111441
@@ -50,8 +50,8 @@ jobs:
echo "${{ secrets.KEY_JKS }}" > release.keystore.asc
gpg -d --passphrase "${{ secrets.KEY_JKS_PASSPHRASE }}" --batch release.keystore.asc > $AVES_STORE_FILE
rm release.keystore.asc
- flutter build apk --bundle-sksl-path shaders_1.22.5.sksl.json
- flutter build appbundle --bundle-sksl-path shaders_1.22.5.sksl.json
+ flutter build apk --bundle-sksl-path shaders_1.22.6.sksl.json
+ flutter build appbundle --bundle-sksl-path shaders_1.22.6.sksl.json
rm $AVES_STORE_FILE
env:
AVES_STORE_FILE: ${{ github.workspace }}/key.jks
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a089b539..44e021228 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
+## [v1.3.3] - 2021-01-31
+### Added
+- Viewer: support for multi-track HEIF
+- Viewer: export image (including multipage TIFF/HEIF and images embedded in XMP)
+- Info: show owner app (Android Q and up)
+- listen to Media Store changes
+
+### Changed
+- upgraded Flutter to stable v1.22.6
+- check connectivity before using features that need it
+
+### Fixed
+- checkerboard background performance
+- deleting files that no longer exist but are still registered in the Media Store
+- insets handling on Android 11
+
## [v1.3.2] - 2021-01-17
### Added
Collection: identify multipage TIFF & multitrack HEIC/HEIF
diff --git a/README.md b/README.md
index 52ed6d473..34fbae115 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Aves is a gallery and metadata explorer app. It is built for Android, with Flutt
## Features
-- support raster images: JPEG, GIF, PNG, HEIC (from Android Pie), WEBP, TIFF, BMP, WBMP, ICO
+- support raster images: JPEG, GIF, PNG, HEIC/HEIF (including multi-track, from Android Pie), WEBP, TIFF (including multi-page), BMP, WBMP, ICO
- support animated images: GIF, WEBP
- support raw images: ARW, CR2, DNG, NEF, NRW, ORF, PEF, RAF, RW2, SRW
- support vector images: SVG
@@ -36,10 +36,10 @@ Aves is a gallery and metadata explorer app. It is built for Android, with Flutt
| Model | Name | Android Version | API |
| ----------- | -------------------------- | --------------- | ---:|
-| SM-G970N | Samsung Galaxy S10e | 10 (Android10) | 29 |
+| SM-G981N | Samsung Galaxy S20 5G | 11 | 30 |
+| SM-G970N | Samsung Galaxy S10e | 10 (Q) | 29 |
| SM-P580 | Samsung Galaxy Tab A 10.1 | 8.1.0 (Oreo) | 27 |
| SM-G930S | Samsung Galaxy S7 | 8.0.0 (Oreo) | 26 |
-| E5823 | Sony Xperia Z5 Compact | 7.1.1 (Nougat) | 25 |
## Project Setup
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7fd1f982e..e8cea44fa 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -98,15 +98,15 @@ repositories {
dependencies {
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
- implementation 'androidx.core:core-ktx:1.5.0-alpha05' // v1.5.0-alpha02+ for ShortcutManagerCompat.setDynamicShortcuts
+ implementation 'androidx.core:core-ktx:1.5.0-beta01' // v1.5.0-alpha02+ for ShortcutManagerCompat.setDynamicShortcuts
implementation 'androidx.exifinterface:exifinterface:1.3.2'
implementation 'com.commonsware.cwac:document:0.4.1'
implementation 'com.drewnoakes:metadata-extractor:2.15.0'
implementation 'com.github.deckerst:Android-TiffBitmapFactory:f87db4305d' // forked, built by JitPack
- implementation 'com.github.bumptech.glide:glide:4.11.0'
+ implementation 'com.github.bumptech.glide:glide:4.12.0'
kapt 'androidx.annotation:annotation:1.1.0'
- kapt 'com.github.bumptech.glide:compiler:4.11.0'
+ kapt 'com.github.bumptech.glide:compiler:4.12.0'
compileOnly rootProject.findProject(':streams_channel')
}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1faac6cc8..66f30eaf6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -40,7 +40,6 @@
-
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
index 6ee05d8d1..a6742b22c 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -16,24 +16,18 @@ import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.PermissionManager
import io.flutter.embedding.android.FlutterActivity
import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
class MainActivity : FlutterActivity() {
- companion object {
- private val LOG_TAG = LogUtils.createTag(MainActivity::class.java)
- const val INTENT_CHANNEL = "deckers.thibault/aves/intent"
- const val VIEWER_CHANNEL = "deckers.thibault/aves/viewer"
- }
-
- private val intentStreamHandler = IntentStreamHandler()
+ private lateinit var contentStreamHandler: ContentChangeStreamHandler
+ private lateinit var intentStreamHandler: IntentStreamHandler
private lateinit var intentDataMap: MutableMap
override fun onCreate(savedInstanceState: Bundle?) {
Log.i(LOG_TAG, "onCreate intent=$intent")
super.onCreate(savedInstanceState)
- intentDataMap = extractIntentData(intent)
-
val messenger = flutterEngine!!.dartExecutor.binaryMessenger
MethodChannel(messenger, AppAdapterHandler.CHANNEL).setMethodCallHandler(AppAdapterHandler(this))
@@ -48,59 +42,34 @@ class MainActivity : FlutterActivity() {
StreamsChannel(messenger, MediaStoreStreamHandler.CHANNEL).setStreamHandlerFactory { args -> MediaStoreStreamHandler(this, args) }
StreamsChannel(messenger, StorageAccessStreamHandler.CHANNEL).setStreamHandlerFactory { args -> StorageAccessStreamHandler(this, args) }
+ // Media Store change monitoring
+ contentStreamHandler = ContentChangeStreamHandler(this).apply {
+ EventChannel(messenger, ContentChangeStreamHandler.CHANNEL).setStreamHandler(this)
+ }
+
+ // intent handling
+ intentStreamHandler = IntentStreamHandler().apply {
+ EventChannel(messenger, IntentStreamHandler.CHANNEL).setStreamHandler(this)
+ }
+ intentDataMap = extractIntentData(intent)
MethodChannel(messenger, VIEWER_CHANNEL).setMethodCallHandler { call, result ->
when (call.method) {
"getIntentData" -> {
result.success(intentDataMap)
intentDataMap.clear()
}
- "pick" -> {
- val pickedUri = call.argument("uri")
- if (pickedUri != null) {
- val intent = Intent().apply {
- data = Uri.parse(pickedUri)
- addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
- }
- setResult(RESULT_OK, intent)
- } else {
- setResult(RESULT_CANCELED)
- }
- finish()
- }
-
+ "pick" -> pick(call)
}
}
- EventChannel(messenger, INTENT_CHANNEL).setStreamHandler(intentStreamHandler)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
setupShortcuts()
}
}
- @RequiresApi(Build.VERSION_CODES.N_MR1)
- private fun setupShortcuts() {
- // do not use 'route' as extra key, as the Flutter framework acts on it
-
- val search = ShortcutInfoCompat.Builder(this, "search")
- .setShortLabel(getString(R.string.search_shortcut_short_label))
- .setIcon(IconCompat.createWithResource(this, R.mipmap.ic_shortcut_search))
- .setIntent(
- Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
- .putExtra("page", "/search")
- )
- .build()
-
- val videos = ShortcutInfoCompat.Builder(this, "videos")
- .setShortLabel(getString(R.string.videos_shortcut_short_label))
- .setIcon(IconCompat.createWithResource(this, R.mipmap.ic_shortcut_movie))
- .setIntent(
- Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
- .putExtra("page", "/collection")
- .putExtra("filters", arrayOf("{\"type\":\"mime\",\"mime\":\"video/*\"}"))
- )
- .build()
-
- ShortcutManagerCompat.setDynamicShortcuts(this, listOf(videos, search))
+ override fun onDestroy() {
+ contentStreamHandler.dispose()
+ super.onDestroy()
}
override fun onNewIntent(intent: Intent) {
@@ -109,6 +78,25 @@ class MainActivity : FlutterActivity() {
intentStreamHandler.notifyNewIntent(extractIntentData(intent))
}
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ if (requestCode == PermissionManager.VOLUME_ACCESS_REQUEST_CODE) {
+ val treeUri = data?.data
+ if (resultCode != RESULT_OK || treeUri == null) {
+ PermissionManager.onPermissionResult(requestCode, null)
+ return
+ }
+
+ // save access permissions across reboots
+ val takeFlags = (data.flags
+ and (Intent.FLAG_GRANT_READ_URI_PERMISSION
+ or Intent.FLAG_GRANT_WRITE_URI_PERMISSION))
+ contentResolver.takePersistableUriPermission(treeUri, takeFlags)
+
+ // resume pending action
+ PermissionManager.onPermissionResult(requestCode, treeUri)
+ }
+ }
+
private fun extractIntentData(intent: Intent?): MutableMap {
when (intent?.action) {
Intent.ACTION_MAIN -> {
@@ -138,22 +126,48 @@ class MainActivity : FlutterActivity() {
return HashMap()
}
- override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
- if (requestCode == PermissionManager.VOLUME_ACCESS_REQUEST_CODE) {
- val treeUri = data?.data
- if (resultCode != RESULT_OK || treeUri == null) {
- PermissionManager.onPermissionResult(requestCode, null)
- return
+ private fun pick(call: MethodCall) {
+ val pickedUri = call.argument("uri")
+ if (pickedUri != null) {
+ val intent = Intent().apply {
+ data = Uri.parse(pickedUri)
+ addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
-
- // save access permissions across reboots
- val takeFlags = (data.flags
- and (Intent.FLAG_GRANT_READ_URI_PERMISSION
- or Intent.FLAG_GRANT_WRITE_URI_PERMISSION))
- contentResolver.takePersistableUriPermission(treeUri, takeFlags)
-
- // resume pending action
- PermissionManager.onPermissionResult(requestCode, treeUri)
+ setResult(RESULT_OK, intent)
+ } else {
+ setResult(RESULT_CANCELED)
}
+ finish()
+ }
+
+ @RequiresApi(Build.VERSION_CODES.N_MR1)
+ private fun setupShortcuts() {
+ // do not use 'route' as extra key, as the Flutter framework acts on it
+
+ val search = ShortcutInfoCompat.Builder(this, "search")
+ .setShortLabel(getString(R.string.search_shortcut_short_label))
+ .setIcon(IconCompat.createWithResource(this, R.mipmap.ic_shortcut_search))
+ .setIntent(
+ Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
+ .putExtra("page", "/search")
+ )
+ .build()
+
+ val videos = ShortcutInfoCompat.Builder(this, "videos")
+ .setShortLabel(getString(R.string.videos_shortcut_short_label))
+ .setIcon(IconCompat.createWithResource(this, R.mipmap.ic_shortcut_movie))
+ .setIntent(
+ Intent(Intent.ACTION_MAIN, null, this, MainActivity::class.java)
+ .putExtra("page", "/collection")
+ .putExtra("filters", arrayOf("{\"type\":\"mime\",\"mime\":\"video/*\"}"))
+ )
+ .build()
+
+ ShortcutManagerCompat.setDynamicShortcuts(this, listOf(videos, search))
+ }
+
+ companion object {
+ private val LOG_TAG = LogUtils.createTag(MainActivity::class.java)
+ const val VIEWER_CHANNEL = "deckers.thibault/aves/viewer"
}
}
\ No newline at end of file
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 6930273bc..c4b8e3377 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
@@ -12,6 +12,8 @@ import androidx.core.content.FileProvider
import com.bumptech.glide.Glide
import com.bumptech.glide.load.DecodeFormat
import com.bumptech.glide.request.RequestOptions
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.LogUtils
import io.flutter.plugin.common.MethodCall
@@ -28,8 +30,8 @@ import kotlin.math.roundToInt
class AppAdapterHandler(private val context: Context) : MethodCallHandler {
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
when (call.method) {
- "getAppIcon" -> GlobalScope.launch(Dispatchers.IO) { getAppIcon(call, Coresult(result)) }
- "getAppNames" -> GlobalScope.launch(Dispatchers.IO) { getAppNames(Coresult(result)) }
+ "getPackages" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getPackages) }
+ "getAppIcon" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getAppIcon) }
"edit" -> {
val title = call.argument("title")
val uri = call.argument("uri")?.let { Uri.parse(it) }
@@ -61,46 +63,51 @@ class AppAdapterHandler(private val context: Context) : MethodCallHandler {
}
}
- private fun getAppNames(result: MethodChannel.Result) {
- val nameMap = HashMap()
- val intent = Intent(Intent.ACTION_MAIN, null)
- .addCategory(Intent.CATEGORY_LAUNCHER)
- .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED)
+ private fun getPackages(@Suppress("UNUSED_PARAMETER") call: MethodCall, result: MethodChannel.Result) {
+ val packages = HashMap()
- // apps tend to use their name in English when creating folders
- // so we get their names in English as well as the current locale
- val englishConfig = Configuration().apply { setLocale(Locale.ENGLISH) }
+ fun addPackageDetails(intent: Intent) {
+ // apps tend to use their name in English when creating folders
+ // so we get their names in English as well as the current locale
+ val englishConfig = Configuration().apply { setLocale(Locale.ENGLISH) }
- val pm = context.packageManager
- for (resolveInfo in pm.queryIntentActivities(intent, 0)) {
- val ai = resolveInfo.activityInfo.applicationInfo
- val isSystemPackage = ai.flags and ApplicationInfo.FLAG_SYSTEM != 0
- if (!isSystemPackage) {
- val packageName = ai.packageName
-
- val currentLabel = pm.getApplicationLabel(ai).toString()
- nameMap[currentLabel] = packageName
-
- val labelRes = ai.labelRes
- if (labelRes != 0) {
- try {
- val resources = pm.getResourcesForApplication(ai)
- // `updateConfiguration` is deprecated but it seems to be the only way
- // to query resources from another app with a specific locale.
- // The following methods do not work:
- // - `resources.getConfiguration().setLocale(...)`
- // - getting a package manager from a custom context with `context.createConfigurationContext(config)`
- @Suppress("DEPRECATION")
- resources.updateConfiguration(englishConfig, resources.displayMetrics)
- val englishLabel = resources.getString(labelRes)
- nameMap[englishLabel] = packageName
- } catch (e: PackageManager.NameNotFoundException) {
- Log.w(LOG_TAG, "failed to get app label in English for packageName=$packageName", e)
+ val pm = context.packageManager
+ for (resolveInfo in pm.queryIntentActivities(intent, 0)) {
+ val appInfo = resolveInfo.activityInfo.applicationInfo
+ val packageName = appInfo.packageName
+ if (!packages.containsKey(packageName)) {
+ val currentLabel = pm.getApplicationLabel(appInfo).toString()
+ val englishLabel: String? = appInfo.labelRes.takeIf { it != 0 }?.let { labelRes ->
+ var englishLabel: String? = null
+ try {
+ val resources = pm.getResourcesForApplication(appInfo)
+ // `updateConfiguration` is deprecated but it seems to be the only way
+ // to query resources from another app with a specific locale.
+ // The following methods do not work:
+ // - `resources.getConfiguration().setLocale(...)`
+ // - getting a package manager from a custom context with `context.createConfigurationContext(config)`
+ @Suppress("DEPRECATION")
+ resources.updateConfiguration(englishConfig, resources.displayMetrics)
+ englishLabel = resources.getString(labelRes)
+ } catch (e: PackageManager.NameNotFoundException) {
+ Log.w(LOG_TAG, "failed to get app label in English for packageName=$packageName", e)
+ }
+ englishLabel
}
+ packages[packageName] = hashMapOf(
+ "packageName" to packageName,
+ "categoryLauncher" to intent.hasCategory(Intent.CATEGORY_LAUNCHER),
+ "isSystem" to (appInfo.flags and ApplicationInfo.FLAG_SYSTEM != 0),
+ "currentLabel" to currentLabel,
+ "englishLabel" to englishLabel,
+ )
}
}
}
- result.success(nameMap)
+
+ addPackageDetails(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_LAUNCHER))
+ addPackageDetails(Intent(Intent.ACTION_MAIN))
+ result.success(ArrayList(packages.values))
}
private fun getAppIcon(call: MethodCall, result: MethodChannel.Result) {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/Coresult.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/Coresult.kt
index d2db62561..5207bde7d 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/Coresult.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/Coresult.kt
@@ -1,9 +1,11 @@
package deckers.thibault.aves.channel.calls
+import io.flutter.plugin.common.MethodCall
import io.flutter.plugin.common.MethodChannel
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
+import kotlin.reflect.KSuspendFunction2
// ensure `result` methods are called on the main looper thread
class Coresult internal constructor(private val methodResult: MethodChannel.Result) : MethodChannel.Result {
@@ -20,4 +22,24 @@ class Coresult internal constructor(private val methodResult: MethodChannel.Resu
override fun notImplemented() {
mainScope.launch { methodResult.notImplemented() }
}
+
+ companion object {
+ fun safe(call: MethodCall, result: MethodChannel.Result, function: (call: MethodCall, result: MethodChannel.Result) -> Unit) {
+ val res = Coresult(result)
+ try {
+ function(call, res)
+ } catch (e: Exception) {
+ res.error("safe-exception", e.message, e.stackTraceToString())
+ }
+ }
+
+ suspend fun safesus(call: MethodCall, result: MethodChannel.Result, function: KSuspendFunction2) {
+ val res = Coresult(result)
+ try {
+ function(call, res)
+ } catch (e: Exception) {
+ res.error("safe-exception", e.message, e.stackTraceToString())
+ }
+ }
+ }
}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
index 22e4c84ca..6b4401073 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/DebugHandler.kt
@@ -12,10 +12,11 @@ import android.util.Log
import androidx.exifinterface.media.ExifInterface
import com.drew.imaging.ImageMetadataReader
import com.drew.metadata.file.FileTypeDirectory
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
import deckers.thibault.aves.metadata.ExifInterfaceHelper
import deckers.thibault.aves.metadata.MediaMetadataRetrieverHelper
import deckers.thibault.aves.metadata.Metadata
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.MimeTypes.isImage
import deckers.thibault.aves.utils.MimeTypes.isSupportedByExifInterface
@@ -37,12 +38,12 @@ class DebugHandler(private val context: Context) : MethodCallHandler {
when (call.method) {
"getContextDirs" -> result.success(getContextDirs())
"getEnv" -> result.success(System.getenv())
- "getBitmapFactoryInfo" -> GlobalScope.launch(Dispatchers.IO) { getBitmapFactoryInfo(call, Coresult(result)) }
- "getContentResolverMetadata" -> GlobalScope.launch(Dispatchers.IO) { getContentResolverMetadata(call, Coresult(result)) }
- "getExifInterfaceMetadata" -> GlobalScope.launch(Dispatchers.IO) { getExifInterfaceMetadata(call, Coresult(result)) }
- "getMediaMetadataRetrieverMetadata" -> GlobalScope.launch(Dispatchers.IO) { getMediaMetadataRetrieverMetadata(call, Coresult(result)) }
- "getMetadataExtractorSummary" -> GlobalScope.launch(Dispatchers.IO) { getMetadataExtractorSummary(call, Coresult(result)) }
- "getTiffStructure" -> GlobalScope.launch(Dispatchers.IO) { getTiffStructure(call, Coresult(result)) }
+ "getBitmapFactoryInfo" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getBitmapFactoryInfo) }
+ "getContentResolverMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getContentResolverMetadata) }
+ "getExifInterfaceMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getExifInterfaceMetadata) }
+ "getMediaMetadataRetrieverMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getMediaMetadataRetrieverMetadata) }
+ "getMetadataExtractorSummary" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getMetadataExtractorSummary) }
+ "getTiffStructure" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getTiffStructure) }
else -> result.notImplemented()
}
}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ImageFileHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ImageFileHandler.kt
index de0ee5245..a9c831565 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ImageFileHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ImageFileHandler.kt
@@ -5,8 +5,13 @@ import android.graphics.Rect
import android.net.Uri
import android.util.Size
import com.bumptech.glide.Glide
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safesus
+import deckers.thibault.aves.channel.calls.fetchers.RegionFetcher
+import deckers.thibault.aves.channel.calls.fetchers.ThumbnailFetcher
+import deckers.thibault.aves.channel.calls.fetchers.TiffRegionFetcher
import deckers.thibault.aves.model.ExifOrientationOp
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.provider.ImageProvider.ImageOpCallback
import deckers.thibault.aves.model.provider.ImageProviderFactory.getProvider
import deckers.thibault.aves.model.provider.MediaStoreImageProvider
@@ -26,17 +31,14 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
when (call.method) {
- "getObsoleteEntries" -> GlobalScope.launch(Dispatchers.IO) { getObsoleteEntries(call, Coresult(result)) }
- "getImageEntry" -> GlobalScope.launch(Dispatchers.IO) { getImageEntry(call, Coresult(result)) }
- "getThumbnail" -> GlobalScope.launch(Dispatchers.IO) { getThumbnail(call, Coresult(result)) }
- "getRegion" -> GlobalScope.launch(Dispatchers.IO) { getRegion(call, Coresult(result)) }
- "clearSizedThumbnailDiskCache" -> {
- GlobalScope.launch(Dispatchers.IO) { Glide.get(activity).clearDiskCache() }
- result.success(null)
- }
- "rename" -> GlobalScope.launch(Dispatchers.IO) { rename(call, Coresult(result)) }
- "rotate" -> GlobalScope.launch(Dispatchers.IO) { rotate(call, Coresult(result)) }
- "flip" -> GlobalScope.launch(Dispatchers.IO) { flip(call, Coresult(result)) }
+ "getObsoleteEntries" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getObsoleteEntries) }
+ "getEntry" -> GlobalScope.launch(Dispatchers.IO) { safesus(call, result, ::getEntry) }
+ "getThumbnail" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getThumbnail) }
+ "getRegion" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getRegion) }
+ "clearSizedThumbnailDiskCache" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::clearSizedThumbnailDiskCache) }
+ "rename" -> GlobalScope.launch(Dispatchers.IO) { safesus(call, result, ::rename) }
+ "rotate" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::rotate) }
+ "flip" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::flip) }
else -> result.notImplemented()
}
}
@@ -58,7 +60,7 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
val isFlipped = call.argument("isFlipped")
val widthDip = call.argument("widthDip")
val heightDip = call.argument("heightDip")
- val page = call.argument("page")
+ val pageId = call.argument("pageId")
val defaultSizeDip = call.argument("defaultSizeDip")
if (uri == null || mimeType == null || dateModifiedSecs == null || rotationDegrees == null || isFlipped == null || widthDip == null || heightDip == null || defaultSizeDip == null) {
@@ -76,7 +78,7 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
isFlipped,
width = (widthDip * density).roundToInt(),
height = (heightDip * density).roundToInt(),
- page = page,
+ pageId = pageId,
defaultSize = (defaultSizeDip * density).roundToInt(),
result,
).fetch()
@@ -85,7 +87,7 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
private fun getRegion(call: MethodCall, result: MethodChannel.Result) {
val uri = call.argument("uri")?.let { Uri.parse(it) }
val mimeType = call.argument("mimeType")
- val page = call.argument("page")
+ val pageId = call.argument("pageId")
val sampleSize = call.argument("sampleSize")
val x = call.argument("regionX")
val y = call.argument("regionY")
@@ -102,43 +104,49 @@ class ImageFileHandler(private val activity: Activity) : MethodCallHandler {
val regionRect = Rect(x, y, x + width, y + height)
when (mimeType) {
MimeTypes.TIFF -> TiffRegionFetcher(activity).fetch(
- uri,
- sampleSize,
- regionRect,
- page = page ?: 0,
- result,
+ uri = uri,
+ page = pageId ?: 0,
+ sampleSize = sampleSize,
+ regionRect = regionRect,
+ result = result,
)
else -> regionFetcher.fetch(
- uri,
- mimeType,
- sampleSize,
- regionRect,
- Size(imageWidth, imageHeight),
- result,
+ uri = uri,
+ mimeType = mimeType,
+ pageId = pageId,
+ sampleSize = sampleSize,
+ regionRect = regionRect,
+ imageSize = Size(imageWidth, imageHeight),
+ result = result,
)
}
}
- private suspend fun getImageEntry(call: MethodCall, result: MethodChannel.Result) {
+ private suspend fun getEntry(call: MethodCall, result: MethodChannel.Result) {
val mimeType = call.argument("mimeType") // MIME type is optional
val uri = call.argument("uri")?.let { Uri.parse(it) }
if (uri == null) {
- result.error("getImageEntry-args", "failed because of missing arguments", null)
+ result.error("getEntry-args", "failed because of missing arguments", null)
return
}
val provider = getProvider(uri)
if (provider == null) {
- result.error("getImageEntry-provider", "failed to find provider for uri=$uri", null)
+ result.error("getEntry-provider", "failed to find provider for uri=$uri", null)
return
}
provider.fetchSingle(activity, uri, mimeType, object : ImageOpCallback {
override fun onSuccess(fields: FieldMap) = result.success(fields)
- override fun onFailure(throwable: Throwable) = result.error("getImageEntry-failure", "failed to get entry for uri=$uri", throwable.message)
+ override fun onFailure(throwable: Throwable) = result.error("getEntry-failure", "failed to get entry for uri=$uri", throwable.message)
})
}
+ private fun clearSizedThumbnailDiskCache(@Suppress("UNUSED_PARAMETER") call: MethodCall, result: MethodChannel.Result) {
+ Glide.get(activity).clearDiskCache()
+ result.success(null)
+ }
+
private suspend fun rename(call: MethodCall, result: MethodChannel.Result) {
val entryMap = call.argument("entry")
val newName = call.argument("newName")
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
index f0a95b2d6..940ab0cba 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MetadataHandler.kt
@@ -1,8 +1,15 @@
package deckers.thibault.aves.channel.calls
+import android.content.ContentResolver
+import android.content.ContentUris
import android.content.Context
+import android.database.Cursor
+import android.media.MediaExtractor
+import android.media.MediaFormat
import android.media.MediaMetadataRetriever
import android.net.Uri
+import android.os.Build
+import android.provider.MediaStore
import android.util.Log
import androidx.exifinterface.media.ExifInterface
import com.adobe.internal.xmp.XMPException
@@ -18,6 +25,7 @@ import com.drew.metadata.iptc.IptcDirectory
import com.drew.metadata.mp4.media.Mp4UuidBoxDirectory
import com.drew.metadata.webp.WebpDirectory
import com.drew.metadata.xmp.XmpDirectory
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
import deckers.thibault.aves.metadata.*
import deckers.thibault.aves.metadata.ExifInterfaceHelper.describeAll
import deckers.thibault.aves.metadata.ExifInterfaceHelper.getSafeDateMillis
@@ -38,13 +46,14 @@ import deckers.thibault.aves.metadata.MetadataExtractorHelper.isGeoTiff
import deckers.thibault.aves.metadata.XMP.getSafeDateMillis
import deckers.thibault.aves.metadata.XMP.getSafeLocalizedText
import deckers.thibault.aves.metadata.XMP.isPanorama
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.provider.FileImageProvider
import deckers.thibault.aves.model.provider.ImageProvider
import deckers.thibault.aves.utils.BitmapUtils
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.MimeTypes
+import deckers.thibault.aves.utils.MimeTypes.isHeifLike
import deckers.thibault.aves.utils.MimeTypes.isImage
import deckers.thibault.aves.utils.MimeTypes.isMultimedia
import deckers.thibault.aves.utils.MimeTypes.isSupportedByExifInterface
@@ -66,14 +75,15 @@ import kotlin.math.roundToLong
class MetadataHandler(private val context: Context) : MethodCallHandler {
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
when (call.method) {
- "getAllMetadata" -> GlobalScope.launch(Dispatchers.IO) { getAllMetadata(call, Coresult(result)) }
- "getCatalogMetadata" -> GlobalScope.launch(Dispatchers.IO) { getCatalogMetadata(call, Coresult(result)) }
- "getOverlayMetadata" -> GlobalScope.launch(Dispatchers.IO) { getOverlayMetadata(call, Coresult(result)) }
- "getMultiPageInfo" -> GlobalScope.launch(Dispatchers.IO) { getMultiPageInfo(call, Coresult(result)) }
- "getPanoramaInfo" -> GlobalScope.launch(Dispatchers.IO) { getPanoramaInfo(call, Coresult(result)) }
- "getEmbeddedPictures" -> GlobalScope.launch(Dispatchers.IO) { getEmbeddedPictures(call, Coresult(result)) }
- "getExifThumbnails" -> GlobalScope.launch(Dispatchers.IO) { getExifThumbnails(call, Coresult(result)) }
- "extractXmpDataProp" -> GlobalScope.launch(Dispatchers.IO) { extractXmpDataProp(call, Coresult(result)) }
+ "getAllMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getAllMetadata) }
+ "getCatalogMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getCatalogMetadata) }
+ "getOverlayMetadata" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getOverlayMetadata) }
+ "getMultiPageInfo" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getMultiPageInfo) }
+ "getPanoramaInfo" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getPanoramaInfo) }
+ "getContentResolverProp" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getContentResolverProp) }
+ "getEmbeddedPictures" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getEmbeddedPictures) }
+ "getExifThumbnails" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::getExifThumbnails) }
+ "extractXmpDataProp" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::extractXmpDataProp) }
else -> result.notImplemented()
}
}
@@ -430,7 +440,7 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
}
}
- if (mimeType == MimeTypes.HEIC || mimeType == MimeTypes.HEIF) {
+ if (isHeifLike(mimeType)) {
retriever.getSafeInt(MediaMetadataRetriever.METADATA_KEY_NUM_TRACKS) {
if (it > 1) flags = flags or MASK_IS_MULTIPAGE
}
@@ -521,21 +531,57 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
return
}
- val pages = HashMap()
+ val pages = ArrayList>()
if (mimeType == MimeTypes.TIFF) {
- fun toMap(options: TiffBitmapFactory.Options): Map {
+ fun toMap(page: Int, options: TiffBitmapFactory.Options): HashMap {
return hashMapOf(
- "width" to options.outWidth,
- "height" to options.outHeight,
+ KEY_PAGE to page,
+ KEY_MIME_TYPE to mimeType,
+ KEY_WIDTH to options.outWidth,
+ KEY_HEIGHT to options.outHeight,
)
}
getTiffPageInfo(uri, 0)?.let { first ->
- pages[0] = toMap(first)
+ pages.add(toMap(0, first))
val pageCount = first.outDirectoryCount
for (i in 1 until pageCount) {
- getTiffPageInfo(uri, i)?.let { pages[i] = toMap(it) }
+ getTiffPageInfo(uri, i)?.let { pages.add(toMap(i, it)) }
}
}
+ } else if (isHeifLike(mimeType)) {
+ fun MediaFormat.getSafeInt(key: String, save: (value: Int) -> Unit) {
+ if (this.containsKey(key)) save(this.getInteger(key))
+ }
+
+ fun MediaFormat.getSafeLong(key: String, save: (value: Long) -> Unit) {
+ if (this.containsKey(key)) save(this.getLong(key))
+ }
+
+ val extractor = MediaExtractor()
+ extractor.setDataSource(context, uri, null)
+ for (i in 0 until extractor.trackCount) {
+ try {
+ val format = extractor.getTrackFormat(i)
+ format.getString(MediaFormat.KEY_MIME)?.let { mime ->
+ val trackMime = if (mime == MediaFormat.MIMETYPE_IMAGE_ANDROID_HEIC) MimeTypes.HEIC else mime
+ val page = hashMapOf(
+ KEY_PAGE to i,
+ KEY_MIME_TYPE to trackMime,
+ )
+ format.getSafeInt(MediaFormat.KEY_IS_DEFAULT) { page[KEY_IS_DEFAULT] = it != 0 }
+ format.getSafeInt(MediaFormat.KEY_TRACK_ID) { page[KEY_TRACK_ID] = it }
+ format.getSafeInt(MediaFormat.KEY_WIDTH) { page[KEY_WIDTH] = it }
+ format.getSafeInt(MediaFormat.KEY_HEIGHT) { page[KEY_HEIGHT] = it }
+ if (isVideo(trackMime)) {
+ format.getSafeLong(MediaFormat.KEY_DURATION) { page[KEY_DURATION] = it / 1000 }
+ }
+ pages.add(page)
+ }
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to get track information for uri=$uri, track num=$i", e)
+ }
+ }
+ extractor.release()
}
result.success(pages)
}
@@ -555,14 +601,16 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
val metadata = ImageMetadataReader.readMetadata(input)
val xmpDirs = metadata.getDirectoriesOfType(XmpDirectory::class.java)
try {
- fun getProp(propName: String): Int? = xmpDirs.map { it.xmpMeta.getPropertyInteger(XMP.GPANO_SCHEMA_NS, propName) }.firstOrNull { it != null }
+ fun getIntProp(propName: String): Int? = xmpDirs.map { it.xmpMeta.getPropertyInteger(XMP.GPANO_SCHEMA_NS, propName) }.firstOrNull { it != null }
+ fun getStringProp(propName: String): String? = xmpDirs.map { it.xmpMeta.getPropertyString(XMP.GPANO_SCHEMA_NS, propName) }.firstOrNull { it != null }
val fields: FieldMap = hashMapOf(
- "croppedAreaLeft" to getProp(XMP.GPANO_CROPPED_AREA_LEFT_PROP_NAME),
- "croppedAreaTop" to getProp(XMP.GPANO_CROPPED_AREA_TOP_PROP_NAME),
- "croppedAreaWidth" to getProp(XMP.GPANO_CROPPED_AREA_WIDTH_PROP_NAME),
- "croppedAreaHeight" to getProp(XMP.GPANO_CROPPED_AREA_HEIGHT_PROP_NAME),
- "fullPanoWidth" to getProp(XMP.GPANO_FULL_PANO_WIDTH_PROP_NAME),
- "fullPanoHeight" to getProp(XMP.GPANO_FULL_PANO_HEIGHT_PROP_NAME),
+ "croppedAreaLeft" to getIntProp(XMP.GPANO_CROPPED_AREA_LEFT_PROP_NAME),
+ "croppedAreaTop" to getIntProp(XMP.GPANO_CROPPED_AREA_TOP_PROP_NAME),
+ "croppedAreaWidth" to getIntProp(XMP.GPANO_CROPPED_AREA_WIDTH_PROP_NAME),
+ "croppedAreaHeight" to getIntProp(XMP.GPANO_CROPPED_AREA_HEIGHT_PROP_NAME),
+ "fullPanoWidth" to getIntProp(XMP.GPANO_FULL_PANO_WIDTH_PROP_NAME),
+ "fullPanoHeight" to getIntProp(XMP.GPANO_FULL_PANO_HEIGHT_PROP_NAME),
+ "projectionType" to (getStringProp(XMP.GPANO_PROJECTION_TYPE_PROP_NAME) ?: XMP.GPANO_PROJECTION_TYPE_DEFAULT),
)
result.success(fields)
return
@@ -580,6 +628,55 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
result.error("getPanoramaInfo-empty", "failed to read XMP from uri=$uri", null)
}
+ private fun getContentResolverProp(call: MethodCall, result: MethodChannel.Result) {
+ val mimeType = call.argument("mimeType")
+ val uri = call.argument("uri")?.let { Uri.parse(it) }
+ val prop = call.argument("prop")
+ if (mimeType == null || uri == null || prop == null) {
+ result.error("getContentResolverProp-args", "failed because of missing arguments", null)
+ return
+ }
+
+ var contentUri: Uri = uri
+ if (uri.scheme == ContentResolver.SCHEME_CONTENT && MediaStore.AUTHORITY.equals(uri.host, ignoreCase = true)) {
+ try {
+ val id = ContentUris.parseId(uri)
+ contentUri = when {
+ isImage(mimeType) -> ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id)
+ isVideo(mimeType) -> ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, id)
+ else -> uri
+ }
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ contentUri = MediaStore.setRequireOriginal(contentUri)
+ }
+ } catch (e: NumberFormatException) {
+ // ignore
+ }
+ }
+
+ val projection = arrayOf(prop)
+ val cursor = context.contentResolver.query(contentUri, projection, null, null, null)
+ if (cursor != null && cursor.moveToFirst()) {
+ var value: Any? = null
+ try {
+ value = when (cursor.getType(0)) {
+ Cursor.FIELD_TYPE_NULL -> null
+ Cursor.FIELD_TYPE_INTEGER -> cursor.getLong(0)
+ Cursor.FIELD_TYPE_FLOAT -> cursor.getFloat(0)
+ Cursor.FIELD_TYPE_STRING -> cursor.getString(0)
+ Cursor.FIELD_TYPE_BLOB -> cursor.getBlob(0)
+ else -> null
+ }
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to get value for key=$prop", e)
+ }
+ cursor.close()
+ result.success(value?.toString())
+ } else {
+ result.error("getContentResolverProp-null", "failed to get cursor for contentUri=$contentUri", null)
+ }
+ }
+
private fun getEmbeddedPictures(call: MethodCall, result: MethodChannel.Result) {
val uri = call.argument("uri")?.let { Uri.parse(it) }
if (uri == null) {
@@ -619,7 +716,7 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
val orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)
exif.thumbnailBitmap?.let { bitmap ->
TransformationUtils.rotateImageExif(BitmapUtils.getBitmapPool(context), bitmap, orientation)?.let {
- it.getBytes(canHaveAlpha = false, recycle = false)?.let { thumbnails.add(it) }
+ it.getBytes(canHaveAlpha = false, recycle = false)?.let { bytes -> thumbnails.add(bytes) }
}
}
}
@@ -733,7 +830,7 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
private val LOG_TAG = LogUtils.createTag(MetadataHandler::class.java)
const val CHANNEL = "deckers.thibault/aves/metadata"
- // catalog metadata
+ // catalog metadata & page info
private const val KEY_MIME_TYPE = "mimeType"
private const val KEY_DATE_MILLIS = "dateMillis"
private const val KEY_FLAGS = "flags"
@@ -742,6 +839,12 @@ class MetadataHandler(private val context: Context) : MethodCallHandler {
private const val KEY_LONGITUDE = "longitude"
private const val KEY_XMP_SUBJECTS = "xmpSubjects"
private const val KEY_XMP_TITLE_DESCRIPTION = "xmpTitleDescription"
+ private const val KEY_HEIGHT = "height"
+ private const val KEY_WIDTH = "width"
+ private const val KEY_PAGE = "page"
+ private const val KEY_TRACK_ID = "trackId"
+ private const val KEY_IS_DEFAULT = "isDefault"
+ private const val KEY_DURATION = "durationMillis"
private const val MASK_IS_ANIMATED = 1 shl 0
private const val MASK_IS_FLIPPED = 1 shl 1
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 6ff8babbb..248db4ff6 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
@@ -5,7 +5,7 @@ import android.media.MediaScannerConnection
import android.net.Uri
import android.os.Build
import android.os.storage.StorageManager
-import androidx.annotation.RequiresApi
+import deckers.thibault.aves.channel.calls.Coresult.Companion.safe
import deckers.thibault.aves.utils.PermissionManager
import deckers.thibault.aves.utils.StorageUtils.getVolumePaths
import io.flutter.plugin.common.MethodCall
@@ -20,27 +20,18 @@ import java.util.*
class StorageHandler(private val context: Context) : MethodCallHandler {
override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
when (call.method) {
- "getStorageVolumes" -> {
- val volumes: List> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- storageVolumes
- } else {
- // TODO TLAD find alternative for Android getFreeSpace(call, result)
- "getGrantedDirectories" -> result.success(ArrayList(PermissionManager.getGrantedDirs(context)))
- "getInaccessibleDirectories" -> getInaccessibleDirectories(call, result)
- "revokeDirectoryAccess" -> revokeDirectoryAccess(call, result)
- "scanFile" -> GlobalScope.launch(Dispatchers.IO) { scanFile(call, Coresult(result)) }
+ "getStorageVolumes" -> safe(call, result, ::getStorageVolumes)
+ "getFreeSpace" -> safe(call, result, ::getFreeSpace)
+ "getGrantedDirectories" -> safe(call, result, ::getGrantedDirectories)
+ "getInaccessibleDirectories" -> safe(call, result, ::getInaccessibleDirectories)
+ "revokeDirectoryAccess" -> safe(call, result, ::revokeDirectoryAccess)
+ "scanFile" -> GlobalScope.launch(Dispatchers.IO) { safe(call, result, ::scanFile) }
else -> result.notImplemented()
}
}
- private val storageVolumes: List>
- @RequiresApi(api = Build.VERSION_CODES.N)
- get() {
+ private fun getStorageVolumes(@Suppress("UNUSED_PARAMETER") call: MethodCall, result: MethodChannel.Result) {
+ val volumes: List> = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
val volumes = ArrayList>()
val sm = context.getSystemService(StorageManager::class.java)
if (sm != null) {
@@ -61,8 +52,13 @@ class StorageHandler(private val context: Context) : MethodCallHandler {
}
}
}
- return volumes
+ volumes
+ } else {
+ // TODO TLAD find alternative for Android ("path")
@@ -93,6 +89,10 @@ class StorageHandler(private val context: Context) : MethodCallHandler {
}
}
+ private fun getGrantedDirectories(@Suppress("UNUSED_PARAMETER") call: MethodCall, result: MethodChannel.Result) {
+ result.success(ArrayList(PermissionManager.getGrantedDirs(context)))
+ }
+
private fun getInaccessibleDirectories(call: MethodCall, result: MethodChannel.Result) {
val dirPaths = call.argument>("dirPaths")
if (dirPaths == null) {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/RegionFetcher.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/RegionFetcher.kt
similarity index 62%
rename from android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/RegionFetcher.kt
rename to android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/RegionFetcher.kt
index 7b9689a7e..9b168e565 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/RegionFetcher.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/RegionFetcher.kt
@@ -1,15 +1,22 @@
-package deckers.thibault.aves.channel.calls
+package deckers.thibault.aves.channel.calls.fetchers
import android.content.Context
+import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.BitmapRegionDecoder
import android.graphics.Rect
import android.net.Uri
import android.util.Size
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DecodeFormat
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
+import deckers.thibault.aves.decoder.MultiTrackImage
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.MimeTypes
import deckers.thibault.aves.utils.StorageUtils
import io.flutter.plugin.common.MethodChannel
+import java.io.File
import kotlin.math.roundToInt
class RegionFetcher internal constructor(
@@ -17,21 +24,42 @@ class RegionFetcher internal constructor(
) {
private var lastDecoderRef: LastDecoderRef? = null
+ private val pageTempUris = HashMap, Uri>()
+
+ private val multiTrackGlideOptions = RequestOptions()
+ .format(DecodeFormat.PREFER_ARGB_8888)
+ .diskCacheStrategy(DiskCacheStrategy.NONE)
+ .skipMemoryCache(true)
+
fun fetch(
uri: Uri,
mimeType: String,
+ pageId: Int?,
sampleSize: Int,
regionRect: Rect,
imageSize: Size,
result: MethodChannel.Result,
) {
+ if (MimeTypes.isHeifLike(mimeType) && pageId != null) {
+ val id = Pair(uri, pageId)
+ fetch(
+ uri = pageTempUris.getOrPut(id) { createJpegForPage(uri, pageId) },
+ mimeType = MimeTypes.JPEG,
+ pageId = null,
+ sampleSize = sampleSize,
+ regionRect = regionRect,
+ imageSize = imageSize,
+ result = result,
+ )
+ return
+ }
+
val options = BitmapFactory.Options().apply {
inSampleSize = sampleSize
}
var currentDecoderRef = lastDecoderRef
if (currentDecoderRef != null && currentDecoderRef.uri != uri) {
- currentDecoderRef.decoder.recycle()
currentDecoderRef = null
}
@@ -74,6 +102,26 @@ class RegionFetcher internal constructor(
result.error("getRegion-read-exception", "failed to initialize region decoder for uri=$uri regionRect=$regionRect", e.message)
}
}
+
+ private fun createJpegForPage(sourceUri: Uri, pageId: Int): Uri {
+ val target = Glide.with(context)
+ .asBitmap()
+ .apply(multiTrackGlideOptions)
+ .load(MultiTrackImage(context, sourceUri, pageId))
+ .submit()
+ try {
+ val bitmap = target.get()
+ val tempFile = File.createTempFile("aves", null, context.cacheDir).apply {
+ deleteOnExit()
+ outputStream().use { outputStream ->
+ bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream)
+ }
+ }
+ return Uri.fromFile(tempFile)
+ } finally {
+ Glide.with(context).clear(target)
+ }
+ }
}
private data class LastDecoderRef(
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ThumbnailFetcher.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/ThumbnailFetcher.kt
similarity index 87%
rename from android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ThumbnailFetcher.kt
rename to android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/ThumbnailFetcher.kt
index 3728fa209..e631af9eb 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/ThumbnailFetcher.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/ThumbnailFetcher.kt
@@ -1,4 +1,4 @@
-package deckers.thibault.aves.channel.calls
+package deckers.thibault.aves.channel.calls.fetchers
import android.content.ContentUris
import android.content.Context
@@ -13,11 +13,13 @@ import com.bumptech.glide.load.DecodeFormat
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.request.RequestOptions
import com.bumptech.glide.signature.ObjectKey
-import deckers.thibault.aves.decoder.TiffThumbnail
+import deckers.thibault.aves.decoder.MultiTrackImage
+import deckers.thibault.aves.decoder.TiffImage
import deckers.thibault.aves.decoder.VideoThumbnail
import deckers.thibault.aves.utils.BitmapUtils.applyExifOrientation
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.MimeTypes
+import deckers.thibault.aves.utils.MimeTypes.isHeifLike
import deckers.thibault.aves.utils.MimeTypes.isVideo
import deckers.thibault.aves.utils.MimeTypes.needRotationAfterContentResolverThumbnail
import deckers.thibault.aves.utils.MimeTypes.needRotationAfterGlide
@@ -32,14 +34,16 @@ class ThumbnailFetcher internal constructor(
private val isFlipped: Boolean,
width: Int?,
height: Int?,
- page: Int?,
+ private val pageId: Int?,
private val defaultSize: Int,
private val result: MethodChannel.Result,
) {
private val uri: Uri = Uri.parse(uri)
private val width: Int = if (width?.takeIf { it > 0 } != null) width else defaultSize
private val height: Int = if (height?.takeIf { it > 0 } != null) height else defaultSize
- private val page = page ?: 0
+ private val tiffFetch = mimeType == MimeTypes.TIFF
+ private val multiTrackFetch = isHeifLike(mimeType) && pageId != null
+ private val customFetch = tiffFetch || multiTrackFetch
fun fetch() {
var bitmap: Bitmap? = null
@@ -47,7 +51,7 @@ class ThumbnailFetcher internal constructor(
var exception: Exception? = null
try {
- if (mimeType != MimeTypes.TIFF && (width == defaultSize || height == defaultSize) && !isFlipped) {
+ if (!customFetch && (width == defaultSize || height == defaultSize) && !isFlipped) {
// Fetch low quality thumbnails when size is not specified.
// As of Android R, the Media Store content resolver may return a thumbnail
// that is automatically rotated according to EXIF orientation, but not flipped,
@@ -110,7 +114,7 @@ class ThumbnailFetcher internal constructor(
// add signature to ignore cache for images which got modified but kept the same URI
var options = RequestOptions()
.format(DecodeFormat.PREFER_RGB_565)
- .signature(ObjectKey("$dateModifiedSecs-$rotationDegrees-$isFlipped-$width-$page"))
+ .signature(ObjectKey("$dateModifiedSecs-$rotationDegrees-$isFlipped-$width-$pageId"))
.override(width, height)
val target = if (isVideo(mimeType)) {
@@ -121,7 +125,11 @@ class ThumbnailFetcher internal constructor(
.load(VideoThumbnail(context, uri))
.submit(width, height)
} else {
- val model: Any = if (mimeType == MimeTypes.TIFF) TiffThumbnail(context, uri, page) else uri
+ val model: Any = when {
+ tiffFetch -> TiffImage(context, uri, pageId)
+ multiTrackFetch -> MultiTrackImage(context, uri, pageId)
+ else -> uri
+ }
Glide.with(context)
.asBitmap()
.apply(options)
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/TiffRegionFetcher.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/TiffRegionFetcher.kt
similarity index 95%
rename from android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/TiffRegionFetcher.kt
rename to android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/TiffRegionFetcher.kt
index 2d17f62d6..502553422 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/TiffRegionFetcher.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/fetchers/TiffRegionFetcher.kt
@@ -1,4 +1,4 @@
-package deckers.thibault.aves.channel.calls
+package deckers.thibault.aves.channel.calls.fetchers
import android.content.Context
import android.graphics.Rect
@@ -13,9 +13,9 @@ class TiffRegionFetcher internal constructor(
) {
fun fetch(
uri: Uri,
+ page: Int,
sampleSize: Int,
regionRect: Rect,
- page: Int = 0,
result: MethodChannel.Result,
) {
try {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt
new file mode 100644
index 000000000..8142c1bb9
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ContentChangeStreamHandler.kt
@@ -0,0 +1,61 @@
+package deckers.thibault.aves.channel.streams
+
+import android.content.Context
+import android.database.ContentObserver
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import android.provider.MediaStore
+import android.util.Log
+import deckers.thibault.aves.utils.LogUtils
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.EventChannel.EventSink
+
+class ContentChangeStreamHandler(private val context: Context) : EventChannel.StreamHandler {
+ private val contentObserver = object : ContentObserver(null) {
+ override fun onChange(selfChange: Boolean) {
+ this.onChange(selfChange, null)
+ }
+
+ override fun onChange(selfChange: Boolean, uri: Uri?) {
+ // warning: querying the content resolver right after a change
+ // sometimes yields obsolete results
+ success(uri?.toString())
+ }
+ }
+ private lateinit var eventSink: EventSink
+ private lateinit var handler: Handler
+
+ init {
+ context.contentResolver.apply {
+ registerContentObserver(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, true, contentObserver)
+ registerContentObserver(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, true, contentObserver)
+ }
+ }
+
+ override fun onListen(arguments: Any?, eventSink: EventSink) {
+ this.eventSink = eventSink
+ handler = Handler(Looper.getMainLooper())
+ }
+
+ override fun onCancel(arguments: Any?) {}
+
+ fun dispose() {
+ context.contentResolver.unregisterContentObserver(contentObserver)
+ }
+
+ private fun success(uri: String?) {
+ handler.post {
+ try {
+ eventSink.success(uri)
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to use event sink", e)
+ }
+ }
+ }
+
+ companion object {
+ private val LOG_TAG = LogUtils.createTag(ContentChangeStreamHandler::class.java)
+ const val CHANNEL = "deckers.thibault/aves/contentchange"
+ }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
index 04087ca04..b0e464483 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageByteStreamHandler.kt
@@ -9,11 +9,14 @@ import com.bumptech.glide.Glide
import com.bumptech.glide.load.DecodeFormat
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.request.RequestOptions
+import deckers.thibault.aves.decoder.MultiTrackImage
+import deckers.thibault.aves.decoder.TiffImage
import deckers.thibault.aves.decoder.VideoThumbnail
import deckers.thibault.aves.utils.BitmapUtils.applyExifOrientation
import deckers.thibault.aves.utils.BitmapUtils.getBytes
import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.MimeTypes
+import deckers.thibault.aves.utils.MimeTypes.isHeifLike
import deckers.thibault.aves.utils.MimeTypes.isSupportedByFlutter
import deckers.thibault.aves.utils.MimeTypes.isVideo
import deckers.thibault.aves.utils.MimeTypes.needRotationAfterGlide
@@ -23,7 +26,6 @@ import io.flutter.plugin.common.EventChannel.EventSink
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
-import org.beyka.tiffbitmapfactory.TiffBitmapFactory
import java.io.IOException
import java.io.InputStream
@@ -84,7 +86,7 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
val uri = (arguments["uri"] as String?)?.let { Uri.parse(it) }
val rotationDegrees = arguments["rotationDegrees"] as Int
val isFlipped = arguments["isFlipped"] as Boolean
- val page = arguments["page"] as Int
+ val pageId = arguments["pageId"] as Int?
if (mimeType == null || uri == null) {
error("streamImage-args", "failed because of missing arguments", null)
@@ -94,11 +96,9 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
if (isVideo(mimeType)) {
streamVideoByGlide(uri)
- } else if (mimeType == MimeTypes.TIFF) {
- streamTiffImage(uri, page)
} else if (!isSupportedByFlutter(mimeType, rotationDegrees, isFlipped)) {
// decode exotic format on platform side, then encode it in portable format for Flutter
- streamImageByGlide(uri, mimeType, rotationDegrees, isFlipped)
+ streamImageByGlide(uri, pageId, mimeType, rotationDegrees, isFlipped)
} else {
// to be decoded by Flutter
streamImageAsIs(uri)
@@ -114,11 +114,19 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
}
}
- private fun streamImageByGlide(uri: Uri, mimeType: String, rotationDegrees: Int, isFlipped: Boolean) {
+ private fun streamImageByGlide(uri: Uri, pageId: Int?, mimeType: String, rotationDegrees: Int, isFlipped: Boolean) {
+ val model: Any = if (isHeifLike(mimeType) && pageId != null) {
+ MultiTrackImage(activity, uri, pageId)
+ } else if (mimeType == MimeTypes.TIFF) {
+ TiffImage(activity, uri, pageId)
+ } else {
+ uri
+ }
+
val target = Glide.with(activity)
.asBitmap()
.apply(glideOptions)
- .load(uri)
+ .load(model)
.submit()
try {
var bitmap = target.get()
@@ -157,28 +165,6 @@ class ImageByteStreamHandler(private val activity: Activity, private val argumen
}
}
- private fun streamTiffImage(uri: Uri, page: Int = 0) {
- val resolver = activity.contentResolver
- try {
- val fd = resolver.openFileDescriptor(uri, "r")?.detachFd()
- if (fd == null) {
- error("streamImage-tiff-fd", "failed to get file descriptor for uri=$uri", null)
- return
- }
- val options = TiffBitmapFactory.Options().apply {
- inDirectoryNumber = page
- }
- val bitmap = TiffBitmapFactory.decodeFileDescriptor(fd, options)
- if (bitmap != null) {
- success(bitmap.getBytes(canHaveAlpha = true, recycle = true))
- } else {
- error("streamImage-tiff-null", "failed to get tiff image (dir=$page) from uri=$uri", null)
- }
- } catch (e: Exception) {
- error("streamImage-tiff-exception", "failed to get image from uri=$uri", toErrorDetails(e))
- }
- }
-
private fun toErrorDetails(e: Exception): String? {
val errorDetails = e.message
return if (errorDetails?.isNotEmpty() == true) {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
index 503fad11e..86e8d0650 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/ImageOpStreamHandler.kt
@@ -5,8 +5,8 @@ import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.util.Log
-import deckers.thibault.aves.model.AvesImageEntry
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.AvesEntry
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.provider.ImageProvider.ImageOpCallback
import deckers.thibault.aves.model.provider.ImageProviderFactory.getProvider
import deckers.thibault.aves.utils.LogUtils
@@ -42,6 +42,7 @@ class ImageOpStreamHandler(private val context: Context, private val arguments:
when (op) {
"delete" -> GlobalScope.launch(Dispatchers.IO) { delete() }
+ "export" -> GlobalScope.launch(Dispatchers.IO) { export() }
"move" -> GlobalScope.launch(Dispatchers.IO) { move() }
else -> endOfStream()
}
@@ -80,36 +81,6 @@ class ImageOpStreamHandler(private val context: Context, private val arguments:
}
}
- private suspend fun move() {
- if (arguments !is Map<*, *> || entryMapList.isEmpty()) {
- endOfStream()
- return
- }
-
- // assume same provider for all entries
- val firstEntry = entryMapList.first()
- val provider = (firstEntry["uri"] as String?)?.let { Uri.parse(it) }?.let { getProvider(it) }
- if (provider == null) {
- error("move-provider", "failed to find provider for entry=$firstEntry", null)
- return
- }
-
- val copy = arguments["copy"] as Boolean?
- var destinationDir = arguments["destinationPath"] as String?
- if (copy == null || destinationDir == null) {
- error("move-args", "failed because of missing arguments", null)
- return
- }
-
- destinationDir = StorageUtils.ensureTrailingSeparator(destinationDir)
- val entries = entryMapList.map(::AvesImageEntry)
- provider.moveMultiple(context, copy, destinationDir, entries, object : ImageOpCallback {
- override fun onSuccess(fields: FieldMap) = success(fields)
- override fun onFailure(throwable: Throwable) = error("move-failure", "failed to move entries", throwable)
- })
- endOfStream()
- }
-
private suspend fun delete() {
if (entryMapList.isEmpty()) {
endOfStream()
@@ -144,6 +115,66 @@ class ImageOpStreamHandler(private val context: Context, private val arguments:
endOfStream()
}
+ private suspend fun export() {
+ if (arguments !is Map<*, *> || entryMapList.isEmpty()) {
+ endOfStream()
+ return
+ }
+
+ var destinationDir = arguments["destinationPath"] as String?
+ val mimeType = arguments["mimeType"] as String?
+ if (destinationDir == null || mimeType == null) {
+ error("export-args", "failed because of missing arguments", null)
+ return
+ }
+
+ // assume same provider for all entries
+ val firstEntry = entryMapList.first()
+ val provider = (firstEntry["uri"] as String?)?.let { Uri.parse(it) }?.let { getProvider(it) }
+ if (provider == null) {
+ error("export-provider", "failed to find provider for entry=$firstEntry", null)
+ return
+ }
+
+ destinationDir = StorageUtils.ensureTrailingSeparator(destinationDir)
+ val entries = entryMapList.map(::AvesEntry)
+ provider.exportMultiple(context, mimeType, destinationDir, entries, object : ImageOpCallback {
+ override fun onSuccess(fields: FieldMap) = success(fields)
+ override fun onFailure(throwable: Throwable) = error("export-failure", "failed to export entries", throwable)
+ })
+ endOfStream()
+ }
+
+ private suspend fun move() {
+ if (arguments !is Map<*, *> || entryMapList.isEmpty()) {
+ endOfStream()
+ return
+ }
+
+ val copy = arguments["copy"] as Boolean?
+ var destinationDir = arguments["destinationPath"] as String?
+ if (copy == null || destinationDir == null) {
+ error("move-args", "failed because of missing arguments", null)
+ return
+ }
+
+ // assume same provider for all entries
+ val firstEntry = entryMapList.first()
+ val provider = (firstEntry["uri"] as String?)?.let { Uri.parse(it) }?.let { getProvider(it) }
+ if (provider == null) {
+ error("move-provider", "failed to find provider for entry=$firstEntry", null)
+ return
+ }
+
+ destinationDir = StorageUtils.ensureTrailingSeparator(destinationDir)
+ val entries = entryMapList.map(::AvesEntry)
+ provider.moveMultiple(context, copy, destinationDir, entries, object : ImageOpCallback {
+ override fun onSuccess(fields: FieldMap) = success(fields)
+ override fun onFailure(throwable: Throwable) = error("move-failure", "failed to move entries", throwable)
+ })
+ endOfStream()
+ }
+
companion object {
private val LOG_TAG = LogUtils.createTag(ImageOpStreamHandler::class.java)
const val CHANNEL = "deckers.thibault/aves/imageopstream"
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/IntentStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/IntentStreamHandler.kt
index abd594c58..c5861f208 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/IntentStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/IntentStreamHandler.kt
@@ -18,4 +18,8 @@ class IntentStreamHandler : EventChannel.StreamHandler {
fun notifyNewIntent(intentData: MutableMap?) {
eventSink?.success(intentData)
}
+
+ companion object {
+ const val CHANNEL = "deckers.thibault/aves/intent"
+ }
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
index f2892cfb2..ac9fec726 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/streams/MediaStoreStreamHandler.kt
@@ -4,7 +4,7 @@ import android.content.Context
import android.os.Handler
import android.os.Looper
import android.util.Log
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.model.provider.MediaStoreImageProvider
import deckers.thibault.aves.utils.LogUtils
import io.flutter.plugin.common.EventChannel
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/MultiTrackImageGlideModule.kt b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/MultiTrackImageGlideModule.kt
new file mode 100644
index 000000000..290b7badd
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/MultiTrackImageGlideModule.kt
@@ -0,0 +1,73 @@
+package deckers.thibault.aves.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Build
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Priority
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.Options
+import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.data.DataFetcher.DataCallback
+import com.bumptech.glide.load.model.ModelLoader
+import com.bumptech.glide.load.model.ModelLoaderFactory
+import com.bumptech.glide.load.model.MultiModelLoaderFactory
+import com.bumptech.glide.module.LibraryGlideModule
+import com.bumptech.glide.signature.ObjectKey
+import deckers.thibault.aves.metadata.MultiTrackMedia
+
+
+@GlideModule
+class MultiTrackImageGlideModule : LibraryGlideModule() {
+ override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+ registry.append(MultiTrackImage::class.java, Bitmap::class.java, MultiTrackThumbnailLoader.Factory())
+ }
+}
+
+class MultiTrackImage(val context: Context, val uri: Uri, val trackId: Int?)
+
+internal class MultiTrackThumbnailLoader : ModelLoader {
+ override fun buildLoadData(model: MultiTrackImage, width: Int, height: Int, options: Options): ModelLoader.LoadData {
+ return ModelLoader.LoadData(ObjectKey(model.uri), MultiTrackImageFetcher(model, width, height))
+ }
+
+ override fun handles(model: MultiTrackImage): Boolean = true
+
+ internal class Factory : ModelLoaderFactory {
+ override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader = MultiTrackThumbnailLoader()
+
+ override fun teardown() {}
+ }
+}
+
+internal class MultiTrackImageFetcher(val model: MultiTrackImage, val width: Int, val height: Int) : DataFetcher {
+ override fun loadData(priority: Priority, callback: DataCallback) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+ callback.onLoadFailed(Exception("unsupported Android version"))
+ return
+ }
+
+ val context = model.context
+ val uri = model.uri
+ val trackId = model.trackId
+
+ val bitmap = MultiTrackMedia.getImage(context, uri, trackId)
+ if (bitmap == null) {
+ callback.onLoadFailed(Exception("null bitmap"))
+ } else {
+ callback.onDataReady(bitmap)
+ }
+ }
+
+ override fun cleanup() {}
+
+ // cannot cancel
+ override fun cancel() {}
+
+ override fun getDataClass(): Class = Bitmap::class.java
+
+ override fun getDataSource(): DataSource = DataSource.LOCAL
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffGlideModule.kt b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffGlideModule.kt
new file mode 100644
index 000000000..074f06332
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffGlideModule.kt
@@ -0,0 +1,99 @@
+package deckers.thibault.aves.decoder
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.net.Uri
+import com.bumptech.glide.Glide
+import com.bumptech.glide.Priority
+import com.bumptech.glide.Registry
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.load.DataSource
+import com.bumptech.glide.load.Options
+import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.data.DataFetcher.DataCallback
+import com.bumptech.glide.load.model.ModelLoader
+import com.bumptech.glide.load.model.ModelLoaderFactory
+import com.bumptech.glide.load.model.MultiModelLoaderFactory
+import com.bumptech.glide.module.LibraryGlideModule
+import com.bumptech.glide.signature.ObjectKey
+import org.beyka.tiffbitmapfactory.TiffBitmapFactory
+
+@GlideModule
+class TiffGlideModule : LibraryGlideModule() {
+ override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+ registry.append(TiffImage::class.java, Bitmap::class.java, TiffLoader.Factory())
+ }
+}
+
+class TiffImage(val context: Context, val uri: Uri, val page: Int?)
+
+internal class TiffLoader : ModelLoader {
+ override fun buildLoadData(model: TiffImage, width: Int, height: Int, options: Options): ModelLoader.LoadData {
+ return ModelLoader.LoadData(ObjectKey(model.uri), TiffFetcher(model, width, height))
+ }
+
+ override fun handles(model: TiffImage): Boolean = true
+
+ internal class Factory : ModelLoaderFactory {
+ override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader = TiffLoader()
+
+ override fun teardown() {}
+ }
+}
+
+internal class TiffFetcher(val model: TiffImage, val width: Int, val height: Int) : DataFetcher {
+ override fun loadData(priority: Priority, callback: DataCallback) {
+ val context = model.context
+ val uri = model.uri
+ val page = model.page ?: 0
+
+ var sampleSize = 1
+ if (width > 0 && height > 0) {
+ // determine sample size
+ val fd = context.contentResolver.openFileDescriptor(uri, "r")?.detachFd()
+ if (fd == null) {
+ callback.onLoadFailed(Exception("null file descriptor"))
+ return
+ }
+ val options = TiffBitmapFactory.Options().apply {
+ inJustDecodeBounds = true
+ inDirectoryNumber = page
+ }
+ TiffBitmapFactory.decodeFileDescriptor(fd, options)
+ val imageWidth = options.outWidth
+ val imageHeight = options.outHeight
+ if (imageHeight > height || imageWidth > width) {
+ while (imageHeight / (sampleSize * 2) > height && imageWidth / (sampleSize * 2) > width) {
+ sampleSize *= 2
+ }
+ }
+ }
+
+ // decode
+ val fd = context.contentResolver.openFileDescriptor(uri, "r")?.detachFd()
+ if (fd == null) {
+ callback.onLoadFailed(Exception("null file descriptor"))
+ return
+ }
+ val options = TiffBitmapFactory.Options().apply {
+ inJustDecodeBounds = false
+ inDirectoryNumber = page
+ inSampleSize = sampleSize
+ }
+ val bitmap = TiffBitmapFactory.decodeFileDescriptor(fd, options)
+ if (bitmap == null) {
+ callback.onLoadFailed(Exception("null bitmap"))
+ } else {
+ callback.onDataReady(bitmap)
+ }
+ }
+
+ override fun cleanup() {}
+
+ // cannot cancel
+ override fun cancel() {}
+
+ override fun getDataClass(): Class = Bitmap::class.java
+
+ override fun getDataSource(): DataSource = DataSource.LOCAL
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffThumbnailGlideModule.kt b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffThumbnailGlideModule.kt
deleted file mode 100644
index 30c3627c2..000000000
--- a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/TiffThumbnailGlideModule.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-package deckers.thibault.aves.decoder
-
-import android.content.Context
-import android.net.Uri
-import com.bumptech.glide.Glide
-import com.bumptech.glide.Priority
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.Options
-import com.bumptech.glide.load.data.DataFetcher
-import com.bumptech.glide.load.data.DataFetcher.DataCallback
-import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import com.bumptech.glide.module.LibraryGlideModule
-import com.bumptech.glide.signature.ObjectKey
-import deckers.thibault.aves.utils.BitmapUtils.getBytes
-import org.beyka.tiffbitmapfactory.TiffBitmapFactory
-import java.io.InputStream
-
-@GlideModule
-class TiffThumbnailGlideModule : LibraryGlideModule() {
- override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
- registry.append(TiffThumbnail::class.java, InputStream::class.java, TiffThumbnailLoader.Factory())
- }
-}
-
-class TiffThumbnail(val context: Context, val uri: Uri, val page: Int)
-
-internal class TiffThumbnailLoader : ModelLoader {
- override fun buildLoadData(model: TiffThumbnail, width: Int, height: Int, options: Options): ModelLoader.LoadData {
- return ModelLoader.LoadData(ObjectKey(model.uri), TiffThumbnailFetcher(model, width, height))
- }
-
- override fun handles(tiffThumbnail: TiffThumbnail): Boolean = true
-
- internal class Factory : ModelLoaderFactory {
- override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader = TiffThumbnailLoader()
-
- override fun teardown() {}
- }
-}
-
-internal class TiffThumbnailFetcher(val model: TiffThumbnail, val width: Int, val height: Int) : DataFetcher {
- override fun loadData(priority: Priority, callback: DataCallback) {
- val context = model.context
- val uri = model.uri
- val page = model.page
-
- // determine sample size
- var fd = context.contentResolver.openFileDescriptor(uri, "r")?.detachFd()
- if (fd == null) {
- callback.onLoadFailed(Exception("null file descriptor"))
- return
- }
- var sampleSize = 1
- var options = TiffBitmapFactory.Options().apply {
- inJustDecodeBounds = true
- inDirectoryNumber = page
- }
- TiffBitmapFactory.decodeFileDescriptor(fd, options)
- val imageWidth = options.outWidth
- val imageHeight = options.outHeight
- if (imageHeight > height || imageWidth > width) {
- while (imageHeight / (sampleSize * 2) > height && imageWidth / (sampleSize * 2) > width) {
- sampleSize *= 2
- }
- }
-
- // decode
- fd = context.contentResolver.openFileDescriptor(uri, "r")?.detachFd()
- if (fd == null) {
- callback.onLoadFailed(Exception("null file descriptor"))
- return
- }
- options = TiffBitmapFactory.Options().apply {
- inJustDecodeBounds = false
- inDirectoryNumber = page
- inSampleSize = sampleSize
- }
- val bitmap = TiffBitmapFactory.decodeFileDescriptor(fd, options)
- if (bitmap == null) {
- callback.onLoadFailed(Exception("null bitmap"))
- } else {
- callback.onDataReady(bitmap.getBytes()?.inputStream())
- }
- }
-
- // already cleaned up in loadData and ByteArrayInputStream will be GC'd
- override fun cleanup() {}
-
- // cannot cancel
- override fun cancel() {}
-
- override fun getDataClass(): Class = InputStream::class.java
-
- override fun getDataSource(): DataSource = DataSource.LOCAL
-}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/VideoThumbnailGlideModule.kt b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/VideoThumbnailGlideModule.kt
index a6045c773..278e55cc6 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/decoder/VideoThumbnailGlideModule.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/decoder/VideoThumbnailGlideModule.kt
@@ -1,7 +1,9 @@
package deckers.thibault.aves.decoder
import android.content.Context
+import android.media.MediaMetadataRetriever
import android.net.Uri
+import android.os.Build
import com.bumptech.glide.Glide
import com.bumptech.glide.Priority
import com.bumptech.glide.Registry
@@ -34,7 +36,7 @@ internal class VideoThumbnailLoader : ModelLoader {
return ModelLoader.LoadData(ObjectKey(model.uri), VideoThumbnailFetcher(model))
}
- override fun handles(videoThumbnail: VideoThumbnail): Boolean = true
+ override fun handles(model: VideoThumbnail): Boolean = true
internal class Factory : ModelLoaderFactory {
override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader = VideoThumbnailLoader()
@@ -48,9 +50,29 @@ internal class VideoThumbnailFetcher(private val model: VideoThumbnail) : DataFe
val retriever = openMetadataRetriever(model.context, model.uri)
if (retriever != null) {
try {
- val picture = retriever.embeddedPicture ?: retriever.frameAtTime?.getBytes(canHaveAlpha = false, recycle = false)
- if (picture != null) {
- callback.onDataReady(ByteArrayInputStream(picture))
+ var bytes = retriever.embeddedPicture
+ if (bytes == null) {
+ // try to match the thumbnails returned by the content resolver / Media Store
+ // the following strategies are from empirical evidence from a few test devices:
+ // - API 29: sync frame closest to the middle
+ // - API 26/27: default representative frame at any time position
+ var timeMillis: Long? = null
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ val durationMillis = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)?.toLongOrNull()
+ if (durationMillis != null) {
+ timeMillis = durationMillis / 2
+ }
+ }
+ val frame = if (timeMillis != null) {
+ retriever.getFrameAtTime(timeMillis * 1000)
+ } else {
+ retriever.frameAtTime
+ }
+ bytes = frame?.getBytes(canHaveAlpha = false, recycle = false)
+ }
+
+ if (bytes != null) {
+ callback.onDataReady(ByteArrayInputStream(bytes))
} else {
callback.onLoadFailed(Exception("failed to get embedded picture or any frame"))
}
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt
new file mode 100644
index 000000000..8ac8dad05
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/MultiTrackMedia.kt
@@ -0,0 +1,59 @@
+package deckers.thibault.aves.metadata
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.media.MediaExtractor
+import android.media.MediaFormat
+import android.net.Uri
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresApi
+import deckers.thibault.aves.utils.LogUtils
+import deckers.thibault.aves.utils.MimeTypes
+import deckers.thibault.aves.utils.StorageUtils
+
+object MultiTrackMedia {
+ private val LOG_TAG = LogUtils.createTag(MultiTrackMedia::class.java)
+
+ @RequiresApi(Build.VERSION_CODES.P)
+ fun getImage(context: Context, uri: Uri, trackId: Int?): Bitmap? {
+ val retriever = StorageUtils.openMetadataRetriever(context, uri) ?: return null
+ try {
+ return if (trackId != null) {
+ val imageIndex = trackIdToImageIndex(context, uri, trackId) ?: return null
+ retriever.getImageAtIndex(imageIndex)
+ } else {
+ retriever.primaryImage
+ }
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to extract image from uri=$uri trackId=$trackId", e)
+ } finally {
+ // cannot rely on `MediaMetadataRetriever` being `AutoCloseable` on older APIs
+ retriever.release()
+ }
+ return null
+ }
+
+ private fun trackIdToImageIndex(context: Context, uri: Uri, trackId: Int): Int? {
+ val extractor = MediaExtractor()
+ try {
+ extractor.setDataSource(context, uri, null)
+ val trackCount = extractor.trackCount
+ var imageIndex = 0
+ for (i in 0 until trackCount) {
+ val trackFormat = extractor.getTrackFormat(i)
+ if (trackId == trackFormat.getInteger(MediaFormat.KEY_TRACK_ID)) {
+ return imageIndex
+ }
+ if (MimeTypes.isImage(trackFormat.getString(MediaFormat.KEY_MIME))) {
+ imageIndex++
+ }
+ }
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to get image index for uri=$uri, trackId=$trackId", e)
+ } finally {
+ extractor.release()
+ }
+ return null
+ }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
index 1e67bdfa4..0ca46696b 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt
@@ -1,6 +1,7 @@
package deckers.thibault.aves.metadata
import android.util.Log
+import com.adobe.internal.xmp.XMPError
import com.adobe.internal.xmp.XMPException
import com.adobe.internal.xmp.XMPMeta
import deckers.thibault.aves.utils.LogUtils
@@ -9,6 +10,8 @@ import java.util.*
object XMP {
private val LOG_TAG = LogUtils.createTag(XMP::class.java)
+ // standard namespaces
+ // cf com.adobe.internal.xmp.XMPConst
const val DC_SCHEMA_NS = "http://purl.org/dc/elements/1.1/"
const val PHOTOSHOP_SCHEMA_NS = "http://ns.adobe.com/photoshop/1.0/"
const val XMP_SCHEMA_NS = "http://ns.adobe.com/xap/1.0/"
@@ -51,27 +54,46 @@ object XMP {
const val GPANO_CROPPED_AREA_TOP_PROP_NAME = "GPano:CroppedAreaTopPixels"
const val GPANO_FULL_PANO_HEIGHT_PROP_NAME = "GPano:FullPanoHeightPixels"
const val GPANO_FULL_PANO_WIDTH_PROP_NAME = "GPano:FullPanoWidthPixels"
- private const val GPANO_PROJECTION_TYPE_PROP_NAME = "GPano:ProjectionType"
+ const val GPANO_PROJECTION_TYPE_PROP_NAME = "GPano:ProjectionType"
+ const val GPANO_PROJECTION_TYPE_DEFAULT = "equirectangular"
private const val PMTM_IS_PANO360 = "pmtm:IsPano360"
+ // `GPano:ProjectionType` is required by spec but it is sometimes missing, assuming default
+ // `GPano:FullPanoHeightPixels` is required by spec but it is sometimes missing (e.g. Samsung Camera app panorama mode)
private val gpanoRequiredProps = listOf(
GPANO_CROPPED_AREA_HEIGHT_PROP_NAME,
GPANO_CROPPED_AREA_WIDTH_PROP_NAME,
GPANO_CROPPED_AREA_LEFT_PROP_NAME,
GPANO_CROPPED_AREA_TOP_PROP_NAME,
- GPANO_FULL_PANO_HEIGHT_PROP_NAME,
GPANO_FULL_PANO_WIDTH_PROP_NAME,
- GPANO_PROJECTION_TYPE_PROP_NAME,
)
// extensions
fun XMPMeta.isPanorama(): Boolean {
// Google
- if (gpanoRequiredProps.all { doesPropertyExist(GPANO_SCHEMA_NS, it) }) return true
+ try {
+ if (gpanoRequiredProps.all { doesPropertyExist(GPANO_SCHEMA_NS, it) }) return true
+ } catch (e: XMPException) {
+ if (e.errorCode != XMPError.BADSCHEMA) {
+ // `BADSCHEMA` code is reported when we check a property
+ // from a non standard namespace, and that namespace is not declared in the XMP
+ Log.w(LOG_TAG, "failed to check Google panorama props from XMP", e)
+ }
+ }
+
// Photomatix
- if (getPropertyString(PMTM_SCHEMA_NS, PMTM_IS_PANO360) == "Yes") return true
+ try {
+ if (getPropertyString(PMTM_SCHEMA_NS, PMTM_IS_PANO360) == "Yes") return true
+ } catch (e: XMPException) {
+ if (e.errorCode != XMPError.BADSCHEMA) {
+ // `BADSCHEMA` code is reported when we check a property
+ // from a non standard namespace, and that namespace is not declared in the XMP
+ Log.w(LOG_TAG, "failed to check Photomatix panorama props from XMP", e)
+ }
+ }
+
return false
}
@@ -102,7 +124,7 @@ object XMP {
}
}
} catch (e: XMPException) {
- Log.w(LOG_TAG, "failed to get text for XMP schema=$schema, propName=$propName", e)
+ Log.w(LOG_TAG, "failed to get date for XMP schema=$schema, propName=$propName", e)
}
}
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/AvesImageEntry.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/AvesEntry.kt
similarity index 66%
rename from android/app/src/main/kotlin/deckers/thibault/aves/model/AvesImageEntry.kt
rename to android/app/src/main/kotlin/deckers/thibault/aves/model/AvesEntry.kt
index 06adb5d03..872ed6819 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/AvesImageEntry.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/AvesEntry.kt
@@ -1,13 +1,15 @@
package deckers.thibault.aves.model
import android.net.Uri
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
-class AvesImageEntry(map: FieldMap) {
+class AvesEntry(map: FieldMap) {
val uri: Uri = Uri.parse(map["uri"] as String) // content or file URI
val path = map["path"] as String? // best effort to get local path
+ val pageId = map["pageId"] as Int? // null means the main entry
val mimeType = map["mimeType"] as String
val width = map["width"] as Int
val height = map["height"] as Int
val rotationDegrees = map["rotationDegrees"] as Int
+ val isFlipped = map["isFlipped"] as Boolean
}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/FieldMap.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/FieldMap.kt
new file mode 100644
index 000000000..78592a2b0
--- /dev/null
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/FieldMap.kt
@@ -0,0 +1,3 @@
+package deckers.thibault.aves.model
+
+typealias FieldMap = MutableMap
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceImageEntry.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
similarity index 98%
rename from android/app/src/main/kotlin/deckers/thibault/aves/model/SourceImageEntry.kt
rename to android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
index 2e963ae6a..5a51905da 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceImageEntry.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/SourceEntry.kt
@@ -25,13 +25,13 @@ import deckers.thibault.aves.metadata.Metadata.getRotationDegreesForExifCode
import deckers.thibault.aves.metadata.MetadataExtractorHelper.getSafeDateMillis
import deckers.thibault.aves.metadata.MetadataExtractorHelper.getSafeInt
import deckers.thibault.aves.metadata.MetadataExtractorHelper.getSafeLong
-import deckers.thibault.aves.model.provider.FieldMap
+import deckers.thibault.aves.model.FieldMap
import deckers.thibault.aves.utils.MimeTypes
import deckers.thibault.aves.utils.StorageUtils
import org.beyka.tiffbitmapfactory.TiffBitmapFactory
import java.io.IOException
-class SourceImageEntry {
+class SourceEntry {
val uri: Uri // content or file URI
var path: String? = null // best effort to get local path
private val sourceMimeType: String
@@ -119,7 +119,7 @@ class SourceImageEntry {
// metadata retrieval
// expects entry with: uri, mimeType
// finds: width, height, orientation/rotation, date, title, duration
- fun fillPreCatalogMetadata(context: Context): SourceImageEntry {
+ fun fillPreCatalogMetadata(context: Context): SourceEntry {
if (isSvg) return this
if (isVideo) {
fillVideoByMediaMetadataRetriever(context)
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ContentImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ContentImageProvider.kt
index 006e61e2f..96b49e980 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ContentImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/ContentImageProvider.kt
@@ -3,7 +3,7 @@ package deckers.thibault.aves.model.provider
import android.content.Context
import android.net.Uri
import android.provider.MediaStore
-import deckers.thibault.aves.model.SourceImageEntry
+import deckers.thibault.aves.model.SourceEntry
internal class ContentImageProvider : ImageProvider() {
override suspend fun fetchSingle(context: Context, uri: Uri, mimeType: String?, callback: ImageOpCallback) {
@@ -28,7 +28,7 @@ internal class ContentImageProvider : ImageProvider() {
return
}
- val entry = SourceImageEntry(map).fillPreCatalogMetadata(context)
+ val entry = SourceEntry(map).fillPreCatalogMetadata(context)
if (entry.isSized || entry.isSvg) {
callback.onSuccess(entry.toMap())
} else {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
index f47adb072..7a08724bf 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/model/provider/FileImageProvider.kt
@@ -2,7 +2,7 @@ package deckers.thibault.aves.model.provider
import android.content.Context
import android.net.Uri
-import deckers.thibault.aves.model.SourceImageEntry
+import deckers.thibault.aves.model.SourceEntry
import java.io.File
internal class FileImageProvider : ImageProvider() {
@@ -12,7 +12,7 @@ internal class FileImageProvider : ImageProvider() {
return
}
- val entry = SourceImageEntry(uri, mimeType)
+ val entry = SourceEntry(uri, mimeType)
val path = uri.path
if (path != 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 8814ee5c7..f92ba728c 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
@@ -2,18 +2,28 @@ package deckers.thibault.aves.model.provider
import android.content.ContentUris
import android.content.Context
+import android.graphics.Bitmap
import android.media.MediaScannerConnection
import android.net.Uri
+import android.os.Build
import android.provider.MediaStore
import android.util.Log
import androidx.exifinterface.media.ExifInterface
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.DecodeFormat
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
import com.commonsware.cwac.document.DocumentFileCompat
-import deckers.thibault.aves.model.AvesImageEntry
+import deckers.thibault.aves.decoder.MultiTrackImage
+import deckers.thibault.aves.decoder.TiffImage
+import deckers.thibault.aves.model.AvesEntry
import deckers.thibault.aves.model.ExifOrientationOp
+import deckers.thibault.aves.model.FieldMap
+import deckers.thibault.aves.utils.BitmapUtils
import deckers.thibault.aves.utils.LogUtils
-import deckers.thibault.aves.utils.MimeTypes.isImage
-import deckers.thibault.aves.utils.MimeTypes.isVideo
+import deckers.thibault.aves.utils.MimeTypes
import deckers.thibault.aves.utils.StorageUtils.copyFileToTemp
+import deckers.thibault.aves.utils.StorageUtils.createDirectoryIfAbsent
import deckers.thibault.aves.utils.StorageUtils.getDocumentFile
import java.io.File
import java.io.FileNotFoundException
@@ -32,10 +42,151 @@ abstract class ImageProvider {
throw UnsupportedOperationException()
}
- open suspend fun moveMultiple(context: Context, copy: Boolean, destinationDir: String, entries: List, callback: ImageOpCallback) {
+ open suspend fun moveMultiple(context: Context, copy: Boolean, destinationDir: String, entries: List, callback: ImageOpCallback) {
callback.onFailure(UnsupportedOperationException())
}
+ suspend fun exportMultiple(
+ context: Context,
+ mimeType: String,
+ destinationDir: String,
+ entries: List,
+ callback: ImageOpCallback,
+ ) {
+ val destinationDirDocFile = createDirectoryIfAbsent(context, destinationDir)
+ if (destinationDirDocFile == null) {
+ callback.onFailure(Exception("failed to create directory at path=$destinationDir"))
+ return
+ }
+
+ for (entry in entries) {
+ val sourceUri = entry.uri
+ val sourcePath = entry.path
+ val pageId = entry.pageId
+
+ val result = hashMapOf(
+ "uri" to sourceUri.toString(),
+ "pageId" to pageId,
+ "success" to false,
+ )
+
+ try {
+ val newFields = exportSingleByTreeDocAndScan(
+ context = context,
+ sourceEntry = entry,
+ destinationDir = destinationDir,
+ destinationDirDocFile = destinationDirDocFile,
+ exportMimeType = mimeType,
+ )
+ result["newFields"] = newFields
+ result["success"] = true
+ } catch (e: Exception) {
+ Log.w(LOG_TAG, "failed to export to destinationDir=$destinationDir entry with sourcePath=$sourcePath pageId=$pageId", e)
+ }
+ callback.onSuccess(result)
+ }
+ }
+
+ private suspend fun exportSingleByTreeDocAndScan(
+ context: Context,
+ sourceEntry: AvesEntry,
+ destinationDir: String,
+ destinationDirDocFile: DocumentFileCompat,
+ exportMimeType: String,
+ ): FieldMap {
+ val sourceMimeType = sourceEntry.mimeType
+ val sourceUri = sourceEntry.uri
+ val pageId = sourceEntry.pageId
+
+ var desiredNameWithoutExtension = if (sourceEntry.path != null) {
+ val sourcePath = sourceEntry.path
+ val sourceFile = File(sourcePath)
+ val sourceFileName = sourceFile.name
+ sourceFileName.replaceFirst("[.][^.]+$".toRegex(), "")
+ } else {
+ sourceUri.lastPathSegment!!
+ }
+ if (pageId != null) {
+ val page = if (sourceMimeType == MimeTypes.TIFF) pageId + 1 else pageId
+ desiredNameWithoutExtension += "_${page.toString().padStart(3, '0')}"
+ }
+ val desiredFileName = desiredNameWithoutExtension + when (exportMimeType) {
+ MimeTypes.JPEG -> ".jpg"
+ MimeTypes.PNG -> ".png"
+ MimeTypes.WEBP -> ".webp"
+ else -> throw Exception("unsupported export MIME type=$exportMimeType")
+ }
+
+ if (File(destinationDir, desiredFileName).exists()) {
+ throw Exception("file with name=$desiredFileName already exists in destination directory")
+ }
+
+ // the file created from a `TreeDocumentFile` is also a `TreeDocumentFile`
+ // but in order to open an output stream to it, we need to use a `SingleDocumentFile`
+ // through a document URI, not a tree URI
+ // note that `DocumentFile.getParentFile()` returns null if we did not pick a tree first
+ @Suppress("BlockingMethodInNonBlockingContext")
+ val destinationTreeFile = destinationDirDocFile.createFile(exportMimeType, desiredNameWithoutExtension)
+ val destinationDocFile = DocumentFileCompat.fromSingleUri(context, destinationTreeFile.uri)
+
+ val model: Any = if (MimeTypes.isHeifLike(sourceMimeType) && pageId != null) {
+ MultiTrackImage(context, sourceUri, pageId)
+ } else if (sourceMimeType == MimeTypes.TIFF) {
+ TiffImage(context, sourceUri, pageId)
+ } else {
+ sourceUri
+ }
+
+ // request a fresh image with the highest quality format
+ val glideOptions = RequestOptions()
+ .format(DecodeFormat.PREFER_ARGB_8888)
+ .diskCacheStrategy(DiskCacheStrategy.NONE)
+ .skipMemoryCache(true)
+
+ val target = Glide.with(context)
+ .asBitmap()
+ .apply(glideOptions)
+ .load(model)
+ .submit()
+ try {
+ @Suppress("BlockingMethodInNonBlockingContext")
+ var bitmap = target.get()
+ if (MimeTypes.needRotationAfterGlide(sourceMimeType)) {
+ bitmap = BitmapUtils.applyExifOrientation(context, bitmap, sourceEntry.rotationDegrees, sourceEntry.isFlipped)
+ }
+ bitmap ?: throw Exception("failed to get image from uri=$sourceUri page=$pageId")
+
+ val quality = 100
+ val format = when (exportMimeType) {
+ MimeTypes.JPEG -> Bitmap.CompressFormat.JPEG
+ MimeTypes.PNG -> Bitmap.CompressFormat.PNG
+ MimeTypes.WEBP -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+ if (quality == 100) {
+ Bitmap.CompressFormat.WEBP_LOSSLESS
+ } else {
+ Bitmap.CompressFormat.WEBP_LOSSY
+ }
+ } else {
+ @Suppress("DEPRECATION")
+ Bitmap.CompressFormat.WEBP
+ }
+ else -> throw Exception("unsupported export MIME type=$exportMimeType")
+ }
+
+ @Suppress("BlockingMethodInNonBlockingContext")
+ destinationDocFile.openOutputStream().use {
+ bitmap.compress(format, quality, it)
+ }
+ } finally {
+ Glide.with(context).clear(target)
+ }
+
+ val fileName = destinationDocFile.name
+ val destinationFullPath = destinationDir + fileName
+
+ return scanNewPath(context, destinationFullPath, exportMimeType)
+ }
+
suspend fun rename(context: Context, oldPath: String, oldMediaUri: Uri, mimeType: String, newFilename: String, callback: ImageOpCallback) {
val oldFile = File(oldPath)
val newFile = File(oldFile.parent, newFilename)
@@ -147,9 +298,9 @@ abstract class ImageProvider {
// `newURI` is possibly a file media URI (e.g. "content://media/12a9-8b42/file/62872")
// but we need an image/video media URI (e.g. "content://media/external/images/media/62872")
contentId = ContentUris.parseId(newUri)
- if (isImage(mimeType)) {
+ if (MimeTypes.isImage(mimeType)) {
contentUri = ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentId)
- } else if (isVideo(mimeType)) {
+ } else if (MimeTypes.isVideo(mimeType)) {
contentUri = ContentUris.withAppendedId(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, contentId)
}
}
@@ -198,5 +349,3 @@ abstract class ImageProvider {
private val LOG_TAG = LogUtils.createTag(ImageProvider::class.java)
}
}
-
-typealias FieldMap = MutableMap
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 7329453a0..cf90f1b5d 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
@@ -8,8 +8,9 @@ import android.os.Build
import android.provider.MediaStore
import android.util.Log
import com.commonsware.cwac.document.DocumentFileCompat
-import deckers.thibault.aves.model.AvesImageEntry
-import deckers.thibault.aves.model.SourceImageEntry
+import deckers.thibault.aves.model.AvesEntry
+import deckers.thibault.aves.model.FieldMap
+import deckers.thibault.aves.model.SourceEntry
import deckers.thibault.aves.utils.LogUtils
import deckers.thibault.aves.utils.MimeTypes
import deckers.thibault.aves.utils.MimeTypes.isImage
@@ -158,7 +159,7 @@ class MediaStoreImageProvider : ImageProvider() {
// missing some attributes such as width, height, orientation.
// Also, the reported size of raw images is inconsistent across devices
// and Android versions (sometimes the raw size, sometimes the decoded size).
- val entry = SourceImageEntry(entryMap).fillPreCatalogMetadata(context)
+ val entry = SourceEntry(entryMap).fillPreCatalogMetadata(context)
entryMap = entry.toMap()
}
@@ -185,7 +186,7 @@ class MediaStoreImageProvider : ImageProvider() {
override suspend fun delete(context: Context, uri: Uri, path: String?) {
path ?: throw Exception("failed to delete file because path is null")
- if (requireAccessPermission(context, path)) {
+ if (File(path).exists() && requireAccessPermission(context, path)) {
// if the file is on SD card, calling the content resolver `delete()` removes the entry from the Media Store
// but it doesn't delete the file, even if the app has the permission
val df = getDocumentFile(context, path, uri)
@@ -203,7 +204,7 @@ class MediaStoreImageProvider : ImageProvider() {
context: Context,
copy: Boolean,
destinationDir: String,
- entries: List,
+ entries: List,
callback: ImageOpCallback,
) {
val destinationDirDocFile = createDirectoryIfAbsent(context, destinationDir)
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
index cb70f3347..2f71186ee 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/BitmapUtils.kt
@@ -26,7 +26,7 @@ object BitmapUtils {
} catch (e: IllegalStateException) {
Log.e(LOG_TAG, "failed to get bytes from bitmap", e)
}
- return null;
+ return null
}
fun applyExifOrientation(context: Context, bitmap: Bitmap?, rotationDegrees: Int?, isFlipped: Boolean?): Bitmap? {
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
index 9f7766d36..f033dbf22 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/MimeTypes.kt
@@ -9,10 +9,10 @@ object MimeTypes {
private const val BMP = "image/bmp"
const val GIF = "image/gif"
const val HEIC = "image/heic"
- const val HEIF = "image/heif"
+ private const val HEIF = "image/heif"
private const val ICO = "image/x-icon"
- private const val JPEG = "image/jpeg"
- private const val PNG = "image/png"
+ const val JPEG = "image/jpeg"
+ const val PNG = "image/png"
const val TIFF = "image/tiff"
private const val WBMP = "image/vnd.wap.wbmp"
const val WEBP = "image/webp"
@@ -41,10 +41,9 @@ object MimeTypes {
fun isVideo(mimeType: String?) = mimeType != null && mimeType.startsWith(VIDEO)
- fun isMultimedia(mimeType: String?) = when (mimeType) {
- HEIC, HEIF -> true
- else -> isVideo(mimeType)
- }
+ fun isHeifLike(mimeType: String?) = mimeType != null && (mimeType == HEIC || mimeType == HEIF)
+
+ fun isMultimedia(mimeType: String?) = isVideo(mimeType) || isHeifLike(mimeType)
fun isRaw(mimeType: String): Boolean {
return when (mimeType) {
diff --git a/android/build.gradle b/android/build.gradle
index 65df263a7..006020e81 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
// TODO TLAD upgrade AGP to 4+ when this lands on stable: https://github.com/flutter/flutter/pull/70808
classpath 'com.android.tools.build:gradle:3.6.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath 'com.google.gms:google-services:4.3.4'
+ classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
}
}
diff --git a/lib/image_providers/app_icon_image_provider.dart b/lib/image_providers/app_icon_image_provider.dart
index 06d21092c..cbc7490e5 100644
--- a/lib/image_providers/app_icon_image_provider.dart
+++ b/lib/image_providers/app_icon_image_provider.dart
@@ -2,7 +2,7 @@ import 'dart:ui' as ui show Codec;
import 'package:aves/services/android_app_service.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
class AppIconImage extends ImageProvider {
const AppIconImage({
diff --git a/lib/image_providers/region_provider.dart b/lib/image_providers/region_provider.dart
index ce08b6967..3563d9419 100644
--- a/lib/image_providers/region_provider.dart
+++ b/lib/image_providers/region_provider.dart
@@ -2,10 +2,9 @@ import 'dart:async';
import 'dart:math';
import 'dart:ui' as ui show Codec;
-import 'package:aves/model/image_entry.dart';
import 'package:aves/services/image_file_service.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
class RegionProvider extends ImageProvider {
final RegionProviderKey key;
@@ -23,7 +22,7 @@ class RegionProvider extends ImageProvider {
codec: _loadAsync(key, decode),
scale: key.scale,
informationCollector: () sync* {
- yield ErrorDescription('uri=${key.uri}, regionRect=${key.regionRect}');
+ yield ErrorDescription('uri=${key.uri}, pageId=${key.pageId}, mimeType=${key.mimeType}, region=${key.region}');
},
);
}
@@ -31,6 +30,7 @@ class RegionProvider extends ImageProvider {
Future _loadAsync(RegionProviderKey key, DecoderCallback decode) async {
final uri = key.uri;
final mimeType = key.mimeType;
+ final pageId = key.pageId;
try {
final bytes = await ImageFileService.getRegion(
uri,
@@ -38,9 +38,9 @@ class RegionProvider extends ImageProvider {
key.rotationDegrees,
key.isFlipped,
key.sampleSize,
- key.regionRect,
+ key.region,
key.imageSize,
- page: key.page,
+ pageId: pageId,
taskKey: key,
);
if (bytes == null) {
@@ -49,7 +49,7 @@ class RegionProvider extends ImageProvider {
return await decode(bytes);
} catch (error) {
debugPrint('$runtimeType _loadAsync failed with mimeType=$mimeType, uri=$uri, error=$error');
- throw StateError('$mimeType region decoding failed');
+ throw StateError('$mimeType region decoding failed (page $pageId)');
}
}
@@ -63,21 +63,23 @@ class RegionProvider extends ImageProvider {
}
class RegionProviderKey {
+ // do not store the entry as it is, because the key should be constant
+ // but the entry attributes may change over time
final String uri, mimeType;
- final int rotationDegrees, sampleSize, page;
+ final int pageId, rotationDegrees, sampleSize;
final bool isFlipped;
- final Rectangle regionRect;
+ final Rectangle region;
final Size imageSize;
final double scale;
const RegionProviderKey({
@required this.uri,
@required this.mimeType,
+ @required this.pageId,
@required this.rotationDegrees,
@required this.isFlipped,
- this.page = 0,
@required this.sampleSize,
- @required this.regionRect,
+ @required this.region,
@required this.imageSize,
this.scale = 1.0,
}) : assert(uri != null),
@@ -85,49 +87,29 @@ class RegionProviderKey {
assert(rotationDegrees != null),
assert(isFlipped != null),
assert(sampleSize != null),
- assert(regionRect != null),
+ assert(region != null),
assert(imageSize != null),
assert(scale != null);
- // do not store the entry as it is, because the key should be constant
- // but the entry attributes may change over time
- factory RegionProviderKey.fromEntry(
- ImageEntry entry, {
- int page = 0,
- @required int sampleSize,
- @required Rectangle rect,
- }) {
- return RegionProviderKey(
- uri: entry.uri,
- mimeType: entry.mimeType,
- rotationDegrees: entry.rotationDegrees,
- isFlipped: entry.isFlipped,
- page: page,
- sampleSize: sampleSize,
- regionRect: rect,
- imageSize: Size(entry.width.toDouble(), entry.height.toDouble()),
- );
- }
-
@override
bool operator ==(Object other) {
if (other.runtimeType != runtimeType) return false;
- return other is RegionProviderKey && other.uri == uri && other.mimeType == mimeType && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.page == page && other.sampleSize == sampleSize && other.regionRect == regionRect && other.imageSize == imageSize && other.scale == scale;
+ return other is RegionProviderKey && other.uri == uri && other.mimeType == mimeType && other.pageId == pageId && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.sampleSize == sampleSize && other.region == region && other.imageSize == imageSize && other.scale == scale;
}
@override
int get hashCode => hashValues(
uri,
mimeType,
+ pageId,
rotationDegrees,
isFlipped,
- page,
sampleSize,
- regionRect,
+ region,
imageSize,
scale,
);
@override
- String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, page=$page, sampleSize=$sampleSize, regionRect=$regionRect, imageSize=$imageSize, scale=$scale}';
+ String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, pageId=$pageId, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, sampleSize=$sampleSize, region=$region, imageSize=$imageSize, scale=$scale}';
}
diff --git a/lib/image_providers/thumbnail_provider.dart b/lib/image_providers/thumbnail_provider.dart
index 62546bbae..fac117ab4 100644
--- a/lib/image_providers/thumbnail_provider.dart
+++ b/lib/image_providers/thumbnail_provider.dart
@@ -1,9 +1,8 @@
import 'dart:ui' as ui show Codec;
-import 'package:aves/model/image_entry.dart';
import 'package:aves/services/image_file_service.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
class ThumbnailProvider extends ImageProvider {
final ThumbnailProviderKey key;
@@ -24,7 +23,7 @@ class ThumbnailProvider extends ImageProvider {
codec: _loadAsync(key, decode),
scale: key.scale,
informationCollector: () sync* {
- yield ErrorDescription('uri=${key.uri}, extent=${key.extent}');
+ yield ErrorDescription('uri=${key.uri}, pageId=${key.pageId}, mimeType=${key.mimeType}, extent=${key.extent}');
},
);
}
@@ -32,16 +31,16 @@ class ThumbnailProvider extends ImageProvider {
Future _loadAsync(ThumbnailProviderKey key, DecoderCallback decode) async {
final uri = key.uri;
final mimeType = key.mimeType;
+ final pageId = key.pageId;
try {
final bytes = await ImageFileService.getThumbnail(
- uri,
- mimeType,
- key.dateModifiedSecs,
- key.rotationDegrees,
- key.isFlipped,
- key.extent,
- key.extent,
- page: key.page,
+ uri: uri,
+ mimeType: mimeType,
+ pageId: pageId,
+ rotationDegrees: key.rotationDegrees,
+ isFlipped: key.isFlipped,
+ dateModifiedSecs: key.dateModifiedSecs,
+ extent: key.extent,
taskKey: key,
);
if (bytes == null) {
@@ -50,7 +49,7 @@ class ThumbnailProvider extends ImageProvider {
return await decode(bytes);
} catch (error) {
debugPrint('$runtimeType _loadAsync failed with uri=$uri, error=$error');
- throw StateError('$mimeType decoding failed');
+ throw StateError('$mimeType decoding failed (page $pageId)');
}
}
@@ -64,61 +63,49 @@ class ThumbnailProvider extends ImageProvider {
}
class ThumbnailProviderKey {
+ // do not store the entry as it is, because the key should be constant
+ // but the entry attributes may change over time
final String uri, mimeType;
- final int dateModifiedSecs, rotationDegrees, page;
+ final int pageId, rotationDegrees;
final bool isFlipped;
+ final int dateModifiedSecs;
final double extent, scale;
const ThumbnailProviderKey({
@required this.uri,
@required this.mimeType,
- @required this.dateModifiedSecs,
+ @required this.pageId,
@required this.rotationDegrees,
@required this.isFlipped,
- this.page = 0,
+ @required this.dateModifiedSecs,
this.extent = 0,
this.scale = 1,
}) : assert(uri != null),
assert(mimeType != null),
- assert(dateModifiedSecs != null),
assert(rotationDegrees != null),
assert(isFlipped != null),
+ assert(dateModifiedSecs != null),
assert(extent != null),
assert(scale != null);
- // do not store the entry as it is, because the key should be constant
- // but the entry attributes may change over time
- factory ThumbnailProviderKey.fromEntry(ImageEntry entry, {int page = 0, double extent = 0}) {
- return ThumbnailProviderKey(
- uri: entry.uri,
- mimeType: entry.mimeType,
- // `dateModifiedSecs` can be missing in viewer mode
- dateModifiedSecs: entry.dateModifiedSecs ?? -1,
- rotationDegrees: entry.rotationDegrees,
- isFlipped: entry.isFlipped,
- page: page,
- extent: extent,
- );
- }
-
@override
bool operator ==(Object other) {
if (other.runtimeType != runtimeType) return false;
- return other is ThumbnailProviderKey && other.uri == uri && other.extent == extent && other.mimeType == mimeType && other.dateModifiedSecs == dateModifiedSecs && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.page == page && other.scale == scale;
+ return other is ThumbnailProviderKey && other.uri == uri && other.mimeType == mimeType && other.pageId == pageId && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.dateModifiedSecs == dateModifiedSecs && other.extent == extent && other.scale == scale;
}
@override
int get hashCode => hashValues(
uri,
mimeType,
- dateModifiedSecs,
+ pageId,
rotationDegrees,
isFlipped,
- page,
+ dateModifiedSecs,
extent,
scale,
);
@override
- String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, dateModifiedSecs=$dateModifiedSecs, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, page=$page, extent=$extent, scale=$scale}';
+ String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, pageId=$pageId, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, dateModifiedSecs=$dateModifiedSecs, extent=$extent, scale=$scale}';
}
diff --git a/lib/image_providers/uri_image_provider.dart b/lib/image_providers/uri_image_provider.dart
index 5290913f9..6c3f9615e 100644
--- a/lib/image_providers/uri_image_provider.dart
+++ b/lib/image_providers/uri_image_provider.dart
@@ -3,19 +3,19 @@ import 'dart:ui' as ui show Codec;
import 'package:aves/services/image_file_service.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
import 'package:pedantic/pedantic.dart';
class UriImage extends ImageProvider {
final String uri, mimeType;
- final int page, rotationDegrees, expectedContentLength;
+ final int pageId, rotationDegrees, expectedContentLength;
final bool isFlipped;
final double scale;
const UriImage({
@required this.uri,
@required this.mimeType,
- this.page = 0,
+ @required this.pageId,
@required this.rotationDegrees,
@required this.isFlipped,
this.expectedContentLength,
@@ -37,7 +37,7 @@ class UriImage extends ImageProvider {
scale: key.scale,
chunkEvents: chunkEvents.stream,
informationCollector: () sync* {
- yield ErrorDescription('uri=$uri, mimeType=$mimeType');
+ yield ErrorDescription('uri=$uri, pageId=$pageId, mimeType=$mimeType');
},
);
}
@@ -51,7 +51,7 @@ class UriImage extends ImageProvider {
mimeType,
rotationDegrees,
isFlipped,
- page: page,
+ pageId: pageId,
expectedContentLength: expectedContentLength,
onBytesReceived: (cumulative, total) {
chunkEvents.add(ImageChunkEvent(
@@ -66,7 +66,7 @@ class UriImage extends ImageProvider {
return await decode(bytes);
} catch (error) {
debugPrint('$runtimeType _loadAsync failed with mimeType=$mimeType, uri=$uri, error=$error');
- throw StateError('$mimeType decoding failed');
+ throw StateError('$mimeType decoding failed (page $pageId)');
} finally {
unawaited(chunkEvents.close());
}
@@ -75,7 +75,7 @@ class UriImage extends ImageProvider {
@override
bool operator ==(Object other) {
if (other.runtimeType != runtimeType) return false;
- return other is UriImage && other.uri == uri && other.mimeType == mimeType && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.page == page && other.scale == scale;
+ return other is UriImage && other.uri == uri && other.mimeType == mimeType && other.rotationDegrees == rotationDegrees && other.isFlipped == isFlipped && other.pageId == pageId && other.scale == scale;
}
@override
@@ -84,10 +84,10 @@ class UriImage extends ImageProvider {
mimeType,
rotationDegrees,
isFlipped,
- page,
+ pageId,
scale,
);
@override
- String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, page=$page, scale=$scale}';
+ String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, mimeType=$mimeType, rotationDegrees=$rotationDegrees, isFlipped=$isFlipped, pageId=$pageId, scale=$scale}';
}
diff --git a/lib/image_providers/uri_picture_provider.dart b/lib/image_providers/uri_picture_provider.dart
index 913c78690..f6e8dc9c1 100644
--- a/lib/image_providers/uri_picture_provider.dart
+++ b/lib/image_providers/uri_picture_provider.dart
@@ -1,6 +1,6 @@
import 'package:aves/services/image_file_service.dart';
import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:pedantic/pedantic.dart';
@@ -30,7 +30,7 @@ class UriPicture extends PictureProvider {
Future _loadAsync(UriPicture key, {PictureErrorListener onError}) async {
assert(key == this);
- final data = await ImageFileService.getImage(uri, mimeType, 0, false);
+ final data = await ImageFileService.getSvg(uri, mimeType);
if (data == null || data.isEmpty) {
return null;
}
diff --git a/lib/main.dart b/lib/main.dart
index 92cd32fbc..02cb28210 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,10 +2,13 @@ import 'dart:isolate';
import 'dart:ui';
import 'package:aves/model/settings/settings.dart';
+import 'package:aves/model/source/collection_source.dart';
+import 'package:aves/model/source/media_store_source.dart';
+import 'package:aves/theme/durations.dart';
import 'package:aves/theme/icons.dart';
+import 'package:aves/utils/debouncer.dart';
import 'package:aves/widgets/common/behaviour/route_tracker.dart';
import 'package:aves/widgets/common/behaviour/routes.dart';
-import 'package:aves/widgets/common/providers/settings_provider.dart';
import 'package:aves/widgets/home_page.dart';
import 'package:aves/widgets/welcome_page.dart';
import 'package:firebase_analytics/firebase_analytics.dart';
@@ -16,6 +19,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:overlay_support/overlay_support.dart';
+import 'package:provider/provider.dart';
void main() {
// HttpClient.enableTimelineLogging = true; // enable network traffic logging
@@ -43,12 +47,16 @@ class AvesApp extends StatefulWidget {
class _AvesAppState extends State {
Future _appSetup;
+ final _mediaStoreSource = MediaStoreSource();
+ final Debouncer _contentChangeDebouncer = Debouncer(delay: Durations.contentChangeDebounceDelay);
+ final List changedUris = [];
// observers are not registered when using the same list object with different items
// the list itself needs to be reassigned
List _navigatorObservers = [];
- final _newIntentChannel = EventChannel('deckers.thibault/aves/intent');
- final _navigatorKey = GlobalKey();
+ final EventChannel _contentChangeChannel = EventChannel('deckers.thibault/aves/contentchange');
+ final EventChannel _newIntentChannel = EventChannel('deckers.thibault/aves/intent');
+ final GlobalKey _navigatorKey = GlobalKey(debugLabel: 'app-navigator');
static const accentColor = Colors.indigoAccent;
@@ -94,9 +102,57 @@ class _AvesAppState extends State {
void initState() {
super.initState();
_appSetup = _setup();
+ _contentChangeChannel.receiveBroadcastStream().listen((event) => _onContentChange(event as String));
_newIntentChannel.receiveBroadcastStream().listen((event) => _onNewIntent(event as Map));
}
+ @override
+ Widget build(BuildContext context) {
+ // place the settings provider above `MaterialApp`
+ // so it can be used during navigation transitions
+ return ChangeNotifierProvider.value(
+ value: settings,
+ child: Provider.value(
+ value: _mediaStoreSource,
+ child: OverlaySupport(
+ child: FutureBuilder(
+ future: _appSetup,
+ builder: (context, snapshot) {
+ final home = (!snapshot.hasError && snapshot.connectionState == ConnectionState.done)
+ ? getFirstPage()
+ : Scaffold(
+ body: snapshot.hasError ? _buildError(snapshot.error) : SizedBox.shrink(),
+ );
+ return MaterialApp(
+ navigatorKey: _navigatorKey,
+ home: home,
+ navigatorObservers: _navigatorObservers,
+ title: 'Aves',
+ darkTheme: darkTheme,
+ themeMode: ThemeMode.dark,
+ );
+ },
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildError(Object error) {
+ return Container(
+ alignment: Alignment.center,
+ padding: EdgeInsets.all(16),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(AIcons.error),
+ SizedBox(height: 16),
+ Text(error.toString()),
+ ],
+ ),
+ );
+ }
+
Future _setup() async {
await Firebase.initializeApp().then((app) {
final crashlytics = FirebaseCrashlytics.instance;
@@ -133,46 +189,11 @@ class _AvesAppState extends State {
));
}
- @override
- Widget build(BuildContext context) {
- // place the settings provider above `MaterialApp`
- // so it can be used during navigation transitions
- return SettingsProvider(
- child: OverlaySupport(
- child: FutureBuilder(
- future: _appSetup,
- builder: (context, snapshot) {
- final home = (!snapshot.hasError && snapshot.connectionState == ConnectionState.done)
- ? getFirstPage()
- : Scaffold(
- body: snapshot.hasError ? _buildError(snapshot.error) : SizedBox.shrink(),
- );
- return MaterialApp(
- navigatorKey: _navigatorKey,
- home: home,
- navigatorObservers: _navigatorObservers,
- title: 'Aves',
- darkTheme: darkTheme,
- themeMode: ThemeMode.dark,
- );
- },
- ),
- ),
- );
- }
-
- Widget _buildError(Object error) {
- return Container(
- alignment: Alignment.center,
- padding: EdgeInsets.all(16),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- Icon(AIcons.error),
- SizedBox(height: 16),
- Text(error.toString()),
- ],
- ),
- );
+ void _onContentChange(String uri) {
+ changedUris.add(uri);
+ _contentChangeDebouncer(() {
+ _mediaStoreSource.refreshUris(List.of(changedUris));
+ changedUris.clear();
+ });
}
}
diff --git a/lib/model/actions/entry_actions.dart b/lib/model/actions/entry_actions.dart
index 805df42f0..5cd6f62c3 100644
--- a/lib/model/actions/entry_actions.dart
+++ b/lib/model/actions/entry_actions.dart
@@ -4,6 +4,7 @@ import 'package:flutter/widgets.dart';
enum EntryAction {
delete,
edit,
+ export,
flip,
info,
open,
@@ -31,6 +32,7 @@ class EntryActions {
EntryAction.share,
EntryAction.delete,
EntryAction.rename,
+ EntryAction.export,
EntryAction.print,
EntryAction.viewSource,
];
@@ -52,6 +54,8 @@ extension ExtraEntryAction on EntryAction {
return null;
case EntryAction.delete:
return 'Delete';
+ case EntryAction.export:
+ return 'Export';
case EntryAction.info:
return 'Info';
case EntryAction.rename:
@@ -91,6 +95,8 @@ extension ExtraEntryAction on EntryAction {
return null;
case EntryAction.delete:
return AIcons.delete;
+ case EntryAction.export:
+ return AIcons.export;
case EntryAction.info:
return AIcons.info;
case EntryAction.rename:
diff --git a/lib/model/actions/move_type.dart b/lib/model/actions/move_type.dart
new file mode 100644
index 000000000..71b326b70
--- /dev/null
+++ b/lib/model/actions/move_type.dart
@@ -0,0 +1 @@
+enum MoveType { copy, move, export }
diff --git a/lib/model/connectivity.dart b/lib/model/connectivity.dart
new file mode 100644
index 000000000..009c0fa1c
--- /dev/null
+++ b/lib/model/connectivity.dart
@@ -0,0 +1,28 @@
+import 'package:connectivity/connectivity.dart';
+import 'package:flutter/foundation.dart';
+
+final AvesConnectivity connectivity = AvesConnectivity._private();
+
+class AvesConnectivity {
+ bool _isConnected;
+
+ AvesConnectivity._private() {
+ Connectivity().onConnectivityChanged.listen(_updateFromResult);
+ }
+
+ void onResume() => _isConnected = null;
+
+ Future get isConnected async {
+ if (_isConnected != null) return SynchronousFuture(_isConnected);
+ final result = await (Connectivity().checkConnectivity());
+ _updateFromResult(result);
+ return _isConnected;
+ }
+
+ Future get canGeolocate => isConnected;
+
+ void _updateFromResult(ConnectivityResult result) {
+ _isConnected = result != ConnectivityResult.none;
+ debugPrint('Device is connected=$_isConnected');
+ }
+}
diff --git a/lib/model/image_entry.dart b/lib/model/entry.dart
similarity index 84%
rename from lib/model/image_entry.dart
rename to lib/model/entry.dart
index 1d1e6f697..384b29a4b 100644
--- a/lib/model/image_entry.dart
+++ b/lib/model/entry.dart
@@ -2,7 +2,7 @@ import 'dart:async';
import 'package:aves/model/entry_cache.dart';
import 'package:aves/model/favourite_repo.dart';
-import 'package:aves/model/image_metadata.dart';
+import 'package:aves/model/metadata.dart';
import 'package:aves/model/metadata_db.dart';
import 'package:aves/model/multipage.dart';
import 'package:aves/services/image_file_service.dart';
@@ -21,16 +21,18 @@ import 'package:path/path.dart' as ppath;
import '../ref/mime_types.dart';
-class ImageEntry {
+class AvesEntry {
String uri;
String _path, _directory, _filename, _extension;
- int contentId;
+ int pageId, contentId;
final String sourceMimeType;
int width;
int height;
int sourceRotationDegrees;
final int sizeBytes;
String sourceTitle;
+
+ // `dateModifiedSecs` can be missing in viewer mode
int _dateModifiedSecs;
final int sourceDateTakenMillis;
final int durationMillis;
@@ -43,10 +45,11 @@ class ImageEntry {
// TODO TLAD make it dynamic if it depends on OS/lib versions
static const List undecodable = [MimeTypes.crw, MimeTypes.psd];
- ImageEntry({
+ AvesEntry({
this.uri,
String path,
this.contentId,
+ this.pageId,
this.sourceMimeType,
@required this.width,
@required this.height,
@@ -66,14 +69,14 @@ class ImageEntry {
bool get canHaveAlpha => MimeTypes.alphaImages.contains(mimeType);
- ImageEntry copyWith({
+ AvesEntry copyWith({
@required String uri,
@required String path,
@required int contentId,
@required int dateModifiedSecs,
}) {
final copyContentId = contentId ?? this.contentId;
- final copied = ImageEntry(
+ final copied = AvesEntry(
uri: uri ?? uri,
path: path ?? this.path,
contentId: copyContentId,
@@ -93,9 +96,39 @@ class ImageEntry {
return copied;
}
+ AvesEntry getPageEntry(SinglePageInfo pageInfo, {bool eraseDefaultPageId = true}) {
+ if (pageInfo == null) return this;
+
+ // do not provide the page ID for the default page,
+ // so that we can treat this page like the main entry
+ // and retrieve cached images for it
+ final pageId = eraseDefaultPageId && pageInfo.isDefault ? null : pageInfo.pageId;
+
+ return AvesEntry(
+ uri: uri,
+ path: path,
+ contentId: contentId,
+ pageId: pageId,
+ sourceMimeType: pageInfo.mimeType ?? sourceMimeType,
+ width: pageInfo.width ?? width,
+ height: pageInfo.height ?? height,
+ sourceRotationDegrees: sourceRotationDegrees,
+ sizeBytes: sizeBytes,
+ sourceTitle: sourceTitle,
+ dateModifiedSecs: dateModifiedSecs,
+ sourceDateTakenMillis: sourceDateTakenMillis,
+ durationMillis: pageInfo.durationMillis ?? durationMillis,
+ )
+ ..catalogMetadata = _catalogMetadata?.copyWith(
+ mimeType: pageInfo.mimeType,
+ isMultipage: false,
+ )
+ ..addressDetails = _addressDetails?.copyWith();
+ }
+
// from DB or platform source entry
- factory ImageEntry.fromMap(Map map) {
- return ImageEntry(
+ factory AvesEntry.fromMap(Map map) {
+ return AvesEntry(
uri: map['uri'] as String,
path: map['path'] as String,
contentId: map['contentId'] as int,
@@ -136,7 +169,7 @@ class ImageEntry {
}
@override
- String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, path=$path}';
+ String toString() => '$runtimeType#${shortHash(this)}{uri=$uri, path=$path, pageId=$pageId}';
set path(String path) {
_path = path;
@@ -196,7 +229,11 @@ class ImageEntry {
].contains(mimeType) &&
!isAnimated;
- bool get canTile => _supportedByBitmapRegionDecoder || mimeType == MimeTypes.tiff;
+ bool get supportTiling => _supportedByBitmapRegionDecoder || mimeType == MimeTypes.tiff;
+
+ // as of panorama v0.3.1, the `Panorama` widget throws on initialization when the image is already resolved
+ // so we use tiles for panoramas as a workaround to not collide with the `panorama` package resolution
+ bool get useTiles => supportTiling && (width > 4096 || height > 4096 || is360);
bool get isRaw => MimeTypes.rawImages.contains(mimeType);
@@ -216,8 +253,6 @@ class ImageEntry {
bool get canEdit => path != null;
- bool get canPrint => !isVideo;
-
bool get canRotateAndFlip => canEdit && canEditExif;
// support for writing EXIF
@@ -233,29 +268,21 @@ class ImageEntry {
}
}
- // The additional comparison of width to height is a workaround for badly registered entries.
- // e.g. a portrait FHD video should be registered as width=1920, height=1080, orientation=90,
- // but is incorrectly registered in the Media Store as width=1080, height=1920, orientation=0
- // Double-checking the width/height during loading or cataloguing is the proper solution,
- // but it would take space and time, so a basic workaround will do.
- bool get isPortrait => rotationDegrees % 180 == 90 && (catalogMetadata?.rotationDegrees == null || width > height);
+ // Media Store size/rotation is inaccurate, e.g. a portrait FHD video is rotated according to its metadata,
+ // so it should be registered as width=1920, height=1080, orientation=90,
+ // but is incorrectly registered as width=1080, height=1920, orientation=0.
+ // Double-checking the width/height during loading or cataloguing is the proper solution, but it would take space and time.
+ // Comparing width and height can help with the portrait FHD video example,
+ // but it fails for a portrait screenshot rotated, which is landscape with width=1080, height=1920, orientation=90
+ bool get isRotated => rotationDegrees % 180 == 90;
static const ratioSeparator = '\u2236';
static const resolutionSeparator = ' \u00D7 ';
- String getResolutionText({MultiPageInfo multiPageInfo, int page}) {
- int w;
- int h;
- if (multiPageInfo != null && page != null) {
- final pageInfo = multiPageInfo.pages[page];
- w = pageInfo?.width;
- h = pageInfo?.height;
- }
- w ??= width;
- h ??= height;
- final ws = w ?? '?';
- final hs = h ?? '?';
- return isPortrait ? '$hs$resolutionSeparator$ws' : '$ws$resolutionSeparator$hs';
+ String get resolutionText {
+ final ws = width ?? '?';
+ final hs = height ?? '?';
+ return isRotated ? '$hs$resolutionSeparator$ws' : '$ws$resolutionSeparator$hs';
}
String get aspectRatioText {
@@ -263,7 +290,7 @@ class ImageEntry {
final gcd = width.gcd(height);
final w = width ~/ gcd;
final h = height ~/ gcd;
- return isPortrait ? '$h$ratioSeparator$w' : '$w$ratioSeparator$h';
+ return isRotated ? '$h$ratioSeparator$w' : '$w$ratioSeparator$h';
} else {
return '?$ratioSeparator?';
}
@@ -271,20 +298,13 @@ class ImageEntry {
double get displayAspectRatio {
if (width == 0 || height == 0) return 1;
- return isPortrait ? height / width : width / height;
+ return isRotated ? height / width : width / height;
}
- Size getDisplaySize({MultiPageInfo multiPageInfo, int page}) {
- int w;
- int h;
- if (multiPageInfo != null && page != null) {
- final pageInfo = multiPageInfo.pages[page];
- w = pageInfo?.width;
- h = pageInfo?.height;
- }
- w ??= width;
- h ??= height;
- return isPortrait ? Size(h.toDouble(), w.toDouble()) : Size(w.toDouble(), h.toDouble());
+ Size get displaySize {
+ final w = width.toDouble();
+ final h = height.toDouble();
+ return isRotated ? Size(h, w) : Size(w, h);
}
int get megaPixels => width != null && height != null ? (width * height / 1000000).round() : null;
@@ -598,7 +618,7 @@ class ImageEntry {
// compare by:
// 1) title ascending
// 2) extension ascending
- static int compareByName(ImageEntry a, ImageEntry b) {
+ static int compareByName(AvesEntry a, AvesEntry b) {
final c = compareAsciiUpperCase(a.bestTitle, b.bestTitle);
return c != 0 ? c : compareAsciiUpperCase(a.extension, b.extension);
}
@@ -606,7 +626,7 @@ class ImageEntry {
// compare by:
// 1) size descending
// 2) name ascending
- static int compareBySize(ImageEntry a, ImageEntry b) {
+ static int compareBySize(AvesEntry a, AvesEntry b) {
final c = b.sizeBytes.compareTo(a.sizeBytes);
return c != 0 ? c : compareByName(a, b);
}
@@ -615,9 +635,12 @@ class ImageEntry {
// compare by:
// 1) date descending
- // 2) name ascending
- static int compareByDate(ImageEntry a, ImageEntry b) {
- final c = (b.bestDate ?? _epoch).compareTo(a.bestDate ?? _epoch);
- return c != 0 ? c : compareByName(a, b);
+ // 2) name descending
+ static int compareByDate(AvesEntry a, AvesEntry b) {
+ var c = (b.bestDate ?? _epoch).compareTo(a.bestDate ?? _epoch);
+ if (c != 0) return c;
+ c = (b.dateModifiedSecs ?? 0).compareTo(a.dateModifiedSecs ?? 0);
+ if (c != 0) return c;
+ return -compareByName(a, b);
}
}
diff --git a/lib/model/entry_cache.dart b/lib/model/entry_cache.dart
index a940821e0..1e794f202 100644
--- a/lib/model/entry_cache.dart
+++ b/lib/model/entry_cache.dart
@@ -12,14 +12,14 @@ class EntryCache {
int oldRotationDegrees,
bool oldIsFlipped,
) async {
- // TODO TLAD revisit this for multipage items, if someday image editing features are added for them
- const page = 0;
+ // TODO TLAD provide pageId parameter for multipage items, if someday image editing features are added for them
+ int pageId;
// evict fullscreen image
await UriImage(
uri: uri,
mimeType: mimeType,
- page: page,
+ pageId: pageId,
rotationDegrees: oldRotationDegrees,
isFlipped: oldIsFlipped,
).evict();
@@ -28,10 +28,10 @@ class EntryCache {
await ThumbnailProvider(ThumbnailProviderKey(
uri: uri,
mimeType: mimeType,
+ pageId: pageId,
dateModifiedSecs: dateModifiedSecs,
rotationDegrees: oldRotationDegrees,
isFlipped: oldIsFlipped,
- page: page,
)).evict();
// evict higher quality thumbnails (with powers of 2 from 32 to 1024 as specified extents)
@@ -41,10 +41,10 @@ class EntryCache {
(extent) => ThumbnailProvider(ThumbnailProviderKey(
uri: uri,
mimeType: mimeType,
+ pageId: pageId,
dateModifiedSecs: dateModifiedSecs,
rotationDegrees: oldRotationDegrees,
isFlipped: oldIsFlipped,
- page: page,
extent: extent,
)).evict());
}
diff --git a/lib/model/entry_images.dart b/lib/model/entry_images.dart
new file mode 100644
index 000000000..cc8c28374
--- /dev/null
+++ b/lib/model/entry_images.dart
@@ -0,0 +1,67 @@
+import 'dart:math';
+import 'dart:ui';
+
+import 'package:aves/image_providers/region_provider.dart';
+import 'package:aves/image_providers/thumbnail_provider.dart';
+import 'package:aves/image_providers/uri_image_provider.dart';
+import 'package:aves/model/entry.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+
+extension ExtraAvesEntry on AvesEntry {
+ ThumbnailProvider getThumbnail({double extent = 0}) {
+ return ThumbnailProvider(_getThumbnailProviderKey(extent));
+ }
+
+ ThumbnailProviderKey _getThumbnailProviderKey(double extent) {
+ // we standardize the thumbnail loading dimension by taking the nearest larger power of 2
+ // so that there are less variants of the thumbnails to load and cache
+ // it increases the chance of cache hit when loading similarly sized columns (e.g. on orientation change)
+ final requestExtent = extent == 0 ? .0 : pow(2, (log(extent) / log(2)).ceil()).toDouble();
+
+ return ThumbnailProviderKey(
+ uri: uri,
+ mimeType: mimeType,
+ pageId: pageId,
+ rotationDegrees: rotationDegrees,
+ isFlipped: isFlipped,
+ dateModifiedSecs: dateModifiedSecs ?? -1,
+ extent: requestExtent,
+ );
+ }
+
+ RegionProvider getRegion({@required int sampleSize, Rectangle region}) {
+ return RegionProvider(_getRegionProviderKey(sampleSize, region));
+ }
+
+ RegionProviderKey _getRegionProviderKey(int sampleSize, Rectangle region) {
+ return RegionProviderKey(
+ uri: uri,
+ mimeType: mimeType,
+ pageId: pageId,
+ rotationDegrees: rotationDegrees,
+ isFlipped: isFlipped,
+ sampleSize: sampleSize,
+ region: region ?? Rectangle(0, 0, width, height),
+ imageSize: Size(width.toDouble(), height.toDouble()),
+ );
+ }
+
+ UriImage get uriImage => UriImage(
+ uri: uri,
+ mimeType: mimeType,
+ pageId: pageId,
+ rotationDegrees: rotationDegrees,
+ isFlipped: isFlipped,
+ expectedContentLength: sizeBytes,
+ );
+
+ bool _isReady(Object providerKey) => imageCache.statusForKey(providerKey).keepAlive;
+
+ ImageProvider getBestThumbnail(double extent) {
+ final sizedThumbnailKey = _getThumbnailProviderKey(extent);
+ if (_isReady(sizedThumbnailKey)) return ThumbnailProvider(sizedThumbnailKey);
+
+ return getThumbnail();
+ }
+}
diff --git a/lib/model/favourite_repo.dart b/lib/model/favourite_repo.dart
index d138de273..78daf8883 100644
--- a/lib/model/favourite_repo.dart
+++ b/lib/model/favourite_repo.dart
@@ -1,5 +1,5 @@
-import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/image_metadata.dart';
+import 'package:aves/model/entry.dart';
+import 'package:aves/model/metadata.dart';
import 'package:aves/model/metadata_db.dart';
import 'package:aves/utils/change_notifier.dart';
@@ -18,25 +18,25 @@ class FavouriteRepo {
int get count => _rows.length;
- bool isFavourite(ImageEntry entry) => _rows.any((row) => row.contentId == entry.contentId);
+ bool isFavourite(AvesEntry entry) => _rows.any((row) => row.contentId == entry.contentId);
- FavouriteRow _entryToRow(ImageEntry entry) => FavouriteRow(contentId: entry.contentId, path: entry.path);
+ FavouriteRow _entryToRow(AvesEntry entry) => FavouriteRow(contentId: entry.contentId, path: entry.path);
- Future add(Iterable entries) async {
+ Future add(Iterable entries) async {
final newRows = entries.map(_entryToRow);
await metadataDb.addFavourites(newRows);
_rows.addAll(newRows);
changeNotifier.notifyListeners();
}
- Future remove(Iterable entries) async {
+ Future remove(Iterable entries) async {
final removedRows = entries.map(_entryToRow);
await metadataDb.removeFavourites(removedRows);
removedRows.forEach(_rows.remove);
changeNotifier.notifyListeners();
}
- Future move(int oldContentId, ImageEntry entry) async {
+ Future move(int oldContentId, AvesEntry entry) async {
final oldRow = _rows.firstWhere((row) => row.contentId == oldContentId, orElse: () => null);
if (oldRow != null) {
_rows.remove(oldRow);
diff --git a/lib/model/filters/album.dart b/lib/model/filters/album.dart
index 82f3bcc56..1ab6ce062 100644
--- a/lib/model/filters/album.dart
+++ b/lib/model/filters/album.dart
@@ -1,6 +1,6 @@
import 'package:aves/image_providers/app_icon_image_provider.dart';
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/utils/android_file_utils.dart';
import 'package:aves/widgets/common/identity/aves_icons.dart';
@@ -33,7 +33,7 @@ class AlbumFilter extends CollectionFilter {
};
@override
- bool filter(ImageEntry entry) => entry.directory == album;
+ bool filter(AvesEntry entry) => entry.directory == album;
@override
String get label => uniqueName ?? album.split(separator).last;
diff --git a/lib/model/filters/favourite.dart b/lib/model/filters/favourite.dart
index d4e9716c1..c64326959 100644
--- a/lib/model/filters/favourite.dart
+++ b/lib/model/filters/favourite.dart
@@ -1,5 +1,5 @@
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
@@ -13,7 +13,7 @@ class FavouriteFilter extends CollectionFilter {
};
@override
- bool filter(ImageEntry entry) => entry.isFavourite;
+ bool filter(AvesEntry entry) => entry.isFavourite;
@override
String get label => 'Favourite';
diff --git a/lib/model/filters/filters.dart b/lib/model/filters/filters.dart
index e70f39dd8..a3e985302 100644
--- a/lib/model/filters/filters.dart
+++ b/lib/model/filters/filters.dart
@@ -1,12 +1,12 @@
import 'dart:convert';
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/album.dart';
import 'package:aves/model/filters/favourite.dart';
import 'package:aves/model/filters/location.dart';
import 'package:aves/model/filters/mime.dart';
import 'package:aves/model/filters/query.dart';
import 'package:aves/model/filters/tag.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/utils/color_utils.dart';
import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
@@ -49,7 +49,7 @@ abstract class CollectionFilter implements Comparable {
String toJson() => jsonEncode(toMap());
- bool filter(ImageEntry entry);
+ bool filter(AvesEntry entry);
bool get isUnique => true;
@@ -78,7 +78,7 @@ abstract class CollectionFilter implements Comparable {
// TODO TLAD replace this by adding getters to CollectionFilter, with cached entry/count coming from Source
class FilterGridItem {
final T filter;
- final ImageEntry entry;
+ final AvesEntry entry;
const FilterGridItem(this.filter, this.entry);
diff --git a/lib/model/filters/location.dart b/lib/model/filters/location.dart
index cf46da1b2..c702cf2c4 100644
--- a/lib/model/filters/location.dart
+++ b/lib/model/filters/location.dart
@@ -1,5 +1,5 @@
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
@@ -35,7 +35,7 @@ class LocationFilter extends CollectionFilter {
String get countryNameAndCode => '$_location$locationSeparator$_countryCode';
@override
- bool filter(ImageEntry entry) => _location.isEmpty ? !entry.isLocated : entry.isLocated && ((level == LocationLevel.country && entry.addressDetails.countryCode == _countryCode) || (level == LocationLevel.place && entry.addressDetails.place == _location));
+ bool filter(AvesEntry entry) => _location.isEmpty ? !entry.isLocated : entry.isLocated && ((level == LocationLevel.country && entry.addressDetails.countryCode == _countryCode) || (level == LocationLevel.place && entry.addressDetails.place == _location));
@override
String get label => _location.isEmpty ? emptyLabel : _location;
diff --git a/lib/model/filters/mime.dart b/lib/model/filters/mime.dart
index 2b3342140..5944c27df 100644
--- a/lib/model/filters/mime.dart
+++ b/lib/model/filters/mime.dart
@@ -1,5 +1,5 @@
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
+import 'package:aves/model/entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:aves/utils/mime_utils.dart';
import 'package:flutter/foundation.dart';
@@ -15,7 +15,7 @@ class MimeFilter extends CollectionFilter {
static const geotiff = 'aves/geotiff'; // subset of `image/tiff`
final String mime;
- bool Function(ImageEntry) _filter;
+ bool Function(AvesEntry) _filter;
String _label;
IconData _icon;
@@ -67,7 +67,7 @@ class MimeFilter extends CollectionFilter {
};
@override
- bool filter(ImageEntry entry) => _filter(entry);
+ bool filter(AvesEntry entry) => _filter(entry);
@override
String get label => _label;
diff --git a/lib/model/filters/query.dart b/lib/model/filters/query.dart
index bb880cb2f..33fe221e4 100644
--- a/lib/model/filters/query.dart
+++ b/lib/model/filters/query.dart
@@ -1,5 +1,5 @@
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
@@ -12,7 +12,7 @@ class QueryFilter extends CollectionFilter {
final String query;
final bool colorful;
- bool Function(ImageEntry) _filter;
+ bool Function(AvesEntry) _filter;
QueryFilter(this.query, {this.colorful = true}) {
var upQuery = query.toUpperCase();
@@ -44,7 +44,7 @@ class QueryFilter extends CollectionFilter {
};
@override
- bool filter(ImageEntry entry) => _filter(entry);
+ bool filter(AvesEntry entry) => _filter(entry);
@override
bool get isUnique => false;
diff --git a/lib/model/filters/tag.dart b/lib/model/filters/tag.dart
index ff9e94611..5d21f0b7f 100644
--- a/lib/model/filters/tag.dart
+++ b/lib/model/filters/tag.dart
@@ -1,5 +1,5 @@
+import 'package:aves/model/entry.dart';
import 'package:aves/model/filters/filters.dart';
-import 'package:aves/model/image_entry.dart';
import 'package:aves/theme/icons.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
@@ -24,7 +24,7 @@ class TagFilter extends CollectionFilter {
};
@override
- bool filter(ImageEntry entry) => tag.isEmpty ? entry.xmpSubjects.isEmpty : entry.xmpSubjects.contains(tag);
+ bool filter(AvesEntry entry) => tag.isEmpty ? entry.xmpSubjects.isEmpty : entry.xmpSubjects.contains(tag);
@override
bool get isUnique => false;
diff --git a/lib/model/image_metadata.dart b/lib/model/metadata.dart
similarity index 97%
rename from lib/model/image_metadata.dart
rename to lib/model/metadata.dart
index ccbbad3c0..e750fbbb0 100644
--- a/lib/model/image_metadata.dart
+++ b/lib/model/metadata.dart
@@ -68,17 +68,19 @@ class CatalogMetadata {
}
CatalogMetadata copyWith({
- @required int contentId,
+ int contentId,
+ String mimeType,
+ bool isMultipage,
}) {
return CatalogMetadata(
contentId: contentId ?? this.contentId,
- mimeType: mimeType,
+ mimeType: mimeType ?? this.mimeType,
dateMillis: dateMillis,
isAnimated: isAnimated,
isFlipped: isFlipped,
isGeotiff: isGeotiff,
is360: is360,
- isMultipage: isMultipage,
+ isMultipage: isMultipage ?? this.isMultipage,
rotationDegrees: rotationDegrees,
xmpSubjects: xmpSubjects,
xmpTitleDescription: xmpTitleDescription,
@@ -169,7 +171,7 @@ class AddressDetails {
});
AddressDetails copyWith({
- @required int contentId,
+ int contentId,
}) {
return AddressDetails(
contentId: contentId ?? this.contentId,
diff --git a/lib/model/metadata_db.dart b/lib/model/metadata_db.dart
index 48a8b5a3b..3630f5a27 100644
--- a/lib/model/metadata_db.dart
+++ b/lib/model/metadata_db.dart
@@ -1,7 +1,7 @@
import 'dart:io';
-import 'package:aves/model/image_entry.dart';
-import 'package:aves/model/image_metadata.dart';
+import 'package:aves/model/entry.dart';
+import 'package:aves/model/metadata.dart';
import 'package:aves/model/metadata_db_upgrade.dart';
import 'package:flutter/foundation.dart';
import 'package:path/path.dart';
@@ -116,16 +116,16 @@ class MetadataDb {
debugPrint('$runtimeType clearEntries deleted $count entries');
}
- Future> loadEntries() async {
+ Future> loadEntries() async {
final stopwatch = Stopwatch()..start();
final db = await _database;
final maps = await db.query(entryTable);
- final entries = maps.map((map) => ImageEntry.fromMap(map)).toList();
+ final entries = maps.map((map) => AvesEntry.fromMap(map)).toList();
debugPrint('$runtimeType loadEntries complete in ${stopwatch.elapsed.inMilliseconds}ms for ${entries.length} entries');
return entries;
}
- Future saveEntries(Iterable entries) async {
+ Future saveEntries(Iterable entries) async {
if (entries == null || entries.isEmpty) return;
final stopwatch = Stopwatch()..start();
final db = await _database;
@@ -135,7 +135,7 @@ class MetadataDb {
debugPrint('$runtimeType saveEntries complete in ${stopwatch.elapsed.inMilliseconds}ms for ${entries.length} entries');
}
- Future updateEntryId(int oldId, ImageEntry entry) async {
+ Future updateEntryId(int oldId, AvesEntry entry) async {
final db = await _database;
final batch = db.batch();
batch.delete(entryTable, where: 'contentId = ?', whereArgs: [oldId]);
@@ -143,7 +143,7 @@ class MetadataDb {
await batch.commit(noResult: true);
}
- void _batchInsertEntry(Batch batch, ImageEntry entry) {
+ void _batchInsertEntry(Batch batch, AvesEntry entry) {
if (entry == null) return;
batch.insert(
entryTable,
diff --git a/lib/model/multipage.dart b/lib/model/multipage.dart
index 7ca616792..9400c1beb 100644
--- a/lib/model/multipage.dart
+++ b/lib/model/multipage.dart
@@ -1,42 +1,83 @@
import 'package:flutter/foundation.dart';
-class SinglePageInfo {
- final int width, height;
-
- SinglePageInfo({
- this.width,
- this.height,
- });
-
- factory SinglePageInfo.fromMap(Map map) {
- return SinglePageInfo(
- width: map['width'] as int,
- height: map['height'] as int,
- );
- }
-
- @override
- String toString() => '$runtimeType#${shortHash(this)}{width=$width, height=$height}';
-}
-
class MultiPageInfo {
- final Map pages;
+ final List pages;
int get pageCount => pages.length;
MultiPageInfo({
this.pages,
- });
-
- factory MultiPageInfo.fromMap(Map map) {
- final pages = {};
- map.keys.forEach((key) {
- final index = key as int;
- pages.putIfAbsent(index, () => SinglePageInfo.fromMap(map[key]));
- });
- return MultiPageInfo(pages: pages);
+ }) {
+ if (pages.isNotEmpty) {
+ pages.sort();
+ // make sure there is a page marked as default
+ if (defaultPage == null) {
+ final firstPage = pages.removeAt(0);
+ pages.insert(0, firstPage.copyWith(isDefault: true));
+ }
+ }
}
+ factory MultiPageInfo.fromPageMaps(List