Remove splash fragment

This commit is contained in:
Kirill Kamakin
2022-10-31 20:57:26 +01:00
parent 81e3fcfd98
commit a6a9aef5e2
6 changed files with 37 additions and 99 deletions

View File

@@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.toUri
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.isVisible
import androidx.navigation.NavController
import androidx.navigation.findNavController
import com.google.android.material.shape.CornerFamily
import com.google.android.material.shape.MaterialShapeDrawable
@@ -24,6 +25,8 @@ class MainActivity : AppCompatActivity() {
private val viewModel by viewModels<MainActivityViewModel>()
private val title: String by lazy { getString(R.string.app_name) }
private val uiState: MainActivityUiState get() = viewModel.uiState
private val navController: NavController
get() = findNavController(binding.navHost.id)
@Inject
lateinit var logger: Logger
@@ -34,12 +37,25 @@ class MainActivity : AppCompatActivity() {
logger.v { "onCreate() called with: savedInstanceState = $savedInstanceState" }
binding = MainActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
configureToolbar()
configureNavGraph()
viewModel.uiStateLive.observe(this, ::onUiStateChange)
binding.navigationView.setNavigationItemSelectedListener(::onNavigationItemSelected)
}
private fun configureNavGraph() {
val graph = navController.navInflater.inflate(R.navigation.nav_graph)
viewModel.startDestination.observe(this) {
graph.setStartDestination(it)
navController.setGraph(graph, intent.extras)
}
}
private fun configureToolbar() {
setSupportActionBar(binding.toolbar)
binding.toolbar.setNavigationIcon(R.drawable.ic_toolbar)
binding.toolbar.setNavigationOnClickListener { binding.drawer.open() }
setToolbarRoundCorner()
viewModel.uiStateLive.observe(this, ::onUiStateChange)
binding.navigationView.setNavigationItemSelectedListener(::onNavigationItemSelected)
}
private fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
@@ -104,7 +120,7 @@ class MainActivity : AppCompatActivity() {
private fun navigateDeepLink(deepLink: String) {
logger.v { "navigateDeepLink() called with: deepLink = $deepLink" }
findNavController(binding.navHost.id).navigate(deepLink.toUri())
navController.navigate(deepLink.toUri())
}
companion object {

View File

@@ -2,7 +2,10 @@ package gq.kirmanak.mealient.ui.activity
import androidx.lifecycle.*
import dagger.hilt.android.lifecycle.HiltViewModel
import gq.kirmanak.mealient.R
import gq.kirmanak.mealient.data.auth.AuthRepo
import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo
import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage
import gq.kirmanak.mealient.logging.Logger
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
@@ -13,6 +16,8 @@ import javax.inject.Inject
class MainActivityViewModel @Inject constructor(
private val authRepo: AuthRepo,
private val logger: Logger,
private val disclaimerStorage: DisclaimerStorage,
private val serverInfoRepo: ServerInfoRepo,
) : ViewModel() {
private val _uiState = MutableLiveData(MainActivityUiState())
@@ -22,10 +27,21 @@ class MainActivityViewModel @Inject constructor(
get() = checkNotNull(_uiState.value) { "UiState must not be null" }
private set(value) = _uiState.postValue(value)
private val _startDestination = MutableLiveData<Int>()
val startDestination: LiveData<Int> = _startDestination
init {
authRepo.isAuthorizedFlow
.onEach { isAuthorized -> updateUiState { it.copy(isAuthorized = isAuthorized) } }
.launchIn(viewModelScope)
viewModelScope.launch {
_startDestination.value = when {
!disclaimerStorage.isDisclaimerAccepted() -> R.id.disclaimerFragment
serverInfoRepo.getUrl() == null -> R.id.baseURLFragment
else -> R.id.recipesFragment
}
}
}
fun updateUiState(updater: (MainActivityUiState) -> MainActivityUiState) {