From 48129e69b86dba45b1e18afe742d30f5fa5ff66c Mon Sep 17 00:00:00 2001
From: WhiteCloud0123 <112397151+WhiteCloud0123@users.noreply.github.com>
Date: Sat, 15 Jul 2023 17:07:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/cleverraven/cataclysmdda/SplashScreen.java | 4 ++--
android/app/src/main/res/values/strings.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java b/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
index 46867518..7f99737b 100644
--- a/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
+++ b/android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java
@@ -114,7 +114,7 @@ protected void onResume() {
Context context = getApplicationContext();
String service_names = CataclysmDDA_Helpers.getEnabledAccessibilityServiceNames(context);
- //accessibilityServicesAlert.setMessage( String.format( getString(R.string.accessibilityServicesMessage), service_names ) );
+ accessibilityServicesAlert.setMessage( String.format( getString(R.string.accessibilityServicesMessage), service_names ) );
if (false) {
accessibilityServicesAlert.show();
} else {
@@ -148,7 +148,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
accessibilityServicesAlert = new AlertDialog.Builder(SplashScreen.this)
- //.setTitle(getString(R.string.accessibilityServicesTitle))
+ .setTitle(getString(R.string.accessibilityServicesTitle))
.setCancelable(false)
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 618987a0..bc48aefe 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -20,4 +20,6 @@
Cancel
Unavailable
The option you chose is not available.
+ Accessibility Services Warning
+ If swipe commands and shortcuts menus are not working in game, you might want to disable one of the following accessibility services/software that interact with touchscreen (swipe assists, auto-clickers, one-handed mode, etc.):\n%1$s
From 291d591bde250f868c19ec21894890bceccd3bbe Mon Sep 17 00:00:00 2001
From: WhiteCloud0123 <112397151+WhiteCloud0123@users.noreply.github.com>
Date: Sat, 15 Jul 2023 17:11:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
android/gradle.properties | 2 +-
src/version.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/android/gradle.properties b/android/gradle.properties
index 32d6b612..bae6a5de 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -46,7 +46,7 @@ deps=./deps.zip
# This property controls which override version number to use
# You can override this from the command line by passing "-Poverride_version=#"
-override_version=
+override_version=CDDA-Breeze-3.1
# This property controls path where overridden version number header should be generated
# You can override this from the command line by passing "-Pversion_header_path=#"
diff --git a/src/version.h b/src/version.h
index bb43c7a3..6d5e9bcf 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
// NOLINT(cata-header-guard)
-#define VERSION "b995146-dirty"
+#define VERSION "CDDA-Breeze 3.1"