diff --git a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart index 3f9ac59b..61f2dac7 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart @@ -28,6 +28,7 @@ class _CurrencyExchangeRateState extends State { final TextEditingController _fromAmountController = TextEditingController(); final TextEditingController _toAmountController = TextEditingController(); late Future> availableCurrencies; + MihBannerAd _bannerAd = MihBannerAd(); Future submitForm() async { String fromCurrencyCode = _fromCurrencyController.text.split(" - ")[0]; @@ -65,6 +66,9 @@ class _CurrencyExchangeRateState extends State { fullscreen: false, windowTitle: "Calculation Results", onWindowTapClose: () { + setState(() { + _bannerAd = MihBannerAd(); + }); Navigator.pop(context); }, windowBody: Column( @@ -154,7 +158,7 @@ class _CurrencyExchangeRateState extends State { ], ), SizedBox(height: 10), - MihBannerAd(), + SizedBox(child: _bannerAd), ], ), ), diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index 59e4c45f..2eee56d6 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -29,6 +29,7 @@ class _TipCalcState extends State { final ValueNotifier splitValue = ValueNotifier(""); late bool splitPosition; final _formKey = GlobalKey(); + MihBannerAd _bannerAd = MihBannerAd(); String tip = ""; String total = ""; String amountPerPerson = ""; @@ -96,6 +97,9 @@ class _TipCalcState extends State { fullscreen: false, windowTitle: "Calculation Results", onWindowTapClose: () { + setState(() { + _bannerAd = MihBannerAd(); + }); Navigator.pop(context); }, windowBody: Column( @@ -223,7 +227,7 @@ class _TipCalcState extends State { ), ), SizedBox(height: 10), - MihBannerAd(), + SizedBox(child: _bannerAd), // if (splitBillController.text == "Yes") const Divider(), ], ), 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..f9511f04 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; + MihBannerAd _bannerAd = MihBannerAd(); List listOfCards = []; //bool showSelectedCardType = false; final ValueNotifier shopName = ValueNotifier(""); @@ -368,6 +370,13 @@ class _MihCardsState extends State { cardList: searchShopName.value, signedInUser: widget.signedInUser, navIndex: 0, + bannerAd: _bannerAd, + onCardViewClose: () { + setState(() { + _bannerAd = MihBannerAd(); + }); + Navigator.pop(context); + }, ); }, ); diff --git a/Frontend/pubspec.lock b/Frontend/pubspec.lock index 7c4863e1..e08b9f6e 100644 --- a/Frontend/pubspec.lock +++ b/Frontend/pubspec.lock @@ -470,6 +470,14 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + sha256: cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845 + url: "https://pub.dev" + source: hosted + version: "2.2.0" flutter_test: dependency: "direct dev" description: flutter @@ -776,6 +784,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.7.0" + measure_size: + dependency: transitive + description: + name: measure_size + sha256: "5faef74474db7bbcd8c6f301d8a09abc69b8e999b85167825e532f1a55c38ae6" + url: "https://pub.dev" + source: hosted + version: "4.0.0" meta: dependency: transitive description: @@ -1000,6 +1016,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" + redacted: + dependency: "direct main" + description: + name: redacted + sha256: "56647696716c2aacaa9532ef88067b4d2d090f744f411a823bb41f57b814b23a" + url: "https://pub.dev" + source: hosted + version: "1.0.13" scratch_space: dependency: transitive description: @@ -1373,6 +1397,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.5.1" + vector_graphics: + dependency: transitive + description: + name: vector_graphics + sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 + url: "https://pub.dev" + source: hosted + version: "1.1.19" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146" + url: "https://pub.dev" + source: hosted + version: "1.1.13" + vector_graphics_compiler: + dependency: transitive + description: + name: vector_graphics_compiler + sha256: "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331" + url: "https://pub.dev" + source: hosted + version: "1.1.17" vector_math: dependency: transitive description: diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index 33c87e07..4238e88a 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -44,6 +44,7 @@ dependencies: app_settings: ^6.1.1 pwa_install: ^0.0.6 google_mobile_ads: ^6.0.0 + redacted: ^1.0.13 dev_dependencies: flutter_test: