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

Add/change ids for testing (EXPOSUREAPP-14120) #5649

Merged
merged 8 commits into from
Oct 19, 2022
Merged

Add/change ids for testing (EXPOSUREAPP-14120) #5649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67f252f
add ids
schauersbergern Oct 14, 2022
c1c0c2a
add ids
schauersbergern Oct 16, 2022
74e0fec
change referenced ids
schauersbergern Oct 17, 2022
72fa075
Merge branch 'release/2.28.x' into fix/14120_testing_ids
mtwalli Oct 17, 2022
f322de2
fix tests
schauersbergern Oct 17, 2022
36cd293
Merge branch 'release/2.28.x' into fix/14120_testing_ids
SamuraiKek Oct 18, 2022
f39740c
change naming
schauersbergern Oct 19, 2022
de53035
Merge branch 'release/2.28.x' into fix/14120_testing_ids
mtwalli Oct 19, 2022
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
8 changes: 4 additions & 4 deletions ...Test/java/de/rki/coronawarnapp/ui/eventregistration/organizer/QrCodeDetailFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ class QrCodeDetailFragmentTest : BaseUITest() {
).toBundle()
)

onView(withId(R.id.title)).check(matches(withText("Jahrestreffen der deutschen SAP Anwendergruppe")))
onView(withId(R.id.subtitle)).check(matches(withText("Hauptstr. 3, 69115 Heidelberg")))
onView(withId(R.id.trace_location_organizer_title)).check(matches(withText("Jahrestreffen der deutschen SAP Anwendergruppe")))
onView(withId(R.id.trace_location_organizer_subtitle)).check(matches(withText("Hauptstr. 3, 69115 Heidelberg")))
onView(withId(R.id.eventDate)).check(matches(withText("21.06.2021, 18:00 - 21:00 Uhr")))
}

Expand All @@ -88,8 +88,8 @@ class QrCodeDetailFragmentTest : BaseUITest() {
traceLocationId = 2
).toBundle()
)
onView(withId(R.id.title)).check(matches(withText("Event XYZ")))
onView(withId(R.id.subtitle)).check(matches(withText("Otto-Hahn-Str. 3, 123456 Berlin")))
onView(withId(R.id.trace_location_organizer_title)).check(matches(withText("Event XYZ")))
onView(withId(R.id.trace_location_organizer_subtitle)).check(matches(withText("Otto-Hahn-Str. 3, 123456 Berlin")))
onView(withId(R.id.eventDate)).check(matches(withText("18.04.2021, 12:00 - 19.04.2021, 22:52 Uhr")))
}

Expand Down
8 changes: 4 additions & 4 deletions ...st/java/de/rki/coronawarnapp/ui/eventregistration/organizer/TraceLocationsFragmentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ class TraceLocationsFragmentTest : BaseUITest() {

launchFragmentInContainer2<TraceLocationsFragment>()

onView(withId(R.id.description)).check(matches(withText("Jahrestreffen der deutschen SAP Anwendergruppe")))
onView(withId(R.id.address)).check(matches(withText("Hauptstr. 3, 69115 Heidelberg")))
onView(withId(R.id.trace_locations_item_description)).check(matches(withText("Jahrestreffen der deutschen SAP Anwendergruppe")))
onView(withId(R.id.trace_locations_item_address)).check(matches(withText("Hauptstr. 3, 69115 Heidelberg")))
onView(withId(R.id.duration)).check(matches(withText("21.06.21, 18:00 - 21:00 Uhr")))
}

Expand All @@ -78,8 +78,8 @@ class TraceLocationsFragmentTest : BaseUITest() {

launchFragmentInContainer2<TraceLocationsFragment>()

onView(withId(R.id.description)).check(matches(withText("Event XYZ")))
onView(withId(R.id.address)).check(matches(withText("Otto-Hahn-Str. 3, 123456 Berlin")))
onView(withId(R.id.trace_locations_item_description)).check(matches(withText("Event XYZ")))
onView(withId(R.id.trace_locations_item_address)).check(matches(withText("Otto-Hahn-Str. 3, 123456 Berlin")))
onView(withId(R.id.duration)).check(matches(withText("18.04.21, 12:00 - 19.04.21, 22:52 Uhr")))
}

