Merge pull request #418 from sora-xor/version_up

version up

app/build.gradle.kts

@@ -241,7 +241,6 @@ dependencies {
     kover(project(":common"))
     kover(project(":common_wallet"))
     kover(project(":core_db"))
-    kover(project(":core_di"))
     kover(project(":demeter"))
     kover(project(":feature_account_api"))
     kover(project(":feature_account_impl"))

app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt

@@ -41,10 +41,10 @@ import coil.decode.SvgDecoder
 import com.google.firebase.FirebaseApp
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
+import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common.io.FileManager
-import jp.co.soramitsu.common.resourses.ResourceManager
 import jp.co.soramitsu.common.util.BuildType
 import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.Flavor

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

@@ -102,10 +102,6 @@ class SplashActivity : AppCompatActivity() {
         splashViewModel.showOnBoardingScreen.observe(this) {
             multiaccStarter.startOnboardingFlow(this)
         }
-        splashViewModel.showOnBoardingScreenViaInviteLink.observe(this) {
-            multiaccStarter.startOnboardingFlowWithInviteLink(this)
-            finish()
-        }
         splashViewModel.showMainScreenFromInviteLink.observe(this) {
             mainStarter.startWithInvite(this)
             finish()

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

@@ -37,9 +37,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
+import jp.co.soramitsu.androidfoundation.fragment.SingleLiveEvent
+import jp.co.soramitsu.androidfoundation.fragment.trigger
 import jp.co.soramitsu.common.logger.FirebaseWrapper
-import jp.co.soramitsu.common.presentation.SingleLiveEvent
-import jp.co.soramitsu.common.presentation.trigger
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.feature_account_api.domain.model.OnboardingState
 import jp.co.soramitsu.sora.splash.domain.SplashInteractor
@@ -58,7 +58,6 @@ class SplashViewModel @Inject constructor(
 
     val showMainScreen = SingleLiveEvent<Unit>()
     val showOnBoardingScreen = SingleLiveEvent<OnboardingState>()
-    val showOnBoardingScreenViaInviteLink = SingleLiveEvent<Unit>()
     val showMainScreenFromInviteLink = SingleLiveEvent<Unit>()
 
     init {
@@ -93,17 +92,4 @@ class SplashViewModel @Inject constructor(
             }
         }
     }
-
-    fun handleDeepLink(invitationCode: String) {
-        viewModelScope.launch {
-            val state = interactor.getRegistrationState()
-            interactor.saveInviteCode(invitationCode)
-
-            if (OnboardingState.INITIAL == state) {
-                showOnBoardingScreenViaInviteLink.trigger()
-            } else {
-                showMainScreenFromInviteLink.trigger()
-            }
-        }
-    }
 }

app/src/test/java/jp/co/soramitsu/sora/splash/presentation/SplashViewModelTest.kt

@@ -52,7 +52,6 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 import org.mockito.BDDMockito.given
 import org.mockito.Mock
-import org.mockito.Mockito.verify
 import org.mockito.junit.MockitoJUnitRunner
 
 @ExperimentalCoroutinesApi
@@ -100,32 +99,4 @@ class SplashViewModelTest {
         val r = splashViewModel.showOnBoardingScreen.getOrAwaitValue()
         assertEquals(OnboardingState.INITIAL, r)
     }
-
-    @Test
-    fun `handleDeepLink before registration called`() = runTest {
-        val state = OnboardingState.INITIAL
-        val invitationCode = "INVITATION_CODE"
-
-        given(interactor.getRegistrationState()).willReturn(state)
-
-        splashViewModel.handleDeepLink(invitationCode)
-        advanceUntilIdle()
-        verify(interactor).saveInviteCode(invitationCode)
-        val r = splashViewModel.showOnBoardingScreenViaInviteLink.getOrAwaitValue()
-        assertEquals(Unit, r)
-    }
-
-    @Test
-    fun `handleDeepLink after registration called`() = runTest {
-        val state = OnboardingState.REGISTRATION_FINISHED
-        val invitationCode = "INVITATION_CODE"
-
-        given(interactor.getRegistrationState()).willReturn(state)
-
-        splashViewModel.handleDeepLink(invitationCode)
-        advanceUntilIdle()
-        verify(interactor).saveInviteCode(invitationCode)
-        val r = splashViewModel.showMainScreenFromInviteLink.getOrAwaitValue()
-        assertEquals(Unit, r)
-    }
 }

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
     alias(libs.plugins.firebaseCrashlyticsPlugin) apply false
     alias(libs.plugins.firebaseAppDistributionPlugin) apply false
     alias(libs.plugins.triplet) apply false
-    id("com.google.devtools.ksp") version "1.9.22-1.0.17" apply false
+    id("com.google.devtools.ksp") version "1.9.24-1.0.20" apply false
     id("org.jetbrains.kotlinx.kover") version "0.7.5"
 }
 

