From 835cd513049f1c6b6d1a175978169c2bbafa6e36 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Tue, 18 May 2021 11:06:55 +0300
Subject: [PATCH] fix admob banners
---
HanoiTowers/client/Game.qml | 3 ++
.../client/admod/AdMobInterstitialAndroid.qml | 7 +++--
.../client/android/AndroidManifest.xml | 2 +-
HanoiTowers/client/languages/en.ts | 28 +++++++++++--------
HanoiTowers/client/languages/ja.ts | 28 +++++++++++--------
HanoiTowers/client/languages/ru.ts | 28 +++++++++++--------
HanoiTowers/client/languages/tr.ts | 28 +++++++++++--------
HanoiTowers/client/languages/uk.ts | 28 +++++++++++--------
HanoiTowers/client/main.qml | 25 ++++++-----------
HanoiTowers/client/menu/MainMenu.qml | 2 +-
10 files changed, 98 insertions(+), 81 deletions(-)
diff --git a/HanoiTowers/client/Game.qml b/HanoiTowers/client/Game.qml
index 8b6e1e6..3bf7dce 100644
--- a/HanoiTowers/client/Game.qml
+++ b/HanoiTowers/client/Game.qml
@@ -177,6 +177,7 @@ Item {
popUp.open()
const action = function () {
+ showAdMobBanner()
stateData.unlockNextLvl();
start(stateData.lvl)
}
@@ -197,7 +198,9 @@ Item {
popUp.open()
const action = function () {
+ showAdMobBanner()
start(++stateWidget.tumbler.spin.value)
+
}
popUp.action = action;
diff --git a/HanoiTowers/client/admod/AdMobInterstitialAndroid.qml b/HanoiTowers/client/admod/AdMobInterstitialAndroid.qml
index a4f6457..e128fb7 100644
--- a/HanoiTowers/client/admod/AdMobInterstitialAndroid.qml
+++ b/HanoiTowers/client/admod/AdMobInterstitialAndroid.qml
@@ -3,9 +3,10 @@ import QtAndroidTools 1.0
QtAndroidAdMobInterstitial {
id: interstitial
+
unitId: "ca-app-pub-5799112356811682/5211864198"
nonPersonalizedAds: false
- onLoading: interstitialState.text = "Loading"
- onLoaded: interstitialState.text = "Loaded"
- onLoadError: interstitialState.text = "Error " + errorId
+ onLoaded: {
+ show()
+ }
}
diff --git a/HanoiTowers/client/android/AndroidManifest.xml b/HanoiTowers/client/android/AndroidManifest.xml
index 9dd9130..1fe0934 100644
--- a/HanoiTowers/client/android/AndroidManifest.xml
+++ b/HanoiTowers/client/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.0.1" android:versionCode="23" android:installLocation="auto">
+<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.0.2" android:versionCode="24" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS -->
diff --git a/HanoiTowers/client/languages/en.ts b/HanoiTowers/client/languages/en.ts
index c803683..262871c 100644
--- a/HanoiTowers/client/languages/en.ts
+++ b/HanoiTowers/client/languages/en.ts
@@ -302,32 +302,32 @@
<translation>User with this id already registered. If it you then use please the login form.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="440"/>
+ <location filename="../hanoitowers.cpp" line="442"/>
<source>Create user error</source>
<translation>User create error</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="441"/>
+ <location filename="../hanoitowers.cpp" line="443"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Failed to create a new user, This name %0 alredy used.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>Remove online error</source>
<translation>Remove online error</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>current profile not online!</source>
<translation>Current profile is offline!</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Remove Local user</source>
<translation>Remove Local user</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Failed to remove the local user data</source>
<translation>Failed to remove the local user data</translation>
</message>
@@ -540,8 +540,12 @@
</message>
<message>
<location filename="../menu/MainMenu.qml" line="121"/>
+ <source>Save and exit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>exit</source>
- <translation>Exit</translation>
+ <translation type="vanished">Exit</translation>
</message>
</context>
<context>
@@ -567,27 +571,27 @@
<translation>Return to main menu</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="72"/>
+ <location filename="../menu/ToolBarPage.qml" line="76"/>
<source>Welcom to Hanoi Towers </source>
<translation>Welcom to Hanoi Towers </translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="83"/>
+ <location filename="../menu/ToolBarPage.qml" line="87"/>
<source>Profiles</source>
<translation>Profiles</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="95"/>
+ <location filename="../menu/ToolBarPage.qml" line="99"/>
<source>This are the main settings</source>
<translation>This are the main settings</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="107"/>
+ <location filename="../menu/ToolBarPage.qml" line="111"/>
<source>About Page</source>
<translation>About Page</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="119"/>
+ <location filename="../menu/ToolBarPage.qml" line="123"/>
<source>World Of Hanoi Towers</source>
<translation>World Of Hanoi Towers</translation>
</message>
diff --git a/HanoiTowers/client/languages/ja.ts b/HanoiTowers/client/languages/ja.ts
index 1da6d92..d1fcf32 100644
--- a/HanoiTowers/client/languages/ja.ts
+++ b/HanoiTowers/client/languages/ja.ts
@@ -320,32 +320,32 @@
<translation>このIDのユーザーはすでに登録されています。 それを使用する場合は、ログインフォームを使用してください。</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="440"/>
+ <location filename="../hanoitowers.cpp" line="442"/>
<source>Create user error</source>
<translation>ユーザーエラーの作成</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="441"/>
+ <location filename="../hanoitowers.cpp" line="443"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>新しいユーザーの作成に失敗しました。名前 %0 はすでに使用されています。</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>Remove online error</source>
<translation>オンラインユーザーデータの削除中にエラーが発生しました</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>current profile not online!</source>
<translation>現在のプロファイルはオフラインです！</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Remove Local user</source>
<translation>ローカルユーザーを削除する</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Failed to remove the local user data</source>
<translation>ローカルユーザーデータの削除に失敗しました</translation>
</message>
@@ -582,8 +582,12 @@
</message>
<message>
<location filename="../menu/MainMenu.qml" line="121"/>
+ <source>Save and exit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>exit</source>
- <translation>出口</translation>
+ <translation type="vanished">出口</translation>
</message>
</context>
<context>
@@ -616,27 +620,27 @@
<translation>メインメニューへ戻る</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="72"/>
+ <location filename="../menu/ToolBarPage.qml" line="76"/>
<source>Welcom to Hanoi Towers </source>
<translation>ハノイタワー</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="83"/>
+ <location filename="../menu/ToolBarPage.qml" line="87"/>
<source>Profiles</source>
<translation>プロファイル</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="95"/>
+ <location filename="../menu/ToolBarPage.qml" line="99"/>
<source>This are the main settings</source>
<translation>これはメインの設定です</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="107"/>
+ <location filename="../menu/ToolBarPage.qml" line="111"/>
<source>About Page</source>
<translation>ページに関して</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="119"/>
+ <location filename="../menu/ToolBarPage.qml" line="123"/>
<source>World Of Hanoi Towers</source>
<translation>ハノイタワーズワールド</translation>
</message>
diff --git a/HanoiTowers/client/languages/ru.ts b/HanoiTowers/client/languages/ru.ts
index fb6adc2..32cc805 100644
--- a/HanoiTowers/client/languages/ru.ts
+++ b/HanoiTowers/client/languages/ru.ts
@@ -327,32 +327,32 @@
<translation>Пользователь с этим id уже зарегистрирован. Если это вы, пожалуйста используйте форму входа.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="440"/>
+ <location filename="../hanoitowers.cpp" line="442"/>
<source>Create user error</source>
<translation>Ошибка создания пользователя</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="441"/>
+ <location filename="../hanoitowers.cpp" line="443"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Не удалось создать пользователя. Данное имя %0 уже используется</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>Remove online error</source>
<translation>Ошибка удаления онлайн аккаунта</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>current profile not online!</source>
<translation>Текущий профиль не в сети!</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Remove Local user</source>
<translation>Удалить локального.пользователя</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Failed to remove the local user data</source>
<translation>Ошибка удаления локального пользователя</translation>
</message>
@@ -585,8 +585,12 @@
</message>
<message>
<location filename="../menu/MainMenu.qml" line="121"/>
+ <source>Save and exit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>exit</source>
- <translation>Выход</translation>
+ <translation type="vanished">Выход</translation>
</message>
</context>
<context>
@@ -619,27 +623,27 @@
<translation>Вернутся в главное меню</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="72"/>
+ <location filename="../menu/ToolBarPage.qml" line="76"/>
<source>Welcom to Hanoi Towers </source>
<translation>Добро пожаловать в Hanoi Towers </translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="83"/>
+ <location filename="../menu/ToolBarPage.qml" line="87"/>
<source>Profiles</source>
<translation>Профили</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="95"/>
+ <location filename="../menu/ToolBarPage.qml" line="99"/>
<source>This are the main settings</source>
<translation>Основные настройки</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="107"/>
+ <location filename="../menu/ToolBarPage.qml" line="111"/>
<source>About Page</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="119"/>
+ <location filename="../menu/ToolBarPage.qml" line="123"/>
<source>World Of Hanoi Towers</source>
<translation>Мир Ханойских башен</translation>
</message>
diff --git a/HanoiTowers/client/languages/tr.ts b/HanoiTowers/client/languages/tr.ts
index 8aa42dd..23ec7fa 100644
--- a/HanoiTowers/client/languages/tr.ts
+++ b/HanoiTowers/client/languages/tr.ts
@@ -328,32 +328,32 @@ Bu seviye için minimum adımlar: %2</translation>
<translation>Bu kimliğe sahip kullanıcı zaten kayıtlı. Eğer öyleyse, lütfen giriş formunu kullanın.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="440"/>
+ <location filename="../hanoitowers.cpp" line="442"/>
<source>Create user error</source>
<translation>Kullanıcı hatası oluştur</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="441"/>
+ <location filename="../hanoitowers.cpp" line="443"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Yeni bir kullanıcı oluşturulamadı, %0 adı kullanıldı.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>Remove online error</source>
<translation>Çevrimiçi kullanıcı verilerini kaldırma hatası</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>current profile not online!</source>
<translation>Mevcut profil çevrimdışı!</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Remove Local user</source>
<translation>Yerel kullanıcıyı kaldır</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Failed to remove the local user data</source>
<translation>Yerel kullanıcı verileri kaldırılamadı</translation>
</message>
@@ -586,8 +586,12 @@ Bu seviye için minimum adımlar: %2</translation>
</message>
<message>
<location filename="../menu/MainMenu.qml" line="121"/>
+ <source>Save and exit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>exit</source>
- <translation>çıkış</translation>
+ <translation type="vanished">çıkış</translation>
</message>
</context>
<context>
@@ -620,27 +624,27 @@ Bu seviye için minimum adımlar: %2</translation>
<translation>Ana menüye dön</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="72"/>
+ <location filename="../menu/ToolBarPage.qml" line="76"/>
<source>Welcom to Hanoi Towers </source>
<translation>Hanoi Kuleleri'ne hoş geldiniz </translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="83"/>
+ <location filename="../menu/ToolBarPage.qml" line="87"/>
<source>Profiles</source>
<translation>Profiller</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="95"/>
+ <location filename="../menu/ToolBarPage.qml" line="99"/>
<source>This are the main settings</source>
<translation>Bu ana ayarlar</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="107"/>
+ <location filename="../menu/ToolBarPage.qml" line="111"/>
<source>About Page</source>
<translation>Sayfa Hakkında</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="119"/>
+ <location filename="../menu/ToolBarPage.qml" line="123"/>
<source>World Of Hanoi Towers</source>
<translation>Hanoi Kuleleri Dünyası</translation>
</message>
diff --git a/HanoiTowers/client/languages/uk.ts b/HanoiTowers/client/languages/uk.ts
index 4b970f4..ae1dd7e 100644
--- a/HanoiTowers/client/languages/uk.ts
+++ b/HanoiTowers/client/languages/uk.ts
@@ -330,32 +330,32 @@
<translation>Користувач з цим ідентифікатором вже зареєстрований. Якщо ви використовуєте його, будь ласка, увійдіть у форму для входу.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="440"/>
+ <location filename="../hanoitowers.cpp" line="442"/>
<source>Create user error</source>
<translation>Помилка створення користувача</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="441"/>
+ <location filename="../hanoitowers.cpp" line="443"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Не вдалося створити нового користувача, ім’я %0 вже використовується.</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>Remove online error</source>
<translation>Помилка видалення онлайн даних користувачів</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="472"/>
+ <location filename="../hanoitowers.cpp" line="474"/>
<source>current profile not online!</source>
<translation>Поточний профіль офлайн!</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Remove Local user</source>
<translation>Видалити локального користувача</translation>
</message>
<message>
- <location filename="../hanoitowers.cpp" line="478"/>
+ <location filename="../hanoitowers.cpp" line="480"/>
<source>Failed to remove the local user data</source>
<translation>Не вдалося видалити локальні дані користувача</translation>
</message>
@@ -588,8 +588,12 @@
</message>
<message>
<location filename="../menu/MainMenu.qml" line="121"/>
+ <source>Save and exit</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>exit</source>
- <translation>Вихід</translation>
+ <translation type="vanished">Вихід</translation>
</message>
</context>
<context>
@@ -622,27 +626,27 @@
<translation>Головне меню</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="72"/>
+ <location filename="../menu/ToolBarPage.qml" line="76"/>
<source>Welcom to Hanoi Towers </source>
<translation>Ласкаво просимо до Ханойських веж</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="83"/>
+ <location filename="../menu/ToolBarPage.qml" line="87"/>
<source>Profiles</source>
<translation>Профілі</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="95"/>
+ <location filename="../menu/ToolBarPage.qml" line="99"/>
<source>This are the main settings</source>
<translation>Це основні налаштування</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="107"/>
+ <location filename="../menu/ToolBarPage.qml" line="111"/>
<source>About Page</source>
<translation>Довідка</translation>
</message>
<message>
- <location filename="../menu/ToolBarPage.qml" line="119"/>
+ <location filename="../menu/ToolBarPage.qml" line="123"/>
<source>World Of Hanoi Towers</source>
<translation>Світ Ханойських веж</translation>
</message>
diff --git a/HanoiTowers/client/main.qml b/HanoiTowers/client/main.qml
index 6428ada..1ef755f 100644
--- a/HanoiTowers/client/main.qml
+++ b/HanoiTowers/client/main.qml
@@ -22,7 +22,7 @@ ApplicationWindow {
title: qsTr("Hanoi Towers")
property var admodbanner: null
- function createSpriteObjects(url, parent) {
+ function createAdBobObjects(url, parent) {
if (!(backEnd.isAndroid() && backEnd.isAdMod())) {
return null;
}
@@ -30,14 +30,18 @@ ApplicationWindow {
return component.createObject(parent);
}
- Component.onCompleted: {
+ function showAdMobBanner() {
+ if (admodbanner) {
+ admodbanner.load()
+ }
+ }
- const obj = createSpriteObjects("qrc:/admod/AdMobInterstitialAndroid.qml", this);
+ Component.onCompleted: {
+ const obj = createAdBobObjects("qrc:/admod/AdMobInterstitialAndroid.qml", this);
if (obj) {
admodbanner = obj;
- admodbanner.load()
- admodbanner.show();
}
+
}
header: Menu.ToolBarPage {
@@ -66,17 +70,6 @@ ApplicationWindow {
anchors.fill: parent
interactive: false
- onCurrentIndexChanged: {
- if (currentIndex)
- return;
-
- if (admodbanner) {
- admodbanner.load()
- admodbanner.show();
-
- }
- }
-
background: Item {}
Menu.MainMenu {
diff --git a/HanoiTowers/client/menu/MainMenu.qml b/HanoiTowers/client/menu/MainMenu.qml
index 1ecb464..b9fa3d8 100644
--- a/HanoiTowers/client/menu/MainMenu.qml
+++ b/HanoiTowers/client/menu/MainMenu.qml
@@ -118,7 +118,7 @@ Page {
Layout.alignment: Qt.AlignCenter
Layout.fillWidth: true
- text: qsTr("exit");
+ text: qsTr("Save and exit");
onClicked: {
Qt.quit();
}