Merge pull request #155 from yaso-meth/QOL--New-card-Designs

QOL--New-card-Designs

Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart

@@ -318,7 +318,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
         itemCount: widget.cardList.length,
         gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
           mainAxisSpacing: 0,
-          crossAxisSpacing: 10,
+          crossAxisSpacing: 5,
           maxCrossAxisExtent: 200,
         ),
         itemBuilder: (context, index) {

Frontend/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart

@@ -18,97 +18,136 @@ class _MihCardDisplayState extends State<MihCardDisplay> {
     switch (widget.shopName.toLowerCase()) {
       case "apple tree":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/apple_tree.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png');
       case "best before":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/best_before.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png');
       case "checkers":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/checkers.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png');
       case "clicks":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/Clicks_Club.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png');
       case "cotton:on":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/cotton_on_perks.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png');
       case "dis-chem":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/dischem_benefit.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png');
       case "pick n pay":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/pnp_smart.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png');
       case "shoprite":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/shoprite.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png');
       case "spar":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/spar_rewards.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png');
       case "woolworths":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/wrewards.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png');
       case "makro":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/makro.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png');
       case "fresh stop":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/fresh_stop.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png');
       case "panarottis":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/panarottis.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png');
       case "shell":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/Shell.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png');
       case "edgars":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/edgars.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png');
       case "jet":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/jet.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png');
       case "spur":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/spur.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png');
       case "infinity":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/infinity.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png');
       case "eskom":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/eskom.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png');
       case "+more":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/plus_more.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png');
       case "bp":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/bp.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png');
       case "builders warehouse":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/builders.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png');
       case "exclusive books":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/exclusive_books.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png');
       case "pna":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/pna.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png');
       case "pq clothing":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/pq.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png');
       case "rage":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/rage.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png');
       case "sasol":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/sasol.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png');
       case "tfg group":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/tfg.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png');
       case "toys r us":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/toysrus.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png');
       case "leroy merlin":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/leroy_merlin.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png');
       case "signature cosmetics & fragrances":
         return Image.asset(
-            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/signature_cosmetics.png');
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png');
+      case "ok foods":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png');
+      case "choppies":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png');
+      case "boxer":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png');
+      case "carrefour":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png');
+      case "sefalana":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png');
+      case "big save":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png');
+      case "justrite":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png');
+      case "naivas":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png');
+      case "kero":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png');
+      case "auchan":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png');
+      case "woermann brock":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png');
+      case "continente":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png');
+      case "fresmart":
+        return Image.asset(
+            'lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png');
       default:
         return const Placeholder();
     }
@@ -116,6 +155,9 @@ class _MihCardDisplayState extends State<MihCardDisplay> {
 
   @override
   Widget build(BuildContext context) {
-    return displayLoyaltyCard();
+    return SizedBox(
+      width: 500,
+      child: displayLoyaltyCard(),
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_wallet/mih_wallet.dart

@@ -78,10 +78,10 @@ class _MihWalletState extends State<MihWallet> {
 
   List<Widget> getToolBody() {
     List<Widget> toolBodies = [
-      MihCardFavourites(
+      MihCards(
         signedInUser: widget.arguments.signedInUser,
       ),
-      MihCards(
+      MihCardFavourites(
         signedInUser: widget.arguments.signedInUser,
       ),
     ];

Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart

@@ -107,26 +107,38 @@ class _MihCardsState extends State<MihCards> {
             dropdownOptions: const [
               "+More",
               "Apple Tree",
+              "Auchan",
               "Best Before",
+              "Big Save",
+              "Boxer",
               "BP",
               "Builders Warehouse",
               "Checkers",
+              "Choppies",
               "Clicks",
+              "Continente",
               "Cotton:On",
+              "Carrefour",
               "Dis-Chem",
               "Edgars",
               "Eskom",
               "Exclusive Books",
               "Fresh Stop",
+              "Fresmart",
               "Infinity",
               "Jet",
+              "Justrite",
+              "Kero",
               "Leroy Merlin",
               "Makro",
+              "Naivas",
+              "OK Foods",
               "Panarottis",
               "Pick n Pay",
               "PnA",
               "PQ Clothing",
               "Rage",
+              "Sefalana",
               "Sasol",
               "Shell",
               "Shoprite",
@@ -135,6 +147,7 @@ class _MihCardsState extends State<MihCards> {
               "Spur",
               "TFG Group",
               "Toys R Us",
+              "Woermann Brock",
               "Woolworths"
             ],
             required: true,

Frontend/pubspec.yaml

@@ -107,6 +107,7 @@ flutter:
     - lib/mih_components/mih_package_components/assets/images/
     - lib/mih_components/mih_package_components/assets/fonts/
     - lib/mih_components/mih_package_components/assets/images/loyalty_cards/
+    - lib/mih_components/mih_package_components/assets/images/loyalty_cards/mini/
     - lib/mih_components/mih_package_components/assets/images/app_icon/
     - lib/mih_components/mih_package_components/assets/images/splash_screen/
     # - images/a_dot_ham.jpeg