Fix image progress

Author: ismartcoding

app/proguard-rules.pro

@@ -27,6 +27,12 @@
 -dontwarn org.apache.log4j.**
 -dontwarn org.apache.logging.log4j.**
 
+# Netty 4.2 uses java.lang.invoke.VarHandle for byte[]/ByteBuffer short/int/long
+# access. R8 horizontal class merging corrupts the invoke-polymorphic call sites,
+# producing java.lang.VerifyError ("expected Reference: java.lang.Object[]") on
+# launch. Keeping the package intact disables that optimization for these classes.
+-keep class io.netty.** { *; }
+
 # ===== kotlinx.serialization =====
 # Keep @Serializable companions and serializer accessors.
 -keepattributes *Annotation*, InnerClasses
@@ -45,6 +51,13 @@
 -keep class kotlinx.coroutines.** { *; }
 -dontwarn io.ktor.**
 
+# ===== App code (vendored kgraphql + GraphQL model classes) =====
+# kgraphql discovers type fields via Kotlin reflection (KClass.memberProperties,
+# primaryConstructor). R8 obfuscation strips/renames properties and corrupts
+# @kotlin.Metadata, producing "An Object type must define one or more fields"
+# at schema build time. Keep the app's own classes intact.
+-keep class com.ismartcoding.plain.** { *; }
+
 # ===== BouncyCastle (reflection-heavy crypto) =====
 -keep class org.bouncycastle.** { *; }
 -dontwarn org.bouncycastle.**

shared/src/androidMain/kotlin/com/ismartcoding/plain/platform/EditorWebView.android.kt

@@ -2,28 +2,12 @@ package com.ismartcoding.plain.platform
 
 import android.webkit.WebView
 
-/**
- * Android implementation of [EditorWebViewHandle] wrapping `android.webkit.WebView`.
- *
- * The underlying WebView is created and configured by the platform-specific
- * `AceEditor` Composable (which needs the parent Compose context for theming)
- * and then assigned to this handle via [webView]. Common code drives the
- * embedded Ace editor via [evaluateJavascript] without touching the Android
- * WebView type directly.
- */
-actual class EditorWebViewHandle actual constructor() {
-    /** The underlying Android WebView, assigned by the platform AceEditor Composable. */
-    var webView: WebView? = null
-
-    actual fun evaluateJavascript(script: String, callback: ((String) -> Unit)?) {
-        val view = webView ?: return
-        view.evaluateJavascript(script) { result ->
-            callback?.invoke(result)
-        }
+actual fun evaluateEditorJavascript(webView: Any?, script: String, callback: ((String) -> Unit)?) {
+    (webView as? WebView)?.evaluateJavascript(script) { result ->
+        callback?.invoke(result)
     }
+}
 
-    actual fun destroy() {
-        webView?.destroy()
-        webView = null
-    }
+actual fun destroyEditorWebView(webView: Any?) {
+    (webView as? WebView)?.destroy()
 }

shared/src/androidMain/kotlin/com/ismartcoding/plain/platform/Lock.android.kt

@@ -1,6 +1,5 @@
 package com.ismartcoding.plain.platform
 
-actual class PlatformLock {
-    private val lock = Any()
-    actual fun <T> withLock(block: () -> T): T = synchronized(lock, block)
-}
+actual fun newPlatformLock(): Any = Any()
+
+actual fun <T> runPlatformLocked(lock: Any, block: () -> T): T = synchronized(lock, block)

shared/src/commonMain/composeResources/values-bn/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">তালিকা পুনর্বিন্যাস করতে নম্বর টেনে আনুন</string>
     <string name="web_client_connected">ওয়েব ক্লায়েন্ট সংযুক্ত হয়েছে</string>
     <string name="clients_online">%1$d ক্লায়েন্ট অনলাইন</string>
-    <string name="downloading_update">ডাউনলোড হচ্ছে… %1$s%%</string>
+    <string name="downloading_update">ডাউনলোড হচ্ছে… %1$s%</string>
     <string name="download_update_failed">ডাউনলোড ব্যর্থ হয়েছে</string>
     <string name="download_on_github">GitHub থেকে ডাউনলোড করুন</string>
     <string name="official">অফিশিয়াল</string>

shared/src/commonMain/composeResources/values-de/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">Ziehen Sie die Nummer, um die Liste neu zu ordnen</string>
     <string name="web_client_connected">Web-Client verbunden</string>
     <string name="clients_online">%1$d Client(s) online</string>
-    <string name="downloading_update">Herunterladen… %1$s%%</string>
+    <string name="downloading_update">Herunterladen… %1$s%</string>
     <string name="download_update_failed">Download fehlgeschlagen</string>
     <string name="download_on_github">Auf GitHub herunterladen</string>
     <string name="official">OFFIZIELL</string>

shared/src/commonMain/composeResources/values-es/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">Arrastra el número para reordenar la lista</string>
     <string name="web_client_connected">Cliente web conectado</string>
     <string name="clients_online">%1$d cliente(s) en línea</string>
-    <string name="downloading_update">Descargando… %1$s%%</string>
+    <string name="downloading_update">Descargando… %1$s%</string>
     <string name="download_update_failed">Error al descargar</string>
     <string name="download_on_github">Descargar en GitHub</string>
     <string name="official">OFICIAL</string>

shared/src/commonMain/composeResources/values-fr/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">Faites glisser le numéro pour réorganiser la liste</string>
     <string name="web_client_connected">Client web connecté</string>
     <string name="clients_online">%1$d client(s) en ligne</string>
-    <string name="downloading_update">Téléchargement… %1$s%%</string>
+    <string name="downloading_update">Téléchargement… %1$s%</string>
     <string name="download_update_failed">Échec du téléchargement</string>
     <string name="download_on_github">Télécharger sur GitHub</string>
     <string name="official">OFFICIEL</string>

shared/src/commonMain/composeResources/values-hi/strings_settings.xml

@@ -73,7 +73,7 @@
 
     <string name="web_client_connected">वेब क्लाइंट कनेक्ट हुआ</string>
     <string name="clients_online">%1$d क्लाइंट ऑनलाइन</string>
-    <string name="downloading_update">डाउनलोड हो रहा है… %1$s%%</string>
+    <string name="downloading_update">डाउनलोड हो रहा है… %1$s%</string>
     <string name="download_update_failed">डाउनलोड विफल हुआ</string>
     <string name="download_on_github">GitHub पर डाउनलोड करें</string>
     <string name="official">आधिकारिक</string>

shared/src/commonMain/composeResources/values-it/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">Trascina il numero per riordinare l'elenco</string>
     <string name="web_client_connected">Client web connesso</string>
     <string name="clients_online">%1$d client online</string>
-    <string name="downloading_update">Download in corso… %1$s%%</string>
+    <string name="downloading_update">Download in corso… %1$s%</string>
     <string name="download_update_failed">Download non riuscito</string>
     <string name="download_on_github">Scarica su GitHub</string>
     <string name="official">UFFICIALE</string>

shared/src/commonMain/composeResources/values-ja/strings_settings.xml

@@ -72,7 +72,7 @@
     <string name="drag_number_to_reorder_list">番号をドラッグしてリストを並べ替え</string>
     <string name="web_client_connected">ウェブクライアントが接続しました</string>
     <string name="clients_online">%1$d クライアントがオンライン</string>
-    <string name="downloading_update">ダウンロード中… %1$s%%</string>
+    <string name="downloading_update">ダウンロード中… %1$s%</string>
     <string name="download_update_failed">ダウンロードに失敗しました</string>
     <string name="download_on_github">GitHubでダウンロード</string>
     <string name="official">公式</string>