common/build.gradle.kts

@@ -38,7 +38,7 @@ android {
     compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
+        minSdk = 26
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -50,7 +50,7 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = true
+            isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

common/src/main/java/jp/co/soramitsu/common/account/AccountAvatarGenerator.kt

@@ -36,7 +36,7 @@ import android.graphics.drawable.PictureDrawable
 import com.caverock.androidsvg.SVG
 import javax.inject.Singleton
 import jdenticon.Jdenticon
-import jp.co.soramitsu.common.resourses.ResourceManager
+import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.xcrypto.util.toHexString
 import jp.co.soramitsu.xsubstrate.ss58.SS58Encoder.toAccountId
 

common/src/main/java/jp/co/soramitsu/common/date/DateTimeFormatter.kt

@@ -38,9 +38,9 @@ import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.concurrent.TimeUnit
+import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.resourses.LanguagesHolder
-import jp.co.soramitsu.common.resourses.ResourceManager
 
 class DateTimeFormatter(
     private val languagesHolder: LanguagesHolder,

common/src/main/java/jp/co/soramitsu/common/di/modules/CommonModule.kt

@@ -53,6 +53,7 @@ import java.util.Locale
 import java.util.TimeZone
 import javax.inject.Singleton
 import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
+import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.BuildConfig
 import jp.co.soramitsu.common.account.AccountAvatarGenerator
 import jp.co.soramitsu.common.data.AppStateProviderImpl
@@ -71,7 +72,6 @@ import jp.co.soramitsu.common.interfaces.WithProgress
 import jp.co.soramitsu.common.io.FileManager
 import jp.co.soramitsu.common.io.FileManagerImpl
 import jp.co.soramitsu.common.resourses.LanguagesHolder
-import jp.co.soramitsu.common.resourses.ResourceManager
 import jp.co.soramitsu.common.util.CryptoAssistant
 import jp.co.soramitsu.common.util.DeviceParamsProvider
 import jp.co.soramitsu.common.util.EncryptionUtil

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

@@ -32,8 +32,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.common.domain
 
+import jp.co.soramitsu.androidfoundation.resource.ResourceManager
 import jp.co.soramitsu.common.R
-import jp.co.soramitsu.common.resourses.ResourceManager
 
 class SoraException(
     val kind: Kind,

common/src/main/java/jp/co/soramitsu/common/presentation/viewmodel/BaseViewModel.kt

@@ -36,13 +36,13 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.navigation.NavOptionsBuilder
+import jp.co.soramitsu.androidfoundation.fragment.SingleLiveEvent
+import jp.co.soramitsu.androidfoundation.fragment.trigger
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.base.theOnlyRoute
 import jp.co.soramitsu.common.domain.SoraException
 import jp.co.soramitsu.common.logger.FirebaseWrapper
-import jp.co.soramitsu.common.presentation.SingleLiveEvent
 import jp.co.soramitsu.common.presentation.compose.SnackBarState
-import jp.co.soramitsu.common.presentation.trigger
 import jp.co.soramitsu.ui_core.component.toolbar.Action
 import jp.co.soramitsu.ui_core.component.toolbar.SoramitsuToolbarState