fix proguard stuff

2026-09-15 10:40:53 +03:00
parent e3643012c6
commit aeb687fc9d
9 changed files with 15 additions and 30 deletions
@@ -34,26 +34,3 @@
 -dontwarn androidx.window.sidecar.SidecarInterface
 -dontwarn androidx.window.sidecar.SidecarProvider
 -dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
-
-keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent { *; }
-keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnSaved { *; }
-keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnRecent { *; }
-keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnSearch { *; }
-
-keep class ru.shadowsparky.videobox.multiplatform.**$Config { *; }
-keep class ru.shadowsparky.videobox.multiplatform.**$Configuration { *; }
-
-keepclassmembers class * implements android.os.Parcelable {
-    static ** CREATOR;
-}
-
-keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
-
-keep class com.arkivanov.decompose.** { *; }
-keep interface com.arkivanov.decompose.** { *; }
-dontwarn com.arkivanov.decompose.**
@@ -3,7 +3,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-feature android:name="android.hardware.type.watch" />
-
+    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <application
@@ -8,7 +8,7 @@ import org.koin.core.annotation.Factory
 import ru.shadowsparky.chat.domain.ChatRepository
 import ru.shadowsparky.chat.domain.Message

-const val ENDPOINT = "http://192.168.0.76:8181"
+const val ENDPOINT = "https://wear.shadowsparky.ru/api"

@Factory
 class GigaChatRepository(
@@ -70,7 +70,7 @@ class AuthComponentFactory(
            child,
            tokenStorage,
            authRepository
-        ) { root.nav(Route.ChatScreen()) }
+        ) { root.navReplace(Route.ChatScreen()) }
        return Child.AuthChild(component)
    }
 }
@@ -1,6 +1,7 @@
 package ru.shadowsparky.gigawear.presentation.auth

 import android.app.RemoteInput
+import android.view.inputmethod.EditorInfo
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
@@ -30,6 +31,7 @@ import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.material3.Button
 import androidx.wear.compose.material3.CircularProgressIndicator
 import androidx.wear.input.RemoteInputIntentHelper
+import androidx.wear.input.wearableExtender
 import ru.shadowsparky.gigawear.R
 import androidx.wear.compose.material3.Text as WearText

@@ -95,6 +97,10 @@ private fun CodeStep(
        val remoteInputs = listOf(
            RemoteInput.Builder(CODE_INPUT_KEY)
                .setLabel(title)
+                .wearableExtender {
+                    setEmojisAllowed(false)
+                    setInputActionType(EditorInfo.IME_ACTION_DONE)
+                }
                .build()
        )
        RemoteInputIntentHelper.putRemoteInputsExtra(intent, remoteInputs)
@@ -37,7 +37,6 @@ class ChatComponent(
    private val scope = coroutineScope(exceptionHandler + SupervisorJob() + Dispatchers.Main.immediate)
    val updateComponent = updateComponentFactory.create(childContext("updater"))

-
    private val _events = Channel<ComponentEvent>(Channel.BUFFERED)
    val events = _events.receiveAsFlow()

@@ -15,6 +15,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,7 +37,6 @@ import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ScreenScaffold
 import androidx.wear.compose.material3.ScrollIndicator
 import androidx.wear.compose.material3.Text
-import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import kotlinx.coroutines.flow.collectLatest
 import ru.shadowsparky.gigawear.R
 import ru.shadowsparky.gigawear.presentation.WearErrorContent
@@ -46,7 +46,7 @@ import java.util.Locale
@Composable
 fun ChatScreen(component: ChatComponent) {
    val context = LocalContext.current
-    val state by component.state.subscribeAsState()
+    val state by component.state.collectAsState()

    var tts by remember {
        mutableStateOf<TextToSpeech?>(null)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/watchface,@raw/watchface_*,@xml/watch_face_info,@xml/watch_face_shapes,@xml/*watchface*,@drawable/preview*" />
@@ -9,7 +9,7 @@
    <string name="auth_next">Далее</string>

    <!-- Экран входа: шаг кода -->
-    <string name="auth_code_title">Код</string>
+    <string name="auth_code_title">Введите код привязки</string>
    <string name="auth_code_label">%1$d цифр</string>
    <string name="auth_code_counter">%1$d / %2$d</string>
    <string name="auth_submit">Войти</string>