update categories and category screen to show the banner text and the…

… loading
zaihcodes · Mar 24, 2024 · ee377ba · ee377ba
1 parent 25c302e
commit ee377ba
Show file tree

Hide file tree

Showing 7 changed files with 155 additions and 119 deletions.
diff --git a/lib/src/category/presentation/screens/categories_screen.dart b/lib/src/category/presentation/screens/categories_screen.dart
@@ -12,40 +12,47 @@ class CategoriesScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.background,
-      body: BlocBuilder<CategoryBloc, CategoryState>(
-        builder: (context, state) {
-          debugPrint('State is ${state.runtimeType}');
-          if (state is CategoryLoading) {
-            return const SizedBox(
-                child: Center(child: CircularProgressIndicator()));
-          } else if (state is CategoryLoaded) {
-            return Column(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                const CategoriesBanner(),
-                Expanded(
-                  child: CategoriesList(
-                    categories: state.categories,
-                  ),
-                )
-              ],
-            );
-          } else if (state is CategoryEmptyData) {
-            return const Center(
-              child: Text('No categories available.'),
-            );
-          } else if (state is CategoryError) {
-            return Center(
-              child: Text('Error: ${state.message}'),
-            );
-          } else if (state is CategoryOffline) {
-            return const NoInternetScreen();
-          } else {
-            return const Center(
-              child: Text('Unexpected state'),
-            );
-          }
-        },
+      body: Column(
+        crossAxisAlignment: CrossAxisAlignment.end,
+        children: [
+          const CategoriesBanner(),
+          Expanded(
+            child: Container(
+              padding: const EdgeInsets.only(top: 20, left: 20, right: 20),
+              decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.secondaryContainer,
+                  borderRadius:
+                      const BorderRadius.vertical(top: Radius.circular(40))),
+              child: BlocBuilder<CategoryBloc, CategoryState>(
+                builder: (context, state) {
+                  debugPrint('State is ${state.runtimeType}');
+                  if (state is CategoryLoading) {
+                    return const SizedBox(
+                        child: Center(child: CircularProgressIndicator()));
+                  } else if (state is CategoryLoaded) {
+                    return CategoriesList(
+                      categories: state.categories,
+                    );
+                  } else if (state is CategoryEmptyData) {
+                    return const Center(
+                      child: Text('No categories available.'),
+                    );
+                  } else if (state is CategoryError) {
+                    return Center(
+                      child: Text('Error: ${state.message}'),
+                    );
+                  } else if (state is CategoryOffline) {
+                    return const NoInternetScreen();
+                  } else {
+                    return const Center(
+                      child: Text('Unexpected state'),
+                    );
+                  }
+                },
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }

diff --git a/lib/src/category/presentation/screens/category_detail_screen.dart b/lib/src/category/presentation/screens/category_detail_screen.dart
@@ -15,40 +15,46 @@ class CategoryDetailScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Theme.of(context).colorScheme.background,
-      body: BlocBuilder<CategoryDetailBloc, CategoryDetailState>(
-        builder: (context, state) {
-          if (state is CategoryDetailLoading) {
-            return const SizedBox(
-                child: Center(child: CircularProgressIndicator()));
-          } else if (state is CategoryDetailLoaded) {
-            return Column(
-              crossAxisAlignment: CrossAxisAlignment.end,
-              children: [
-                CategoryDetailBanner(
-                  categoryTitle: categoryTitle,
-                ),
-                Expanded(
-                  child: CategoryDetailList(
-                      categoriesDetail: state.categoriesDetail),
-                )
-              ],
-            );
-          } else if (state is CategoryDetailEmptyData) {
-            return const Center(
-              child: Text('No categories available.'),
-            );
-          } else if (state is CategoryDetailError) {
-            return Center(
-              child: Text('Error: ${state.message}'),
-            );
-          } else if (state is CategoryDetailOffline) {
-            return const NoInternetScreen();
-          } else {
-            return const Center(
-              child: Text('Unexpected state'),
-            );
-          }
-        },
+      body: Column(
+        children: [
+          CategoryDetailBanner(
+            categoryTitle: categoryTitle,
+          ),
+          Expanded(
+            child: Container(
+              padding: const EdgeInsets.only(top: 20, left: 20, right: 20),
+              decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.secondaryContainer,
+                  borderRadius:
+                      const BorderRadius.vertical(top: Radius.circular(40))),
+              child: BlocBuilder<CategoryDetailBloc, CategoryDetailState>(
+                builder: (context, state) {
+                  if (state is CategoryDetailLoading) {
+                    return const SizedBox(
+                        child: Center(child: CircularProgressIndicator()));
+                  } else if (state is CategoryDetailLoaded) {
+                    return CategoryDetailList(
+                        categoriesDetail: state.categoriesDetail);
+                  } else if (state is CategoryDetailEmptyData) {
+                    return const Center(
+                      child: Text('No categories available.'),
+                    );
+                  } else if (state is CategoryDetailError) {
+                    return Center(
+                      child: Text('Error: ${state.message}'),
+                    );
+                  } else if (state is CategoryDetailOffline) {
+                    return const NoInternetScreen();
+                  } else {
+                    return const Center(
+                      child: Text('Unexpected state'),
+                    );
+                  }
+                },
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }

diff --git a/lib/src/category/presentation/widgets/categories/categories_list.dart b/lib/src/category/presentation/widgets/categories/categories_list.dart
@@ -7,18 +7,12 @@ class CategoriesList extends StatelessWidget {
   final List<Category> categories;
   @override
   Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.only(top: 20, left: 20, right: 20),
-      decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.secondaryContainer,
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(40))),
-      child: ListView.builder(
-        itemCount: categories.length,
-        itemBuilder: (context, index) {
-          final category = categories[index];
-          return SingleCategory(category: category);
-        },
-      ),
+    return ListView.builder(
+      itemCount: categories.length,
+      itemBuilder: (context, index) {
+        final category = categories[index];
+        return SingleCategory(category: category);
+      },
     );
   }
 }
diff --git a/lib/src/category/presentation/widgets/categories/single_category.dart b/lib/src/category/presentation/widgets/categories/single_category.dart
@@ -35,6 +35,16 @@ class SingleCategory extends StatelessWidget {
             borderRadius: BorderRadius.circular(10)),
         child: Row(
           children: [
+            Expanded(
+              child: Text(
+                category.title,
+                textAlign: TextAlign.end,
+                style: GoogleFonts.changa(),
+              ),
+            ),
+            const SizedBox(
+              width: 50,
+            ),
             Container(
                 padding: const EdgeInsets.all(8),
                 decoration: BoxDecoration(
@@ -44,16 +54,9 @@ class SingleCategory extends StatelessWidget {
                       width: 1),
                 ),
                 child: const Icon(
-                  Icons.arrow_back_ios_new_outlined,
+                  Icons.arrow_forward,
                   size: 14,
                 )),
-            Expanded(
-              child: Text(
-                category.title,
-                textAlign: TextAlign.end,
-                style: GoogleFonts.changa(),
-              ),
-            ),
           ],
         ),
         // Add more category information as needed

diff --git a/lib/src/category/presentation/widgets/category_detail/category_detail_item.dart b/lib/src/category/presentation/widgets/category_detail/category_detail_item.dart
@@ -31,6 +31,16 @@ class CategoryDetailItem extends StatelessWidget {
             borderRadius: BorderRadius.circular(10)),
         child: Row(
           children: [
+            Expanded(
+              child: Text(
+                categoryHadeeth.title,
+                textAlign: TextAlign.end,
+                style: GoogleFonts.changa(),
+              ),
+            ),
+            const SizedBox(
+              width: 10,
+            ),
             Container(
                 padding: const EdgeInsets.all(8),
                 decoration: BoxDecoration(
@@ -40,19 +50,9 @@ class CategoryDetailItem extends StatelessWidget {
                       width: 1),
                 ),
                 child: const Icon(
-                  Icons.arrow_back_ios_new_outlined,
+                  Icons.arrow_forward,
                   size: 14,
                 )),
-            const SizedBox(
-              width: 10,
-            ),
-            Expanded(
-              child: Text(
-                categoryHadeeth.title,
-                textAlign: TextAlign.end,
-                style: GoogleFonts.changa(),
-              ),
-            ),
           ],
         ),
         // Add more category information as needed

diff --git a/lib/src/category/presentation/widgets/category_detail/category_detail_list.dart b/lib/src/category/presentation/widgets/category_detail/category_detail_list.dart
@@ -7,18 +7,12 @@ class CategoryDetailList extends StatelessWidget {
   final CategoryDetail categoriesDetail;
   @override
   Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.only(top: 20, left: 20, right: 20),
-      decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.secondaryContainer,
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(40))),
-      child: ListView.builder(
-        itemCount: categoriesDetail.data.length,
-        itemBuilder: (context, index) {
-          final categoryHadeeth = categoriesDetail.data[index];
-          return CategoryDetailItem(categoryHadeeth: categoryHadeeth);
-        },
-      ),
+    return ListView.builder(
+      itemCount: categoriesDetail.data.length,
+      itemBuilder: (context, index) {
+        final categoryHadeeth = categoriesDetail.data[index];
+        return CategoryDetailItem(categoryHadeeth: categoryHadeeth);
+      },
     );
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
@@ -155,6 +155,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0+1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -167,26 +191,26 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   nested:
     dependency: transitive
     description:
@@ -199,10 +223,10 @@ packages:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider:
     dependency: transitive
     description:
@@ -344,6 +368,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
   web:
     dependency: transitive
     description: