atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #98 from kirmanak/fix-crash-on-url-fragment

Browse Source 
Fix crash on URL input fragment
This commit is contained in:
Kirill Kamakin
2022-11-20 18:26:49 +01:00
committed by GitHub
parent 9f4790eab5 376a9b2ee0
commit 1947de99db
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -17,8 +17,8 @@ plugins {
android { android {
defaultConfig { defaultConfig {
applicationId = "gq.kirmanak.mealient" applicationId = "gq.kirmanak.mealient"
versionCode = 19 versionCode = 20
versionName = "0.3.4" versionName = "0.3.5"
} }
signingConfigs { signingConfigs {

4
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt
View File

@@ -53,8 +53,8 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
logger.d { "configureNavGraph: received destination" } logger.d { "configureNavGraph: received destination" }
val controller = navController val controller = navController
val graph = controller.navInflater.inflate(R.navigation.nav_graph) val graph = controller.navInflater.inflate(R.navigation.nav_graph)
graph.setStartDestination(it) graph.setStartDestination(it.startDestinationId)
controller.setGraph(graph, intent.extras) controller.setGraph(graph, it.startDestinationArgs)
} }
} }

17
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt
View File

@@ -8,6 +8,7 @@ import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo
import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage
import gq.kirmanak.mealient.data.recipes.RecipeRepo import gq.kirmanak.mealient.data.recipes.RecipeRepo
import gq.kirmanak.mealient.logging.Logger import gq.kirmanak.mealient.logging.Logger
import gq.kirmanak.mealient.ui.baseurl.BaseURLFragmentArgs
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
@@ -32,8 +33,8 @@ class MainActivityViewModel @Inject constructor(
get() = checkNotNull(_uiState.value) { "UiState must not be null" } get() = checkNotNull(_uiState.value) { "UiState must not be null" }
private set(value) = _uiState.postValue(value) private set(value) = _uiState.postValue(value)
private val _startDestination = MutableLiveData<Int>() private val _startDestination = MutableLiveData<StartDestinationInfo>()
val startDestination: LiveData<Int> = _startDestination val startDestination: LiveData<StartDestinationInfo> = _startDestination
private val _clearSearchViewFocusChannel = Channel<Unit>() private val _clearSearchViewFocusChannel = Channel<Unit>()
val clearSearchViewFocus: Flow<Unit> = _clearSearchViewFocusChannel.receiveAsFlow() val clearSearchViewFocus: Flow<Unit> = _clearSearchViewFocusChannel.receiveAsFlow()
@@ -45,9 +46,15 @@ class MainActivityViewModel @Inject constructor(
viewModelScope.launch { viewModelScope.launch {
_startDestination.value = when { _startDestination.value = when {
!disclaimerStorage.isDisclaimerAccepted() -> R.id.disclaimerFragment !disclaimerStorage.isDisclaimerAccepted() -> {
serverInfoRepo.getUrl() == null -> R.id.baseURLFragment StartDestinationInfo(R.id.disclaimerFragment)
else -> R.id.recipesListFragment }
serverInfoRepo.getUrl() == null -> {
StartDestinationInfo(R.id.baseURLFragment, BaseURLFragmentArgs(true).toBundle())
}
else -> {
StartDestinationInfo(R.id.recipesListFragment)
}
} }
} }
} }

9
app/src/main/java/gq/kirmanak/mealient/ui/activity/StartDestinationInfo.kt Normal file
View File

@@ -0,0 +1,9 @@
package gq.kirmanak.mealient.ui.activity
import android.os.Bundle
import androidx.annotation.IdRes
data class StartDestinationInfo(
@IdRes val startDestinationId: Int,
val startDestinationArgs: Bundle? = null,
)