Remove helpers.hideAd() (#1925)

* move hideAd to startAd.js

* Update src/lib/startAd.js

* Update src/components/settingsPage.js

* format

* format

* Update src/lib/removeAds.js

* fix: imports

* fix: imports

* revert version chnages

* explicit import

* format

Author: RohitKushvaha01

package-lock.json

@@ -5,6 +5,7 @@ import select from "dialogs/select";
 import Ref from "html-tag-js/ref";
 import actionStack from "lib/actionStack";
 import appSettings from "lib/settings";
+import { hideAd } from "lib/startAd";
 import FileBrowser from "pages/fileBrowser";
 import { isValidColor } from "utils/color/regex";
 import helpers from "utils/helpers";
@@ -70,7 +71,7 @@ export default function settingsPage(
 	/** DISCLAIMER: do not assign hideSearchBar directly because it can change  */
 	$page.ondisconnect = () => hideSearchBar();
 	$page.onhide = () => {
-		helpers.hideAd();
+		hideAd();
 		actionStack.remove(title);
 	};
 

src/components/settingsPage.js

@@ -1,5 +1,5 @@
 import purchaseListener from "handlers/purchase";
-import helpers from "utils/helpers";
+import { hideAd } from "./startAd.js";
 
 /**
  * Remove ads after purchase
@@ -25,7 +25,7 @@ export default function removeAds() {
 
 		function onpurchase() {
 			resolve(null);
-			helpers.hideAd(true);
+			hideAd(true);
 			localStorage.setItem("acode_pro", "true");
 			window.IS_FREE_VERSION = false;
 			toast(strings["thank you :)"]);

src/lib/removeAds.js

@@ -1,3 +1,5 @@
+import tag from "html-tag-js";
+
 let adUnitIdBanner = "ca-app-pub-5911839694379275/9157899592"; // Production
 let adUnitIdInterstitial = "ca-app-pub-5911839694379275/9570937608"; // Production
 let adUnitIdRewarded = "ca-app-pub-5911839694379275/1633667633"; // Production
@@ -57,3 +59,20 @@ export default async function startAd() {
 	window.iad = interstitial;
 	window.adRewardedUnitId = adUnitIdRewarded;
 }
+
+/**
+ * Hides the ad
+ * @param {Boolean} [force=false]
+ */
+export function hideAd(force = false) {
+	const { ad } = window;
+	if (ad?.active) {
+		const $pages = tag.getAll(".page-replacement");
+		const hide = $pages.length === 1;
+
+		if (force || hide) {
+			ad.active = false;
+			ad.hide();
+		}
+	}
+}

src/lib/startAd.js

@@ -4,8 +4,8 @@ import Page from "components/page";
 import Reactive from "html-tag-js/reactive";
 import actionStack from "lib/actionStack";
 import constants from "lib/constants";
+import { hideAd } from "lib/startAd";
 import helpers from "utils/helpers";
-
 export default function AboutInclude() {
 	const $page = Page(strings.about.capitalize());
 	const webviewVersionName = Reactive("N/A");
@@ -115,7 +115,7 @@ export default function AboutInclude() {
 
 	$page.onhide = function () {
 		actionStack.remove("about");
-		helpers.hideAd();
+		hideAd();
 	};
 
 	app.append($page);

src/pages/about/about.js

@@ -5,6 +5,7 @@ import loader from "dialogs/loader";
 import actionStack from "lib/actionStack";
 import adRewards from "lib/adRewards";
 import removeAds from "lib/removeAds";
+import { hideAd } from "lib/startAd";
 import helpers from "utils/helpers";
 
 let $rewardPage = null;
@@ -179,7 +180,7 @@ export default function openAdRewardsPage() {
 		action: $page.hide,
 	});
 
-	helpers.hideAd(true);
+	hideAd(true);
 	render();
 	app.append($page);
 	$rewardPage = $page;

src/pages/adRewards/index.js

@@ -6,6 +6,7 @@ import toast from "components/toast";
 import DOMPurify from "dompurify";
 import Ref from "html-tag-js/ref";
 import actionStack from "lib/actionStack";
+import { hideAd } from "lib/startAd";
 import markdownIt from "markdown-it";
 import markdownItFootnote from "markdown-it-footnote";
 import markdownItTaskLists from "markdown-it-task-lists";
@@ -73,7 +74,7 @@ export default async function Changelog() {
 
 	$page.onhide = function () {
 		actionStack.remove("changelog");
-		helpers.hideAd();
+		hideAd();
 	};
 
 	actionStack.push({

src/pages/changelog/changelog.js

@@ -6,6 +6,7 @@ import confirm from "dialogs/confirm";
 import select from "dialogs/select";
 import actionStack from "lib/actionStack";
 import settings from "lib/settings";
+import { hideAd } from "lib/startAd";
 import ThemeBuilder from "theme/builder";
 import themes from "theme/list";
 import { isValidColor } from "utils/color/regex";
@@ -34,7 +35,7 @@ export default function CustomThemeInclude() {
 
 	$page.onhide = () => {
 		actionStack.remove("custom-theme");
-		helpers.hideAd();
+		hideAd();
 	};
 
 	$page.addEventListener("click", handleClick);

src/pages/customTheme/customTheme.js

@@ -20,6 +20,7 @@ import projects from "lib/projects";
 import recents from "lib/recents";
 import remoteStorage from "lib/remoteStorage";
 import appSettings from "lib/settings";
+import { hideAd } from "lib/startAd";
 import mimeTypes from "mime-types";
 import mustache from "mustache";
 import filesSettings from "settings/filesSettings";
@@ -511,7 +512,7 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
 
 		$page.onhide = function () {
 			hideSearchBar();
-			helpers.hideAd();
+			hideAd();
 			actionStack.clearFromMark();
 			actionStack.remove("filebrowser");
 			$content.removeEventListener("click", handleClick);

src/pages/fileBrowser/fileBrowser.js

@@ -12,6 +12,7 @@ import Ref from "html-tag-js/ref";
 import actionStack from "lib/actionStack";
 import fonts from "lib/fonts";
 import appSettings from "lib/settings";
+import { hideAd } from "lib/startAd";
 import FileBrowser from "pages/fileBrowser";
 import helpers from "utils/helpers";
 import Url from "utils/Url";
@@ -33,7 +34,7 @@ export default function fontManager() {
 	});
 
 	$page.onhide = () => {
-		helpers.hideAd();
+		hideAd();
 		actionStack.remove("fontManager");
 	};