fix: resolved conflicts

Author: samruddhi-Rahegaonkar

lib/view/homescreen.dart

@@ -33,34 +33,73 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen>
-    with TickerProviderStateMixin, AutomaticKeepAliveClientMixin {
+    with
+        TickerProviderStateMixin,
+        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 errorVal = "";
+  String previousText = '';
+  String _cachedText = '';
 
   @override
   void initState() {
+    WidgetsBinding.instance.addObserver(this);
     inlineimagecontroller.addListener(handleTextChange);
     _setPortraitOrientation();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       inlineImageProvider.setContext(context);
     });
     _startImageCaching();
     speedDialProvider = SpeedDialProvider(animationProvider);
+    _tabController = TabController(length: 3, vsync: this);
     super.initState();
+  }
 
-    _tabController = TabController(length: 3, vsync: this);
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    inlineimagecontroller.removeListener(handleTextChange);
+    inlineimagecontroller.removeListener(_controllerListner);
+    animationProvider.stopAnimation();
+    _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.paused) {
+      _cachedText = inlineimagecontroller.text;
+      animationProvider.stopAnimation();
+    } else if (state == AppLifecycleState.resumed) {
+      if (inlineimagecontroller.text.trim().isEmpty &&
+          _cachedText.trim().isNotEmpty) {
+        inlineimagecontroller.text = _cachedText;
+      }
+      animationProvider.badgeAnimation(
+        inlineimagecontroller.text,
+        Converters(),
+        animationProvider.isEffectActive(InvertLEDEffect()),
+      );
+    }
+  }
+
+  void _controllerListner() {
+    animationProvider.badgeAnimation(
+      inlineImageProvider.getController().text,
+      Converters(),
+      animationProvider.isEffectActive(InvertLEDEffect()),
+    );
   }
 
   void handleTextChange() {
@@ -69,7 +108,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);
 
@@ -94,20 +132,6 @@ class _HomeScreenState extends State<HomeScreen>
     }
   }
 
-  void _controllerListner() {
-    animationProvider.badgeAnimation(inlineImageProvider.getController().text,
-        Converters(), animationProvider.isEffectActive(InvertLEDEffect()));
-  }
-
-  @override
-  void dispose() {
-    inlineimagecontroller.removeListener(handleTextChange);
-    animationProvider.stopAnimation();
-    inlineImageProvider.getController().removeListener(_controllerListner);
-    _tabController.dispose();
-    super.dispose();
-  }
-
   void _setPortraitOrientation() {
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.portraitUp,
@@ -127,17 +151,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;
           },
         ),
@@ -280,18 +302,18 @@ class _HomeScreenState extends State<HomeScreen>
                         child: GestureDetector(
                           onTap: () {
                             badgeData.checkAndTransfer(
-                                inlineimagecontroller.text,
-                                animationProvider.isEffectActive(FlashEffect()),
-                                animationProvider
-                                    .isEffectActive(MarqueeEffect()),
-                                animationProvider
-                                    .isEffectActive(InvertLEDEffect()),
-                                speedDialProvider.getOuterValue(),
-                                modeValueMap[
-                                    animationProvider.getAnimationIndex()],
-                                null,
-                                false,
-                                context); //added context
+                              inlineimagecontroller.text,
+                              animationProvider.isEffectActive(FlashEffect()),
+                              animationProvider.isEffectActive(MarqueeEffect()),
+                              animationProvider
+                                  .isEffectActive(InvertLEDEffect()),
+                              speedDialProvider.getOuterValue(),
+                              modeValueMap[
+                                  animationProvider.getAnimationIndex()],
+                              null,
+                              false,
+                              context, // <== This is needed and now passed
+                            );
                           },
                           child: Container(
                             padding: EdgeInsets.symmetric(