8000 Navigate to contact diary app launcher menu (EXPOSUREAPP-14555) by schauersbergern · Pull Request #5808 · corona-warn-app/cwa-app-android · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Navigate to contact diary app launcher menu (EXPOSUREAPP-14555) #5808

Merged
merged 2 commits into from
Jan 20, 2023
Merged

Navigate to contact diary app launcher menu (EXPOSUREAPP-14555) #5808

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e7ae15
observe livedata
schauersbergern Jan 20, 2023
e97b0a6
Merge branch 'release/3.1.x' into fix/14555_diary_applauncher
mtwalli Jan 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import de.rki.coronawarnapp.util.di.AppInjector
import de.rki.coronawarnapp.util.shortcuts.AppShortcutsHelper.Companion.getShortcutExtra
import de.rki.coronawarnapp.util.ui.findNavController
import de.rki.coronawarnapp.util.ui.findNestedGraph
import de.rki.coronawarnapp.util.ui.observeOnce
import de.rki.coronawarnapp.util.ui.updateCountBadge
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
import de.rki.coronawarnapp.util.viewmodel.cwaViewModels
< 99C1 tool-tip id="tooltip-d1175ca2-7e97-4223-b949-a8ae6b757f41" for="expand-down-link-8-diff-ca92f028ec14866f16f1f5218f5bb23d90418cbf5389eccb44eeb6028ba77a96" popover="manual" data-direction="ne" data-type="label" data-view-component="true" class="sr-only position-absolute">Expand Down Expand Up @@ -275,19 +276,22 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
}

private fun goToContactJournal() {
findViewById<BottomNavigationView>(R.id.main_bottom_navigation).selectedItemId = R.id.contact_diary_nav_graph
val nestedGraph = navController.findNestedGraph(R.id.contact_diary_nav_graph)

if (viewModel.isContactDiaryOnboardingDone.value == true) {
nestedGraph.setStartDestination(R.id.contactDiaryOverviewFragment)
navController.navigate(
ContactDiaryOverviewFragmentDirections.actionContactDiaryOverviewFragmentToContactDiaryDayFragment(
selectedDay = LocalDate.now().toString()
viewModel.isContactDiaryOnboardingDone.observeOnce { onboardingDone ->
findViewById<BottomNavigationView>(R.id.main_bottom_navigation).selectedItemId =
R.id.contact_diary_nav_graph
val nestedGraph = navController.findNestedGraph(R.id.contact_diary_nav_graph)

if (onboardingDone) {
nestedGraph.setStartDestination(R.id.contactDiaryOverviewFragment)
navController.navigate(
ContactDiaryOverviewFragmentDirections.actionContactDiaryOverviewFragmentToContactDiaryDayFragment(
selectedDay = LocalDate.now().toString()
)
)
)
} else {
nestedGraph.setStartDestination(R.id.contactDiaryOnboardingFragment)
navController.navigate("coronawarnapp://contact-journal/oboarding/?goToDay=true".toUri())
} else {
nestedGraph.setStartDestination(R.id.contactDiaryOnboardingFragment)
navController.navigate("coronawarnapp://contact-journal/oboarding/?goToDay=true".toUri())
}
}
}

Expand Down
0