Merge pull request #901 from Prime-Holding/develop

Merge develop to master
Prime-Holding · Nov 28, 2024 · 8cf7d36 · 8cf7d36
2 parents fd0cd9f + c1344ec
commit 8cf7d36
Show file tree

Hide file tree

Showing 52 changed files with 735 additions and 493 deletions.
diff --git a/packages/rx_bloc_cli/CHANGELOG.md b/packages/rx_bloc_cli/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [5.3.1]
+* Design uplift for the generated project
+
 ## [5.3.0]
 * Replace golden tests dependency from `golden_toolkit` to [`alchemist`][alchemist_url] in generated projects
 * Updated project dependencies

diff --git a/packages/rx_bloc_cli/lib/src/models/bundle_generator.dart b/packages/rx_bloc_cli/lib/src/models/bundle_generator.dart
@@ -123,11 +123,6 @@ class BundleGenerator {
     if (arguments.otpEnabled) {
       _bundle.files.addAll(_featureOtpBundle.files);
     }
-    // Add PIN code brick _bundle when needed
-    if (arguments.pinCodeEnabled) {
-      _bundle.files.addAll(_libPinCodeBundle.files);
-    }
-
     //Add lib_router to _bundle
     _bundle.files.addAll(_libRouterBundle.files);
 
@@ -146,6 +141,10 @@ class BundleGenerator {
     if (arguments.profileEnabled) {
       _bundle.files.addAll(_featureProfile.files);
     }
+    // Add PIN code brick _bundle when needed
+    if (arguments.pinCodeEnabled) {
+      _bundle.files.addAll(_libPinCodeBundle.files);
+    }
     if (arguments.showcaseEnabled) {
       _bundle.files.addAll(_featureShowcase.files);
     }

diff --git a/packages/rx_bloc_cli/lib/src/rx_bloc_cli_constants.dart b/packages/rx_bloc_cli/lib/src/rx_bloc_cli_constants.dart
@@ -1,5 +1,5 @@
 /// Indicates the version of the package
-const rxBlocCliPackageVersion = '5.3.0';
+const rxBlocCliPackageVersion = '5.3.1';
 
 /// Generated project's Android Compile SDK version
 const kAndroidCompileSDKVersion = 34;

diff --git a/...icks/feature_deeplink/__brick__/lib/feature_deep_link_list/views/deep_link_list_page.dart b/...icks/feature_deeplink/__brick__/lib/feature_deep_link_list/views/deep_link_list_page.dart
@@ -6,8 +6,10 @@ import 'package:provider/provider.dart';
 import 'package:widget_toolkit/widget_toolkit.dart' hide ErrorModel;
 
 import '../../app_extensions.dart';
+import '../../base/common_ui_components/app_divider.dart';
 import '../../base/common_ui_components/app_error_modal_widget.dart';
 import '../../base/common_ui_components/app_error_widget.dart';
+import '../../base/common_ui_components/app_list_tile.dart';
 import '../../base/common_ui_components/app_loading_indicator.dart';
 import '../../base/common_ui_components/custom_app_bar.dart';
 import '../../base/models/deep_link_model.dart';
@@ -46,38 +48,28 @@ class DeepLinkListPage extends StatelessWidget {
               listener: _onMessageReceived,
             ),
             Expanded(
-              child: Padding(
-                padding: EdgeInsets.all(
-                  context.designSystem.spacing.m,
+              child: RxResultBuilder<DeepLinkListBlocType, List<DeepLinkModel>>(
+                state: (bloc) => bloc.states.deepLinkList,
+                buildError: (ctx, error, bloc) => AppErrorWidget(
+                  error: error,
+                  onTabRetry: () => bloc.events.fetchDeepLinkList(),
                 ),
-                child:
-                    RxResultBuilder<DeepLinkListBlocType, List<DeepLinkModel>>(
-                  state: (bloc) => bloc.states.deepLinkList,
-                  buildError: (ctx, error, bloc) => AppErrorWidget(
-                    error: error,
-                    onTabRetry: () => bloc.events.fetchDeepLinkList(),
-                  ),
-                  buildLoading: (ctx, bloc) => Center(
-                    child: AppLoadingIndicator.taskValue(context),
+                buildLoading: (ctx, bloc) => Center(
+                  child: AppLoadingIndicator.taskValue(context),
+                ),
+                buildSuccess: (ctx, items, bloc) => ListView.separated(
+                  padding: EdgeInsets.only(
+                    top: context.designSystem.spacing.xs,
                   ),
-                  buildSuccess: (ctx, items, bloc) => ListView.separated(
-                    padding: EdgeInsets.all(
-                      context.designSystem.spacing.xs,
-                    ),
-                    itemCount: items.length,
-                    itemBuilder: (BuildContext context, int index) =>
-                        OutlineFillButton(
-                      text: items[index].name,
-                      onPressed: () =>
-                          context.read<RouterBlocType>().events.push(
-                                DeepLinkDetailsRoute(items[index].id),
-                                extra: items[index],
-                              ),
-                    ),
-                    separatorBuilder: (context, index) => Divider(
-                      height: context.designSystem.spacing.l,
-                    ),
+                  itemCount: items.length,
+                  itemBuilder: (BuildContext context, int index) => AppListTile(
+                    featureTitle: items[index].name,
+                    onTap: () => context.read<RouterBlocType>().events.push(
+                          DeepLinkDetailsRoute(items[index].id),
+                          extra: items[index],
+                        ),
                   ),
+                  separatorBuilder: (context, index) => AppDivider(),
                 ),
               ),
             ),
@@ -90,8 +82,7 @@ class DeepLinkListPage extends StatelessWidget {
     String message,
   ) =>
       showBlurredBottomSheet(
-        context: AppRouter.rootNavigatorKey.currentContext ??
-            context,
+        context: AppRouter.rootNavigatorKey.currentContext ?? context,
         builder: (BuildContext context) => MessagePanelWidget(
           message: message,
           messageState: MessagePanelState.informative,