Navigation tweaks, and check market state updates

premnirmal · Jul 21, 2022 · 937f856 · 937f856
1 parent 5662b3f
commit 937f856
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/home/MainActivity.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/home/MainActivity.kt
@@ -7,7 +7,6 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog.Builder
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.github.premnirmal.ticker.AppPreferences
 import com.github.premnirmal.ticker.analytics.Analytics
@@ -78,7 +77,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), BottomNavigationView.O
       val fragment = HomeFragment()
       supportFragmentManager.beginTransaction()
           .add(R.id.fragment_container, fragment, fragment.javaClass.name)
-          .show(fragment)
           .commit()
       fragment
     } else {
@@ -101,13 +99,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), BottomNavigationView.O
   }
 
   override fun onBackPressed() {
-    val eaten = onNavigationItemSelected(binding.bottomNavigation.menu.findItem(R.id.action_portfolio))
-    if (eaten) {
+    if (binding.bottomNavigation.selectedItemId == R.id.action_portfolio) {
+      if (!maybeAskToRate()) {
+        super.onBackPressed()
+      }
+    } else {
       binding.bottomNavigation.selectedItemId = R.id.action_portfolio
     }
-    if (!eaten && !maybeAskToRate()) {
-      super.onBackPressed()
-    }
   }
 
   override fun onSaveInstanceState(outState: Bundle) {
@@ -165,25 +163,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), BottomNavigationView.O
           throw IllegalStateException("Unknown bottom nav itemId: $itemId - ${item.title}")
         }
       }
-      supportFragmentManager.beginTransaction()
-          .add(R.id.fragment_container, fragment, fragment::class.java.name)
-          .hide(fragment)
-          .show(currentChild as Fragment)
-          .commitNowAllowingStateLoss()
-    }
-    if (fragment.isHidden) {
-      supportFragmentManager.beginTransaction()
-          .hide(currentChild as Fragment)
-          .show(fragment)
+      if (fragment != currentChild) {
+        supportFragmentManager.beginTransaction()
+          .replace(R.id.fragment_container, fragment, fragment::class.java.name)
           .commit()
-      currentChild = fragment as ChildFragment
-      analytics.trackClickEvent(
-          ClickEvent("BottomNavClick")
-              .addProperty("NavItem", item.title.toString())
-      )
-      return true
+      } else return false
     }
-    return false
+    currentChild = fragment as ChildFragment
+    analytics.trackClickEvent(
+      ClickEvent("BottomNavClick")
+        .addProperty("NavItem", item.title.toString())
+    )
+    return true
   }
 
   // BottomNavigationView.OnNavigationItemReselectedListener

diff --git a/app/src/main/kotlin/com/github/premnirmal/ticker/network/data/Quote.kt b/app/src/main/kotlin/com/github/premnirmal/ticker/network/data/Quote.kt
@@ -162,7 +162,7 @@ data class Quote constructor(
   }
 
   val isMarketOpen: Boolean
-    get() = "CLOSED" != marketState.uppercase()
+    get() = "REGULAR" == marketState.uppercase()
 
   override operator fun compareTo(other: Quote): Int =
     other.changeInPercent.compareTo(changeInPercent)

diff --git a/app/src/main/res/values-v31/color_palette.xml b/app/src/main/res/values-v31/color_palette.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <color name="accent_fallback">@android:color/system_accent1_400</color>
+  <color name="accent_fallback">@android:color/system_accent1_600</color>
 </resources>