Merge remote-tracking branch 'origin/develop'

Oztechan · Dec 5, 2021 · 0031566 · 0031566
2 parents 9047cf1 + 7fff60a
commit 0031566
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/android/src/main/java/com/github/mustafaozhan/ccc/android/ui/main/MainActivity.kt b/android/src/main/java/com/github/mustafaozhan/ccc/android/ui/main/MainActivity.kt
@@ -66,11 +66,12 @@ class MainActivity : BaseActivity() {
  }
 
  private fun checkDestination() = with(getNavigationController()) {
- if (mainViewModel.isFistRun()) {
- graph = navInflater.inflate(R.navigation.main_graph)
- .apply {
- startDestination = R.id.sliderFragment
- }
+ graph = navInflater.inflate(R.navigation.main_graph).apply {
+ startDestination = if (mainViewModel.isFistRun()) {
+ R.id.sliderFragment
+ } else {
+ R.id.calculatorFragment
+ }
  }
  }
 

diff --git a/android/src/main/res/layout/activity_main.xml b/android/src/main/res/layout/activity_main.xml
@@ -9,5 +9,4 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  app:defaultNavHost="true"
- app:navGraph="@navigation/main_graph"
  tools:ignore="FragmentTagUsage" />