Merge pull request #205 from WhiteCloud0123/develop

杂项
WhiteCloud0123 · Jul 15, 2023 · 3275448 · 3275448
2 parents 88069f1 + 291d591
commit 3275448
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 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
@@ -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
@@ -20,4 +20,6 @@
  <string name="cancel">Cancel</string>
  <string name="unavailable">Unavailable</string>
  <string name="unavailableOption">The option you chose is not available.</string>
+ <string name="accessibilityServicesTitle">Accessibility Services Warning</string>
+ <string name="accessibilityServicesMessage">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</string>
 </resources>
diff --git 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
@@ -1,2 +1,2 @@
 // NOLINT(cata-header-guard)
-#define VERSION "b995146-dirty"
+#define VERSION "CDDA-Breeze 3.1"