Hcmpre 1796: Changed HCM main app component (#646)

* removed digit_components from main app * changed library in blocs and data * library changed in pages * change component in test * removed sidebar not needed anymore * fix component issues * removed table card widget not needed * removed table card import * added spacing for sideBar * added digit ui component published package * resolved code review comments * removed digit_component from forms_engine * removed digit_components library (no need anymore) * changed digit data model path in attendance * changed digit_ui_components version in packages * fix capitaliseLetters issue * merge develop
egovernments · Feb 6, 2025 · c8a1ca9 · c8a1ca9
1 parent c542711
commit c8a1ca9
Show file tree

Hide file tree

Showing 288 changed files with 2,092 additions and 17,050 deletions.
diff --git a/apps/health_campaign_field_worker_app/assets/icons/svg/closed_household.svg b/apps/health_campaign_field_worker_app/assets/icons/svg/closed_household.svg
diff --git a/apps/health_campaign_field_worker_app/assets/icons/svg/mychecklist.svg b/apps/health_campaign_field_worker_app/assets/icons/svg/mychecklist.svg
diff --git a/...onents/assets/images/powered_by_digit.png → ...er_app/assets/images/powered_by_digit.png b/...onents/assets/images/powered_by_digit.png → ...er_app/assets/images/powered_by_digit.png
diff --git a/apps/health_campaign_field_worker_app/lib/app.dart b/apps/health_campaign_field_worker_app/lib/app.dart
@@ -1,10 +1,12 @@
 import 'package:attendance_management/attendance_management.dart';
 import 'package:closed_household/blocs/closed_household.dart';
 import 'package:closed_household/closed_household.dart';
-import 'package:digit_components/digit_components.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_dss/digit_dss.dart';
 import 'package:digit_scanner/blocs/scanner.dart';
+import 'package:digit_ui_components/services/location_bloc.dart';
+import 'package:digit_ui_components/theme/digit_extended_theme.dart';
+import 'package:digit_ui_components/theme/digit_theme.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -395,7 +397,7 @@ class MainApplicationState extends State<MainApplication>
                                     selectedLocale.split("_").last,
                                   )
                                 : firstLanguage,
-                            theme: DigitTheme.instance.mobileTheme,
+                            theme: DigitExtendedTheme.instance.getLightTheme(),
                             routeInformationParser:
                                 widget.appRouter.defaultRouteParser(),
                             scaffoldMessengerKey: scaffoldMessengerKey,

diff --git a/apps/health_campaign_field_worker_app/lib/blocs/app_bloc_observer.dart b/apps/health_campaign_field_worker_app/lib/blocs/app_bloc_observer.dart
@@ -1,4 +1,5 @@
-import 'package:digit_components/digit_components.dart';
+import 'package:digit_ui_components/services/location_bloc.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

diff --git a/apps/health_campaign_field_worker_app/lib/blocs/auth/auth.dart b/apps/health_campaign_field_worker_app/lib/blocs/auth/auth.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:digit_components/digit_components.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

diff --git a/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart b/apps/health_campaign_field_worker_app/lib/blocs/project/project.dart
@@ -3,8 +3,9 @@ import 'dart:async';
 import 'dart:core';
 
 import 'package:attendance_management/attendance_management.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
+import 'package:survey_form/survey_form.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:digit_components/digit_components.dart';
 import 'package:digit_data_model/data_model.dart';
 import 'package:digit_dss/digit_dss.dart';
 import 'package:flutter/cupertino.dart';

diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/api_interceptors.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/api_interceptors.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:digit_components/digit_components.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:dio/dio.dart';
 
 import '../../models/request_info/request_info_model.dart';

diff --git a/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart b/apps/health_campaign_field_worker_app/lib/data/repositories/remote/mdms.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:digit_components/digit_components.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:dio/dio.dart';
 import 'package:isar/isar.dart';
 

diff --git a/apps/health_campaign_field_worker_app/lib/data/sync_registry.dart b/apps/health_campaign_field_worker_app/lib/data/sync_registry.dart
@@ -1,8 +1,8 @@
 import 'package:complaints/data/repositories/remote/pgr_service.dart';
 import 'package:complaints/models/pgr_complaints.dart';
 import 'package:complaints/models/pgr_complaints_response.dart';
-import 'package:digit_components/utils/app_logger.dart';
 import 'package:digit_data_model/data_model.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:sync_service/data/repositories/sync/sync_up.dart';
 

diff --git a/apps/health_campaign_field_worker_app/lib/main.dart b/apps/health_campaign_field_worker_app/lib/main.dart
@@ -1,5 +1,6 @@
-import 'package:digit_components/digit_components.dart';
 import 'package:digit_data_model/data/local_store/sql_store/sql_store.dart';
+import 'package:digit_ui_components/digit_components.dart';
+import 'package:digit_ui_components/utils/app_logger.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_background_service/flutter_background_service.dart';

