Merge remote-tracking branch 'origin/release/2.4.x' into zengate

android/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "org.ergoplatform.android"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 2304
-        versionName "2.4.2304"
+        versionCode 2305
+        versionName "2.4.2305"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

android/src/main/java/org/ergoplatform/android/transactions/SigningPromptDialogFragment.kt

@@ -2,6 +2,7 @@ package org.ergoplatform.android.transactions
 
 import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -45,7 +46,7 @@ class SigningPromptDialogFragment : BottomSheetDialogFragment() {
             ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
-                refreshButtonState()
+                Handler().post { refreshButtonState() }
             }
         })
         binding.buttonScanSignedTx.setOnClickListener {

android/src/main/res/layout/fragment_prompt_signing_dialog.xml

@@ -36,24 +36,23 @@
             android:gravity="center"
             android:text="@string/desc_prompt_signing" />
 
-        <Button
-            android:id="@+id/button_scan_next_qr"
-            style="?attr/materialButtonStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/activity_horizontal_margin"
-            android:layout_marginBottom="24dp"
-            android:text="@string/button_next"
-            android:visibility="gone" />
-
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
             android:layout_marginTop="@dimen/activity_horizontal_margin"
+            android:layout_marginBottom="24dp"
             android:orientation="horizontal">
 
+            <Button
+                android:id="@+id/button_scan_next_qr"
+                style="?attr/materialButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:text="@string/button_next"
+                android:visibility="gone" />
+
             <Button
                 android:id="@+id/button_scan_signed_tx"
                 style="?attr/materialButtonStyle"

android/src/main/res/xml/locales_config.xml

@@ -8,4 +8,5 @@
     <locale android:name="ru"/>
     <locale android:name="tr"/>
     <locale android:name="zh"/>
+    <locale android:name="in"/>
 </locale-config>

desktop/build.gradle.kts

@@ -57,7 +57,7 @@ compose.desktop {
     }
 }
 
-project.version = "2.4.2304"
+project.version = "2.4.2305"
 
 tasks {
     processResources {

ios/Info.plist.xml

@@ -18,6 +18,7 @@
             <string>tr</string>
             <string>ru</string>
             <string>zh</string>
+            <string>in</string>
         </array>
         <key>CFBundleIdentifier</key>
         <string>${app.id}</string>

ios/build.gradle

@@ -110,6 +110,7 @@ task convertStrings {
         convertFile("it")
         convertFile("tr")
         convertFile("ru")
+        convertFile("in")
     }
 }
 
@@ -130,4 +131,4 @@ dependencies {
     // Mosaik
     implementation "com.github.MrStahlfelge.mosaik:common-abstractui:$mosaik_version"
     implementation "org.jetbrains:markdown-jvm:0.3.1"
-}
+}

ios/robovm.properties

@@ -1,5 +1,5 @@
-app.version=2.4.2304
-app.build=2304
+app.version=2.4.2305
+app.build=2305
 app.mainclass=org.ergoplatform.ios.Main
 app.executable=ErgoWallet
 app.id=global.zengate.ergowallet