diff --git a/Frontend/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/Frontend/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..4576c563 Binary files /dev/null and b/Frontend/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/Frontend/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/Frontend/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..633d805e Binary files /dev/null and b/Frontend/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/Frontend/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/Frontend/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..67f8ed97 Binary files /dev/null and b/Frontend/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/Frontend/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..233d6946 Binary files /dev/null and b/Frontend/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/Frontend/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..eb2691ac Binary files /dev/null and b/Frontend/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/Frontend/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml b/Frontend/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml new file mode 100644 index 00000000..5f349f7f --- /dev/null +++ b/Frontend/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Frontend/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/Frontend/android/app/src/main/res/mipmap-hdpi/launcher_icon.png index c61cf9a4..0d3fad5b 100644 Binary files a/Frontend/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/Frontend/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/Frontend/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/Frontend/android/app/src/main/res/mipmap-mdpi/launcher_icon.png index ac7c9607..dd848c57 100644 Binary files a/Frontend/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/Frontend/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/Frontend/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/Frontend/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png index 485b38a9..834aa77e 100644 Binary files a/Frontend/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/Frontend/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/Frontend/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/Frontend/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png index 4f234519..75203c3e 100644 Binary files a/Frontend/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/Frontend/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/Frontend/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/Frontend/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png index 3eb15925..bb9cb89e 100644 Binary files a/Frontend/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/Frontend/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/Frontend/android/app/src/main/res/values/colors.xml b/Frontend/android/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..66426078 --- /dev/null +++ b/Frontend/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #3A4454 + \ No newline at end of file diff --git a/Frontend/flutter_launcher_icons.yaml b/Frontend/flutter_launcher_icons.yaml index 028e2360..ea1c42ed 100644 --- a/Frontend/flutter_launcher_icons.yaml +++ b/Frontend/flutter_launcher_icons.yaml @@ -1,12 +1,12 @@ # flutter pub run flutter_launcher_icons flutter_launcher_icons: - image_path: "images/app_icon/App_Icon_2.png" + image_path: "images/app_icon/App_Icon_1.png" android: "launcher_icon" # image_path_android: "assets/icon/icon.png" min_sdk_android: 21 # android min sdk min:16, default 21 adaptive_icon_background: "#3A4454" - # adaptive_icon_foreground: "assets/icon/foreground.png" + adaptive_icon_foreground: "images/app_icon/App_Icon_1.png" # adaptive_icon_monochrome: "assets/icon/monochrome.png" ios: true @@ -18,15 +18,15 @@ flutter_launcher_icons: web: generate: true - image_path: "images/app_icon/mih_app_icon.png" - background_color: "#hexcode" - theme_color: "#hexcode" + image_path: "images/app_icon/circle_logo.png" + background_color: "#3A4454" + theme_color: "#3A4454" windows: generate: true - image_path: "images/app_icon/mih_app_icon.png" + image_path: "images/app_icon/circle_logo.png" icon_size: 48 # min:48, max:256, default: 48 macos: generate: true - image_path: "images/app_icon/mih_app_icon.png" + image_path: "images/app_icon/circle_logo.png" diff --git a/Frontend/images/app_icon/App_Icon.png b/Frontend/images/app_icon/App_Icon.png deleted file mode 100644 index 9d5dbe08..00000000 Binary files a/Frontend/images/app_icon/App_Icon.png and /dev/null differ diff --git a/Frontend/images/app_icon/App_Icon_1.png b/Frontend/images/app_icon/App_Icon_1.png new file mode 100644 index 00000000..938224a3 Binary files /dev/null and b/Frontend/images/app_icon/App_Icon_1.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 2269fb50..c4053b78 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 17f2e317..ee84ccfa 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 6c3728ef..1d7dc9c5 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index e1dd70d9..d77c9e06 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 8d509c9a..23aa8b28 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index dd062169..d04578be 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 816082e6..bfb2523c 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 6c3728ef..1d7dc9c5 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 1aed5c26..bb073e58 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 6220e9ae..33de7cb4 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index fe202716..7ee44fdb 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index 7a205a76..83d35efd 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index adaae346..c60c3021 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index bfa667c0..fc86eab5 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 6220e9ae..33de7cb4 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 5e262e9b..f1f9171c 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index c61cf9a4..0d3fad5b 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 4f234519..75203c3e 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 12d768fe..ddb9078c 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index 44c570eb..221fcd68 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 827b8d0b..4413977f 100644 Binary files a/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/Frontend/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart index 630b37fe..57561a02 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart @@ -101,18 +101,26 @@ class _BuildLoyaltyCardListState extends State { ); } + double getHorizontalPaddingSize(Size screenSize) { + if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + return screenSize.width / 10; + } else { + return 20; + } + } + @override Widget build(BuildContext context) { final Size size = MediaQuery.sizeOf(context); - final double width = size.width; + // final double width = size.width; //final double height = size.height; if (widget.cardList.isNotEmpty) { return GridView.builder( - //physics: const NeverScrollableScrollPhysics(), + physics: const NeverScrollableScrollPhysics(), shrinkWrap: true, padding: EdgeInsets.only( - left: width / 10, - right: width / 10, + left: getHorizontalPaddingSize(size), + right: getHorizontalPaddingSize(size), //bottom: height / 5, //top: 20, ), @@ -120,7 +128,9 @@ class _BuildLoyaltyCardListState extends State { // shrinkWrap: true, itemCount: widget.cardList.length, gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( - mainAxisSpacing: 15, maxCrossAxisExtent: 200), + //mainAxisSpacing: 15, + maxCrossAxisExtent: 175, + ), itemBuilder: (context, index) { return GestureDetector( child: MihCardDisplay( diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart index ea333f57..f2caa379 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart @@ -1,3 +1,4 @@ +import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:flutter/material.dart'; class MihCardDisplay extends StatefulWidget { @@ -20,9 +21,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/bb_club.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/bb_club.png'), + ), + const SizedBox(height: 10), + Text( + "Best Before", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -30,9 +46,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/checkers_xtra.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/checkers_xtra.png'), + ), + const SizedBox(height: 10), + Text( + "Checkers", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -40,9 +71,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/Clicks_Club.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/Clicks_Club.png'), + ), + const SizedBox(height: 10), + Text( + "Clicks", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -50,9 +96,25 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/cotton_on_perks.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: + Image.asset('images/loyalty_cards/cotton_on_perks.png'), + ), + const SizedBox(height: 10), + Text( + "Cotton:On", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -60,9 +122,25 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/dischem_benefit.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: + Image.asset('images/loyalty_cards/dischem_benefit.png'), + ), + const SizedBox(height: 10), + Text( + "Dis-Chem", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -70,9 +148,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/pnp_smart.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/pnp_smart.png'), + ), + const SizedBox(height: 10), + Text( + "Pick 'n Pay", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -80,9 +173,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/shoprite_xtra.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/shoprite_xtra.png'), + ), + const SizedBox(height: 10), + Text( + "Shoprite", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -90,9 +198,24 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/spar_rewards.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/spar_rewards.png'), + ), + const SizedBox(height: 10), + Text( + "Spar", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); @@ -100,16 +223,31 @@ class _MihCardDisplayState extends State { return Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - SizedBox( - height: widget.height, - child: Image.asset('images/loyalty_cards/wrewards.png'), + Column( + children: [ + SizedBox( + height: widget.height, + child: Image.asset('images/loyalty_cards/wrewards.png'), + ), + const SizedBox(height: 10), + Text( + "WoolWorths", + textAlign: TextAlign.center, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: + MzanziInnovationHub.of(context)!.theme.secondaryColor(), + ), + ), + ], ), ], ); default: return const SizedBox( height: 150, - //child: Placeholder(), + child: Placeholder(), ); } } diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 2ba4b695..c9db10c7 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 9cf7a7be..f2df8559 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 4fdf8440..aca5af0e 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index 454b766a..e2b78bc9 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 16627b35..67e01f1d 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 62b325f3..b5ac2f88 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index d2ae847a..511dc4d8 100644 Binary files a/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/Frontend/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/Frontend/web/favicon.png b/Frontend/web/favicon.png index 4fdf8440..aca5af0e 100644 Binary files a/Frontend/web/favicon.png and b/Frontend/web/favicon.png differ diff --git a/Frontend/web/icons/Icon-192.png b/Frontend/web/icons/Icon-192.png index 6132cffe..9f2c031b 100644 Binary files a/Frontend/web/icons/Icon-192.png and b/Frontend/web/icons/Icon-192.png differ diff --git a/Frontend/web/icons/Icon-512.png b/Frontend/web/icons/Icon-512.png index 62b325f3..b5ac2f88 100644 Binary files a/Frontend/web/icons/Icon-512.png and b/Frontend/web/icons/Icon-512.png differ diff --git a/Frontend/web/icons/Icon-maskable-192.png b/Frontend/web/icons/Icon-maskable-192.png index 6132cffe..9f2c031b 100644 Binary files a/Frontend/web/icons/Icon-maskable-192.png and b/Frontend/web/icons/Icon-maskable-192.png differ diff --git a/Frontend/web/icons/Icon-maskable-512.png b/Frontend/web/icons/Icon-maskable-512.png index 62b325f3..b5ac2f88 100644 Binary files a/Frontend/web/icons/Icon-maskable-512.png and b/Frontend/web/icons/Icon-maskable-512.png differ diff --git a/Frontend/web/manifest.json b/Frontend/web/manifest.json index 62e43640..e8ad7e18 100644 --- a/Frontend/web/manifest.json +++ b/Frontend/web/manifest.json @@ -3,8 +3,8 @@ "short_name": "MIH", "start_url": ".", "display": "standalone", - "background_color": "#hexcode", - "theme_color": "#hexcode", + "background_color": "#3A4454", + "theme_color": "#3A4454", "description": "Digitizing Mzansi one process at a time. Discover essential Mzansi apps to streamline your personal and professional life. Simplify your daily tasks with our user-friendly solutions.", "orientation": "any", "prefer_related_applications": false, diff --git a/Frontend/windows/runner/resources/app_icon.ico b/Frontend/windows/runner/resources/app_icon.ico index 56f9f71d..b643450e 100644 Binary files a/Frontend/windows/runner/resources/app_icon.ico and b/Frontend/windows/runner/resources/app_icon.ico differ