Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Call diary activity directly (DEV) #1952

Merged
merged 2 commits into from
Dec 18, 2020
Merged

Call diary activity directly (DEV) #1952

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d3684c
call activity directly
chiljamgossow Dec 18, 2020
938da8d
Merge branch 'release/1.10.x' into fix/diary-navigation
ralfgehrer Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 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 @@ -15,7 +15,6 @@ import dagger.android.DispatchingAndroidInjector
import dagger.android.HasAndroidInjector
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.retention.ContactDiaryWorkScheduler
import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
import de.rki.coronawarnapp.deadman.DeadmanNotificationScheduler
import de.rki.coronawarnapp.storage.LocalData
import de.rki.coronawarnapp.ui.base.startActivitySafely
Expand Down Expand Up @@ -201,10 +200,6 @@ class MainActivity : AppCompatActivity(), HasAndroidInjector {
onBackPressed()
}

fun navigateToContactDiaryActivity() {
ContactDiaryActivity.start(this)
}

/**
* Scheduling for a download of keys every hour.
*/
Expand Down
10 changes: 5 additions & 5 deletions Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/home/HomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import android.view.View
import android.view.accessibility.AccessibilityEvent
import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
import de.rki.coronawarnapp.databinding.FragmentHomeBinding
import de.rki.coronawarnapp.ui.main.MainActivity
import de.rki.coronawarnapp.util.DeviceUIState
import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.ExternalActionHelper
Expand Down Expand Up @@ -69,15 +69,15 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
contentDescription = getString(R.string.hint_external_webpage)
}

vm.popupEvents.observe2(this) {
when (it) {
vm.popupEvents.observe2(this) { event ->
when (event) {
HomeFragmentEvents.ShowInteropDeltaOnboarding -> {
doNavigate(
HomeFragmentDirections.actionMainFragmentToOnboardingDeltaInteroperabilityFragment()
)
}
is HomeFragmentEvents.ShowTracingExplanation -> {
tracingExplanationDialog.show(it.activeTracingDaysInRetentionPeriod) {
tracingExplanationDialog.show(event.activeTracingDaysInRetentionPeriod) {
vm.tracingExplanationWasShown()
}
}
Expand All @@ -91,7 +91,7 @@ class HomeFragment : Fragment(R.layout.fragment_home), AutoInject {
showRemoveTestDialog()
}
HomeFragmentEvents.GoToContactDiary -> {
(requireActivity() as MainActivity).navigateToContactDiaryActivity()
context?.let { ContactDiaryActivity.start(it) }
}
}
}
Expand Down