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

Lock drawer closed in onboarding

Browse Source
This commit is contained in:
Kirill Kamakin
2022-11-19 12:30:43 +01:00
parent bc820123b2
commit 1a4d15b680
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,7 @@ class MainActivity : AppCompatActivity(R.layout.main_activity) {
val directions = when (menuItem.itemId) {
R.id.add_recipe -> actionGlobalAddRecipeFragment()
R.id.recipes_list -> actionGlobalRecipesListFragment()
R.id.change_url -> actionGlobalBaseURLFragment()
R.id.change_url -> actionGlobalBaseURLFragment(false)
R.id.login -> actionGlobalAuthenticationFragment()
R.id.logout -> {
viewModel.logout()

7
app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityUiState.kt
View File

@@ -1,14 +1,11 @@
package gq.kirmanak.mealient.ui.activity
data class MainActivityUiState(
val loginButtonVisible: Boolean = false,
val isAuthorized: Boolean = false,
val navigationVisible: Boolean = false,
val searchVisible: Boolean = false,
) {
val canShowLogin: Boolean
get() = !isAuthorized && loginButtonVisible
val canShowLogin: Boolean get() = !isAuthorized
val canShowLogout: Boolean
get() = isAuthorized && loginButtonVisible
val canShowLogout: Boolean get() = isAuthorized
}

2
app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeFragment.kt
View File

@@ -38,7 +38,7 @@ class AddRecipeFragment : Fragment(R.layout.fragment_add_recipe) {
super.onViewCreated(view, savedInstanceState)
logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
activityViewModel.updateUiState {
it.copy(loginButtonVisible = true, navigationVisible = true, searchVisible = false)
it.copy(navigationVisible = true, searchVisible = false)
}
viewModel.loadPreservedRequest()
setupViews()

2
app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt
View File

@@ -32,7 +32,7 @@ class AuthenticationFragment : Fragment(R.layout.fragment_authentication) {
logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
binding.button.setOnClickListener { onLoginClicked() }
activityViewModel.updateUiState {
it.copy(loginButtonVisible = false, navigationVisible = false, searchVisible = false)
it.copy(navigationVisible = true, searchVisible = false)
}
viewModel.uiState.observe(viewLifecycleOwner, ::onUiStateChange)
}

4
app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLFragment.kt
View File

@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import by.kirich1409.viewbindingdelegate.viewBinding
import dagger.hilt.android.AndroidEntryPoint
import gq.kirmanak.mealient.R
@@ -24,6 +25,7 @@ class BaseURLFragment : Fragment(R.layout.fragment_base_url) {
private val binding by viewBinding(FragmentBaseUrlBinding::bind)
private val viewModel by viewModels<BaseURLViewModel>()
private val activityViewModel by activityViewModels<MainActivityViewModel>()
private val args by navArgs<BaseURLFragmentArgs>()
@Inject
lateinit var logger: Logger
@@ -34,7 +36,7 @@ class BaseURLFragment : Fragment(R.layout.fragment_base_url) {
binding.button.setOnClickListener(::onProceedClick)
viewModel.uiState.observe(viewLifecycleOwner, ::onUiStateChange)
activityViewModel.updateUiState {
it.copy(loginButtonVisible = false, navigationVisible = false, searchVisible = false)
it.copy(navigationVisible = !args.isOnboarding, searchVisible = false)
}
}

4
app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerFragment.kt
View File

@@ -38,7 +38,7 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer) {
private fun navigateNext() {
logger.v { "navigateNext() called" }
findNavController().navigate(actionDisclaimerFragmentToBaseURLFragment())
findNavController().navigate(actionDisclaimerFragmentToBaseURLFragment(true))
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -58,7 +58,7 @@ class DisclaimerFragment : Fragment(R.layout.fragment_disclaimer) {
}
viewModel.startCountDown()
activityViewModel.updateUiState {
it.copy(loginButtonVisible = false, navigationVisible = false, searchVisible = false)
it.copy(navigationVisible = false, searchVisible = false)
}
}
}

2
app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesListFragment.kt
View File

@@ -49,7 +49,7 @@ class RecipesListFragment : Fragment(R.layout.fragment_recipes_list) {
super.onViewCreated(view, savedInstanceState)
logger.v { "onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState" }
activityViewModel.updateUiState {
it.copy(loginButtonVisible = true, navigationVisible = true, searchVisible = true)
it.copy(navigationVisible = true, searchVisible = true)
}
setupRecipeAdapter()
hideKeyboardOnScroll()

3
app/src/main/res/navigation/nav_graph.xml
View File

@@ -53,6 +53,9 @@
app:destination="@id/recipesListFragment"
app:popUpTo="@id/nav_graph"
app:popUpToInclusive="true" />
<argument
android:name="isOnboarding"
app:argType="boolean" />
</fragment>
<fragment