Fix being able to show Renter from setting launch option. Wallet FAB changes back as soon as collapse begins. v0.1.10

Author: nickjvandyke

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.vandyke.sia"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 109
-        versionName "0.1.9"
+        versionCode 110
+        versionName "0.1.10"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         /* lets us not shrink debug builds, for faster build times. Not necessary for release builds, since we shrink those */
         multiDexEnabled true
@@ -39,7 +39,7 @@ android {
         }
     }
     splits {
-        /* see main.c file in cpp directory for why we use ABI splits */
+        /* see app/src/main/cpp/main.c for why we use ABI splits */
         abi {
             enable true
             reset()

app/src/main/java/com/vandyke/sia/ui/main/MainActivity.kt

@@ -22,9 +22,6 @@ import com.vandyke.sia.data.siad.SiadService
 import com.vandyke.sia.ui.common.BaseFragment
 import com.vandyke.sia.ui.onboarding.IntroActivity
 import com.vandyke.sia.ui.onboarding.PurchaseActivity
-import com.vandyke.sia.ui.renter.files.view.FilesFragment
-import com.vandyke.sia.ui.terminal.TerminalFragment
-import com.vandyke.sia.ui.wallet.view.WalletFragment
 import com.vandyke.sia.util.GenUtil
 import com.vandyke.sia.util.observe
 import kotlinx.android.synthetic.main.activity_main.*
@@ -114,18 +111,18 @@ class MainActivity : AppCompatActivity() {
         /* notify VM when navigation items are selected */
         navigationView.setNavigationItemSelectedListener({ item ->
             drawerLayout.closeDrawers()
-            viewModel.navigationItemSelected(item)
+            viewModel.navigationItemSelected(item.itemId)
             return@setNavigationItemSelectedListener true
         })
         drawerToggle = ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close)
         drawerLayout.addDrawerListener(drawerToggle)
 
         /* set the VM's visibleFragmentClass differently depending on whether the activity is being recreated */
         if (savedInstanceState == null) {
-            viewModel.setDisplayedFragmentClass(when (Prefs.startupPage) {
-                "renter" -> FilesFragment::class.java
-                "wallet" -> WalletFragment::class.java
-                "terminal" -> TerminalFragment::class.java
+            viewModel.navigationItemSelected(when (Prefs.startupPage) {
+                "renter" -> R.id.drawer_item_renter
+                "wallet" -> R.id.drawer_item_wallet
+                "terminal" -> R.id.drawer_item_terminal
                 else -> throw Exception()
             })
         } else {

app/src/main/java/com/vandyke/sia/ui/main/MainViewModel.kt

@@ -6,7 +6,6 @@ package com.vandyke.sia.ui.main
 
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
-import android.view.MenuItem
 import com.vandyke.sia.BuildConfig
 import com.vandyke.sia.R
 import com.vandyke.sia.ui.about.AboutFragment
@@ -21,8 +20,8 @@ class MainViewModel : ViewModel() {
     val title = MutableLiveData<String>()
     val selectedMenuItem = MutableLiveData<Int>()
 
-    fun navigationItemSelected(item: MenuItem) {
-        visibleFragmentClass.value = when (item.itemId) {
+    fun navigationItemSelected(itemId: Int) {
+        visibleFragmentClass.value = when (itemId) {
             R.id.drawer_item_renter -> {
                 if (BuildConfig.DEBUG)
                     FilesFragment::class.java

app/src/main/java/com/vandyke/sia/ui/wallet/view/WalletFragment.kt

@@ -217,13 +217,13 @@ class WalletFragment : BaseFragment() {
     }
 
     fun collapseFrame() {
+        expandedFragment = null
+        setFabIcon()
         expandableFrame.collapseVertically({
             val currentChildFragment = childFragmentManager.findFragmentById(R.id.expandableFrame)
             if (currentChildFragment != null)
                 childFragmentManager.beginTransaction().remove(currentChildFragment).commit()
             setProgressColor(android.R.color.white)
-            expandedFragment = null
-            setFabIcon()
         })
         GenUtil.hideSoftKeyboard(activity!!)
     }

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

@@ -29,7 +29,7 @@
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:text="Sia for Android is still in heavy development. By subscribing, you'll support development, and gain access to all features, including new ones as they're added. Starts with an automatic 30 day free trial. Cancellable at any time."
+        android:text="Sia for Android is still in heavy development. By subscribing, you'll support development, and gain access to all features, including new ones as they're added. Starts with an automatic 30 day free trial. Easily cancellable at any time from Settings."
         android:textSize="18sp"
         app:layout_constraintBottom_toTopOf="@id/subscribe"
         app:layout_constraintEnd_toEndOf="parent"