[Jrisk-cvs] SF.net SVN: domination-code:[2633] Domination

[<yu...@us...>]

Revision: 2633
          http://sourceforge.net/p/domination/code/2633
Author:   yuranet
Date:     2025-02-09 16:07:58 +0000 (Sun, 09 Feb 2025)
Log Message:
-----------
loading dialog getting stuck fix

Modified Paths:
--------------
    Domination/ChangeLog.txt
    Domination/android/AndroidManifest.xml
    Domination/android/src/net/yura/domination/android/RealTimeMultiplayer.java

Modified: Domination/ChangeLog.txt
===================================================================
--- Domination/ChangeLog.txt	2025-02-09 13:43:03 UTC (rev 2632)
+++ Domination/ChangeLog.txt	2025-02-09 16:07:58 UTC (rev 2633)
@@ -7,7 +7,7 @@
 	 * Save:	8
 
 	iOS:		16
-	Android:	99
+	Android:	100
 	Game GUI:	2
 	Swing GUI:	2
 	Simple GUI:	2
@@ -16,6 +16,7 @@
 
 1.3.4
 
+	Accessibility GameGUI: right click options to increate and decrease font size
 	better fallbacks for audio not loading from url
 	fix for small screen Domination not loading when space in path
 

Modified: Domination/android/AndroidManifest.xml
===================================================================
--- Domination/android/AndroidManifest.xml	2025-02-09 13:43:03 UTC (rev 2632)
+++ Domination/android/AndroidManifest.xml	2025-02-09 16:07:58 UTC (rev 2633)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
       package="net.yura.domination"
-      android:versionCode="99"
-      android:versionName="99"
+      android:versionCode="100"
+      android:versionName="100"
       android:installLocation="auto">
 
     <!-- android:targetSdkVersion 11 to hide the legacy menu button on tablets -->
@@ -96,7 +96,6 @@
 
         <activity android:name="net.yura.domination.android.push.PushActivity" android:theme="@android:style/Theme.NoDisplay"/>
         <activity android:name="net.yura.android.WebViewActivity" android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize" android:windowSoftInputMode="stateAlwaysHidden" />
-        <activity android:name="net.yura.android.LoadingDialog" android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize" android:windowSoftInputMode="stateAlwaysHidden" android:theme="@android:style/Theme.NoDisplay"/>
         <activity android:name="net.yura.domination.android.StatsActivity" android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize" android:windowSoftInputMode="stateAlwaysHidden" android:theme="@style/Theme" />
         <activity android:name="net.yura.domination.android.GamePreferenceActivity" android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize" android:windowSoftInputMode="stateAlwaysHidden" android:theme="@style/Dialog" />
         <activity android:name="net.yura.domination.android.AboutActivity" android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize" android:windowSoftInputMode="stateAlwaysHidden" android:theme="@style/Theme" />

Modified: Domination/android/src/net/yura/domination/android/RealTimeMultiplayer.java
===================================================================
--- Domination/android/src/net/yura/domination/android/RealTimeMultiplayer.java	2025-02-09 13:43:03 UTC (rev 2632)
+++ Domination/android/src/net/yura/domination/android/RealTimeMultiplayer.java	2025-02-09 16:07:58 UTC (rev 2633)
@@ -11,7 +11,6 @@
 import java.util.logging.Logger;
 import net.yura.android.LoadingDialog;
 import net.yura.domination.engine.JavaCompatUtil;
-import net.yura.domination.engine.RiskUtil;
 import net.yura.domination.engine.translation.TranslationBundle;
 import net.yura.lobby.client.ProtoAccess;
 import net.yura.lobby.model.Game;
@@ -585,17 +584,12 @@
                 .build());
     }
 
-    private void closeLoadingDialog() {
-        Intent intent = new Intent(activity, LoadingDialog.class);
-        intent.putExtra(LoadingDialog.PARAM_COMMAND, "hide");
-        activity.startActivity(intent);
+    private void openLoadingDialog(String messageName) {
+        LoadingDialog.setupAndShow(TranslationBundle.getBundle().getString(messageName), true);
     }
 
-    private void openLoadingDialog(String messageName) {
-        Intent intent = new Intent(activity, LoadingDialog.class);
-        intent.putExtra(LoadingDialog.PARAM_MESSAGE, TranslationBundle.getBundle().getString(messageName));
-        intent.putExtra(LoadingDialog.PARAM_CANCELLABLE, true);
-        activity.startActivity(intent);
+    private void closeLoadingDialog() {
+        LoadingDialog.hide();
     }
 
     void toast(String text) {