Skip to content
Snippets Groups Projects
Unverified Commit 85301167 authored by axelherbstreith's avatar axelherbstreith Committed by GitHub
Browse files

Organizer Flow: Add Onboarding Screen to Menu (DEV) (#2731)

* linked information screen to menu

* linting
parent a8ac9242
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,6 @@ package de.rki.coronawarnapp.ui.eventregistration.organizer.list ...@@ -3,7 +3,6 @@ package de.rki.coronawarnapp.ui.eventregistration.organizer.list
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityEvent
import android.widget.Toast
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.view.isGone import androidx.core.view.isGone
...@@ -108,7 +107,9 @@ class TraceLocationsFragment : Fragment(R.layout.trace_location_organizer_trace_ ...@@ -108,7 +107,9 @@ class TraceLocationsFragment : Fragment(R.layout.trace_location_organizer_trace_
setOnMenuItemClickListener { setOnMenuItemClickListener {
when (it.itemId) { when (it.itemId) {
R.id.menu_information -> { R.id.menu_information -> {
Toast.makeText(requireContext(), "Information // TODO", Toast.LENGTH_SHORT).show() findNavController().navigate(
R.id.action_traceLocationOrganizerListFragment_to_traceLocationOrganizerQRInfoFragment
)
true true
} }
R.id.menu_remove_all -> { R.id.menu_remove_all -> {
......
...@@ -38,14 +38,24 @@ class TraceLocationQRInfoFragment : Fragment(R.layout.trace_location_organizer_q ...@@ -38,14 +38,24 @@ class TraceLocationQRInfoFragment : Fragment(R.layout.trace_location_organizer_q
when (it) { when (it) {
is TraceLocationQRInfoNavigationEvents.NavigateToDataPrivacy -> is TraceLocationQRInfoNavigationEvents.NavigateToDataPrivacy ->
findNavController().navigate("coronawarnapp://contactdiary/dataPrivacy".toUri()) findNavController().navigate("coronawarnapp://contactdiary/dataPrivacy".toUri())
is TraceLocationQRInfoNavigationEvents.NavigateToMyQrCodes -> { is TraceLocationQRInfoNavigationEvents.NavigateToMyQrCodes -> {
settings.qrInfoAcknowledged = true
doNavigate( if (isAlreadyOnboarded()) {
TraceLocationQRInfoFragmentDirections popBackStack()
.actionTraceLocationOrganizerQRInfoFragmentToTraceLocationOrganizerListFragment() } else {
) settings.qrInfoAcknowledged = true
doNavigate(
TraceLocationQRInfoFragmentDirections
.actionTraceLocationOrganizerQRInfoFragmentToTraceLocationOrganizerListFragment()
)
}
} }
} }
} }
} }
private fun isAlreadyOnboarded(): Boolean {
return settings.qrInfoAcknowledged
}
} }
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
<action <action
android:id="@+id/action_traceLocationOrganizerListFragment_to_traceLocationCreateFragment" android:id="@+id/action_traceLocationOrganizerListFragment_to_traceLocationCreateFragment"
app:destination="@id/traceLocationCreateFragment" /> app:destination="@id/traceLocationCreateFragment" />
<action
android:id="@+id/action_traceLocationOrganizerListFragment_to_traceLocationOrganizerQRInfoFragment"
app:destination="@id/traceLocationOrganizerQRInfoFragment" />
</fragment> </fragment>
</navigation> </navigation>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment