From 6143eb9d08ac88a49e59e7640e79b1a173df8912 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Wed, 23 Feb 2022 13:45:52 +0300
Subject: [PATCH] fix build

---
 CMakeLists.txt                                            | 4 ++--
 HanoiTowers/client/Background.qml                         | 2 +-
 HanoiTowers/client/CMakeLists.txt                         | 7 +++++++
 HanoiTowers/client/android/build.gradle.in                | 4 ++--
 .../android/gradle/wrapper/gradle-wrapper.properties      | 2 +-
 HanoiTowers/client/menu/CheatCard.qml                     | 8 ++++----
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 486e289..f342e26 100644
--- 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)
diff --git a/HanoiTowers/client/Background.qml b/HanoiTowers/client/Background.qml
index 566018a..b974823 100644
--- a/HanoiTowers/client/Background.qml
+++ b/HanoiTowers/client/Background.qml
@@ -29,7 +29,7 @@ Item {
 
             GradientStop {
                 position: 1;
-                color: "#ff3782c8";
+                color: "#ff379fff";
             }
 
 
diff --git a/HanoiTowers/client/CMakeLists.txt b/HanoiTowers/client/CMakeLists.txt
index 6262dba..1708159 100644
--- 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
diff --git a/HanoiTowers/client/android/build.gradle.in b/HanoiTowers/client/android/build.gradle.in
index dc4feaa..df0500c 100644
--- 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 {
diff --git a/HanoiTowers/client/android/gradle/wrapper/gradle-wrapper.properties b/HanoiTowers/client/android/gradle/wrapper/gradle-wrapper.properties
index 442d913..0f80bbf 100644
--- 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
diff --git a/HanoiTowers/client/menu/CheatCard.qml b/HanoiTowers/client/menu/CheatCard.qml
index 458e769..8727920 100644
--- a/HanoiTowers/client/menu/CheatCard.qml
+++ b/HanoiTowers/client/menu/CheatCard.qml
@@ -6,8 +6,8 @@ import QtQuick.Controls.Material 2.15
 
 Dialog {
 
-    width: parent.width * 0.6
-    height: parent.height * 0.8
+    width: parent.width * 0.8
+    height: parent.height * 0.9
 
     x: parent.width / 2 - width / 2
     y: parent.height / 2 - height / 2
@@ -28,7 +28,7 @@ Dialog {
             fillMode: Image.PreserveAspectFit
 
             Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            Layout.preferredWidth: parent.width * 0.95
+            Layout.preferredWidth: parent.width * 0.60
             Layout.preferredHeight: width * 0.4
 
             source: "qrc:/img/res/CheatCard_Banner.jpg"
@@ -56,5 +56,5 @@ Dialog {
         }
     }
 
-    standardButtons: Dialog.Ok
+//    standardButtons: Dialog.Ok
 }