Merge pull request #135 from soramitsu/rc/1.1

Rc/1.1

Author: antonkhvorov

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Fearless Dev</string>
+</resources>

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

@@ -25,7 +25,7 @@ open class App : Application(), FeatureContainer {
         super.attachBaseContext(contextManager.setLocale(base))
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration?) {
+    override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         val contextManager = ContextManager.getInstanceOrInit(this, languagesHolder)
         contextManager.setLocale(this)

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

@@ -27,7 +27,7 @@ import jp.co.soramitsu.feature_account_impl.presentation.pincode.ToolbarConfigur
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
 import jp.co.soramitsu.feature_onboarding_impl.presentation.create.CreateAccountFragment
 import jp.co.soramitsu.feature_onboarding_impl.presentation.welcome.WelcomeFragment
-import jp.co.soramitsu.feature_wallet_api.domain.model.Asset
+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
@@ -204,6 +204,10 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_open_receive)
     }
 
+    override fun openBuy() {
+        navController?.navigate(R.id.action_open_buy)
+    }
+
     override fun returnToMain() {
         // to achieve smooth animation
         postToUiThread {
@@ -229,8 +233,8 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_nodesFragment_to_nodeDetailsFragment, NodeDetailsFragment.getBundle(nodeId, isSelected))
     }
 
-    override fun openAssetDetails(token: Asset.Token) {
-        val bundle = BalanceDetailFragment.getBundle(token)
+    override fun openAssetDetails(type: Token.Type) {
+        val bundle = BalanceDetailFragment.getBundle(type)
 
         navController?.navigate(R.id.action_mainFragment_to_balanceDetailFragment, bundle)
     }

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -67,6 +67,14 @@
         android:id="@+id/action_export_json"
         app:destination="@id/exportJsonPasswordFragment" />
 
+    <action
+        android:id="@+id/action_open_buy"
+        app:destination="@+id/buyFragment"
+        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/mainFragment"
         android:name="jp.co.soramitsu.app.root.presentation.main.MainFragment"
@@ -348,4 +356,10 @@
         android:label="fragment_pincode"
         tools:layout="@layout/fragment_pincode" />
 
+    <fragment
+        android:id="@+id/buyFragment"
+        android:name="jp.co.soramitsu.feature_wallet_impl.presentation.buy.BuyFragment"
+        android:label="BuyFragment"
+        tools:layout="@layout/fragment_buy" />
+
 </navigation>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.0.1'
-        versionCode = 5
+        versionName = '1.1.0'
+        versionCode = 6
 
         // SDK and tools
         compileSdkVersion = 29

app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -5,8 +5,8 @@ import android.os.Bundle
 import androidx.annotation.StringRes
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.data.network.ExternalAnalyzer
-import jp.co.soramitsu.common.view.bottomSheet.FixedListBottomSheet
-import jp.co.soramitsu.common.view.bottomSheet.item
+import jp.co.soramitsu.common.view.bottomSheet.list.fixed.FixedListBottomSheet
+import jp.co.soramitsu.common.view.bottomSheet.list.fixed.item
 import jp.co.soramitsu.feature_account_api.domain.model.Node
 
 typealias ExternalViewCallback = (ExternalAnalyzer, String, Node.NetworkType) -> Unit

app/src/main/res/mipmap-ldpi/ic_launcher.png

@@ -1,4 +1,4 @@
-package jp.co.soramitsu.common.groupedList
+package jp.co.soramitsu.common.list
 
 import android.view.View
 import android.view.ViewGroup

app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -0,0 +1,29 @@
+package jp.co.soramitsu.common.list
+
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+
+typealias DiffCheck<T, V> = (T) -> V
+
+open class PayloadGenerator<T>(vararg val checks: DiffCheck<T, *>) {
+
+    fun diff(first: T, second: T): List<DiffCheck<T, *>> {
+        return checks.filter { check -> check(first) != check(second) }
+    }
+}
+
+@Suppress("UNCHECKED_CAST")
+fun <T, VH : RecyclerView.ViewHolder> ListAdapter<T, VH>.resolvePayload(
+    holder: VH,
+    position: Int,
+    payloads: MutableList<Any>,
+    onDiffCheck: (DiffCheck<T, *>) -> Unit
+) {
+    if (payloads.isEmpty()) {
+        onBindViewHolder(holder, position)
+    } else {
+        val diffChecks = payloads.first() as List<DiffCheck<T, *>>
+
+        diffChecks.forEach(onDiffCheck)
+    }
+}

app/src/main/res/mipmap-xhdpi/ic_launcher.png

@@ -24,4 +24,10 @@ inline fun postToUiThread(crossinline action: () -> Unit) {
     Handler(Looper.getMainLooper()).post {
         action.invoke()
     }
+}
+
+fun Int.dp(context: Context): Int {
+    val inPx = context.resources.displayMetrics.density * this
+
+    return inPx.toInt()
 }

app/src/main/res/mipmap-xxhdpi/ic_launcher.png

@@ -15,6 +15,7 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.LayoutRes
 import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 
 fun View.updatePadding(
     top: Int = paddingTop,
@@ -99,4 +100,14 @@ fun View.setVisible(visible: Boolean, falseState: Int = View.GONE) {
 fun View.hideSoftKeyboard() {
     val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
     inputMethodManager.hideSoftInputFromWindow(windowToken, 0)
+}
+
+fun RecyclerView.enableShowingNewlyAddedTopElements() {
+    adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+        override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
+            if (positionStart == 0) {
+                scrollToPosition(0)
+            }
+        }
+    })
 }

app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

@@ -20,7 +20,7 @@ class GlassyButton @JvmOverloads constructor(
         View.inflate(context, R.layout.button_glassy, this)
 
         with(context) {
-            background = addRipple(getCutCornerDrawable(fillColorRes = R.color.blurColor))
+            background = addRipple(getCutCornerDrawable(fillColorRes = R.color.blurColorDark))
         }
 
         attrs?.let(::applyAttributes)