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 5a05bb6d..b4855643 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 @@ -20,12 +20,16 @@ class BuildLoyaltyCardList extends StatefulWidget { final AppUser signedInUser; final List cardList; final int navIndex; + final MihBannerAd? bannerAd; + final void Function()? onCardViewClose; const BuildLoyaltyCardList({ super.key, required this.signedInUser, required this.cardList, required this.navIndex, + this.bannerAd, + this.onCardViewClose, }); @override @@ -391,9 +395,10 @@ class _BuildLoyaltyCardListState extends State { }, ), ], - onWindowTapClose: () { - Navigator.pop(context); - }, + onWindowTapClose: widget.onCardViewClose ?? + () { + Navigator.pop(context); + }, windowBody: Column( mainAxisSize: MainAxisSize.max, children: [ @@ -451,7 +456,8 @@ class _BuildLoyaltyCardListState extends State { ), ), SizedBox(height: 10), - MihBannerAd(), + widget.bannerAd ?? SizedBox(), + // MihBannerAd(), ], ), ), diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart index bbdfb0d9..4327d6e3 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; @@ -20,11 +21,13 @@ class MihCardFavourites extends StatefulWidget { class _MihCardFavouritesState extends State { late Future> cardList; + late MihBannerAd _bannerAd; List listOfCards = []; @override void initState() { super.initState(); + _bannerAd = MihBannerAd(); cardList = MIHMzansiWalletApis.getFavouriteLoyaltyCards( widget.signedInUser.app_id, ); @@ -59,6 +62,13 @@ class _MihCardFavouritesState extends State { cardList: listOfCards, signedInUser: widget.signedInUser, navIndex: 0, + bannerAd: _bannerAd, + onCardViewClose: () { + setState(() { + _bannerAd = MihBannerAd(); + }); + Navigator.pop(context); + }, ); } else { return const Center( diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index 319936e0..3f4b96c8 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; @@ -40,6 +41,7 @@ class _MihCardsState extends State { final FocusNode searchFocusNode = FocusNode(); final _formKey = GlobalKey(); late Future> cardList; + late MihBannerAd _bannerAd; List listOfCards = []; //bool showSelectedCardType = false; final ValueNotifier shopName = ValueNotifier(""); @@ -309,6 +311,7 @@ class _MihCardsState extends State { @override void initState() { + _bannerAd = MihBannerAd(); cardList = MIHMzansiWalletApis.getLoyaltyCards(widget.signedInUser.app_id); shopController.addListener(shopSelected); cardSearchController.addListener(searchShop); @@ -368,6 +371,13 @@ class _MihCardsState extends State { cardList: searchShopName.value, signedInUser: widget.signedInUser, navIndex: 0, + bannerAd: _bannerAd, + onCardViewClose: () { + setState(() { + _bannerAd = MihBannerAd(); + }); + Navigator.pop(context); + }, ); }, );