resolved conflicts (#112)

Co-authored-by: Tavkeer Shah <[email protected]>
CCExtractor · Oct 19, 2023 · f10d879 · f10d879
1 parent bf11d3b
commit f10d879
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart
@@ -586,7 +586,7 @@ class HomeView extends GetView<HomeController> {
                                 if (!snapshot.hasData) {
                                   return const Center(
                                     child: CircularProgressIndicator.adaptive(
-                                      backgroundColor: kprimaryColor,
+                                      backgroundColor: Colors.transparent,
                                       valueColor: AlwaysStoppedAnimation(
                                         kprimaryColor,
                                       ),
@@ -1194,7 +1194,12 @@ class HomeView extends GetView<HomeController> {
                               },
                             );
                           } else {
-                            return const CircularProgressIndicator.adaptive();
+                            return const CircularProgressIndicator.adaptive(
+                              backgroundColor: Colors.transparent,
+                              valueColor: AlwaysStoppedAnimation(
+                                kprimaryColor,
+                              ),
+                            );
                           }
                         },
                       );