Merge pull request #129 from QuasarApp/dev

Dev
2025-05-14 02:19:33 +00:00 · 2022-02-23 14:01:28 +03:00 · 2022-02-23 14:01:28 +03:00 · 01af6c9dcd
commit 01af6c9dcd
parent 6969046d66 6143eb9d08
19 changed files with 233 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,6 +10,7 @@ project(HanoiTowers)

 set(BUILD_SHARED_LIBS ON)

+set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/HanoiTowers/client/android")

 include(submodules/Heart/QuasarAppLib/CMake/QuasarApp.cmake)
 include(submodules/Heart/QuasarAppLib/CMake/Version.cmake)
@ -104,7 +105,7 @@ else()
    set (PATRONUM_TESTS OFF)
 endif()

-set(HEART_SSL OFF)
+option(HEART_SSL "This option enable or disabled ssl functions of nodes" OFF)
 add_subdirectory(submodules/Heart)
 add_subdirectory(HanoiTowers/Protockol)

@ -119,7 +120,6 @@ if (HANOI_CLIENT)
    add_subdirectory(submodules/Credits)

    if (ANDROID)
-        set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/HanoiTowers/client/android")
        if (HANOI_ADMOD)
            set(QTAT_APP_PERMISSIONS OFF)
            set(QTAT_APK_EXPANSION_FILES OFF)
--- a/HanoiTowers/client/Background.qml
+++ b/HanoiTowers/client/Background.qml
@ -29,7 +29,7 @@ Item {

            GradientStop {
                position: 1;
-                color: "#ff3782c8";
+                color: "#ff379fff";
            }


--- a/HanoiTowers/client/CMakeLists.txt
+++ b/HanoiTowers/client/CMakeLists.txt
@ -47,6 +47,7 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts
 prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")

 if (ANDROID)
+    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")

    set(ENV{ANDROID_API_VERSION} 31)
    set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION})
