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

Add transition to Contact Journal onboarding fragment (COMMUNITY) (#2954)


* Add transition to contact diary onboarding fragment

This makes the transition behavior of this fragment the same as the check-in
onboarding fragment.

* Correctly transition when accessing diary intro manually

Co-authored-by: default avatarMohamed <mohamed.metwalli@sap.com>
parent 64b0ce7f
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ import androidx.core.net.toUri ...@@ -7,6 +7,7 @@ import androidx.core.net.toUri
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs import androidx.navigation.fragment.navArgs
import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.R import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.databinding.ContactDiaryOnboardingFragmentBinding import de.rki.coronawarnapp.databinding.ContactDiaryOnboardingFragmentBinding
...@@ -32,6 +33,10 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin ...@@ -32,6 +33,10 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
binding.apply { binding.apply {
contactDiaryOnboardingNextButton.setOnClickListener { contactDiaryOnboardingNextButton.setOnClickListener {
vm.onNextButtonClick() vm.onNextButtonClick()
......
...@@ -6,6 +6,7 @@ import android.view.accessibility.AccessibilityEvent ...@@ -6,6 +6,7 @@ import android.view.accessibility.AccessibilityEvent
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.app.ShareCompat import androidx.core.app.ShareCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.R import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.DiaryOverviewAdapter import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.DiaryOverviewAdapter
import de.rki.coronawarnapp.contactdiary.util.MarginRecyclerViewDecoration import de.rki.coronawarnapp.contactdiary.util.MarginRecyclerViewDecoration
...@@ -26,6 +27,13 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr ...@@ -26,6 +27,13 @@ class ContactDiaryOverviewFragment : Fragment(R.layout.contact_diary_overview_fr
private val vm: ContactDiaryOverviewViewModel by cwaViewModels { viewModelFactory } private val vm: ContactDiaryOverviewViewModel by cwaViewModels { viewModelFactory }
private val binding: ContactDiaryOverviewFragmentBinding by viewBindingLazy() private val binding: ContactDiaryOverviewFragmentBinding by viewBindingLazy()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:contentDescription="@string/contact_diary_overview_title" android:contentDescription="@string/contact_diary_overview_title"
android:background="@color/colorBackground"
android:orientation="vertical"> android:orientation="vertical">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
......
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