temp flutter upgrade

arifayduran · Dec 19, 2024 · 6f2bd8a · 6f2bd8a
1 parent 1c9dcb4
commit 6f2bd8a
Show file tree

Hide file tree

Showing 21 changed files with 1,069 additions and 346 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -5,4 +5,20 @@ This project uses materials licensed under the CC BY 4.0 License.
 This includes the following animation:
 
 Dark/Light Switch: Animation by YoucefDev, licensed under [CC BY 4.0 License].
-No Modifications were made.
+No Modifications were made.
+
+---
+
+# LICENSE for Google Fonts
+
+Die verwendeten Schriftarten stammen von [Google Fonts](https://fonts.google.com), die unter den folgenden Lizenzen stehen:
+
+- **SIL Open Font License (OFL) 1.1**: Diese Lizenz erlaubt es dir, die Schriftarten zu nutzen, zu ändern und weiterzugeben, solange du die Lizenz beibehältst und die Namen der Schriftarten nicht verändertst, ohne ausdrückliche Genehmigung. Für mehr Informationen siehe die [Open Font License](https://openfontlicense.org).
+
+- **Apache License 2.0**: Diese Lizenz erlaubt es dir, die Schriftarten zu nutzen, zu ändern und zu verteilen, solange du die Lizenzbedingungen einhältst und die Namensrechte der Schriftarten nicht verletzt.
+
+### Für mehr Informationen:
+
+- [Google Fonts Lizenzbedingungen](https://fonts.google.com)
+- [SIL Open Font License](https://openfontlicense.org)
+- [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
diff --git a/assets/fonts/BeauRivage-Regular.ttf b/assets/fonts/BeauRivage-Regular.ttf
diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb
@@ -20,5 +20,6 @@
   "langCopiedFromSettingsMessage": "تم تعيين لغة العرض من إعدادات اللغة الخاصة بك.",
   "languageSettingsCopiedFromLastTimeMessage": "تم نسخ إعدادات اللغة الخاصة بك من آخر مرة.",
   "onHoverSystemLang": "تُستخدم لغة النظام لمعالجة البيانات وتنسيقات العملات والإعدادات المحلية الأخرى.",
-  "lastRouteMessage": "تمت استعادة جلسة الطريق الأخيرة بنجاح."
+  "lastRouteMessage": "تمت استعادة جلسة الطريق الأخيرة بنجاح.",
+  "drawerOnHover": "الوصول إلى قائمة الإعدادات."
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
@@ -20,5 +20,6 @@
   "langCopiedFromSettingsMessage": "Anzeigesprache wurde von Ihren Spracheinstellungen übernommen.",
   "languageSettingsCopiedFromLastTimeMessage": "Ihre Spracheinstellungen wurden vom letzten Mal übernommen",
   "onHoverSystemLang": "Die Systemsprache wird verwendet, um Daten-, Währungsformate und andere lokale Einstellungen zu verwalten.",
-  "lastRouteMessage":"Die letzte Routensitzung wurde erfolgreich wiederhergestellt."
+  "lastRouteMessage":"Die letzte Routensitzung wurde erfolgreich wiederhergestellt.",
+  "drawerOnHover": "Zugriff auf das Einstellungen-Menü."
 }
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -79,6 +79,10 @@
     "lastRouteMessage": "The last route session has been successfully restored.",
     "@lastRouteMessage": {
         "description": "Notification shown when the last route session is restored successfully."
+    },
+    "drawerOnHover": "Access the settings menu.",
+    "@drawerOnHover": {
+    "description": "Manage basic settings and adjustments."
     }
 
 }
diff --git a/lib/l10n/app_tr.arb b/lib/l10n/app_tr.arb
@@ -20,6 +20,7 @@
   "langCopiedFromSettingsMessage": "Görüntü dili, dil ayarlarınızdan alındı.",
   "languageSettingsCopiedFromLastTimeMessage": "Dil ayarlarınız son seferden alındı.",
   "onHoverSystemLang": "Sistem dili, veri, para birimi formatı ve diğer yerel ayarları işlemek için kullanılır.",
-  "lastRouteMessage": "Son rota oturumu başarıyla geri yüklendi."
+  "lastRouteMessage": "Son rota oturumu başarıyla geri yüklendi.",
+  "drawerOnHover": "Ayarlar menüsüne erişim."
 }   
 
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,3 +1,4 @@
+
 import 'package:arifayduran_dev/src/core/my_toolbar.dart';
 import 'package:arifayduran_dev/src/features/settings/application/controllers/language_provider.dart';
 // import 'package:arifayduran_dev/src/features/settings/application/services/first_launch_service.dart';
@@ -28,6 +29,7 @@ void main() async {
   initialRoute = routeHistory!.isNotEmpty ? routeHistory!.last : '/';
 
   myToolbar = MyToolbar(uiModeController: uiModeController);
+  // myBottombar = MyBottombar(uiModeController: uiModeController);
 
   runApp(MultiProvider(providers: [
     ChangeNotifierProvider(
@@ -36,5 +38,8 @@ void main() async {
     ChangeNotifierProvider(
       create: (context) => ToolbarProvider(),
     ),
+    // ChangeNotifierProvider(
+    //   create: (context) => BottombarProvider(),
+    // ),
   ], child: MyApp(uiModeController: uiModeController)));
 }
diff --git a/lib/src/config/theme.dart b/lib/src/config/theme.dart
@@ -1,10 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+const Color textColorDark = white;
+const Color textColorLight = mainGrey;
+
 const Color effectColorDark = black;
 const Color effectColorLight = mainBlue;
 const Color destinationColorDark = darkBlue;
 const Color destinationColorLight = white;
+
+const Color touchColorDark = mainRed;
+const Color touchColorLight = lightBlue;
+const Color secondaryTouchColorDark = white;
+const Color secondaryTouchColorLight = mainGrey;
+
 Color snackBarColorDark = effectColorDark.withValues(alpha: 0.5);
 Color snackBarColorLight = effectColorLight.withValues(alpha: 0.5);
 Color snackBarTextColorDark = white;

diff --git a/lib/src/core/application/responsive_update.dart b/lib/src/core/application/responsive_update.dart
@@ -0,0 +1,39 @@
+
+import 'package:arifayduran_dev/src/core/my_toolbar.dart';
+import 'package:arifayduran_dev/src/features/settings/data/session_settings.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:responsive_framework/responsive_framework.dart';
+
+// void initializeToolbarHeight(BuildContext context) {
+//   final toolbarProvider = Provider.of<ToolbarProvider>(context, listen: false);
+//   responsiveUpdate(context);
+//   toolbarProvider.toolbarHeight = maxBarsHeight;
+// }
+// if (!isToolbarInitialized) {
+//           initializeToolbarHeight(context);
+//           isToolbarInitialized = true;
+//         }
+
+// isToolbarInitialized sil
+
+void responsiveUpdate(BuildContext context) {
+  // final double height = MediaQuery.of(context).size.height;
+  final toolbarProvider = Provider.of<ToolbarProvider>(context, listen: false);
+  // final bottombarProvider =
+  //     Provider.of<BottombarProvider>(context, listen: false);
+
+  if (ResponsiveBreakpoints.of(context).smallerThan("Big")) {
+    toolbarProvider.providersmaxBarsHeight = 60;
+    toolbarProvider.providersminBarsHeight = 40;
+    // bottombarProvider.providersMaxBottombarHeight = 60;
+    // bottombarProvider.providersMinBottombarHeight = 40;
+    maxBarsHeight = 60;
+    minBarsHeight = 40;
+  } else {
+    // bottombarProvider.providersMaxBottombarHeight = 80;
+    // bottombarProvider.providersMinBottombarHeight = 60;
+    maxBarsHeight = 80;
+    minBarsHeight = 60;
+  }
+}
diff --git a/lib/src/core/my_app.dart b/lib/src/core/my_app.dart
@@ -5,12 +5,15 @@ import 'package:arifayduran_dev/src/features/settings/application/controllers/la
 // import 'package:arifayduran_dev/src/features/settings/application/services/deactivated/routes_service.dart'; // not using since observer
 import 'package:arifayduran_dev/src/features/settings/application/controllers/ui_mode_controller.dart';
 import 'package:arifayduran_dev/src/features/settings/data/session_settings.dart';
+import 'package:arifayduran_dev/src/presentation/svg_color_mapper.dart';
+import 'package:arifayduran_dev/src/presentation/svg_shadow_painter_oval.dart';
 // import 'package:arifayduran_dev/src/features/settings/data/session_settings.dart'; // not using since observer
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:arifayduran_dev/src/config/my_custom_scroll_behavior.dart';
 import 'package:arifayduran_dev/src/config/theme.dart';
 import 'package:arifayduran_dev/src/features/home/presentation/home_screen.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
 import 'package:responsive_framework/responsive_framework.dart';
 
@@ -29,10 +32,13 @@ class MyApp extends StatelessWidget {
             builder: (context, child) => ResponsiveBreakpoints.builder(
               child: child!,
               breakpoints: [
-                const Breakpoint(start: 0, end: 450, name: MOBILE),
-                const Breakpoint(start: 451, end: 800, name: TABLET),
-                const Breakpoint(start: 801, end: 1920, name: DESKTOP),
-                const Breakpoint(start: 1921, end: double.infinity, name: '4K'),
+                const Breakpoint(start: 0, end: 300, name: "Small"),
+                const Breakpoint(start: 301, end: 600, name: MOBILE),
+                const Breakpoint(start: 601, end: double.infinity, name: "Big"),
+                // const Breakpoint(start: 0, end: 450, name: MOBILE),
+                // const Breakpoint(start: 451, end: 800, name: TABLET),
+                // const Breakpoint(start: 801, end: 1920, name: DESKTOP),
+                // const Breakpoint(start: 1921, end: double.infinity, name: '4K'),
               ],
             ),
             scrollBehavior: MyCustomScrollBehavior(),
@@ -90,48 +96,116 @@ class MyApp extends StatelessWidget {
         transitionDuration: const Duration(milliseconds: 500),
         reverseTransitionDuration: const Duration(milliseconds: 500),
         pageBuilder: (context, animation, secondaryAnimation) {
+          final toolbarProvider =
+              Provider.of<ToolbarProvider>(context, listen: false);
+          // final bottombarProvider =
+          //     Provider.of<BottombarProvider>(context, listen: false);
           if (uiModeController.darkModeSet) {
-            Provider.of<ToolbarProvider>(context, listen: false)
-                .scrolledPlaceColor = effectColorDark;
+            toolbarProvider.scrolledPlaceColor = effectColorDark;
+            // bottombarProvider.scrolledPlaceColor = effectColorDark;
           } else {
-            Provider.of<ToolbarProvider>(context, listen: false)
-                .scrolledPlaceColor = effectColorLight;
+            toolbarProvider.scrolledPlaceColor = effectColorLight;
+            // bottombarProvider.scrolledPlaceColor = effectColorLight;
           }
           String pathName = path; // Kein `substring(1)`
           // String pathName =
           //     path != '/' && path.startsWith('/') ? path.substring(1) : path;
 
           return Scaffold(
-            backgroundColor:
-                Provider.of<ToolbarProvider>(context, listen: false)
-                    .scrolledPlaceColor,
+            backgroundColor: toolbarProvider.scrolledPlaceColor,
             appBar: PreferredSize(
               preferredSize: Size.fromHeight(
-                  Provider.of<ToolbarProvider>(context, listen: false)
-                      .toolbarHeight),
-              child: myToolbar,
+                  Provider.of<ToolbarProvider>(context).toolbarHeight),
+              child: Stack(
+                clipBehavior: Clip.none,
+                children: [
+                  myToolbar,
+                  Positioned(
+                      top: 0,
+                      height: Provider.of<ToolbarProvider>(context).toolbarHeight *
+                          1.3,
+                      width: Provider.of<ToolbarProvider>(context).toolbarHeight *
+                          1.3 *
+                          2,
+                      child: uiModeController.darkModeSet
+                          ? CustomPaint(
+                              painter: SvgShadowPainterOval(
+                                  shadowColor: touchColorDark,
+                                  shouldReverse: false),
+                              child: SvgPicture(SvgAssetLoader("assets/app_icons/logo_graphic_top_SVG.svg",
+                                  colorMapper: SvgColorMapper(
+                                      fromColor: const Color(0xFFD02A1E),
+                                      toColor: touchColorDark,
+                                      fromSecondColor: const Color(0xFFFFFFFF),
+                                      toSecondColor: secondaryTouchColorDark))))
+                          : CustomPaint(
+                              painter: SvgShadowPainterOval(
+                                  shadowColor: secondaryTouchColorLight,
+                                  shouldReverse: false),
+                              child: SvgPicture(SvgAssetLoader("assets/app_icons/logo_graphic_top_SVG.svg",
+                                  colorMapper: SvgColorMapper(fromColor: const Color(0xFFD02A1E), toColor: touchColorLight, fromSecondColor: const Color(0xFFFFFFFF), toSecondColor: secondaryTouchColorLight))))),
+                ],
+              ),
             ),
-            body: FadeTransition(
-                opacity: animation,
-                child: switch (pathName) {
-                  '/' ||
-                  HomeScreen.routeName =>
-                    HomeScreen(uiModeController: uiModeController),
-                  ProjectsScreen.routeName =>
-                    ProjectsScreen(uiModeController: uiModeController),
-                  "/placeholder" =>
+            // extendBody: true,
+            // bottomNavigationBar:
+            //     MyBottombar(uiModeController: uiModeController),
+            body:
 
-                    // const ResponsiveBreakpoints(breakpoints: [
-                    //   Breakpoint(start: 0, end: 480, name: MOBILE),
-                    //   Breakpoint(start: 481, end: 1200, name: TABLET),
-                    //   Breakpoint(start: 1201, end: double.infinity, name: DESKTOP),
-                    // ], child:
-                    const Placeholder(),
-                  // ),
+                // Stack(
+                //   clipBehavior: Clip.none,
+                //   children: [
+                FadeTransition(
+                    opacity: animation,
+                    child: switch (pathName) {
+                      '/' ||
+                      HomeScreen.routeName =>
+                        HomeScreen(uiModeController: uiModeController),
+                      ProjectsScreen.routeName =>
+                        ProjectsScreen(uiModeController: uiModeController),
+                      "/placeholder" =>
 
-                  String() => HomeScreen(uiModeController: uiModeController),
-                }),
+                        // const ResponsiveBreakpoints(breakpoints: [
+                        //   Breakpoint(start: 0, end: 480, name: MOBILE),
+                        //   Breakpoint(start: 481, end: 1200, name: TABLET),
+                        //   Breakpoint(start: 1201, end: double.infinity, name: DESKTOP),
+                        // ], child:
+                        const Placeholder(),
+                      // ),
+
+                      String() =>
+                        HomeScreen(uiModeController: uiModeController),
+                    }),
+            // Positioned.fill(
+            //   left: -634,
+            //   child: CustomPaint(
+            //     painter: VerticalLinePainter(),
+            //   ),
+            // ),
+            //   ],
+            // ),
           );
         });
   }
 }
+
+// class VerticalLinePainter extends CustomPainter {
+//   @override
+//   void paint(Canvas canvas, Size size) {
+//     final Paint paint = Paint()
+//       ..color = const Color.fromARGB(129, 255, 255, 255) // Farbe der Linie
+//       ..strokeWidth = 1.0 // Breite der Linie
+//       ..style = PaintingStyle.stroke;
+
+//     // Zeichne eine Linie von oben nach unten in der Mitte des Bildschirms
+//     final double startX = size.width / 2; // X-Position (zentriert)
+//     canvas.drawLine(
+//       Offset(startX, 0), // Startpunkt (oben)
+//       Offset(startX, size.height), // Endpunkt (unten)
+//       paint,
+//     );
+//   }
+
+//   @override
+//   bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
+// }