Merge remote-tracking branch 'origin/develop' into Gradle-KotlinDSL-Migration

Author: Renarde-dev

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.27.4"
+  "flutter": "3.32.4"
 }

.gitignore

@@ -5,9 +5,11 @@
 /.flutter-plugins
 /.flutter-plugins-dependencies
 /.packages
-
 *.env
 
+# May be temporary
+devtools_options.yaml
+
 # FVM Version Cache
 .fvm/
 /.dart_tool/

lib/models/image_model.dart

@@ -48,7 +48,7 @@ class ImageModel {
         dateCreation = json['date_creation'],
         dateAvailable = json['date_available'],
         pageUrl = json['page_url'],
-        elementUrl = json['element_url'],
+        elementUrl = json.containsKey("element_url") ? json['element_url'] : "",
         derivatives = Derivatives.fromJson(json['derivatives']),
         categories = json['categories'] ?? [],
         tags = json['tags']

lib/network/images.dart

@@ -246,7 +246,7 @@ Future<bool> share(
   print(filesPath);
   if (filesPath == null || filesPath.isEmpty) return false;
   try {
-    Share.shareXFiles(filesPath);
+    SharePlus.instance.share(ShareParams(files: filesPath));
     return true;
   } catch (e) {
     debugPrint("$e");

lib/utils/themes.dart

@@ -7,7 +7,6 @@ final ThemeData lightTheme = ThemeData.light(useMaterial3: true).copyWith(
   primaryColorDark: AppColors.black,
   disabledColor: AppColors.disabled,
   scaffoldBackgroundColor: AppColors.backgroundLight,
-  dialogBackgroundColor: AppColors.backgroundLight,
   focusColor: AppColors.accent,
   splashColor: AppColors.accent.withValues(alpha: 0.3),
   cardColor: AppColors.cardLight,
@@ -40,7 +39,7 @@ final ThemeData lightTheme = ThemeData.light(useMaterial3: true).copyWith(
     foregroundColor: AppColors.accent,
     titleTextStyle: TextStyle(fontSize: 20.0, color: AppColors.black),
   ),
-  tabBarTheme: TabBarTheme(
+  tabBarTheme: TabBarThemeData(
     dividerColor: Colors.transparent,
     labelStyle: TextStyle(
       fontSize: 16,
@@ -169,7 +168,7 @@ final ThemeData lightTheme = ThemeData.light(useMaterial3: true).copyWith(
       color: AppColors.black,
       fontWeight: FontWeight.normal,
     ),
-  ),
+  ), dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundLight),
 );
 
 final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
@@ -178,7 +177,6 @@ final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
   primaryColorDark: AppColors.black,
   disabledColor: AppColors.disabled,
   scaffoldBackgroundColor: AppColors.backgroundDark,
-  dialogBackgroundColor: AppColors.backgroundDark,
   focusColor: AppColors.accent,
   splashColor: AppColors.accent.withValues(alpha: 0.3),
   cardColor: AppColors.cardDark,
@@ -211,7 +209,7 @@ final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
     foregroundColor: AppColors.accent,
     titleTextStyle: TextStyle(fontSize: 20.0, color: AppColors.white),
   ),
-  tabBarTheme: TabBarTheme(
+  tabBarTheme: TabBarThemeData(
     dividerColor: Colors.transparent,
     labelStyle: TextStyle(
       fontSize: 16,
@@ -329,5 +327,5 @@ final ThemeData darkTheme = ThemeData.dark(useMaterial3: true).copyWith(
       color: AppColors.white,
       fontWeight: FontWeight.bold,
     ),
-  ),
+  ), dialogTheme: DialogThemeData(backgroundColor: AppColors.backgroundDark),
 );

lib/views/image/image_page.dart

@@ -480,9 +480,8 @@ class _ImagePageState extends State<ImagePage> {
       builder: (context, index) {
         final ImageModel image = _imageList[index];
 
-        String imageUrl = '';
-        if (Preferences.getImageFullScreenSize == 'full') {
-          imageUrl = image.elementUrl;
+        String imageUrl = image.elementUrl;
+        if (Preferences.getImageFullScreenSize == 'full' && imageUrl.isNotEmpty) {
           imageUrl = HtmlUnescape().convert(imageUrl);
         } else {
           imageUrl = image.getDerivativeFromString(Preferences.getImageFullScreenSize)?.url ?? '';
@@ -709,10 +708,12 @@ class _ImagePageState extends State<ImagePage> {
             },
           ),
         ),
-      IconButton(
-        onPressed: () => downloadImages([_currentImage]),
-        icon: Icon(Icons.download),
-      ),
+      if (_currentImage.elementUrl != "")
+        IconButton(
+          onPressed: () => downloadImages([_currentImage]),
+          icon: Icon(Icons.download),
+        )
+      ,
     ];
 
     return widget.isAdmin ? adminActions : userActions;