Expand Down
6 changes: 5 additions & 1 deletion .../rki/coronawarnapp/ui/presencetracing/organizer/category/TraceLocationCategoryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerCategoryFragmentBinding
import de.rki.coronawarnapp.ui.presencetracing.organizer.category.adapter.TraceLocationCategoryAdapter
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
Expand All @@ -34,7 +35,10 @@ class TraceLocationCategoryFragment : Fragment(R.layout.trace_location_organizer
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

binding.toolbar.setNavigationOnClickListener { popBackStack() }
binding.toolbar.apply {
setNavigationOnClickListener { popBackStack() }
addTitleId(R.id.trace_location_organizer_category_fragment_title_id)
}

vm.categoryItems.observe2(this) { categoryItems ->
val adapter = TraceLocationCategoryAdapter(categoryItems) {
Expand Down
4 changes: 2 additions & 2 deletions ...warnapp/ui/presencetracing/organizer/category/adapter/category/TraceLocationCategoryVH.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class TraceLocationCategoryVH(parent: ViewGroup, onItemClickListener: (category:
override val onBindData:
TraceLocationOrganizerCategoryItemBinding.(item: TraceLocationCategory, payloads: List<Any>) -> Unit =
{ item, _ ->
title.text = context.getString(item.title)
categoryItemTitle.text = context.getString(item.title)
if (item.subtitle != null) {
subtitle.text = context.getString(item.subtitle)
categoryItemSubtitle.text = context.getString(item.subtitle)
}
root.setOnClickListener { onItemClickListener.invoke(item) }
}
Expand Down
12 changes: 9 additions & 3 deletions ...a/de/rki/coronawarnapp/ui/presencetracing/organizer/create/TraceLocationCreateFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import de.rki.coronawarnapp.ui.durationpicker.DurationPicker
import de.rki.coronawarnapp.ui.durationpicker.format
import de.rki.coronawarnapp.util.DialogHelper
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.addSubtitleId
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
Expand Down Expand Up @@ -54,9 +56,13 @@ class TraceLocationCreateFragment : Fragment(R.layout.trace_location_create_frag
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

binding.toolbar.setNavigationOnClickListener {
it.hideKeyboard()
popBackStack()
binding.toolbar.apply {
setNavigationOnClickListener {
it.hideKeyboard()
popBackStack()
}
addTitleId(R.id.trace_location_create_fragment_title_id)
addSubtitleId(R.id.trace_location_create_fragment_subtitle_id)
}

viewModel.result.observe(viewLifecycleOwner) { result ->
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/de/rki/coronawarnapp/ui/presencetracing/organizer/details/QrCodeDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class QrCodeDetailFragment : Fragment(R.layout.trace_location_organizer_qr_code_

binding.apply {
appBarLayout.onOffsetChange { titleAlpha, subtitleAlpha ->
title.alpha = titleAlpha
subtitle.alpha = subtitleAlpha
traceLocationOrganizerTitle.alpha = titleAlpha
traceLocationOrganizerSubtitle.alpha = subtitleAlpha
checkShadowVisibility()
}
root.viewTreeObserver.addOnGlobalLayoutListener { checkShadowVisibility() }
Expand Down Expand Up @@ -116,8 +116,8 @@ class QrCodeDetailFragment : Fragment(R.layout.trace_location_organizer_qr_code_

viewModel.uiState.observe2(this) { uiState ->
with(binding) {
title.text = uiState.description
subtitle.text = uiState.address
traceLocationOrganizerTitle.text = uiState.description
traceLocationOrganizerSubtitle.text = uiState.address

if (uiState.startDateTime != null && uiState.endDateTime != null) {

Expand Down Expand Up @@ -168,9 +168,9 @@ class QrCodeDetailFragment : Fragment(R.layout.trace_location_organizer_qr_code_
val params: CoordinatorLayout.LayoutParams = binding.nestedScrollView.layoutParams
as (CoordinatorLayout.LayoutParams)

val textParams = binding.subtitle.layoutParams as (LinearLayout.LayoutParams)
val textParams = binding.traceLocationOrganizerSubtitle.layoutParams as (LinearLayout.LayoutParams)
textParams.bottomMargin = ((width) / 2) - 24 /* 24 is space between screen border and QrCode */
binding.subtitle.requestLayout() /* 24 is space between screen border and QrCode */
binding.traceLocationOrganizerSubtitle.requestLayout() /* 24 is space between screen border and QrCode */

val behavior: AppBarLayout.ScrollingViewBehavior = params.behavior as ((AppBarLayout.ScrollingViewBehavior))
behavior.overlayTop = ((width) / 2) - 24
Expand Down
10 changes: 7 additions & 3 deletions ...ain/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/TraceLocationsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import de.rki.coronawarnapp.util.lists.decorations.TopBottomPaddingDecorator
import de.rki.coronawarnapp.util.lists.diffutil.update
import de.rki.coronawarnapp.util.onScroll
import de.rki.coronawarnapp.util.ui.addMenuId
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
Expand Down Expand Up @@ -59,9 +60,12 @@ class TraceLocationsFragment : Fragment(R.layout.trace_location_organizer_trace_
setupSwipe(context = requireContext())
}

binding.toolbar.addMenuId(R.id.trace_locations_fragment_menu_id)
binding.toolbar.setNavigationOnClickListener {
popBackStack()
binding.toolbar.apply {
setNavigationOnClickListener {
popBackStack()
}
addMenuId(R.id.trace_locations_fragment_menu_id)
addTitleId(R.id.trace_location_organizer_trace_locations_list_fragment_title_id)
}

viewModel.traceLocations.observe2(this) {
Expand Down
8 changes: 4 additions & 4 deletions ...main/java/de/rki/coronawarnapp/ui/presencetracing/organizer/list/items/TraceLocationVH.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class TraceLocationVH(parent: ViewGroup) :
) -> Unit = { item, _ ->
latestItem = item

description.text = item.traceLocation.description
address.text = item.traceLocation.address
traceLocationsItemDescription.text = item.traceLocation.description
traceLocationsItemAddress.text = item.traceLocation.address

if (item.traceLocation.startDate != null && item.traceLocation.endDate != null) {

Expand All @@ -57,7 +57,7 @@ class TraceLocationVH(parent: ViewGroup) :
endTime.format(timeFormat)
)
} else {
icon.setCaption(null)
traceLocationsItemIcon.setCaption(null)
val startDateTime =
"${startTime.toLocalDate().format(dateFormat)}, ${startTime.toLocalTime().format(timeFormat)}"
val endDateTime =
Expand All @@ -69,7 +69,7 @@ class TraceLocationVH(parent: ViewGroup) :
)
}
} else {
icon.setCaption(null)
traceLocationsItemIcon.setCaption(null)
duration.isGone = true
}

Expand Down
2 changes: 2 additions & 0 deletions ...a/de/rki/coronawarnapp/ui/presencetracing/organizer/warn/TraceLocationWarnInfoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.navigation.fragment.findNavController
import com.google.android.material.transition.MaterialSharedAxis
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerWarnInfoFragmentBinding
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding

Expand All @@ -25,6 +26,7 @@ class TraceLocationWarnInfoFragment : Fragment(R.layout.trace_location_organizer
super.onViewCreated(view, savedInstanceState)
binding.apply {
toolbar.setNavigationOnClickListener { popBackStack() }
toolbar.addTitleId(R.id.trace_location_organizer_warn_info_fragment_title_id)
nextButton.setOnClickListener {
findNavController().navigate(
TraceLocationWarnInfoFragmentDirections
Expand Down
4 changes: 3 additions & 1 deletion ...nawarnapp/ui/presencetracing/organizer/warn/duration/TraceLocationWarnDurationFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import de.rki.coronawarnapp.ui.durationpicker.DurationPicker
import de.rki.coronawarnapp.ui.durationpicker.format
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.toLocalDateTimeUserTz
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
Expand Down Expand Up @@ -61,7 +62,7 @@ class TraceLocationWarnDurationFragment :

viewModel.state.observe2(this) { uiState ->
with(binding) {
description.text = uiState.description
eventDescription.text = uiState.description
eventAddress.text = uiState.address

if (uiState.startDateTime != null && uiState.endDateTime != null) {
Expand Down Expand Up @@ -127,6 +128,7 @@ class TraceLocationWarnDurationFragment :
toolbar.setNavigationOnClickListener {
popBackStack()
}
toolbar.addTitleId(R.id.trace_location_organizer_warn_duration_fragment_title_id)
nextButton.setOnClickListener {
viewModel.goNext()
}
Expand Down
2 changes: 2 additions & 0 deletions ...ki/coronawarnapp/ui/presencetracing/organizer/warn/list/TraceLocationSelectionFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerTraceLocationsWarnListFragmentBinding
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.lists.diffutil.update
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
Expand Down Expand Up @@ -44,6 +45,7 @@ class TraceLocationSelectionFragment :
toolbar.setNavigationOnClickListener {
popBackStack()
}
toolbar.addTitleId(R.id.trace_location_organizer_trace_locations_warn_list_fragment_title_id)

nextButton.setOnClickListener {
viewModel.goNext()
Expand Down
4 changes: 2 additions & 2 deletions ...java/de/rki/coronawarnapp/ui/presencetracing/organizer/warn/list/items/TraceLocationVH.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class TraceLocationVH(parent: ViewGroup) :
payloads: List<Any>
) -> Unit = { item, _ ->

address.text = item.traceLocation.address
title.text = item.traceLocation.description
warnItemAddress.text = item.traceLocation.address
warnItemTitle.text = item.traceLocation.description
headerCheckbox.setImageResource(if (item.selected) R.drawable.ic_selected else R.drawable.ic_unselected)

if (item.traceLocation.startDate != null && item.traceLocation.endDate != null) {
Expand Down
2 changes: 2 additions & 0 deletions ...e/rki/coronawarnapp/ui/presencetracing/organizer/warn/tan/TraceLocationWarnTanFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import de.rki.coronawarnapp.contactdiary.util.hideKeyboard
import de.rki.coronawarnapp.databinding.TraceLocationOrganizerWarnTanFragmentBinding
import de.rki.coronawarnapp.ui.submission.ApiRequestState
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.ui.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.setGone
Expand Down Expand Up @@ -63,6 +64,7 @@ class TraceLocationWarnTanFragment : Fragment(R.layout.trace_location_organizer_
viewModel.startTanSubmission()
}
toolbar.setNavigationOnClickListener { goBack() }
toolbar.addTitleId(R.id.trace_location_organizer_warn_tan_fragment_title_id)
}

viewModel.registrationState.observe2(this) {
Expand Down
10 changes: 10 additions & 0 deletions Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/ui/MaterialToolbarExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,13 @@ fun MaterialToolbar.addMenuId(id: Int) {
fun MaterialToolbar.addNavigationIconButtonId(id: Int) {
ToolbarUtils.getNavigationIconButton(this)?.id = id
}

@SuppressLint("RestrictedApi")
fun MaterialToolbar.addTitleId(id: Int) {
ToolbarUtils.getTitleTextView(this)?.id = id
}

@SuppressLint("RestrictedApi")
fun MaterialToolbar.addSubtitleId(id: Int) {
ToolbarUtils.getSubtitleTextView(this)?.id = id
}
3 changes: 2 additions & 1 deletion Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
android:background="@color/colorSurface"
android:contentDescription="@string/tracelocation_organizer_category_title"
android:orientation="vertical"
android:transitionName="trace_location_organizer_category">
android:transitionName="trace_location_organizer_category"
tools:context=".ui.presencetracing.organizer.category.TraceLocationCategoryFragment">

<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
Expand Down
4 changes: 2 additions & 2 deletions Corona-Warn-App/src/main/res/layout/trace_location_organizer_category_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
android:orientation="vertical">

<TextView
android:id="@+id/title"
android:id="@+id/category_item_title"
style="@style/body1"
android:textSize="17sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Einzelhandel" />

<TextView
android:id="@+id/subtitle"
android:id="@+id/category_item_subtitle"
style="@style/subtitleMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
9 changes: 6 additions & 3 deletions Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_detail_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/trace_location_gradient_background"
android:contentDescription="@string/trace_location_event_detail_title_accessibility">
android:contentDescription="@string/trace_location_event_detail_title_accessibility"
tools:context=".ui.presencetracing.organizer.details.QrCodeDetailFragment">

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
Expand Down Expand Up @@ -47,7 +48,7 @@
app:layout_collapseMode="parallax">

<TextView
android:id="@+id/title"
android:id="@+id/trace_location_organizer_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="24dp"
Expand All @@ -61,7 +62,7 @@
tools:text="Jahrestreffen der deutschen SAP Anwendergruppe" />

<TextView
android:id="@+id/subtitle"
android:id="@+id/trace_location_organizer_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
Expand Down Expand Up @@ -94,9 +95,11 @@
android:orientation="horizontal">

<ImageView
android:id="@+id/cwa_logo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="72dp"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_cwa_logo_white" />

</LinearLayout>
Expand Down
Loading