Merge branch 'issue1344' of https://github.com/samruddhi-Rahegaonkar/badgemagic-app into issue1344

Author: samruddhi-Rahegaonkar

.github/workflows/pull_request.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches: [ "development" ]
 
+
 env:
   ANDROID_EMULATOR_API: 34
   ANDROID_EMULATOR_ARCH: x86_64

.github/workflows/pull_request_closed.yml

@@ -5,6 +5,7 @@ on:
     branches: [ "development" ]
 
     branches: [ "flutter_app" ]
+
     types:
       - closed
 

.github/workflows/push.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches: ["development"]
 
+
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ANDROID_EMULATOR_API: 34

android/settings.gradle

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.10.1" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.0" apply false
 }
 
 include ":app"

lib/view/homescreen.dart

@@ -38,20 +38,21 @@ class _HomeScreenState extends State<HomeScreen>
         AutomaticKeepAliveClientMixin,
         WidgetsBindingObserver {
   late final TabController _tabController;
-  AnimationBadgeProvider animationProvider = AnimationBadgeProvider();
   late SpeedDialProvider speedDialProvider;
-  BadgeMessageProvider badgeData = BadgeMessageProvider();
-  ImageUtils imageUtils = ImageUtils();
-  InlineImageProvider inlineImageProvider =
+  final AnimationBadgeProvider animationProvider = AnimationBadgeProvider();
+  final BadgeMessageProvider badgeData = BadgeMessageProvider();
+  final ImageUtils imageUtils = ImageUtils();
+  final InlineImageProvider inlineImageProvider =
       GetIt.instance<InlineImageProvider>();
-  bool isPrefixIconClicked = false;
-  int textfieldLength = 0;
-  String previousText = '';
   final TextEditingController inlineimagecontroller =
       GetIt.instance.get<InlineImageProvider>().getController();
+
+  bool isPrefixIconClicked = false;
   bool isDialInteracting = false;
   String _cachedText = '';
   late ScreenSize _selectedSize;
+  String previousText = '';
+  String _cachedText = ''; // <-- NEW: to cache text on pause
 
   @override
   void initState() {
@@ -66,6 +67,8 @@ class _HomeScreenState extends State<HomeScreen>
     speedDialProvider = SpeedDialProvider(animationProvider);
     _tabController = TabController(length: 3, vsync: this);
     _selectedSize = supportedScreenSizes.first;
+    _selectedSize = supportedScreenSizes.first; // default value
+    super.initState();
   }
 
   @override
@@ -95,6 +98,7 @@ class _HomeScreenState extends State<HomeScreen>
           InvertLEDEffect(),
         ),
         _selectedSize,
+        animationProvider.isEffectActive(InvertLEDEffect()),
       );
     }
   }
@@ -107,6 +111,8 @@ class _HomeScreenState extends State<HomeScreen>
         InvertLEDEffect(),
       ),
       _selectedSize,
+
+      animationProvider.isEffectActive(InvertLEDEffect()),
     );
   }
 
