Merge pull request #146 from soramitsu/rc/1.2.0

Rc/1.2.0

Author: valentunn

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

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

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

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

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

@@ -115,14 +115,6 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_profileFragment_to_aboutFragment)
     }
 
-    override fun openTermsScreen() {
-        navController?.navigate(R.id.openTerms)
-    }
-
-    override fun openPrivacyScreen() {
-        navController?.navigate(R.id.openPrivacy)
-    }
-
     override fun openImportAccountScreen(selectedNetworkType: Node.NetworkType?) {
         navController?.navigate(R.id.importAction, ImportAccountFragment.getBundle(selectedNetworkType))
     }

app/src/main/res/layout/fragment_coming_soon.xml

@@ -25,7 +25,7 @@
         android:layout_marginBottom="35dp"
         android:adjustViewBounds="true"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_logo_about"
+        android:src="@drawable/drawable_fearless_logo"
         app:layout_constraintBottom_toTopOf="@+id/comingSoonLabel"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />

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

@@ -27,22 +27,6 @@
         app:popEnterAnim="@anim/fragment_close_enter"
         app:popExitAnim="@anim/fragment_close_exit" />
 
-    <action
-        android:id="@+id/openPrivacy"
-        app:destination="@id/privacyFragment"
-        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/openTerms"
-        app:destination="@id/termsFragment"
-        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/splashFragment"
         android:name="jp.co.soramitsu.splash.presentation.SplashFragment"
@@ -72,15 +56,4 @@
         android:label="fragment_pincode"
         tools:layout="@layout/fragment_pincode" />
 
-    <fragment
-        android:id="@+id/privacyFragment"
-        android:name="jp.co.soramitsu.feature_onboarding_impl.presentation.privacy.PrivacyFragment"
-        tools:layout="@layout/fragment_privacy" />
-
-    <fragment
-        android:id="@+id/termsFragment"
-        android:name="jp.co.soramitsu.feature_onboarding_impl.presentation.terms.TermsFragment"
-        android:label="fragment_terms"
-        tools:layout="@layout/fragment_terms" />
-
 </navigation>

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

