v1.2.0+54

- screaming_possum.gif

lib/widgets/end_drawer.dart

@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 
-import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get/get.dart';
 
 import 'package:f0ckapp/providers/theme_provider.dart';
+//import 'package:f0ckapp/services/api_service.dart';
 import 'package:f0ckapp/utils/appversion_util.dart';
 
 class EndDrawer extends StatelessWidget {
-  final WidgetRef ref;
-
-  const EndDrawer({super.key, required this.ref});
+  const EndDrawer({super.key});
 
   void _showMsg(String message, BuildContext context) {
     ScaffoldMessenger.of(context)
@@ -18,6 +17,9 @@ class EndDrawer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    //final ApiService c = Get.find<ApiService>();
+    final ThemeController themeController = Get.find();
+
     return Drawer(
       child: ListView(
         padding: EdgeInsets.zero,
@@ -88,34 +90,32 @@ class EndDrawer extends StatelessWidget {
             children: [
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                child: Column(
-                  children: themeMap.entries.map((entry) {
-                    final String themeName = entry.key;
-                    final ThemeData themeData = entry.value;
-                    final ThemeData currentTheme = ref.watch(
-                      themeNotifierProvider,
-                    );
-                    final bool isSelected = currentTheme == themeData;
-                    return ListTile(
-                      title: Text(themeName),
-                      selected: isSelected,
-                      selectedTileColor: Colors.blue.withValues(alpha: 0.2),
-                      onTap: () async {
-                        await ref
-                            .read(themeNotifierProvider.notifier)
-                            .updateTheme(themeName);
-                      },
-                    );
-                  }).toList(),
-                ),
+                child: Obx(() {
+                  return Column(
+                    children: themeController.themeMap.entries.map((entry) {
+                      final String themeName = entry.key;
+                      final ThemeData themeData = entry.value;
+                      final bool isSelected =
+                          themeController.currentTheme.value == themeData;
+                      return ListTile(
+                        title: Text(themeName),
+                        selected: isSelected,
+                        selectedTileColor: Colors.blue.withValues(alpha: 0.2),
+                        onTap: () async {
+                          await themeController.updateTheme(themeName);
+                        },
+                      );
+                    }).toList(),
+                  );
+                }),
               ),
             ],
           ),
           ListTile(
-            title: const Text('Einstellungen'),
+            title: const Text('Settings'),
             onTap: () {
-              //context.go('/settings');
-              Navigator.pushReplacementNamed(context, '/settings');
+              Navigator.pop(context);
+              Get.toNamed('/settings');
             },
           ),
           ListTile(