@@ -116,7 +122,6 @@ class _HomeScreenState extends State<HomeScreen>
 
     if (previousText.length > currentText.length) {
       final deletionIndex = selection.baseOffset;
-
       final regex = RegExp(r'<<\d+>>');
       final matches = regex.allMatches(previousText);
 
@@ -160,17 +165,15 @@ class _HomeScreenState extends State<HomeScreen>
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    InlineImageProvider inlineImageProvider =
-        Provider.of<InlineImageProvider>(context);
 
     return MultiProvider(
       providers: [
         ChangeNotifierProvider<AnimationBadgeProvider>(
-          create: (context) => animationProvider,
+          create: (_) => animationProvider,
         ),
         ChangeNotifierProvider<SpeedDialProvider>(
-          create: (context) {
-            inlineImageProvider.getController().addListener(_controllerListner);
+          create: (_) {
+            inlineimagecontroller.addListener(_controllerListner);
             return speedDialProvider;
           },
         ),
@@ -224,6 +227,7 @@ class _HomeScreenState extends State<HomeScreen>
                       ],
                     ),
                   ),
+                  AnimationBadge(),
                   Container(
                     margin: EdgeInsets.all(15.w),
                     child: Material(
@@ -343,6 +347,47 @@ class _HomeScreenState extends State<HomeScreen>
                             child: const Text('Save'),
                           ),
                         ),
+                        ),
+                        AnimationTab(),
+                        EffectTab(),
+                      ],
+                    ),
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      Container(
+                        padding: EdgeInsets.symmetric(vertical: 20.h),
+                        child: GestureDetector(
+                          onTap: () {
+                            if (inlineimagecontroller.text.trim().isEmpty) {
+                              ToastUtils()
+                                  .showErrorToast("Please enter a message");
+                              return;
+                            }
+                            showDialog(
+                              context: context,
+                              builder: (context) {
+                                return SaveBadgeDialog(
+                                  speed: speedDialProvider,
+                                  animationProvider: animationProvider,
+                                  textController: inlineimagecontroller,
+                                  isInverse: animationProvider
+                                      .isEffectActive(InvertLEDEffect()),
+                                );
+                              },
+                            );
+                          },
+                          child: Container(
+                            padding: EdgeInsets.symmetric(
+                                horizontal: 33.w, vertical: 8.h),
+                            decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(2.r),
+                              color: mdGrey400,
+                            ),
+                            child: const Text('Save'),
+                          ),
+                        ),
                       ),
                       SizedBox(width: 100.w),
                       Container(
@@ -360,13 +405,20 @@ class _HomeScreenState extends State<HomeScreen>
                               animationProvider.isEffectActive(
                                 InvertLEDEffect(),
                               ),
+
+                              animationProvider.isEffectActive(FlashEffect()),
+                              animationProvider.isEffectActive(MarqueeEffect()),
+                              animationProvider
+                                  .isEffectActive(InvertLEDEffect()),
                               speedDialProvider.getOuterValue(),
                               modeValueMap[
                                   animationProvider.getAnimationIndex()],
                               null,
                               false,
                               _selectedSize.height,
                               _selectedSize.width,
+                              _selectedSize.width, // <-- pass badge height
+
                             );
                           },
                           child: Container(

pubspec.lock

@@ -173,10 +173,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "77f8e81d22d2a07d0dee2c62e1dda71dc1da73bf43bb2d45af09727406167964"
+      sha256: ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.9"
+    version: "10.2.0"
   fixnum:
     dependency: transitive
     description:
@@ -271,10 +271,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
+      sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -310,10 +310,10 @@ packages:
     dependency: "direct main"
     description:
       name: go_router
-      sha256: b453934c36e289cef06525734d1e676c1f91da9e22e2017d9dcab6ce0f999175
+      sha256: ac294be30ba841830cfa146e5a3b22bb09f8dc5a0fdd9ca9332b04b0bde99ebf
       url: "https://pub.dev"
     source: hosted
-    version: "15.1.3"
+    version: "15.2.4"
   google_fonts:
     dependency: "direct main"
     description:
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
+      sha256: "2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   logging:
     dependency: transitive
     description:

pubspec.yaml

@@ -20,7 +20,7 @@ version: 1.0.0+1
 
 environment:
   sdk: '>=3.3.4 <4.0.0'
-  flutter: '3.32.2'
+  flutter: '3.32.4'
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -38,16 +38,16 @@ dependencies:
   cupertino_icons: ^1.0.6
   provider: ^6.1.5
   flutter_blue_plus: ^1.35.5
-  logger: ^2.5.0
-  flutter_svg: ^2.1.0
+  logger: ^2.6.0
+  flutter_svg: ^2.2.0
   get_it: ^8.0.3
   flutter_screenutil: ^5.9.3
   extended_text_field: ^16.0.2
   path_provider: ^2.1.5
   uuid: ^4.5.0
-  go_router: ^15.1.3
+  go_router: ^15.2.4
   share_plus: ^11.0.0
-  file_picker: ^10.1.9
+  file_picker: ^10.2.0
   google_fonts: ^6.2.1
   url_launcher: ^6.3.1
   image: ^4.5.4