Added clean image url function

Author: ReightI

lib/components/app_image_display.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/network/api_client.dart';
+import 'package:piwigo_ng/network/images.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/utils/settings.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -24,11 +25,13 @@ class ImageNetworkDisplay extends StatefulWidget {
 
 class _ImageNetworkDisplayState extends State<ImageNetworkDisplay> {
   late final Future<Map<String, String>> _headers;
+  late final String? _cleanUrl;
 
   @override
   initState() {
     super.initState();
     _headers = _getHeaders();
+    _cleanUrl = cleanImageUrl(widget.imageUrl) ?? widget.imageUrl;
   }
 
   Future<Map<String, String>> _getHeaders() async {
@@ -68,7 +71,7 @@ class _ImageNetworkDisplayState extends State<ImageNetworkDisplay> {
 
   @override
   Widget build(BuildContext context) {
-    if (widget.imageUrl == null) {
+    if (_cleanUrl == null) {
       return _buildNoImageWidget(context);
     }
     _checkMemory();
@@ -83,7 +86,7 @@ class _ImageNetworkDisplayState extends State<ImageNetworkDisplay> {
                   ? constraints.maxHeight
                   : null;
               return CachedNetworkImage(
-                imageUrl: widget.imageUrl!,
+                imageUrl: _cleanUrl!,
                 fadeInDuration: const Duration(milliseconds: 300),
                 fit: widget.fit ?? BoxFit.cover,
                 httpHeaders: snapshot.data!,

lib/components/cards/image_card.dart

@@ -1,5 +1,4 @@
 import 'package:auto_size_text/auto_size_text.dart';
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:piwigo_ng/components/app_image_display.dart';
 import 'package:piwigo_ng/models/image_model.dart';
@@ -106,32 +105,6 @@ class ImageCard extends StatelessWidget {
     return ImageNetworkDisplay(
       imageUrl: imageUrl,
     );
-    return CachedNetworkImage(
-      imageUrl: imageUrl ?? '',
-      fadeInDuration: const Duration(milliseconds: 300),
-      imageBuilder: (context, provider) => Image(
-        image: provider,
-        fit: BoxFit.cover,
-        errorBuilder: (context, o, s) {
-          debugPrint("$o\n$s");
-          return _buildErrorWidget(context);
-        },
-      ),
-      progressIndicatorBuilder: (context, url, download) {
-        if (download.downloaded >= (download.totalSize ?? 0)) {
-          return const SizedBox();
-        }
-        return Center(
-          child: CircularProgressIndicator(
-            value: download.progress,
-          ),
-        );
-      },
-      errorWidget: (context, url, error) {
-        debugPrint("[$url] $error");
-        return _buildErrorWidget(context);
-      },
-    );
   }
 
   List<Widget> _buildSelectOverlay(context) {
@@ -185,17 +158,4 @@ class ImageCard extends StatelessWidget {
       ),
     ];
   }
-
-  Widget _buildErrorWidget(BuildContext context) {
-    return FittedBox(
-      fit: BoxFit.cover,
-      child: Container(
-        padding: const EdgeInsets.all(16.0),
-        decoration: BoxDecoration(
-          color: Theme.of(context).scaffoldBackgroundColor,
-        ),
-        child: const Icon(Icons.broken_image_outlined),
-      ),
-    );
-  }
 }

lib/main.dart

@@ -13,7 +13,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  // SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
   _setUITheme();
   HttpOverrides.global = SSLHttpOverrides();
   appPreferences = await SharedPreferences.getInstance();

lib/services/notification_service.dart

@@ -13,7 +13,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 final FlutterLocalNotificationsPlugin localNotification =
     FlutterLocalNotificationsPlugin();
 
-void initLocalNotifications() {
+Future<void> initLocalNotifications() async {
   const AndroidInitializationSettings initializationSettingsAndroid =
       AndroidInitializationSettings(
     '@mipmap/ic_launcher',
@@ -24,6 +24,7 @@ void initLocalNotifications() {
     initSettings,
     onDidReceiveNotificationResponse: onSelectNotification,
   );
+  await askNotificationPermissions();
 }
 
 Future<void> onSelectNotification(NotificationResponse response) async {