@@ -1,15 +1,15 @@
 buildscript {
     ext {
         // App version
-        versionName = '1.1.1'
-        versionCode = 7
+        versionName = '1.2.0'
+        versionCode = 8
 
         // SDK and tools
         compileSdkVersion = 29
         minSdkVersion = 24
         targetSdkVersion = 29
 
-        kotlinVersion = '1.3.61'
+        kotlinVersion = '1.4.21'
 
         supportVersion = '1.1.0'
         cardViewVersion = '1.0.0'
@@ -41,7 +41,7 @@ buildscript {
 
         bouncyCastleVersion = '1.60'
 
-        fearlessLibVersion = '1.0.28'
+        fearlessLibVersion = '1.0.30'
 
         gifVersion = '1.2.19'
 

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

@@ -3,13 +3,16 @@ package jp.co.soramitsu.common.account
 import io.reactivex.Single
 import jp.co.soramitsu.common.resources.ResourceManager
 import jp.co.soramitsu.fearless_utils.icon.IconGenerator
+import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder
 
 class AddressIconGenerator(
     private val iconGenerator: IconGenerator,
+    private val sS58Encoder: SS58Encoder,
     private val resourceManager: ResourceManager
 ) {
-    fun createAddressModel(accountAddress: String, addressId: ByteArray, sizeInDp: Int): Single<AddressModel> {
+    fun createAddressModel(accountAddress: String, sizeInDp: Int): Single<AddressModel> {
         return Single.fromCallable {
+            val addressId = sS58Encoder.decode(accountAddress)
             val sizeInPx = resourceManager.measureInPx(sizeInDp)
             val icon = iconGenerator.getSvgImage(addressId, sizeInPx)
             AddressModel(accountAddress, icon)

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

@@ -8,7 +8,6 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.utils.Event
 import jp.co.soramitsu.common.utils.EventObserver
@@ -19,8 +18,6 @@ abstract class BaseFragment<T : BaseViewModel> : Fragment() {
 
     @Inject protected open lateinit var viewModel: T
 
-    private val observables = mutableListOf<LiveData<*>>()
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -59,27 +56,14 @@ abstract class BaseFragment<T : BaseViewModel> : Fragment() {
             .show()
     }
 
-    override fun onDestroyView() {
-        observables.forEach { it.removeObservers(this) }
-        super.onDestroyView()
-    }
-
-    @Suppress("unchecked_cast")
-    protected fun <V : Any?> observe(source: LiveData<V>, observer: Observer<V>) {
-        source.observe(viewLifecycleOwner, observer as Observer<in Any?>)
-        observables.add(source)
-    }
-
     inline fun <V> LiveData<Event<V>>.observeEvent(crossinline observer: (V) -> Unit) {
         observe(viewLifecycleOwner, EventObserver {
             observer.invoke(it)
         })
     }
 
-    inline fun <V> LiveData<V>.observe(crossinline observer: (V) -> Unit) {
-        observe(viewLifecycleOwner, Observer {
-            observer.invoke(it)
-        })
+    fun <V> LiveData<V>.observe(observer: (V) -> Unit) {
+        observe(viewLifecycleOwner, observer)
     }
 
     protected fun EditText.bindTo(liveData: MutableLiveData<String>) = bindTo(liveData, viewLifecycleOwner)

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

@@ -132,8 +132,9 @@ class CommonModule {
     @ApplicationScope
     fun provideAddressModelCreator(
         resourceManager: ResourceManager,
+        sS58Encoder: SS58Encoder,
         iconGenerator: IconGenerator
-    ): AddressIconGenerator = AddressIconGenerator(iconGenerator, resourceManager)
+    ): AddressIconGenerator = AddressIconGenerator(iconGenerator, sS58Encoder, resourceManager)
 
     @Provides
     @ApplicationScope

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

@@ -0,0 +1,8 @@
+package jp.co.soramitsu.common.utils
+
+import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder
+import jp.co.soramitsu.feature_account_api.domain.model.Node
+
+fun SS58Encoder.encode(publicKey: ByteArray, networkType: Node.NetworkType): String {
+    return encode(publicKey, networkType.runtimeConfiguration.addressByte)
+}

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

@@ -13,14 +13,16 @@ fun MutableLiveData<Event<Unit>>.sendEvent() {
 }
 
 fun <FROM, TO> LiveData<FROM>.map(mapper: (FROM) -> TO): LiveData<TO> {
-    return Transformations.map(this, mapper)
+    return map(null, mapper)
 }
 
-fun <FROM, TO> LiveData<FROM>.mapMutable(mapper: (FROM) -> TO): MutableLiveData<TO> {
+fun <FROM, TO> LiveData<FROM>.map(initial: TO?, mapper: (FROM) -> TO): LiveData<TO> {
     return MediatorLiveData<TO>().apply {
-        addSource(this@mapMutable) {
+        addSource(this@map) {
             value = mapper.invoke(it)
         }
+
+        initial?.let(::setValue)
     }
 }
 

app/src/release/res/mipmap-mdpi/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.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
 fun View.updatePadding(
@@ -105,7 +106,7 @@ fun View.hideSoftKeyboard() {
 fun RecyclerView.enableShowingNewlyAddedTopElements(): RecyclerView.AdapterDataObserver {
     val adapterDataObserver = object : RecyclerView.AdapterDataObserver() {
         override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            if (positionStart == 0) {
+            if (positionStart == 0 && wasAtBeginningBeforeInsertion(itemCount)) {
                 scrollToPosition(0)
             }
         }
@@ -114,4 +115,11 @@ fun RecyclerView.enableShowingNewlyAddedTopElements(): RecyclerView.AdapterDataO
     adapter?.registerAdapterDataObserver(adapterDataObserver)
 
     return adapterDataObserver
+}
+
+private fun RecyclerView.wasAtBeginningBeforeInsertion(insertedCount: Int) =
+    findFirstVisiblePosition() < insertedCount && insertedCount != adapter!!.itemCount
+
+fun RecyclerView.findFirstVisiblePosition(): Int {
+    return (layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
 }