ci fixes develop to staging (#1203) (#1215)

* test

* fix

* Update libs.versions.toml

* Update libs.versions.toml

* Update libs.versions.toml

* test

* test

* Add remote assets sync service



* Add new price service



* MWR-951 Replaced StartActivityForResult to PickVisualMedia

* Flw 5120 cleared 1 (#1212)

* flw-5120

* soramitsu foundation as lib, flw-5120,

---------



* fix/ui (#1213)

* fix history UI

* version up

* fixes/release (#1214)

* fix input background

* version code up

* nothing to claim warning

* 207

* fixed MAX amount button in staking, improve debugging by breakpoints



* strings update

* stop chosen node from reset

* 208

* toc-connect accept urls

* build up 209

---------




---------

Signed-off-by: Deneath <[email protected]>
Co-authored-by: Denis Lyazgin <[email protected]>
Co-authored-by: Marat Biryushev <[email protected]>
Co-authored-by: marat-biriushev <[email protected]>
Co-authored-by: Naghme98 <[email protected]>
Co-authored-by: NaghmeMohammadifar <[email protected]>
Co-authored-by: Faimi the Legend Zufarov <[email protected]>
Co-authored-by: Faimi Zufarov <[email protected]>
Co-authored-by: arvifox <[email protected]>

Author: 6 people

android-foundation

@@ -118,6 +118,14 @@ android {
 
         jvmTarget = '17'
     }
+    kotlin {
+        compilerOptions {
+            if (System.getProperty("idea.active") == "true") {
+                println("Enable coroutine debugging")
+                freeCompilerArgs.add("-Xdebug")
+            }
+        }
+    }
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
@@ -139,7 +147,6 @@ play {
 }
 
 dependencies {
-    implementation project(':android-foundation')
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':core-db')
     implementation project(':common')

app/build.gradle

@@ -173,6 +173,9 @@
 -dontwarn org.ietf.jgss.GSSName
 -dontwarn org.ietf.jgss.Oid
 
+-dontwarn org.apiguardian.api.API$Status
+-dontwarn org.apiguardian.api.API
+
 # Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
 # EnclosingMethod is required to use InnerClasses.
 -keepattributes Signature, InnerClasses, EnclosingMethod

app/proguard-rules.pro

@@ -53,6 +53,18 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <category android:name="android.intent.category.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <!-- Only accept URLs that look like https://fearlesswallet.io/ton-connect/* -->
+                <data
+                    android:scheme="https"
+                    android:host="fearlesswallet.io"
+                    android:pathPrefix="/ton-connect/" />
+            </intent-filter>
         </activity>
 
         <activity

app/src/main/AndroidManifest.xml

@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
 buildscript {
     ext {
         // App version
-        versionName = '3.7.3'
-        versionCode = 204
+        versionName = '3.7.4'
+        versionCode = 209
 
         // SDK and tools
         compileSdkVersion = 34

build.gradle

@@ -144,9 +144,7 @@ dependencies {
     implementation libs.progressbutton
 
     implementation libs.nv.websocket.client
-    implementation libs.xnetworking.basic
-    implementation libs.xnetworking.fearless, withoutBasic
-    implementation libs.xnetworking.sorawallet, withoutBasic
+    implementation libs.xnetworking.lib.android
 
     implementation libs.middle.ellipsis.text
 

common/build.gradle

@@ -63,7 +63,7 @@ abstract class BaseComposeFragment<T : BaseViewModel> : Fragment() {
                     val modalBottomSheetState: ModalBottomSheetState = rememberModalBottomSheetState(
                         initialValue = ModalBottomSheetValue.Hidden,
                         skipHalfExpanded = true,
-                        confirmStateChange = ::hideKeyboardAndConfirm
+                        confirmValueChange = ::hideKeyboardAndConfirm,
                     )
 
                     Background()

common/src/main/java/jp/co/soramitsu/common/base/BaseComposeFragment.kt

@@ -3,6 +3,7 @@ package jp.co.soramitsu.common.compose.component
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
@@ -34,6 +35,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.compose.theme.FearlessTheme
+import jp.co.soramitsu.common.compose.theme.black
 import jp.co.soramitsu.common.compose.theme.black05
 import jp.co.soramitsu.common.compose.theme.black2
 import jp.co.soramitsu.common.compose.theme.colorAccentDark
@@ -110,7 +112,7 @@ fun TextInput(
                 singleLine = true,
                 maxLines = 1,
                 keyboardOptions = KeyboardOptions(
-                    autoCorrect = false,
+                    autoCorrectEnabled = false,
                     keyboardType = when (state.mode) {
                         TextInputViewState.Mode.Text -> KeyboardType.Text
                         TextInputViewState.Mode.Password -> KeyboardType.Password
@@ -119,7 +121,6 @@ fun TextInput(
                 ),
                 visualTransformation = visualTransformation,
                 modifier = Modifier
-                    .background(color = transparent)
                     .onFocusChanged(onFocusChanged)
                     .fillMaxWidth(),
                 cursorBrush = SolidColor(colorAccentDark),
@@ -136,6 +137,9 @@ fun TextInput(
                                 overflow = TextOverflow.Ellipsis
                             )
                         },
+                        colors = TextFieldDefaults.textFieldColors(
+                            backgroundColor = transparent
+                        ),
                         singleLine = false,
                         enabled = true,
                         contentPadding = PaddingValues(),
@@ -166,9 +170,13 @@ private fun TextInputPreview() {
         hint = "Pool name",
         endIcon = R.drawable.ic_close_16_circle
     )
-    FearlessTheme {
-        Column {
-            TextInput(state, onInput = {})
-        }
+    Column(
+        modifier = Modifier
+            .background(black)
+            .padding(6.dp),
+        verticalArrangement = Arrangement.spacedBy(6.dp)
+    ) {
+        TextInput(state, onInput = {})
+        TextInput(state.copy(text = ""), onInput = {})
     }
 }

common/src/main/java/jp/co/soramitsu/common/compose/component/TextInput.kt

@@ -5,11 +5,4 @@ object OptionsProvider {
     var CURRENT_VERSION_NAME: String = ""
     var APPLICATION_ID: String = ""
     var CURRENT_BUILD_TYPE: String = ""
-
-    val header: String by lazy {
-        "$APPLICATION_ID/$CURRENT_VERSION_NAME/$CURRENT_VERSION_CODE/$CURRENT_BUILD_TYPE"
-    }
-
-    const val soraConfigCommon = "https://config.polkaswap2.io/prod/common.json"
-    const val soraConfigMobile = "https://config.polkaswap2.io/prod/mobile.json"
 }