Merge pull request #383 from soramitsu/rc/1.9.4

Rc/1.9.4

Author: valentunn

README.md

@@ -21,12 +21,9 @@ To build Fearless Wallet Android project, you need to provide several keys eithe
 ``` properties
 MOONPAY_TEST_SECRET=stub
 MOONPAY_PRODUCTION_SECRET=stub
-SUBSCAN_API_KEY=
 ```
 
 Note, that with stub keys buy via moonpay will not work correctly. However, other parts of application will not be affected.
 
-If you will leave SUBSCAN_API_KEY value empty, you will have very strict limits for the subscan api requests. If you want to increase the limits, check the [Subscan website](https://docs.api.subscan.io/#introduction) and then add the api key to the 'local.properties' -> SUBSCAN_API_KEY=YOUR_API_KEY
-
 ## License
 Fearless Wallet Android is available under the Apache 2.0 license. See the LICENSE file for more info.

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

@@ -65,11 +65,13 @@ import jp.co.soramitsu.feature_staking_impl.presentation.validators.parcel.Valid
 import jp.co.soramitsu.feature_wallet_api.domain.model.Token
 import jp.co.soramitsu.feature_wallet_impl.presentation.WalletRouter
 import jp.co.soramitsu.feature_wallet_impl.presentation.balance.detail.BalanceDetailFragment
-import jp.co.soramitsu.feature_wallet_impl.presentation.model.TransactionModel
+import jp.co.soramitsu.feature_wallet_impl.presentation.model.OperationParcelizeModel
 import jp.co.soramitsu.feature_wallet_impl.presentation.send.TransferDraft
 import jp.co.soramitsu.feature_wallet_impl.presentation.send.amount.ChooseAmountFragment
 import jp.co.soramitsu.feature_wallet_impl.presentation.send.confirm.ConfirmTransferFragment
-import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.TransactionDetailFragment
+import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.extrinsic.ExtrinsicDetailFragment
+import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.reward.RewardDetailFragment
+import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.transfer.TransferDetailFragment
 import jp.co.soramitsu.splash.SplashRouter
 import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.flow.Flow
@@ -345,6 +347,10 @@ class Navigator :
         navController?.navigate(R.id.action_open_send)
     }
 
+    override fun openFilter() {
+        navController?.navigate(R.id.action_mainFragment_to_filterFragment)
+    }
+
     override fun openChooseAmount(recipientAddress: String) {
         val bundle = ChooseAmountFragment.getBundle(recipientAddress)
 
@@ -367,10 +373,22 @@ class Navigator :
         navController?.navigate(R.id.openSelectAmount, bundle)
     }
 
