diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/apple_tree.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/apple_tree.png new file mode 100644 index 00000000..78e3e47e Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/apple_tree.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/auchan.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/auchan.png new file mode 100644 index 00000000..762f49e4 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/auchan.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/best_before.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/best_before.png new file mode 100644 index 00000000..17bc2171 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/best_before.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/big_save.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/big_save.png new file mode 100644 index 00000000..a83a2030 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/big_save.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/boxer.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/boxer.png new file mode 100644 index 00000000..64c3f820 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/boxer.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/bp.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/bp.png new file mode 100644 index 00000000..4696c206 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/bp.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/builders.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/builders.png new file mode 100644 index 00000000..e2fd6fdf Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/builders.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/carrefour.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/carrefour.png new file mode 100644 index 00000000..73d5d9d2 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/carrefour.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/checkers.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/checkers.png new file mode 100644 index 00000000..6c5cb7b6 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/checkers.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/choppies.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/choppies.png new file mode 100644 index 00000000..0e16d67c Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/choppies.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/clicks.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/clicks.png new file mode 100644 index 00000000..b11bcccd Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/clicks.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/continente.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/continente.png new file mode 100644 index 00000000..d5da666c Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/continente.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/cotton_on.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/cotton_on.png new file mode 100644 index 00000000..35acdfbd Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/cotton_on.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/dischem.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/dischem.png new file mode 100644 index 00000000..c3eb9e0a Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/dischem.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/edgars.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/edgars.png new file mode 100644 index 00000000..33b11f5f Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/edgars.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/engen.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/engen.png new file mode 100644 index 00000000..c5b3fb05 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/engen.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/eskom.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/eskom.png new file mode 100644 index 00000000..47a72af3 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/eskom.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/exclusive_books.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/exclusive_books.png new file mode 100644 index 00000000..8557914c Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/exclusive_books.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresh_stop.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresh_stop.png new file mode 100644 index 00000000..3400bf4b Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresh_stop.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresmart.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresmart.png new file mode 100644 index 00000000..8dd93350 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/fresmart.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/infinity.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/infinity.png new file mode 100644 index 00000000..bbea7be8 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/infinity.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/jet.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/jet.png new file mode 100644 index 00000000..d4edcf86 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/jet.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/justrite.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/justrite.png new file mode 100644 index 00000000..aff157bc Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/justrite.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/kero.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/kero.png new file mode 100644 index 00000000..c863ccea Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/kero.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/leroy_merlin.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/leroy_merlin.png new file mode 100644 index 00000000..8d9e6417 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/leroy_merlin.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/makro.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/makro.png new file mode 100644 index 00000000..eb4e0b50 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/makro.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/naivas.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/naivas.png new file mode 100644 index 00000000..0e81bd09 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/naivas.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/ok_foods.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/ok_foods.png new file mode 100644 index 00000000..f9718d07 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/ok_foods.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/panarottis.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/panarottis.png new file mode 100644 index 00000000..5932588c Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/panarottis.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pick_n_pay.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pick_n_pay.png new file mode 100644 index 00000000..570fba44 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pick_n_pay.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/plus_more.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/plus_more.png new file mode 100644 index 00000000..aa1d23b4 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/plus_more.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pna.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pna.png new file mode 100644 index 00000000..91101c95 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pna.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pq.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pq.png new file mode 100644 index 00000000..f17f74e7 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/pq.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/rage.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/rage.png new file mode 100644 index 00000000..451e9077 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/rage.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sasol.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sasol.png new file mode 100644 index 00000000..216a0061 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sasol.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sefalana.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sefalana.png new file mode 100644 index 00000000..e580c42e Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/sefalana.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shell.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shell.png new file mode 100644 index 00000000..e7a3b0d0 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shell.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shoprite.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shoprite.png new file mode 100644 index 00000000..1ec59407 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/shoprite.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/signature.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/signature.png new file mode 100644 index 00000000..4c0b6a5a Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/signature.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spar.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spar.png new file mode 100644 index 00000000..d8b764e2 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spar.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spur.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spur.png new file mode 100644 index 00000000..e3f54ed8 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/spur.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/tfg.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/tfg.png new file mode 100644 index 00000000..d4497739 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/tfg.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/total.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/total.png new file mode 100644 index 00000000..74794260 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/total.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/toys_r_us.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/toys_r_us.png new file mode 100644 index 00000000..e36da7dc Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/toys_r_us.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woermann_brock.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woermann_brock.png new file mode 100644 index 00000000..af38d1f6 Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woermann_brock.png differ diff --git a/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woolworths.png b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woolworths.png new file mode 100644 index 00000000..77f7353e Binary files /dev/null and b/mih_ui/lib/mih_package_components/assets/images/loyalty_cards/woolworths.png differ diff --git a/mih_ui/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/mih_ui/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart index 5fc235dd..078411af 100644 --- a/mih_ui/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart +++ b/mih_ui/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart @@ -343,6 +343,105 @@ class _BuildLoyaltyCardListState extends State { ); } + Color getCardColor(String shopName) { + switch (shopName.toLowerCase()) { + case "apple tree": + return const Color(0xFFffffff); + case "best before": + return const Color(0xFF000000); + case "checkers": + return const Color(0xFF00a6a3); + case "clicks": + return const Color(0xFF005caf); + case "cotton:on": + return const Color(0xFFffffff); + case "dis-chem": + return const Color(0xFF00a950); + case "pick n pay": + return const Color(0xFFffffff); + case "shoprite": + return const Color(0xFFc12514); + case "spar": + return const Color(0xFFffffff); + case "woolworths": + return const Color(0xFF000000); + case "makro": + return const Color(0xFFffffff); + case "fresh stop": + return const Color(0xFF50b849); + case "panarottis": + return const Color(0xFF3c3c3b); + case "shell": + return const Color(0xFF1d232a); + case "edgars": + return const Color(0xFFffffff); + case "jet": + return const Color(0xFFffffff); + case "spur": + return const Color(0xFF0a0157); + case "infinity": + return const Color(0xFFffffff); + case "eskom": + return const Color(0xFF003897); + case "+more": + return const Color(0xFFffffff); + case "bp": + return const Color(0xFF9dc600); + case "builders warehouse": + return const Color(0xFFffcb26); + case "exclusive books": + return const Color(0xFF2abdc5); + case "pna": + return const Color(0xFFcf3339); + case "pq clothing": + return const Color(0xFFed2223); + case "rage": + return const Color(0xFFffffff); + case "sasol": + return const Color(0xFFffffff); + case "tfg group": + return const Color(0xFF622775); + case "toys r us": + return const Color(0xFF0962ad); + case "leroy merlin": + return const Color(0xFFffffff); + case "signature cosmetics & fragrances": + return const Color(0xFFec028b); + case "ok foods": + return const Color(0xFFffffff); + case "choppies": + return const Color(0xFFffffff); + case "boxer": + return const Color(0xFFffffff); + case "carrefour": + return const Color(0xFFffffff); + case "sefalana": + return const Color(0xFFffffff); + case "big save": + return const Color(0xFF333333); + case "justrite": + return const Color(0xFF50b849); + case "naivas": + return const Color(0xFFf26535); + case "kero": + return const Color(0xFF004986); + case "auchan": + return const Color(0xFFffffff); + case "woermann brock": + return const Color(0xFFe31e2d); + case "continente": + return const Color(0xFFffffff); + case "fresmart": + return const Color(0xFF72ba2e); + case "total energies": + return const Color(0xFFffffff); + case "engen": + return const Color(0xFF002b8f); + default: + return const Color(0xFFffffff); + } + } + void viewCardWindow(MzansiProfileProvider mzansiProfileProvider, MzansiWalletProvider walletProvider, int index, double width) { //print(widget.cardList[index].card_number); @@ -357,8 +456,9 @@ class _BuildLoyaltyCardListState extends State { context: context, barrierDismissible: false, builder: (context) => MihPackageWindow( + backgroundColor: getCardColor(widget.cardList[index].shop_name), fullscreen: false, - windowTitle: widget.cardList[index].shop_name.toUpperCase(), + windowTitle: null, menuOptions: [ SpeedDialChild( child: widget.cardList[index].favourite == "" @@ -452,12 +552,14 @@ class _BuildLoyaltyCardListState extends State { windowBody: Column( mainAxisSize: MainAxisSize.max, children: [ - Container( + SizedBox( + height: 15, + ), + SizedBox( width: 500, child: MihCardDisplay( shopName: widget.cardList[index].shop_name, nickname: widget.cardList[index].nickname, - height: 250, ), ), const SizedBox(height: 20), @@ -474,7 +576,7 @@ class _BuildLoyaltyCardListState extends State { Padding( padding: const EdgeInsets.all(10.0), child: SizedBox( - height: 75, + height: 150, // width: 300, child: BarcodeWidget( //color: MihColors.secondary(), @@ -625,16 +727,16 @@ class _BuildLoyaltyCardListState extends State { ), itemCount: widget.cardList.length, gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent( - mainAxisSpacing: 0, + mainAxisSpacing: 5, crossAxisSpacing: 5, maxCrossAxisExtent: 200, + // childAspectRatio: 0.80, ), itemBuilder: (context, index) { return GestureDetector( child: MihCardDisplay( shopName: widget.cardList[index].shop_name, nickname: widget.cardList[index].nickname, - height: 100, ), onTap: () { setScreenBrightness(1.0); diff --git a/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart b/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart index ec7ae93d..2c0512d4 100644 --- a/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart +++ b/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart @@ -143,23 +143,31 @@ class _MihAddCardWindowState extends State { "Woolworths", ], ), - ValueListenableBuilder( - valueListenable: _shopName, - builder: - (BuildContext context, String value, Widget? child) { - return Visibility( - visible: value != "", - child: Column( - children: [ - const SizedBox(height: 10), - MihCardDisplay( - shopName: _shopName.value, - nickname: "", - height: 200), - ], - ), - ); - }, + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + ValueListenableBuilder( + valueListenable: _shopName, + builder: (BuildContext context, String value, + Widget? child) { + return Visibility( + visible: value != "", + child: Column( + children: [ + const SizedBox(height: 10), + SizedBox( + height: 250, + child: MihCardDisplay( + shopName: _shopName.value, + nickname: "", + ), + ), + ], + ), + ); + }, + ), + ], ), const SizedBox(height: 10), MihTextFormField( diff --git a/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart b/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart index a7facfc3..b281f2eb 100644 --- a/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart +++ b/mih_ui/lib/mih_packages/mzansi_wallet/components/mih_card_display.dart @@ -1,13 +1,12 @@ import 'package:flutter/material.dart'; +import 'package:mih_package_toolkit/mih_package_toolkit.dart'; class MihCardDisplay extends StatefulWidget { final String shopName; final String nickname; - final double height; const MihCardDisplay({ super.key, required this.shopName, - required this.height, required this.nickname, }); @@ -20,142 +19,142 @@ class _MihCardDisplayState extends State { switch (widget.shopName.toLowerCase()) { case "apple tree": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/apple_tree-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/apple_tree.png'); case "best before": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/best_before-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/best_before.png'); case "checkers": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/checkers-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/checkers.png'); case "clicks": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/clicks-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/clicks.png'); case "cotton:on": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/cotton_on-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/cotton_on.png'); case "dis-chem": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/dischem-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/dischem.png'); case "pick n pay": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/pick_n_pay-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/pick_n_pay.png'); case "shoprite": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/shoprite-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/shoprite.png'); case "spar": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/spar-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/spar.png'); case "woolworths": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/woolworths-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/woolworths.png'); case "makro": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/makro-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/makro.png'); case "fresh stop": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/fresh_stop-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/fresh_stop.png'); case "panarottis": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/panarottis-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/panarottis.png'); case "shell": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/shell-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/shell.png'); case "edgars": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/edgars-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/edgars.png'); case "jet": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/jet-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/jet.png'); case "spur": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/spur-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/spur.png'); case "infinity": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/infinity-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/infinity.png'); case "eskom": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/eskom-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/eskom.png'); case "+more": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/plus_more-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/plus_more.png'); case "bp": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/bp-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/bp.png'); case "builders warehouse": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/builders-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/builders.png'); case "exclusive books": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/exclusive_books-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/exclusive_books.png'); case "pna": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/pna-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/pna.png'); case "pq clothing": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/pq-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/pq.png'); case "rage": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/rage-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/rage.png'); case "sasol": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/sasol-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/sasol.png'); case "tfg group": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/tfg-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/tfg.png'); case "toys r us": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/toysrus-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/toys_r_us.png'); case "leroy merlin": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/leroy_merlin-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/leroy_merlin.png'); case "signature cosmetics & fragrances": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/signature_cosmetics-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/signature.png'); case "ok foods": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/ok_food-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/ok_foods.png'); case "choppies": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/choppies-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/choppies.png'); case "boxer": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/boxer-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/boxer.png'); case "carrefour": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/carrefour-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/carrefour.png'); case "sefalana": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/sefalana-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/sefalana.png'); case "big save": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/big_save-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/big_save.png'); case "justrite": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/justrite-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/justrite.png'); case "naivas": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/naivas-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/naivas.png'); case "kero": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/kero-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/kero.png'); case "auchan": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/auchan-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/auchan.png'); case "woermann brock": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/woermann_brock-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/woermann_brock.png'); case "continente": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/continente-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/continente.png'); case "fresmart": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/fresmart-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/fresmart.png'); case "total energies": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/total_energies-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/total.png'); case "engen": return Image.asset( - 'lib/mih_package_components/assets/images/loyalty_cards/mini/engen-min.png'); + 'lib/mih_package_components/assets/images/loyalty_cards/engen.png'); default: return null; } @@ -165,16 +164,34 @@ class _MihCardDisplayState extends State { Widget build(BuildContext context) { return Visibility( visible: displayLoyaltyCard() != null, - child: Column( + child: Stack( children: [ - displayLoyaltyCard() != null ? displayLoyaltyCard()! : SizedBox(), - FittedBox( - child: Text( - widget.nickname, - textAlign: TextAlign.center, - style: const TextStyle( - fontSize: 25, - fontWeight: FontWeight.bold, + if (displayLoyaltyCard() != null) + ClipRRect( + borderRadius: BorderRadius.circular(25), + child: displayLoyaltyCard()!, + ), + Container( + padding: EdgeInsets.symmetric(vertical: 5.0), + alignment: Alignment.bottomCenter, + child: FittedBox( + child: Container( + padding: EdgeInsets.symmetric( + horizontal: widget.nickname.isNotEmpty ? 8.0 : 0.0), + decoration: BoxDecoration( + color: MihColors.primary(), + borderRadius: BorderRadius.circular( + 15, + ), + ), + child: Text( + widget.nickname, + textAlign: TextAlign.center, + style: const TextStyle( + fontSize: 25, + fontWeight: FontWeight.bold, + ), + ), ), ), )