diff --git a/apps/health_campaign_field_worker_app/lib/pages/acknowledgement.dart b/apps/health_campaign_field_worker_app/lib/pages/acknowledgement.dart
@@ -1,4 +1,9 @@
-import 'package:digit_components/digit_components.dart';
+import 'package:digit_ui_components/digit_components.dart';
+import 'package:digit_ui_components/theme/digit_extended_theme.dart';
+import 'package:digit_ui_components/widgets/atoms/label_value_list.dart';
+import 'package:digit_ui_components/widgets/molecules/digit_card.dart';
+import 'package:digit_ui_components/widgets/molecules/label_value_summary.dart';
+import 'package:digit_ui_components/widgets/molecules/panel_cards.dart';
 import 'package:flutter/material.dart';
 
 import '../router/app_router.dart';
@@ -30,72 +35,64 @@ class _AcknowledgementPageState extends LocalizedState<AcknowledgementPage> {
     final theme = Theme.of(context);
 
     return Scaffold(
-      body: DigitAcknowledgement.success(
-        description: widget.description ??
-            localizations.translate(
-              i18.acknowledgementSuccess.acknowledgementDescriptionText,
-            ),
-        descriptionWidget: widget.isDataRecordSuccess
-            ? DigitTableCard(
-                element: widget.descriptionTableData ?? {},
-              )
-            : null,
-        label: widget.label ??
+      body: PanelCard(
+        type: PanelType.success,
+        title: widget.label ??
             localizations.translate(
               i18.acknowledgementSuccess.acknowledgementLabelText,
             ),
-        action: () {
-          context.router.maybePop();
-        },
-        enableBackToSearch: widget.isDataRecordSuccess ? false : true,
-        actionLabel:
-            localizations.translate(i18.acknowledgementSuccess.actionLabelText),
-      ),
-      bottomNavigationBar: Offstage(
-        offstage: !widget.isDataRecordSuccess,
-        // Show the bottom navigation bar if `isDataRecordSuccess` is true
-        child: SizedBox(
-          height: 150,
-          child: DigitCard(
-            margin: const EdgeInsets.fromLTRB(0, kPadding, 0, 0),
-            padding: const EdgeInsets.fromLTRB(kPadding, 0, kPadding, 0),
-            child: Column(
-              children: [
-                DigitElevatedButton(
-                  child: Text(localizations
-                      .translate(i18.acknowledgementSuccess.goToHome)),
-                  onPressed: () {
-                    context.router.popUntilRouteWithName(HomeRoute.name);
-                  },
-                ),
-                const SizedBox(
-                  height: 12,
+        additionWidgets: widget.isDataRecordSuccess
+            ? [
+                LabelValueSummary(
+                  items: widget.descriptionTableData!.keys
+                      .map((e) => LabelValueItem(
+                          labelFlex: 5,
+                          label: e,
+                          value: widget.descriptionTableData?[e].toString()))
+                      .toList(),
                 ),
-                DigitOutLineButton(
+              ]
+            : null,
+        actions: (!widget.isDataRecordSuccess)
+            ? [
+                DigitButton(
+                  isDisabled: widget.isDataRecordSuccess,
+                  type: DigitButtonType.primary,
+                  size: DigitButtonSize.large,
+                  label: localizations
+                      .translate(i18.acknowledgementSuccess.actionLabelText),
                   onPressed: () {
-                    context.router.popAndPush(BoundarySelectionRoute());
+                    context.router.maybePop();
                   },
-                  label: localizations
-                      .translate(i18.acknowledgementSuccess.downloadmoredata),
-                  buttonStyle: OutlinedButton.styleFrom(
-                    backgroundColor: Colors.white,
-                    shape: const RoundedRectangleBorder(
-                      borderRadius: BorderRadius.zero,
-                    ),
-                    side: BorderSide(
-                      width: 1.0,
-                      color: theme.colorScheme.secondary,
-                    ),
-                    minimumSize: Size(
-                      MediaQuery.of(context).size.width,
-                      50,
-                    ),
-                  ),
                 ),
-              ],
-            ),
+              ]
+            : null,
+      ),
+      bottomNavigationBar: Offstage(
+        offstage: !widget.isDataRecordSuccess,
+        // Show the bottom navigation bar if `isDataRecordSuccess` is true
+        child:
+            DigitCard(margin: const EdgeInsets.only(top: spacer2), children: [
+          DigitButton(
+            mainAxisSize: MainAxisSize.max,
+            label: localizations.translate(i18.acknowledgementSuccess.goToHome),
+            type: DigitButtonType.primary,
+            size: DigitButtonSize.large,
+            onPressed: () {
+              context.router.popUntilRouteWithName(HomeRoute.name);
+            },
+          ),
+          DigitButton(
+            type: DigitButtonType.secondary,
+            mainAxisSize: MainAxisSize.max,
+            size: DigitButtonSize.large,
+            onPressed: () {
+              context.router.popAndPush(BoundarySelectionRoute());
+            },
+            label: localizations
+                .translate(i18.acknowledgementSuccess.downloadmoredata),
           ),
-        ),
+        ]),
       ),
     );
   }