-    override fun openTransactionDetail(transaction: TransactionModel) {
-        val bundle = TransactionDetailFragment.getBundle(transaction)
+    override fun openTransferDetail(transaction: OperationParcelizeModel.Transfer) {
+        val bundle = TransferDetailFragment.getBundle(transaction)
+
+        navController?.navigate(R.id.open_transfer_detail, bundle)
+    }
+
+    override fun openRewardDetail(reward: OperationParcelizeModel.Reward) {
+        val bundle = RewardDetailFragment.getBundle(reward)
+
+        navController?.navigate(R.id.open_reward_detail, bundle)
+    }
+
+    override fun openExtrinsicDetail(extrinsic: OperationParcelizeModel.Extrinsic) {
+        val bundle = ExtrinsicDetailFragment.getBundle(extrinsic)
 
-        navController?.navigate(R.id.open_transaction_detail, bundle)
+        navController?.navigate(R.id.open_extrinsic_detail, bundle)
     }
 
     override fun openAccounts(accountChosenNavDirection: AccountChosenNavDirection) {

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

@@ -22,8 +22,24 @@
         app:popExitAnim="@anim/fragment_close_exit" />
 
     <action
-        android:id="@+id/open_transaction_detail"
-        app:destination="@id/transactionDetailFragment"
+        android:id="@+id/open_transfer_detail"
+        app:destination="@id/transferDetailFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
+    <action
+        android:id="@+id/open_reward_detail"
+        app:destination="@id/rewardDetailFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
+    <action
+        android:id="@+id/open_extrinsic_detail"
+        app:destination="@id/extrinsicDetailFragment"
         app:enterAnim="@anim/fragment_open_enter"
         app:exitAnim="@anim/fragment_open_exit"
         app:popEnterAnim="@anim/fragment_close_enter"
@@ -283,10 +299,22 @@
 
 
     <fragment
-        android:id="@+id/transactionDetailFragment"
-        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.TransactionDetailFragment"
-        android:label="TransactionDetailFragment"
-        tools:layout="@layout/fragment_transaction_details" />
+        android:id="@+id/transferDetailFragment"
+        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.transfer.TransferDetailFragment"
+        android:label="TransferDetailFragment"
+        tools:layout="@layout/fragment_transfer_details" />
+
+    <fragment
+        android:id="@+id/extrinsicDetailFragment"
+        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.extrinsic.ExtrinsicDetailFragment"
+        android:label="ExtrinsicDetailFragment"
+        tools:layout="@layout/fragment_extrinsic_details" />
+
+    <fragment
+        android:id="@+id/rewardDetailFragment"
+        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.reward.RewardDetailFragment"
+        android:label="RewardDetailFragment"
+        tools:layout="@layout/fragment_reward_slash_details" />
 
     <action
         android:id="@+id/openSelectAmount"
@@ -332,6 +360,19 @@
             app:popExitAnim="@anim/fragment_close_exit" />
     </fragment>
 
+    <action
+        android:id="@+id/action_mainFragment_to_filterFragment"
+        app:destination="@id/transactionHistoryFilterFragment"
+        app:enterAnim="@anim/fragment_open_enter"
+        app:exitAnim="@anim/fragment_open_exit"
+        app:popEnterAnim="@anim/fragment_close_enter"
+        app:popExitAnim="@anim/fragment_close_exit" />
+
+    <fragment
+        android:id="@+id/transactionHistoryFilterFragment"
+        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.transaction.filter.TransactionHistoryFilterFragment"
+        android:label="TransactionHistoryFilterFragment"/>
+
     <fragment
         android:id="@+id/confirmTransferFragment"
         android:name="jp.co.soramitsu.feature_wallet_impl.presentation.send.confirm.ConfirmTransferFragment"

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.9.0'
-        versionCode = 20
+        versionName = '1.9.4'
+        versionCode = 24
 
         // SDK and tools
         compileSdkVersion = 29
@@ -42,7 +42,7 @@ buildscript {
 
         bouncyCastleVersion = '1.60'
 
-        fearlessLibVersion = '1.0.75'
+        fearlessLibVersion = '1.0.77'
 
         gifVersion = '1.2.19'
 

common/build.gradle

@@ -21,16 +21,13 @@ android {
 
         buildConfigField "String", "TWITTER_ACCOUNT_TEMPLATE", "\"https://twitter.com/%s\""
 
-        buildConfigField "String", "ROADMAP_URL", "\"https://soramitsucoltd.aha.io/shared/97bc3006ee3c1baa0598863615cf8d14\""
-        buildConfigField "String", "DEV_STATUS_URL", "\"https://soramitsucoltd.aha.io/shared/343e5db57d53398e3f26d0048158c4a2\""
-
         buildConfigField "String", "SUBSCAN_TRANSACTION_TEMPLATE", "\"https://%1\$s.subscan.io/extrinsic/%2\$s\""
         buildConfigField "String", "SUBSCAN_ACCOUNT_TEMPLATE", "\"https://%1\$s.subscan.io/account/%2\$s\""
 
         buildConfigField "String", "POLKSASCAN_TRANSACTION_TEMPLATE", "\"https://polkascan.io/%1\$s/extrinsic/%2\$s\""
         buildConfigField "String", "POLKSASCAN_ACCOUNT_TEMPLATE", "\"https://polkascan.io/%1\$s/account/%2\$s\""
+        buildConfigField "String", "POLKSASCAN_EVENT_TEMPLATE", "\"https://polkascan.io/%1\$s/event/%2\$s\""
 
-        buildConfigField "String", "NOMINATOR_LEARN_MORE", "\"https://wiki.polkadot.network/docs/en/learn-nominator\""
         buildConfigField "String", "PAYOUTS_LEARN_MORE", "\"https://wiki.polkadot.network/docs/en/learn-simple-payouts\""
 
         buildConfigField "String", "SET_CONTROLLER_LEARN_MORE", "\"https://wiki.polkadot.network/docs/en/maintain-guides-how-to-nominate-polkadot#setting-up-stash-and-controller-keys\""

common/src/main/java/jp/co/soramitsu/common/address/AddressIconGenerator.kt

@@ -15,6 +15,7 @@ class AddressIconGenerator(
     companion object {
         const val SIZE_SMALL = 18
         const val SIZE_MEDIUM = 24
+        const val SIZE_BIG = 32
     }
 
     @Throws(AddressFormatException::class)

common/src/main/java/jp/co/soramitsu/common/data/model/CursorPage.kt

@@ -0,0 +1,6 @@
+package jp.co.soramitsu.common.data.model
+
+data class CursorPage<T>(
+    val nextCursor: String?,
+    val items: List<T>
+) : List<T> by items

common/src/main/java/jp/co/soramitsu/common/data/network/AppLinksProvider.kt

@@ -9,44 +9,46 @@ class AppLinksProvider(
 
     private val externalAnalyzerTemplates: Map<ExternalAnalyzer, ExternalAnalyzerLinks>,
 
-    val roadMapUrl: String,
-    val devStatusUrl: String,
-
-    val nominatorLearnMore: String,
     val payoutsLearnMore: String,
     val twitterAccountTemplate: String,
     val setControllerLearnMore: String
 ) {
 
+    fun getExternalEventUrl(
+        analyzer: ExternalAnalyzer,
+        eventId: String,
+        networkType: Node.NetworkType
+    ) = getExternalUrl(analyzer, eventId, networkType, ExternalAnalyzerLinks::event)
+
     fun getExternalTransactionUrl(
         analyzer: ExternalAnalyzer,
         hash: String,
         networkType: Node.NetworkType
-    ) = getExternalUrl(analyzer, hashWithPrefix(hash), networkType, ExternalAnalyzerLinks::transaction)
+    ) = getExternalUrl(analyzer, hashWithPrefix(hash), networkType, ExternalAnalyzerLinks::transaction)!!
 
     fun getExternalAddressUrl(
         analyzer: ExternalAnalyzer,
         address: String,
         networkType: Node.NetworkType
-    ) = getExternalUrl(analyzer, address, networkType, ExternalAnalyzerLinks::account)
+    ) = getExternalUrl(analyzer, address, networkType, ExternalAnalyzerLinks::account)!!
 
     private fun getExternalUrl(
         analyzer: ExternalAnalyzer,
         value: String,
         networkType: Node.NetworkType,
-        extractor: (ExternalAnalyzerLinks) -> String
-    ): String {
+        extractor: (ExternalAnalyzerLinks) -> String?
+    ): String? {
         val template = externalAnalyzerTemplates[analyzer] ?: error("No template for $analyzer")
 
-        return extractor(template).format(networkPathSegment(networkType), value)
+        return extractor(template)?.format(networkPathSegment(networkType), value)
     }
 
     fun getTwitterAccountUrl(
         accountName: String
     ): String = twitterAccountTemplate.format(accountName)
 }
 
-class ExternalAnalyzerLinks(val transaction: String, val account: String)
+class ExternalAnalyzerLinks(val transaction: String, val account: String, val event: String?)
 
 enum class ExternalAnalyzer(val supportedNetworks: List<Node.NetworkType>) {
     SUBSCAN(

common/src/main/java/jp/co/soramitsu/common/data/network/coingecko/PriceInfo.kt

@@ -0,0 +1,11 @@
+package jp.co.soramitsu.common.data.network.coingecko
+
+import com.google.gson.annotations.SerializedName
+import java.math.BigDecimal
+
+class PriceInfo(
+    @SerializedName("usd")
+    val price: BigDecimal,
+    @SerializedName("usd_24h_change")
+    val rateChange: BigDecimal
+)

common/src/main/java/jp/co/soramitsu/common/data/network/runtime/binding/Constants.kt

@@ -9,8 +9,14 @@ import java.math.BigInteger
 fun bindNumberConstant(
     constant: Constant,
     runtime: RuntimeSnapshot
-): BigInteger {
+): BigInteger = bindNullableNumberConstant(constant, runtime) ?: incompatible()
+
+@HelperBinding
+fun bindNullableNumberConstant(
+    constant: Constant,
+    runtime: RuntimeSnapshot
+): BigInteger? {
     val decoded = constant.type?.fromByteArrayOrNull(runtime, constant.value) ?: incompatible()
 
-    return decoded as? BigInteger ?: incompatible()
+    return decoded as BigInteger?
 }