diff --git a/Frontend/android/app/src/main/AndroidManifest.xml b/Frontend/android/app/src/main/AndroidManifest.xml index 6bdf2e76..0c66eab2 100644 --- a/Frontend/android/app/src/main/AndroidManifest.xml +++ b/Frontend/android/app/src/main/AndroidManifest.xml @@ -53,6 +53,10 @@ android:name="flutter-deeplink" android:value="true" /> + + diff --git a/Frontend/android/app/src/main/res/drawable/calculator.xml b/Frontend/android/app/src/main/res/drawable/calculator.xml new file mode 100644 index 00000000..24464f94 --- /dev/null +++ b/Frontend/android/app/src/main/res/drawable/calculator.xml @@ -0,0 +1,9 @@ + + + diff --git a/Frontend/android/app/src/main/res/drawable/mih_calculator_sc.xml b/Frontend/android/app/src/main/res/drawable/mih_calculator_sc.xml new file mode 100644 index 00000000..b881d937 --- /dev/null +++ b/Frontend/android/app/src/main/res/drawable/mih_calculator_sc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Frontend/android/app/src/main/res/drawable/mih_home_sc.xml b/Frontend/android/app/src/main/res/drawable/mih_home_sc.xml index a4df0ba4..577d6937 100644 --- a/Frontend/android/app/src/main/res/drawable/mih_home_sc.xml +++ b/Frontend/android/app/src/main/res/drawable/mih_home_sc.xml @@ -1,31 +1,14 @@ - - - + - - + - - - + android:drawable="@drawable/mih_logo" + android:width="48dp" + android:height="48dp" + android:gravity="center" /> \ No newline at end of file diff --git a/Frontend/android/app/src/main/res/drawable/mih_logo.xml b/Frontend/android/app/src/main/res/drawable/mih_logo.xml index a38d59e5..e67a36d8 100644 --- a/Frontend/android/app/src/main/res/drawable/mih_logo.xml +++ b/Frontend/android/app/src/main/res/drawable/mih_logo.xml @@ -6,7 +6,7 @@ android:width="24dp"> diff --git a/Frontend/android/app/src/main/res/drawable/mzansi_ai.xml b/Frontend/android/app/src/main/res/drawable/mzansi_ai.xml new file mode 100644 index 00000000..6aa32a86 --- /dev/null +++ b/Frontend/android/app/src/main/res/drawable/mzansi_ai.xml @@ -0,0 +1,9 @@ + + + diff --git a/Frontend/android/app/src/main/res/drawable/mzansi_ai_sc.xml b/Frontend/android/app/src/main/res/drawable/mzansi_ai_sc.xml new file mode 100644 index 00000000..5cce8b99 --- /dev/null +++ b/Frontend/android/app/src/main/res/drawable/mzansi_ai_sc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Frontend/android/app/src/main/res/drawable/mzansi_wallet.xml b/Frontend/android/app/src/main/res/drawable/mzansi_wallet.xml index 33f5f2ee..c3681bf8 100644 --- a/Frontend/android/app/src/main/res/drawable/mzansi_wallet.xml +++ b/Frontend/android/app/src/main/res/drawable/mzansi_wallet.xml @@ -6,7 +6,7 @@ android:width="24dp"> diff --git a/Frontend/android/app/src/main/res/drawable/mzansi_wallet_sc.xml b/Frontend/android/app/src/main/res/drawable/mzansi_wallet_sc.xml index 2b817108..9d0af1f3 100644 --- a/Frontend/android/app/src/main/res/drawable/mzansi_wallet_sc.xml +++ b/Frontend/android/app/src/main/res/drawable/mzansi_wallet_sc.xml @@ -1,31 +1,14 @@ - - - + - - + - - - + android:drawable="@drawable/mzansi_wallet" + android:width="48dp" + android:height="48dp" + android:gravity="center" /> \ No newline at end of file diff --git a/Frontend/android/app/src/main/res/values/arrays.xml b/Frontend/android/app/src/main/res/values/arrays.xml new file mode 100644 index 00000000..fb766383 --- /dev/null +++ b/Frontend/android/app/src/main/res/values/arrays.xml @@ -0,0 +1,9 @@ + + + + @drawable/mih_home_sc + @drawable/mzansi_wallet_sc + @drawable/mzansi_ai_sc + @drawable/mih_calculator_sc + + \ No newline at end of file diff --git a/Frontend/android/app/src/main/res/values/colors.xml b/Frontend/android/app/src/main/res/values/colors.xml index 95166e7c..9b51788f 100644 --- a/Frontend/android/app/src/main/res/values/colors.xml +++ b/Frontend/android/app/src/main/res/values/colors.xml @@ -1,5 +1,10 @@ #3A4454 - #3A4454 + + #6641b2 + #E0D1FF + + \ No newline at end of file diff --git a/Frontend/android/build/reports/problems/problems-report.html b/Frontend/android/build/reports/problems/problems-report.html new file mode 100644 index 00000000..0784829f --- /dev/null +++ b/Frontend/android/build/reports/problems/problems-report.html @@ -0,0 +1,663 @@ + + + + + + + + + + + + + Gradle Configuration Cache + + + +
+ +
+ Loading... +
+ + + + + + diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index da340b4d..9c4153a6 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; +import 'package:ken_logger/ken_logger.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_providers/about_mih_provider.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_access_controlls_provider.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_providers/mih_authentication_provider.dart'; @@ -13,6 +14,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_profil import 'package:mzansi_innovation_hub/mih_components/mih_providers/mzansi_wallet_provider.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_providers/patient_manager_provider.dart'; import 'package:provider/provider.dart'; +import 'package:quick_actions/quick_actions.dart'; import 'package:upgrader/upgrader.dart'; import 'mih_config/mih_env.dart'; import 'mih_config/mih_theme.dart'; @@ -34,10 +36,61 @@ class MzansiInnovationHub extends StatefulWidget { class _MzansiInnovationHubState extends State { late MihTheme theme; + final QuickActions quickActions = QuickActions(); + String shortcut = 'no action set'; + + void _initializeQuickActions() { + quickActions.initialize((String shortcutType) { + setState(() { + shortcut = shortcutType; + }); + if (shortcutType == 'mihHome') { + KenLogger.success("ShortCut: mihHome"); + widget.router.goNamed("mihHome"); + } + if (shortcutType == 'mzansiWallet') { + KenLogger.success("ShortCut: mzansiWallet"); + widget.router.goNamed("mzansiWallet"); + } + if (shortcutType == 'mzansiAi') { + KenLogger.success("ShortCut: mzansiAi"); + widget.router.goNamed("mzansiAi"); + } + if (shortcutType == 'mihCalculator') { + KenLogger.success("ShortCut: mihCalculator"); + widget.router.goNamed("mihCalculator"); + } + }); + // Set the quick actions + quickActions.setShortcutItems([ + const ShortcutItem( + type: 'mzansiWallet', + localizedTitle: 'Mzansi Wallet', + icon: 'mzansi_wallet_sc', + ), + const ShortcutItem( + type: 'mzansiAi', + localizedTitle: 'Mzansi AI', + icon: 'mzansi_ai_sc', + ), + const ShortcutItem( + type: 'mihCalculator', + localizedTitle: 'MIH Calc', + icon: 'mih_calculator_sc', + ), + ]).then((void _) { + setState(() { + if (shortcut == 'no action set') { + shortcut = 'mih_home_sc'; + } + }); + }); + } @override void initState() { super.initState(); + _initializeQuickActions(); theme = MihTheme(); theme.mode = "Dark"; theme.platform = Theme.of(context).platform; @@ -47,7 +100,6 @@ class _MzansiInnovationHubState extends State { Widget build(BuildContext context) { double width = MediaQuery.sizeOf(context).width; theme.setScreenType(width); - precacheImage(theme.loadingImage(), context); return MultiProvider( providers: [ ChangeNotifierProvider( diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index f7f4a5d2..877057e6 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -28,7 +28,6 @@ import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services import 'package:mzansi_innovation_hub/mih_services/mih_user_consent_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; import 'package:provider/provider.dart'; -import 'package:quick_actions/quick_actions.dart'; class MihHome extends StatefulWidget { const MihHome({ @@ -43,35 +42,6 @@ class _MihHomeState extends State { DateTime latestPrivacyPolicyDate = DateTime.parse("2024-12-01"); DateTime latestTermOfServiceDate = DateTime.parse("2024-12-01"); bool _isLoadingInitialData = true; - final QuickActions quickActions = QuickActions(); - String shortcut = 'no action set'; - - void _initializeQuickActions() { - quickActions.initialize((String shortcutType) { - setState(() { - shortcut = shortcutType; - }); - if (shortcutType == 'mihHome') { - context.goNamed("mihHome"); - } - if (shortcutType == 'mzansiWallet') { - context.goNamed("mzansiWallet"); - } - }); - // Set the quick actions - quickActions.setShortcutItems([ - const ShortcutItem( - type: 'mzansiWallet', - localizedTitle: 'Mzansi Wallet', - icon: 'mzansi_wallet_sc'), - ]).then((void _) { - setState(() { - if (shortcut == 'no action set') { - shortcut = 'mihHome'; - } - }); - }); - } Future _loadInitialData() async { if (mounted) { @@ -235,7 +205,6 @@ class _MihHomeState extends State { void initState() { super.initState(); _loadInitialData(); - _initializeQuickActions(); } List getToolTitle() { diff --git a/Frontend/pubspec.lock b/Frontend/pubspec.lock index aa88bf94..ec7cf4f8 100644 --- a/Frontend/pubspec.lock +++ b/Frontend/pubspec.lock @@ -848,14 +848,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.5" - gif_view: - dependency: "direct main" - description: - name: gif_view - sha256: "4c7e17c134719531dabab54af121e4600d63283f56f3aff57c16db54766b67bc" - url: "https://pub.dev" - source: hosted - version: "1.0.3" glob: dependency: transitive description: diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index dd463420..fffe555d 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -1,7 +1,7 @@ name: mzansi_innovation_hub description: "" publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.2.3+105 +version: 1.2.3+110 # version: 1.1.1+97 #--- Updated version for upgrader package testing environment: @@ -22,7 +22,6 @@ dependencies: supertokens_flutter: ^0.6.3 http: ^1.2.1 args: ^2.7.0 - gif_view: ^1.0.3 intl: ^0.20.2 flutter_native_splash: ^2.4.6 printing: ^5.13.3