@ -87,6 +88,12 @@ if (ANDROID)

    file(GLOB java_files
       "android/src/com/quasarapp/androidtools/*.java"
+       "android/*.xml"
+       "android/*.in"
+       "android/*.gradle"
+       "android/gradlew"
+       "android/gradle.*"
+
    )

    add_custom_target(${name}Android
--- a/HanoiTowers/client/android/build.gradle.in
+++ b/HanoiTowers/client/android/build.gradle.in
@ -5,8 +5,8 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-    }
+        classpath "com.android.tools.build:gradle:7.0.2"
+        }
 }

 repositories {
--- a/HanoiTowers/client/android/gradle/wrapper/gradle-wrapper.properties
+++ b/HanoiTowers/client/android/gradle/wrapper/gradle-wrapper.properties
@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/HanoiTowers/client/languages/de.ts
+++ b/HanoiTowers/client/languages/de.ts
@ -23,6 +23,21 @@
        <translation>Wird geladen ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/en.ts
+++ b/HanoiTowers/client/languages/en.ts
@ -23,6 +23,21 @@
        <translation>Loading ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/es.ts
+++ b/HanoiTowers/client/languages/es.ts
@ -23,6 +23,21 @@
        <translation>La sobreprima ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/fr.ts
+++ b/HanoiTowers/client/languages/fr.ts
@ -23,6 +23,21 @@
        <translation>Le bourrage ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/ja.ts
+++ b/HanoiTowers/client/languages/ja.ts
@ -23,6 +23,21 @@
        <translation>読み込み中...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/pl.ts
+++ b/HanoiTowers/client/languages/pl.ts
@ -23,6 +23,21 @@
        <translation>Ładowanie ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/ru.ts
+++ b/HanoiTowers/client/languages/ru.ts
@ -23,6 +23,21 @@
        <translation>Загрузка ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation>Попробуйте наше новое приложение!</translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation>Cheat Card - Бесплатное мобильное приложение для создания бонусных карт для вашего бизнеса</translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation>Получить CheatCard</translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/tr.ts
+++ b/HanoiTowers/client/languages/tr.ts
@ -23,6 +23,21 @@
        <translation>Yükleniyor ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/uk.ts
+++ b/HanoiTowers/client/languages/uk.ts
@ -23,6 +23,21 @@
        <translation>Ладування ...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/languages/zh.ts
+++ b/HanoiTowers/client/languages/zh.ts
@ -23,6 +23,21 @@
        <translation>正在加载...</translation>
    </message>
 </context>
+<context>
+    <name>CheatCard</name>
+    <message>
+        <source>Try our new application!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cheat Card is Free mobile application for create bonus cards for your business</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get CheatCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>Config</name>
    <message>
--- a/HanoiTowers/client/menu/CheatCard.qml
+++ b/HanoiTowers/client/menu/CheatCard.qml
@ -0,0 +1,60 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.1
+import QtQuick.Controls.Material 2.15
+
+Dialog {
+
+    width: parent.width * 0.8
+    height: parent.height * 0.9
+
+    x: parent.width / 2 - width / 2
+    y: parent.height / 2 - height / 2
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        Label {
+            text: qsTr("Try our new application!")
+            font.bold: true
+            font.capitalization: Font.AllUppercase
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+
+        }
+
+        Image {
+            fillMode: Image.PreserveAspectFit
+
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+            Layout.preferredWidth: parent.width * 0.60
+            Layout.preferredHeight: width * 0.4
+
+            source: "qrc:/img/res/CheatCard_Banner.jpg"
+        }
+
+
+        Label {
+            text: qsTr("Cheat Card is Free mobile application for create bonus cards for your business")
+            font.bold: false
+            font.capitalization: Font.AllUppercase
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+            wrapMode: Label.WordWrap
+
+        }
+
+        Button {
+            text: qsTr("Get CheatCard")
+            Layout.alignment: Layout.Center
+            Material.background: Material.LightGreen
+
+            onClicked: {
+                Qt.openUrlExternally("https://play.google.com/store/apps/details?id=quasarapp.core.cheatcard");
+            }
+        }
+    }
+
+//    standardButtons: Dialog.Ok
+}
--- a/HanoiTowers/client/menu/PremiumLoader.qml
+++ b/HanoiTowers/client/menu/PremiumLoader.qml
@ -6,8 +6,8 @@ Item {

    Component.onCompleted:  {

-        if (!backEnd.isAndroid())
-            return;
+//        if (!backEnd.isAndroid())
+//            return;

 //        if (backEnd.isAdMod()) {

@ -25,6 +25,10 @@ Item {
 //            popup = component.createObject(this);
 //            popup.open();
 //        }
+
+        const component = Qt.createComponent("qrc:/menu/CheatCard.qml");
+        popup = component.createObject(this);
+        popup.open();
    }

    anchors.fill: parent
--- a/HanoiTowers/client/qml.qrc
+++ b/HanoiTowers/client/qml.qrc
@ -27,6 +27,7 @@
        <file>menu/PremiumThanks.qml</file>
        <file>menu/PremiumLoader.qml</file>
        <file>menu/AdLoadScrean.qml</file>
+        <file>menu/CheatCard.qml</file>
    </qresource>
    <qresource prefix="/textures">
        <file>res/fogBack.png</file>
@ -36,8 +37,9 @@
    <qresource prefix="/img">
        <file alias="DefaultAvatar">res/DefaultAvatar.png</file>
        <file alias="premium">res/HanoiTowers_premium_logo.png</file>
-		<file>res/unlock.png</file>
-		<file>res/galochka.png</file>
+        <file>res/unlock.png</file>
+        <file>res/galochka.png</file>
+        <file>res/CheatCard_Banner.jpg</file>
    </qresource>
    <qresource prefix="/languages">
        <file>languages/ru.qm</file>
--- a/HanoiTowers/client/res/CheatCard_Banner.jpg
+++ b/HanoiTowers/client/res/CheatCard_Banner.jpg