From 48f376a96e20e0800bde2c3ce8c509d6d4729f39 Mon Sep 17 00:00:00 2001
From: axelherbstreith <75120552+axelherbstreith@users.noreply.github.com>
Date: Fri, 18 Dec 2020 11:33:40 +0100
Subject: [PATCH] Contact Diary Polishing 3 (#1934)
* Changed background color on onboarding screen
* Updated back navigation
* clean
Co-authored-by: BMItter <berndus@gmx.de>
Co-authored-by: Matthias Urhahn <matthias.urhahn@sap.com>
Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>
---
.../ui/onboarding/ContactDiaryOnboardingFragment.kt | 3 +--
.../src/main/res/layout/contact_diary_onboarding_fragment.xml | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
index 1dd44a3ee..bea754305 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
import de.rki.coronawarnapp.contactdiary.ui.ContactDiarySettings
import de.rki.coronawarnapp.databinding.ContactDiaryOnboardingFragmentBinding
import de.rki.coronawarnapp.util.di.AutoInject
@@ -45,7 +44,7 @@ class ContactDiaryOnboardingFragment : Fragment(R.layout.contact_diary_onboardin
when (it) {
ContactDiaryOnboardingNavigationEvents.NavigateToMainActivity -> {
- (requireActivity() as ContactDiaryActivity).finish()
+ requireActivity().onBackPressed()
}
ContactDiaryOnboardingNavigationEvents.NavigateToPrivacyFragment -> {
diff --git a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
index adc913469..66b5e927c 100644
--- a/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
+++ b/Corona-Warn-App/src/main/res/layout/contact_diary_onboarding_fragment.xml
@@ -6,7 +6,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@drawable/card">
<include
android:id="@+id/contact_diary_onboarding_header"
--
GitLab