diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98fb110e9..075604ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
+### Fixed
+
+- opening home when launching app as media picker
+
## [v1.13.1] - 2025-05-14
### Fixed
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 7b1b7b190..a7dbecf71 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
@@ -710,6 +710,7 @@ class MediaStoreImageProvider : ImageProvider() {
// note that `DocumentFile.getParentFile()` returns null if we did not pick a tree first
val targetTreeFile = targetDirDocFile.createFile(mimeType, targetNameWithoutExtension)
val targetDocFile = DocumentFileCompat.fromSingleUri(activity, targetTreeFile.uri)
+ // TODO TLAD [missing extension] check whether targetDocFile.name has a valid extension
try {
targetDocFile.openOutputStream().use(write)
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 c0bef41c9..8d9d53f1a 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
@@ -168,6 +168,7 @@ object MimeTypes {
HEIC, HEIF -> ".heif"
MP2T, MP2TS -> ".m2ts"
PSD_VND, PSD_X -> ".psd"
+ // TODO TLAD [missing extension] check whether to define more manual mapping and raise exception on miss
else -> MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType)?.let { ".$it" }
}
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 50dafb3b1..035cbc41e 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -767,7 +767,7 @@
"sortByName": "By name",
"sortByItemCount": "By item count",
"sortBySize": "By size",
- "sortByAlbumFileName": "By album & file name",
+ "sortByAlbumFileName": "By album & item title",
"sortByRating": "By rating",
"sortByDuration": "By duration",
"sortByPath": "By path",
diff --git a/lib/model/app/dependencies.dart b/lib/model/app/dependencies.dart
index cf408038b..c660a2a87 100644
--- a/lib/model/app/dependencies.dart
+++ b/lib/model/app/dependencies.dart
@@ -212,9 +212,9 @@ class Dependencies {
sourceUrl: 'https://github.com/fleaflet/flutter_map',
),
Dependency(
- name: 'Flutter Markdown',
+ name: 'Flutter Markdown Plus',
license: bsd3,
- sourceUrl: 'https://github.com/flutter/packages/tree/main/packages/flutter_markdown',
+ sourceUrl: 'https://github.com/foresightmobile/flutter_markdown_plus',
),
Dependency(
name: 'Flutter Staggered Animations',
diff --git a/lib/widgets/common/basic/markdown_container.dart b/lib/widgets/common/basic/markdown_container.dart
index de44dcd4f..391b34a95 100644
--- a/lib/widgets/common/basic/markdown_container.dart
+++ b/lib/widgets/common/basic/markdown_container.dart
@@ -3,7 +3,7 @@ import 'package:aves/theme/themes.dart';
import 'package:aves/widgets/aves_app.dart';
import 'package:aves/widgets/common/fx/borders.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
class MarkdownContainer extends StatelessWidget {
final String data;
diff --git a/lib/widgets/common/map/attribution.dart b/lib/widgets/common/map/attribution.dart
index bfe8c7aee..f1cd7b023 100644
--- a/lib/widgets/common/map/attribution.dart
+++ b/lib/widgets/common/map/attribution.dart
@@ -5,7 +5,7 @@ import 'package:aves/widgets/common/extensions/build_context.dart';
import 'package:aves/widgets/viewer/info/common.dart';
import 'package:aves_map/aves_map.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
+import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
import 'package:provider/provider.dart';
class Attribution extends StatelessWidget {
diff --git a/lib/widgets/home/home_page.dart b/lib/widgets/home/home_page.dart
index 98c353fa2..12ee7e758 100644
--- a/lib/widgets/home/home_page.dart
+++ b/lib/widgets/home/home_page.dart
@@ -304,9 +304,6 @@ class _HomePageState extends State {
String routeName;
Set? filters;
switch (appMode) {
- case AppMode.pickSingleMediaExternal:
- case AppMode.pickMultipleMediaExternal:
- routeName = CollectionPage.routeName;
case AppMode.setWallpaper:
return DirectMaterialPageRoute(
settings: const RouteSettings(name: WallpaperPage.routeName),
@@ -374,7 +371,17 @@ class _HomePageState extends State {
);
},
);
- default:
+ case AppMode.initialization:
+ case AppMode.main:
+ case AppMode.pickCollectionFiltersExternal:
+ case AppMode.pickSingleMediaExternal:
+ case AppMode.pickMultipleMediaExternal:
+ case AppMode.pickFilteredMediaInternal:
+ case AppMode.pickUnfilteredMediaInternal:
+ case AppMode.pickFilterInternal:
+ case AppMode.previewMap:
+ case AppMode.screenSaver:
+ case AppMode.slideshow:
routeName = _initialRouteName ?? settings.homePage.routeName;
filters = _initialFilters ?? (settings.homePage == HomePageSetting.collection ? settings.homeCustomCollection : {});
}
diff --git a/pubspec.lock b/pubspec.lock
index 7cc2091eb..77c2e8035 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -13,18 +13,18 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
- sha256: de9ecbb3ddafd446095f7e833c853aff2fa1682b017921fe63a833f9d6f0e422
+ sha256: "214e6f07e2a44f45972e0365c7b537eaeaddb4598db0778dd4ac64b4acd3f5b1"
url: "https://pub.dev"
source: hosted
- version: "1.3.54"
+ version: "1.3.55"
analyzer:
dependency: transitive
description:
name: analyzer
- sha256: "13c1e6c6fd460522ea840abec3f677cc226f5fec7872c04ad7b425517ccf54f7"
+ sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
url: "https://pub.dev"
source: hosted
- version: "7.4.4"
+ version: "7.4.5"
archive:
dependency: transitive
description:
@@ -312,10 +312,10 @@ packages:
dependency: transitive
description:
name: firebase_core
- sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe"
+ sha256: "8cfe3c900512399ce8d50fcc817e5758ff8615eeb6fa5c846a4cc47bbf6353b6"
url: "https://pub.dev"
source: hosted
- version: "3.13.0"
+ version: "3.13.1"
firebase_core_platform_interface:
dependency: transitive
description:
@@ -328,26 +328,26 @@ packages:
dependency: transitive
description:
name: firebase_core_web
- sha256: "129a34d1e0fb62e2b488d988a1fc26cc15636357e50944ffee2862efe8929b23"
+ sha256: ddd72baa6f727e5b23f32d9af23d7d453d67946f380bd9c21daf474ee0f7326e
url: "https://pub.dev"
source: hosted
- version: "2.22.0"
+ version: "2.23.0"
firebase_crashlytics:
dependency: transitive
description:
name: firebase_crashlytics
- sha256: f3fa4a17c2f061b16b2e3ac7aaed889ae954b8952d0fd3e0009a9870cde7bbd2
+ sha256: "49d20b1dd87bb42746e27b5c72c1e3a3d84ae6415d062f8b31ecb71a35d36d0c"
url: "https://pub.dev"
source: hosted
- version: "4.3.5"
+ version: "4.3.6"
firebase_crashlytics_platform_interface:
dependency: transitive
description:
name: firebase_crashlytics_platform_interface
- sha256: cedfbe39927711c0e56fc38bfecbd89e17816b21698a3d88d63298c530ed375c
+ sha256: "0a5b2c9a662db7563482547b31da06a3951277cbfb42af12c5b52a15456ea951"
url: "https://pub.dev"
source: hosted
- version: "3.8.5"
+ version: "3.8.6"
fixnum:
dependency: transitive
description:
@@ -439,7 +439,7 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: HEAD
+ ref: "6a8c14bceaefd00e703ad517fd2a32fa2081b5de"
resolved-ref: "6a8c14bceaefd00e703ad517fd2a32fa2081b5de"
url: "https://github.com/deckerst/flutter_localizations_plus.git"
source: git
@@ -452,14 +452,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.0.2"
- flutter_markdown:
+ flutter_markdown_plus:
dependency: "direct main"
description:
- name: flutter_markdown
- sha256: "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec"
+ name: flutter_markdown_plus
+ sha256: fe74214c5ac2f850d93efda290dcde3f18006e90a87caa9e3e6c13222a5db4de
url: "https://pub.dev"
source: hosted
- version: "0.7.7"
+ version: "1.0.3"
flutter_plugin_android_lifecycle:
dependency: transitive
description:
@@ -551,10 +551,10 @@ packages:
dependency: transitive
description:
name: google_maps_flutter
- sha256: "830d8f7b51b4a950bf0d7daa675324fed6c9beb57a7ecca2a59018270c96b4e0"
+ sha256: d7e4704e6b9f3452c7cd9eb6efc226e1f9e8273c28da47b0a1e7451916d71005
url: "https://pub.dev"
source: hosted
- version: "2.12.1"
+ version: "2.12.2"
google_maps_flutter_android:
dependency: transitive
description:
@@ -615,10 +615,10 @@ packages:
dependency: "direct main"
description:
name: http
- sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
+ sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
url: "https://pub.dev"
source: hosted
- version: "1.3.0"
+ version: "1.4.0"
http_multi_server:
dependency: transitive
description:
@@ -944,10 +944,10 @@ packages:
dependency: "direct main"
description:
name: palette_generator
- sha256: "5a96b78983752faeb94866b30cb8f52e94ef176722bf51d1c5541d6a3044368f"
+ sha256: "4420f7ccc3f0a4a906144e73f8b6267cd940b64f57a7262e95cb8cec3a8ae0ed"
url: "https://pub.dev"
source: hosted
- version: "0.3.3+6"
+ version: "0.3.3+7"
panorama:
dependency: "direct main"
description:
@@ -1241,10 +1241,10 @@ packages:
dependency: "direct main"
description:
name: screen_brightness
- sha256: eca7bd9d2c3c688bcad14855361cab7097839400b6b4a56f62b7ae511c709958
+ sha256: "46d1b448729c1ed67c812f2c97d7fa8308809d91031c7ecdeb216ca65f7660de"
url: "https://pub.dev"
source: hosted
- version: "2.1.2"
+ version: "2.1.3"
screen_brightness_android:
dependency: transitive
description:
@@ -1269,6 +1269,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.1"
+ screen_brightness_ohos:
+ dependency: transitive
+ description:
+ name: screen_brightness_ohos
+ sha256: "61e313e46eaee3f83dd4e85a2a91f8a81be02c154bc9e60830a7c0fd76dac286"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.0"
screen_brightness_platform_interface:
dependency: transitive
description:
@@ -1671,10 +1679,10 @@ packages:
dependency: transitive
description:
name: vector_tile
- sha256: "3adb04426f3aebefce56f3fdf8ab2e23cc9f7d5b06ff8ca33ae87e3a1e441874"
+ sha256: "7ae290246e3a8734422672dbe791d3f7b8ab631734489fc6d405f1cc2080e38c"
url: "https://pub.dev"
source: hosted
- version: "2.0.0"
+ version: "2.0.1"
vector_tile_renderer:
dependency: "direct main"
description:
@@ -1735,10 +1743,10 @@ packages:
dependency: transitive
description:
name: web_socket
- sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b
+ sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
url: "https://pub.dev"
source: hosted
- version: "1.0.0"
+ version: "1.0.1"
web_socket_channel:
dependency: transitive
description:
@@ -1767,10 +1775,10 @@ packages:
dependency: transitive
description:
name: win32
- sha256: dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f
+ sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba"
url: "https://pub.dev"
source: hosted
- version: "5.12.0"
+ version: "5.13.0"
win32_registry:
dependency: transitive
description:
diff --git a/pubspec.yaml b/pubspec.yaml
index de9243f95..c4f8ca896 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -86,8 +86,9 @@ dependencies:
flutter_localizations_plus:
git:
url: https://github.com/deckerst/flutter_localizations_plus.git
+ ref: 6a8c14bceaefd00e703ad517fd2a32fa2081b5de
flutter_map:
- flutter_markdown: # discontinued on 2025/04/30
+ flutter_markdown_plus:
flutter_staggered_animations:
get_it:
gpx: