Merge branch 'develop' into mwr-652

app/build.gradle

@@ -140,7 +140,7 @@ play {
     serviceAccountCredentials = file(System.env.CI_PLAY_KEY ?: "../key/fake.json")
     track = "internal"
     releaseStatus = ReleaseStatus.DRAFT
-    releaseName = "3.4.0.4 - Explore Ecosystem"
+    releaseName = "3.4.0.5 - Explore Ecosystem"
 }
 
 dependencies {

app/src/main/java/jp/co/soramitsu/sora/navigation/Navigator.kt

@@ -69,7 +69,7 @@ import jp.co.soramitsu.feature_select_node_api.SelectNodeRouter
 import jp.co.soramitsu.feature_select_node_impl.presentation.nodeAddress
 import jp.co.soramitsu.feature_select_node_impl.presentation.nodeName
 import jp.co.soramitsu.feature_select_node_impl.presentation.pinCodeChecked
-import jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.GetSoraCardFragment
+import jp.co.soramitsu.feature_sora_card_impl.presentation.GetSoraCardFragment
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.sora.R
 

app/src/main/java/jp/co/soramitsu/sora/splash/presentation/SplashActivity.kt

@@ -33,18 +33,12 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.sora.splash.presentation
 
 import android.animation.ValueAnimator
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import com.airbnb.lottie.LottieProperty
-import com.airbnb.lottie.model.KeyPath
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
-import jp.co.soramitsu.common.R
-import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.feature_main_api.launcher.MainStarter
 import jp.co.soramitsu.feature_multiaccount_api.MultiaccountStarter
 import jp.co.soramitsu.sora.databinding.ActivitySplashBinding
@@ -84,27 +78,7 @@ class SplashActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(ActivitySplashBinding.inflate(layoutInflater).also { viewBinding = it }.root)
 
-        val currentPageColorTypedValue = getColorFromAttrs(R.attr.baseBackground)
-
-        viewBinding.animationView.apply {
-            addValueCallback(
-                KeyPath(
-                    LOTTIE_WILDCARD_GLOBSTAR,
-                    WAVE_ANIMATION_RINGS_PATH,
-                    LOTTIE_WILDCARD_GLOBSTAR,
-                ),
-                LottieProperty.COLOR_FILTER
-            ) {
-                PorterDuffColorFilter(
-                    currentPageColorTypedValue.data,
-                    PorterDuff.Mode.MULTIPLY
-                )
-            }
-
-            addAnimatorUpdateListener(
-                animatorUpdateListener
-            )
-        }
+        viewBinding.animationView.addAnimatorUpdateListener(animatorUpdateListener)
 
         splashViewModel.runtimeInitiated.observe(
             this
@@ -142,9 +116,4 @@ class SplashActivity : AppCompatActivity() {
         viewBinding.animationView.removeUpdateListener(animatorUpdateListener)
         splashViewModel.nextScreen()
     }
-
-    private companion object {
-        const val LOTTIE_WILDCARD_GLOBSTAR = "*"
-        const val WAVE_ANIMATION_RINGS_PATH = "Ellipse 1"
-    }
 }

app/src/main/res/navigation/main_nav_graph.xml

@@ -75,7 +75,7 @@
 
     <fragment
         android:id="@+id/soraCardDetailsFragment"
-        android:name="jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.details.SoraCardDetailsFragment" />
+        android:name="jp.co.soramitsu.feature_sora_card_impl.presentation.details.SoraCardDetailsFragment" />
 
     <include app:graph="@navigation/activities_nav_graph" />
     <include app:graph="@navigation/profile_nav_graph" />

build.gradle

@@ -44,7 +44,7 @@ buildscript {
             composeCompiler        : '1.5.3',
             composeConstraintLayout: '1.1.0-alpha05',
             uiCore                 : '0.2.7',
-            soraCard               : '0.1.49',
+            soraCard               : '0.1.55',
             lazySodium             : '5.0.2',
             jna                    : '5.8.0',
             accompanist            : '0.30.1',
@@ -56,11 +56,11 @@ buildscript {
     ]
 
     ext {
-        // soralution 110 3.4.0.4 2023.09.20
+        // soralution 111 3.4.0.5 2023.10.08
         // sora dae 98 3.3.0.0 2023.08.18
 //        appVersionCode = Integer.valueOf(System.env.BUILD_NUMBER ?: 96)
-        appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 110)
-        appVersionName = '3.4.0.4'
+        appVersionCode = Integer.valueOf(System.env.CI_BUILD_ID ?: 111)
+        appVersionName = '3.4.0.5'
 
         compileVersion = 34
         minVersion = 24

common/src/main/java/jp/co/soramitsu/common/domain/Fiat.kt

@@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common.domain
 
 import java.math.BigDecimal
+import jp.co.soramitsu.common.domain.OptionsProvider.nbspace
 import jp.co.soramitsu.common.util.NumbersFormatter
 
 fun formatFiatAmount(
@@ -43,7 +44,7 @@ fun formatFiatAmount(
 ) = "$currencySymbol%s".format(nf.format(value, 2, checkFraction))
 
 fun formatFiatChange(value: Double, nf: NumbersFormatter) =
-    String.format("%s%s %%", if (value >= 0.0001) "+" else "", nf.format(value * 100, 2)).trim()
+    String.format("%s%s$nbspace%%", if (value >= 0.0001) "+" else "", nf.format(value * 100, 2)).trim()
 
 fun List<Asset>.fiatSum(): Double =
     if (isNotEmpty()) map { it.fiat ?: 0.0 }.reduce { acc, d -> acc + d } else 0.0

common/src/main/java/jp/co/soramitsu/common/domain/OptionsProvider.kt

@@ -50,6 +50,8 @@ object OptionsProvider {
     const val defaultScale = 18
     const val nameByteLimit = 32
     const val fiatSymbol = "$"
+    const val nbspace = ' '
+    const val euroSign = '€'
 
     const val website = "https://sora.org"
     const val sourceLink = "https://github.com/sora-xor/Sora-Android"

feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/cardshub/BasicBannerCard.kt → common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/BasicBannerCard.kt

@@ -30,7 +30,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package jp.co.soramitsu.feature_wallet_impl.presentation.cardshub
+package jp.co.soramitsu.common.presentation.compose.components
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image

common/src/main/java/jp/co/soramitsu/common/util/NumbersFormatter.kt

@@ -40,12 +40,12 @@ import java.text.NumberFormat
 import java.util.Currency
 import java.util.Locale
 import jp.co.soramitsu.common.domain.OptionsProvider
+import jp.co.soramitsu.common.domain.OptionsProvider.nbspace
 import kotlin.math.absoluteValue
 import kotlin.math.pow
 
 private const val DECIMAL_PATTERN_BASE = "###,###."
 private const val TWO_DIGITS_PATTERN = "00"
-const val nbspace = ' '
 
 private const val DEFAULT_PRECISION = 2
 

common/src/main/res/values-ar/strings.xml

@@ -39,6 +39,8 @@
   <string name="asset_details_token_price">سعر الرمز المميز</string>
   <string name="asset_details_your_pools">تجمعات %s الخاصة بك</string>
   <string name="asset_to_send">الأصول المراد إرسالها</string>
+  <string name="backup_account_already_exist">Backup already exists. Proceed to rewrite it.</string>
+  <string name="backup_not_enough_space_error">Backup failed. Not enough space on your Google Drive. Free some space and try again.</string>
   <string name="backup_password_mandatory_reqs_fulfilled">Mandatory requirement for the password fulfilled</string>
   <string name="backup_password_requirments">Minimum six characters. Optionally, for better security, include uppercase letters, numbers and non-alphabetic characters.</string>
   <string name="backup_password_title">Setting a password will encrypt your Google backup. You’ll need to enter this when restoring your wallet.\nMinimum password length is 6 characters.</string>
@@ -48,6 +50,7 @@
   <string name="buy_crypto_buy_xor_banner_title">شراء توكن XOR</string>
   <string name="buy_crypto_buy_xor_with_fiat_subtitle">شراء أو بيع توكن XOR باليورو</string>
   <string name="buy_crypto_buy_xor_with_fiat_title">شراء XOR مع فيات</string>
+  <string name="cant_load_balance">Can\'t load balance</string>
   <string name="change_language">تغيير اللغة</string>
   <string name="change_pin">تغيير PIN</string>
   <string name="choose_token">اختر عملة</string>
@@ -172,6 +175,7 @@
   <string name="common_refresh">تحديث</string>
   <string name="common_remove">إزالة</string>
   <string name="common_request">Request</string>
+  <string name="common_rewrite">Rewrite</string>
   <string name="common_russian">الروسية</string>
   <string name="common_scan">مسح ضوئي</string>
   <string name="common_scan_qr">مسح QR</string>
@@ -235,6 +239,7 @@
   <string name="enter_password_incorect_title">Incorrect password</string>
   <string name="enter_password_title">Enter password</string>
   <string name="error_transaction_fee_title">ارصدة غير كافية لرسوم المعاملة</string>
+  <string name="explore_create_pool">Create pool</string>
   <string name="explore_provide_and_earn">Provide liquidity and earn rewards</string>
   <string name="explore_swap_tokens_on_sora">Swap tokens on SORA network</string>
   <string name="export_account_details_backup_description">إذا فقدت الوصول إلى هذا الجهاز ، فستفقد أموالك ، ما لم تقم بعمل نسخة احتياطية!</string>
@@ -515,7 +520,7 @@
   <string name="sora_card_iban_headline">IBAN account details</string>
   <string name="sora_card_log_in_or_sign_up">Log in or Sign up</string>
   <string name="sora_card_no_more_free_tries">لا مزيد من المحاولات المجانية</string>
-  <string name="sora_card_option_logout">Log out SORA Card</string>
+  <string name="sora_card_option_logout">Log out of SORA Card</string>
   <string name="sora_card_option_logout_description">You are about to log out of SORA Card. You will still have access to the SORA Card standalone app, but the balance will no longer be available to you in the SORA Wallet.</string>
   <string name="sora_card_refer_and_earn_action">Refer &amp; Earn</string>
   <string name="sora_card_referral_headline">Refer SORA Card.\nGet €20 bonus. </string>
@@ -536,6 +541,7 @@
   <string name="status_successful">ناجح</string>
   <string name="status_title">الحالة</string>
   <string name="succesfully_imported_account_title">You have succesfully imported an account</string>
+  <string name="support_chat">Support chat</string>
   <string name="swap_confirmation_screen_warning_balance_afterwards_transaction_is_too_small">Ensure that you have %s left after this transaction. Otherwise, you won’t be able to do another transaction.</string>
   <string name="switch_node">Switch node</string>
   <string name="system_appearance">مظهر النظام</string>

common/src/main/res/values-az/strings.xml

@@ -39,6 +39,8 @@
   <string name="asset_details_token_price">Token price</string>
   <string name="asset_details_your_pools">Your %s pools</string>
   <string name="asset_to_send">Asset to send</string>
+  <string name="backup_account_already_exist">Yedək artıq mövcuddur. Yenidən yazmağa davam edin.</string>
+  <string name="backup_not_enough_space_error">Yedəkləmə alınmadı. Google Diskinizdə kifayət qədər yer yoxdur. Bir az yer boşaltın və yenidən cəhd edin.</string>
   <string name="backup_password_mandatory_reqs_fulfilled">Parol üçün məcburi tələb yerinə yetirildi</string>
   <string name="backup_password_requirments">Minimum altı simvol. İsteğe bağlı olaraq, daha yaxşı təhlükəsizlik üçün böyük hərflər, rəqəmlər və qeyri-əlifba simvolları daxil edin.</string>
   <string name="backup_password_title">Parolun təyin edilməsi Google ehtiyat nüsxənizi şifrələyəcək. Pul kisəsini bərpa edərkən bunu daxil etməlisiniz.\n Minimum parol uzunluğu 6 simvoldur.</string>
@@ -48,6 +50,7 @@
   <string name="buy_crypto_buy_xor_banner_title">Buy XOR token</string>
   <string name="buy_crypto_buy_xor_with_fiat_subtitle">Buy or sell XOR token with euro</string>
   <string name="buy_crypto_buy_xor_with_fiat_title">Buy XOR with fiat</string>
+  <string name="cant_load_balance">Balansı yükləmək mümkün deyil</string>
   <string name="change_language">Change language</string>
   <string name="change_pin">Change PIN</string>
   <string name="choose_token">Token seçin</string>
@@ -168,6 +171,7 @@
   <string name="common_refresh">Refresh</string>
   <string name="common_remove">Sil</string>
   <string name="common_request">Request</string>
+  <string name="common_rewrite">Yenidən yazmaq</string>
   <string name="common_russian">Rus dili</string>
   <string name="common_scan">Tara</string>
   <string name="common_scan_qr">Scan QR</string>
@@ -231,6 +235,7 @@
   <string name="enter_password_incorect_title">Incorrect password</string>
   <string name="enter_password_title">Enter password</string>
   <string name="error_transaction_fee_title">Əməliyyat haqqı üçün kifayət qədər vəsait yoxdur</string>
+  <string name="explore_create_pool">Hovuz yaradın</string>
   <string name="explore_provide_and_earn">Likvidliyi təmin edin və mükafatlar qazanın</string>
   <string name="explore_swap_tokens_on_sora">SORA şəbəkəsində tokenləri dəyişdirin</string>
   <string name="export_account_details_backup_description">If you loose access to this device, your funds will be lost, unless you back up!</string>
@@ -512,6 +517,7 @@
   <string name="status_successful">Successful</string>
   <string name="status_title">Status</string>
   <string name="succesfully_imported_account_title">You have succesfully imported an account</string>
+  <string name="support_chat">Dəstək söhbəti</string>
   <string name="swap_confirmation_screen_warning_balance_afterwards_transaction_is_too_small">Bu əməliyyatdan sonra %s qaldığınıza əmin olun. Əks halda, başqa sövdələşmə edə bilməyəcəksiniz.</string>
   <string name="switch_node">Switch node</string>
   <string name="system_appearance">System appearance</string>

common/src/main/res/values-de/strings.xml

@@ -39,6 +39,8 @@
   <string name="asset_details_token_price">Token price</string>
   <string name="asset_details_your_pools">Your %s pools</string>
   <string name="asset_to_send">Asset to send</string>
+  <string name="backup_account_already_exist">Backup already exists. Proceed to rewrite it.</string>
+  <string name="backup_not_enough_space_error">Backup failed. Not enough space on your Google Drive. Free some space and try again.</string>
   <string name="backup_password_mandatory_reqs_fulfilled">Mandatory requirement for the password fulfilled</string>
   <string name="backup_password_requirments">Minimum six characters. Optionally, for better security, include uppercase letters, numbers and non-alphabetic characters.</string>
   <string name="backup_password_title">Setting a password will encrypt your Google backup. You’ll need to enter this when restoring your wallet.\nMinimum password length is 6 characters.</string>
@@ -48,6 +50,7 @@
   <string name="buy_crypto_buy_xor_banner_title">Buy XOR token</string>
   <string name="buy_crypto_buy_xor_with_fiat_subtitle">Buy or sell XOR token with euro</string>
   <string name="buy_crypto_buy_xor_with_fiat_title">Buy XOR with fiat</string>
+  <string name="cant_load_balance">Can\'t load balance</string>
   <string name="change_language">Change language</string>
   <string name="change_pin">Change PIN</string>
   <string name="choose_token">Token\nauswählen</string>
@@ -168,6 +171,7 @@
   <string name="common_refresh">Refresh</string>
   <string name="common_remove">Entfernen</string>
   <string name="common_request">Request</string>
+  <string name="common_rewrite">Rewrite</string>
   <string name="common_russian">Russisch</string>
   <string name="common_scan">Scan</string>
   <string name="common_scan_qr">Scan QR</string>
@@ -231,6 +235,7 @@
   <string name="enter_password_incorect_title">Incorrect password</string>
   <string name="enter_password_title">Enter password</string>
   <string name="error_transaction_fee_title">Nicht genügend Guthaben für die Transaktionsgebühr</string>
+  <string name="explore_create_pool">Create pool</string>
   <string name="explore_provide_and_earn">Provide liquidity and earn rewards</string>
   <string name="explore_swap_tokens_on_sora">Swap tokens on SORA network</string>
   <string name="export_account_details_backup_description">Wenn du den Zugang zu diesem Gerät verlierst, gehen deine Assets verloren, es sei denn, du machst ein Backup!</string>
@@ -491,7 +496,7 @@
   <string name="sora_card_iban_headline">IBAN account details</string>
   <string name="sora_card_log_in_or_sign_up">Log in or Sign up</string>
   <string name="sora_card_no_more_free_tries">No more free attempts</string>
-  <string name="sora_card_option_logout">Log out SORA Card</string>
+  <string name="sora_card_option_logout">Log out of SORA Card</string>
   <string name="sora_card_option_logout_description">You are about to log out of SORA Card. You will still have access to the SORA Card standalone app, but the balance will no longer be available to you in the SORA Wallet.</string>
   <string name="sora_card_refer_and_earn_action">Refer &amp; Earn</string>
   <string name="sora_card_referral_headline">Refer SORA Card.\nGet €20 bonus. </string>
@@ -512,6 +517,7 @@
   <string name="status_successful">Successful</string>
   <string name="status_title">Status</string>
   <string name="succesfully_imported_account_title">You have succesfully imported an account</string>
+  <string name="support_chat">Support chat</string>
   <string name="swap_confirmation_screen_warning_balance_afterwards_transaction_is_too_small">Ensure that you have %s left after this transaction. Otherwise, you won’t be able to do another transaction.</string>
   <string name="switch_node">Switch node</string>
   <string name="system_appearance">System appearance</string>