Merge pull request #905 from soramitsu/staging

staging

Author: PankraSerg

.editorconfig

@@ -6,4 +6,7 @@ root = true
 max_line_length = 160
 insert_final_newline = true
 indent_size = 4
-ktlint_disabled_rules = import-ordering,package-name
+ij_kotlin_packages_to_use_import_on_demand = unset
+ktlint_standard_import-ordering = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_indent = disabled

README.md

@@ -18,12 +18,44 @@ Track features development: [board link](https://soramitsucoltd.aha.io/shared/34
 
 To build Fearless Wallet Android project, you need to provide several keys either in enviroment variables or in `local.properties` file:
 
-``` properties
+### Moonpay properties
+``` 
 MOONPAY_TEST_SECRET=stub
 MOONPAY_PRODUCTION_SECRET=stub
 ```
-
 Note, that with stub keys buy via moonpay will not work correctly. However, other parts of application will not be affected.
 
+### Sora CARD SDK
+
+For starting Sora CARD SDK initial data have to be provided via gradle properties due to security purpose.
+
+````
+// PayWings repo credentials properties for getting artifacts
+PAY_WINGS_REPOSITORY_URL
+PAY_WINGS_USERNAME
+PAY_WINGS_PASSWORD
+
+// Sora CARD API key
+SORA_CARD_API_KEY
+SORA_CARD_DOMAIN
+
+// Sora CARD KYC credentials
+SORA_CARD_KYC_ENDPOINT_URL
+SORA_CARD_KYC_USERNAME
+SORA_CARD_KYC_PASSWORD
+````
+
+### X1 plugin
+
+X1 is a plugin which is embedded into webView. It requires url and id for launching.
+
+````
+X1_ENDPOINT_URL_RELEASE
+X1_WIDGET_ID_RELEASE
+
+X1_ENDPOINT_URL_DEBUG
+X1_WIDGET_ID_DEBUG
+````
+
 ## License
 Fearless Wallet Android is available under the Apache 2.0 license. See the LICENSE file for more info.

app/build.gradle

@@ -30,6 +30,8 @@ android {
     }
     buildTypes {
         debug {
+            minifyEnabled minifyRelease
+            proguardFiles 'proguard-rules.pro'
             applicationIdSuffix '.debug'
             versionNameSuffix '-debug'
         }
@@ -105,8 +107,8 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion composeCompilerVersion
     }
-    lintOptions {
-        disable "Instantiatable"
+    lint {
+        disable 'Instantiatable'
     }
     namespace 'jp.co.soramitsu.app'
 }
@@ -146,6 +148,9 @@ dependencies {
     implementation project(':feature-success-api')
     implementation project(':feature-success-impl')
 
+    implementation project(':feature-soracard-api')
+    implementation project(':feature-soracard-impl')
+
     implementation kotlinDep
 
     implementation androidDep
@@ -158,8 +163,6 @@ dependencies {
 
     implementation roomDep
 
-    implementation fearlessLibDep
-
     implementation daggerDep
     kapt daggerKapt
 

app/proguard-rules.pro

@@ -1,7 +1,7 @@
 ## General
 #-keep class ** { *; }
 #-dontobfuscate
--keep class jp.co.soramitsu.fearless_utils.** { *; }
+-keep class jp.co.soramitsu.shared_utils.** { *; }
 -keep class jp.co.soramitsu.runtime.** { *; }
 
 -keep class jp.co.soramitsu.wallet.impl.data.** { *; }

app/src/main/AndroidManifest.xml

@@ -9,21 +9,23 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        tools:replace="android:allowBackup"
         android:name="jp.co.soramitsu.app.App"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+        android:largeHeap="true"
+        tools:replace="android:allowBackup">
 
         <activity android:name="jp.co.soramitsu.common.qrScanner.QrScannerActivity" />
 
         <activity
             android:name="jp.co.soramitsu.app.root.presentation.RootActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Soramitsu.Fearless"
-            android:launchMode="singleTask"
+            android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter tools:ignore="AppLinkUrlError">
@@ -62,7 +64,8 @@
             android:exported="false">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
+                android:resource="@xml/provider_paths"
+                tools:replace="android:resource" />
         </provider>
 
     </application>

app/src/main/java/jp/co/soramitsu/app/App.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import dagger.hilt.android.HiltAndroidApp
+import jp.co.soramitsu.common.data.network.OptionsProvider
 import jp.co.soramitsu.common.resources.ContextManager
 import jp.co.soramitsu.common.resources.LanguagesHolder
 
@@ -22,4 +23,13 @@ open class App : Application() {
         val contextManager = ContextManager.getInstanceOrInit(this, languagesHolder)
         contextManager.setLocale(this)
     }
+
+    override fun onCreate() {
+        super.onCreate()
+
+        OptionsProvider.APPLICATION_ID = BuildConfig.APPLICATION_ID
+        OptionsProvider.CURRENT_VERSION_CODE = BuildConfig.VERSION_CODE
+        OptionsProvider.CURRENT_VERSION_NAME = BuildConfig.VERSION_NAME
+        OptionsProvider.CURRENT_BUILD_TYPE = BuildConfig.BUILD_TYPE
+    }
 }

app/src/main/java/jp/co/soramitsu/app/di/app/NavigationModule.kt

@@ -4,16 +4,17 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import jp.co.soramitsu.app.root.navigation.Navigator
+import javax.inject.Singleton
 import jp.co.soramitsu.account.impl.presentation.AccountRouter
+import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.crowdloan.impl.presentation.CrowdloanRouter
 import jp.co.soramitsu.onboarding.impl.OnboardingRouter
 import jp.co.soramitsu.polkaswap.api.presentation.PolkaswapRouter
-import jp.co.soramitsu.staking.impl.presentation.StakingRouter
-import jp.co.soramitsu.wallet.impl.presentation.WalletRouter
+import jp.co.soramitsu.soracard.api.presentation.SoraCardRouter
 import jp.co.soramitsu.splash.SplashRouter
+import jp.co.soramitsu.staking.impl.presentation.StakingRouter
 import jp.co.soramitsu.success.presentation.SuccessRouter
-import javax.inject.Singleton
+import jp.co.soramitsu.wallet.impl.presentation.WalletRouter
 
 @InstallIn(SingletonComponent::class)
 @Module
@@ -54,4 +55,8 @@ class NavigationModule {
     @Singleton
     @Provides
     fun provideCrowdloanRouter(navigator: Navigator): CrowdloanRouter = navigator
+
+    @Singleton
+    @Provides
+    fun provideSoraCardRouter(navigator: Navigator): SoraCardRouter = navigator
 }

app/src/main/java/jp/co/soramitsu/app/root/domain/RootInteractor.kt

@@ -2,10 +2,11 @@ package jp.co.soramitsu.app.root.domain
 
 import jp.co.soramitsu.common.data.storage.Preferences
 import jp.co.soramitsu.common.domain.model.toDomain
+import jp.co.soramitsu.common.utils.inBackground
 import jp.co.soramitsu.core.updater.UpdateSystem
 import jp.co.soramitsu.core.updater.Updater
-import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletRepository
 import jp.co.soramitsu.wallet.impl.data.buyToken.ExternalProvider
+import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
@@ -15,7 +16,7 @@ class RootInteractor(
     private val preferences: Preferences
 ) {
 
-    fun runBalancesUpdate(): Flow<Updater.SideEffect> = updateSystem.start()
+    fun runBalancesUpdate(): Flow<Updater.SideEffect> = updateSystem.start().inBackground()
 
     fun isBuyProviderRedirectLink(link: String) = ExternalProvider.REDIRECT_URL_BASE in link