Merge remote-tracking branch 'origin/develop' into SN-2813/cut-and-pa…

…ste-problems-fix

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

@@ -37,7 +37,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
-import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter
+import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
 import jp.co.soramitsu.feature_main_api.launcher.MainRouter
 import jp.co.soramitsu.feature_polkaswap_api.launcher.PolkaswapRouter
 import jp.co.soramitsu.feature_referral_api.ReferralRouter

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

@@ -51,7 +51,7 @@ import jp.co.soramitsu.common.presentation.compose.webview.title
 import jp.co.soramitsu.common.presentation.compose.webview.url
 import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.StringPair
-import jp.co.soramitsu.feature_assets_api.presentation.launcher.AssetsRouter
+import jp.co.soramitsu.feature_assets_api.presentation.AssetsRouter
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.assetdetails.AssetDetailsFragment
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.receiverequest.QRCodeFlowFragment
 import jp.co.soramitsu.feature_assets_impl.presentation.screens.send.TransferAmountFragment
@@ -73,7 +73,13 @@ import jp.co.soramitsu.feature_sora_card_impl.presentation.get.card.GetSoraCardF
 import jp.co.soramitsu.feature_wallet_api.launcher.WalletRouter
 import jp.co.soramitsu.sora.R
 
-class Navigator : MainRouter, WalletRouter, ReferralRouter, SelectNodeRouter, PolkaswapRouter, AssetsRouter {
+class Navigator :
+    MainRouter,
+    WalletRouter,
+    ReferralRouter,
+    SelectNodeRouter,
+    PolkaswapRouter,
+    AssetsRouter {
 
     private var navController: NavController? = null
 

common/build.gradle

@@ -114,6 +114,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(":android-foundation")
     implementation project(":soracrypro")
 
     implementation activityKtxDep

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

@@ -33,10 +33,12 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.common.base
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ScrollState
@@ -70,6 +72,7 @@ import jp.co.soramitsu.common.presentation.compose.components.AlertDialogContent
 import jp.co.soramitsu.common.presentation.compose.components.Toolbar
 import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
+import jp.co.soramitsu.common.util.BuildUtils
 import jp.co.soramitsu.common.util.DebounceClickHandler
 import jp.co.soramitsu.common.util.ext.safeCast
 import jp.co.soramitsu.ui_core.theme.customColors
@@ -90,6 +93,15 @@ abstract class SoraBaseFragment<T : BaseViewModel> : Fragment() {
         activity?.safeCast<BarsColorhandler>()?.setColor(backgroundColor())
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (BuildUtils.sdkAtLeast(Build.VERSION_CODES.TIRAMISU).not()) {
+            viewModel.copiedToast.observe {
+                Toast.makeText(requireActivity(), R.string.common_copied, Toast.LENGTH_SHORT).show()
+            }
+        }
+    }
+
     @SuppressLint("UnusedMaterialScaffoldPaddingParameter")
     override fun onCreateView(
         inflater: LayoutInflater,

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

@@ -32,6 +32,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package jp.co.soramitsu.common.di.modules
 
+import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.Color
 import android.os.Build
@@ -51,6 +52,7 @@ import java.security.SecureRandom
 import java.util.Locale
 import java.util.TimeZone
 import javax.inject.Singleton
+import jp.co.soramitsu.androidfoundation.phone.BasicClipboardManager
 import jp.co.soramitsu.backup.BackupService
 import jp.co.soramitsu.common.BuildConfig
 import jp.co.soramitsu.common.account.AccountAvatarGenerator
@@ -69,7 +71,6 @@ import jp.co.soramitsu.common.inappupdate.InAppUpdateManager
 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.ClipboardManager
 import jp.co.soramitsu.common.resourses.LanguagesHolder
 import jp.co.soramitsu.common.resourses.ResourceManager
 import jp.co.soramitsu.common.util.CryptoAssistant
@@ -293,8 +294,8 @@ class CommonModule {
 
     @Provides
     @Singleton
-    fun provideClipBoardManager(@ApplicationContext context: Context): ClipboardManager {
-        return ClipboardManager(context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager)
+    fun provideClipBoardManager(@ApplicationContext context: Context): BasicClipboardManager {
+        return BasicClipboardManager(context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager)
     }
 
     @Provides

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

@@ -52,6 +52,7 @@ open class BaseViewModel : ViewModel() {
     val errorFromResourceLiveData = SingleLiveEvent<Pair<Int, Int>>()
     val alertDialogLiveData = SingleLiveEvent<Pair<String, String>>()
     val snackBarLiveData = SingleLiveEvent<SnackBarState>()
+    val copiedToast = SingleLiveEvent<Unit>()
 
     protected val _toolbarState = MutableLiveData<SoramitsuToolbarState>()
     val toolbarState: LiveData<SoramitsuToolbarState> = _toolbarState

demeter/src/main/java/jp/co/soramitsu/demeter/data/DemeterFarmingRepository.kt

@@ -40,7 +40,6 @@ import jp.co.soramitsu.common_wallet.data.AssetLocalToAssetMapper
 import jp.co.soramitsu.core_db.AppDatabase
 import jp.co.soramitsu.demeter.domain.DemeterFarmingPool
 import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager
-import jp.co.soramitsu.shared_utils.extensions.toHexString
 import jp.co.soramitsu.shared_utils.runtime.definitions.types.composite.Struct
 import jp.co.soramitsu.shared_utils.runtime.definitions.types.fromHex
 import jp.co.soramitsu.shared_utils.runtime.metadata.module
@@ -50,6 +49,7 @@ import jp.co.soramitsu.shared_utils.ss58.SS58Encoder.toAccountId
 import jp.co.soramitsu.sora.substrate.runtime.Pallete
 import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager
 import jp.co.soramitsu.sora.substrate.runtime.Storage
+import jp.co.soramitsu.sora.substrate.runtime.mapToToken
 import jp.co.soramitsu.sora.substrate.substrate.SubstrateCalls
 
 interface DemeterFarmingRepository {
@@ -123,18 +123,9 @@ internal class DemeterFarmingRepositoryImpl(
                 ?.safeCast<List<*>>()
                 ?.filterIsInstance<Struct.Instance>()
                 ?.mapNotNull { instance ->
-                    val baseToken = instance.get<Struct.Instance>("baseAsset")
-                        ?.get<List<*>>("code")?.map {
-                            (it as BigInteger).toByte()
-                        }?.toByteArray()?.toHexString(true)
-                    val poolToken = instance.get<Struct.Instance>("poolAsset")
-                        ?.get<List<*>>("code")?.map {
-                            (it as BigInteger).toByte()
-                        }?.toByteArray()?.toHexString(true)
-                    val rewardToken = instance.get<Struct.Instance>("rewardAsset")
-                        ?.get<List<*>>("code")?.map {
-                            (it as BigInteger).toByte()
-                        }?.toByteArray()?.toHexString(true)
+                    val baseToken = instance.mapToToken("baseAsset")
+                    val poolToken = instance.mapToToken("poolAsset")
+                    val rewardToken = instance.mapToToken("rewardAsset")
                     val isFarm = instance.get<Boolean>("isFarm")
                     val pooled = instance.get<BigInteger>("pooledTokens")
                     if (isFarm != null && baseToken != null && poolToken != null && rewardToken != null && pooled != null) {

feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/interfaces/AssetsRepository.kt → feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/data/AssetsRepository.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_assets_api.data.interfaces
+package jp.co.soramitsu.feature_assets_api.data
 
 import java.math.BigDecimal
 import jp.co.soramitsu.common.account.SoraAccount

feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/AssetsInteractor.kt → feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/AssetsInteractor.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_assets_api.domain.interfaces
+package jp.co.soramitsu.feature_assets_api.domain
 
 import java.math.BigDecimal
 import jp.co.soramitsu.common.account.SoraAccount

feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/interfaces/QrCodeInteractor.kt → feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/domain/QrCodeInteractor.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_assets_api.domain.interfaces
+package jp.co.soramitsu.feature_assets_api.domain
 
 interface QrCodeInteractor {
 

feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/launcher/AssetsRouter.kt → feature_assets_api/src/main/java/jp/co/soramitsu/feature_assets_api/presentation/AssetsRouter.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_assets_api.presentation.launcher
+package jp.co.soramitsu.feature_assets_api.presentation
 
 interface AssetsRouter {
 

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/data/AssetsRepositoryImpl.kt

@@ -55,7 +55,7 @@ import jp.co.soramitsu.core_db.AppDatabase
 import jp.co.soramitsu.core_db.model.AssetLocal
 import jp.co.soramitsu.core_db.model.AssetTokenWithFiatLocal
 import jp.co.soramitsu.core_db.model.TokenLocal
-import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository
+import jp.co.soramitsu.feature_assets_api.data.AssetsRepository
 import jp.co.soramitsu.feature_blockexplorer_api.data.SoraConfigManager
 import jp.co.soramitsu.shared_utils.encrypt.keypair.substrate.Sr25519Keypair
 import jp.co.soramitsu.sora.substrate.models.ExtrinsicSubmitStatus

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/di/AssetsFeatureModule.kt

@@ -40,9 +40,9 @@ import javax.inject.Singleton
 import jp.co.soramitsu.common.domain.CoroutineManager
 import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository
 import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository
-import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository
-import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor
-import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor
+import jp.co.soramitsu.feature_assets_api.data.AssetsRepository
+import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor
+import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor
 import jp.co.soramitsu.feature_assets_impl.data.AssetsRepositoryImpl
 import jp.co.soramitsu.feature_assets_impl.domain.AssetsInteractorImpl
 import jp.co.soramitsu.feature_assets_impl.domain.QrCodeInteractorImpl

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/AssetsInteractorImpl.kt

@@ -46,8 +46,8 @@ import jp.co.soramitsu.common.util.ext.orZero
 import jp.co.soramitsu.common_wallet.data.XorAssetBalance
 import jp.co.soramitsu.feature_account_api.domain.interfaces.CredentialsRepository
 import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository
-import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository
-import jp.co.soramitsu.feature_assets_api.domain.interfaces.AssetsInteractor
+import jp.co.soramitsu.feature_assets_api.data.AssetsRepository
+import jp.co.soramitsu.feature_assets_api.domain.AssetsInteractor
 import jp.co.soramitsu.feature_blockexplorer_api.data.TransactionHistoryRepository
 import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionBuilder
 import jp.co.soramitsu.feature_blockexplorer_api.presentation.txhistory.TransactionStatus

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/domain/QrCodeInteractorImpl.kt

@@ -37,8 +37,8 @@ import javax.inject.Inject
 import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common_wallet.domain.model.QrException
 import jp.co.soramitsu.feature_account_api.domain.interfaces.UserRepository
-import jp.co.soramitsu.feature_assets_api.data.interfaces.AssetsRepository
-import jp.co.soramitsu.feature_assets_api.domain.interfaces.QrCodeInteractor
+import jp.co.soramitsu.feature_assets_api.data.AssetsRepository
+import jp.co.soramitsu.feature_assets_api.domain.QrCodeInteractor
 import jp.co.soramitsu.sora.substrate.runtime.RuntimeManager
 import jp.co.soramitsu.sora.substrate.runtime.SubstrateOptionsProvider
 

feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/screens/assetdetails/AssetDetailsFragment.kt

@@ -34,7 +34,6 @@ package jp.co.soramitsu.feature_assets_impl.presentation.screens.assetdetails
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Box
@@ -56,7 +55,6 @@ import androidx.navigation.NavHostController
 import com.google.accompanist.navigation.animation.composable
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
-import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.base.SoraBaseFragment
 import jp.co.soramitsu.common.base.theOnlyRoute
 import jp.co.soramitsu.common.domain.BottomBarController
@@ -174,11 +172,7 @@ class AssetDetailsFragment : SoraBaseFragment<AssetDetailsViewModel>() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        (activity as BottomBarController).hideBottomBar()
-        viewModel.copyEvent.observe {
-            Toast.makeText(requireActivity(), R.string.common_copied, Toast.LENGTH_SHORT).show()
-        }
-
         super.onViewCreated(view, savedInstanceState)
+        (activity as BottomBarController).hideBottomBar()
     }
 }