8000 Add/change test accessibility ids (EXPOSUREAPP-14304) by schauersbergern · Pull Request #5798 · corona-warn-app/cwa-app-android · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Add/change test accessibility ids (EXPOSUREAPP-14304) #5798

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Add/change test accessibility ids (EXPOSUREAPP-14304) #5798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cda2885
add ids
schauersbergern Jan 11, 2023
895e109
Merge branch 'release/3.1.x' into fix/14304_test_accessibility_ids
SamuraiKek Jan 12, 2023
e1ad4c3
Merge branch 'release/3.1.x' into fix/14304_test_accessibility_ids
mtwalli Jan 12, 2023
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: 6 additions & 2 deletions ...na-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/create/ProfileCreateFragment.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.profile.model.Profile
import de.rki.coronawarnapp.ui.view.addEmojiFilter
import de.rki.coronawarnapp.util.di.AutoInject
import de.rki.coronawarnapp.util.toLocalDateUserTz
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 @@ -56,8 +57,11 @@ class ProfileCreateFragment : Fragment(R.layout.profile_create_fragment), AutoIn

override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
with(binding) {
toolbar.setNavigationOnClickListener {
viewModel.navigateBack()
toolbar.apply {
addTitleId(R.id.profile_create_fragment_title)
setNavigationOnClickListener {
viewModel.navigateBack()
}
}

profileSaveButton.setOnClickListener {
Expand Down
18 changes: 11 additions & 7 deletions Corona-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/list/ProfileListFragment.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.util.di.AutoInject
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.addTitleId
import de.rki.coronawarnapp.util.ui.observe2
import de.rki.coronawarnapp.util.ui.popBackStack
import de.rki.coronawarnapp.util.ui.viewBinding
Expand All @@ -37,14 +38,17 @@ class ProfileListFragment : Fragment(R.layout.profile_list_fragment), AutoInject
onScrollChange(it)
}
}
binding.toolbar.setNavigationOnClickListener { popBackStack() }
binding.toolbar.setOnMenuItemClickListener {
findNavController().navigate(
ProfileListFragmentDirections.actionProfileListFragmentToProfileOnboardingFragment(
showButton = false
binding.toolbar.apply {
addTitleId(R.id.profile_list_fragment_title)
setNavigationOnClickListener { popBackStack() }
setOnMenuItemClickListener {
findNavController().navigate(
ProfileListFragmentDirections.actionProfileListFragmentToProfileOnboardingFragment(
showButton = false
)
)
)
true
true
}
}
binding.profileFab.setOnClickListener {
viewModel.onCreateProfileClicked()
Expand Down
6 changes: 5 additions & 1 deletion ...App/src/main/java/de/rki/coronawarnapp/profile/ui/onboarding/ProfileOnboardingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import androidx.navigation.fragment.navArgs
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.ProfileOnboardingFragmentBinding
import de.rki.coronawarnapp.util.di.AutoInject
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 All @@ -26,7 +27,10 @@ class ProfileOnboardingFragment : Fragment(R.layout.profile_onboarding_fragment)

override fun onViewCreated(view: View, savedInstanceState: Bundle?) =
with(binding) {
toolbar.setNavigationOnClickListener { popBackStack() }
toolbar.apply {
setNavigationOnClickListener { popBackStack() }
addTitleId(R.id.profile_onboarding_fragment_title)
}
nextButton.apply {
setOnClickListener {
viewModel.onNext()
Expand Down
6 changes: 3 additions & 3 deletions ...na-Warn-App/src/main/java/de/rki/coronawarnapp/profile/ui/qrcode/ProfileQrCodeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class ProfileQrCodeFragment : Fragment(R.layout.profile_qr_code_fragment), AutoI
binding.apply {
appBarLayout.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
val alpha = 1.0f - abs(verticalOffset / (appBarLayout.totalScrollRange.toFloat() * 0.5f))
title.alpha = alpha
profileQrCodeFragmentTitle.alpha = alpha
}

nextButton.setOnClickListener { viewModel.onNext() }
Expand Down Expand Up @@ -137,9 +137,9 @@ class ProfileQrCodeFragment : Fragment(R.layout.profile_qr_code_fragment), AutoI
val params: CoordinatorLayout.LayoutParams = binding.nestedScrollView.layoutParams
as (CoordinatorLayout.LayoutParams)

val textParams = binding.title.layoutParams as (LinearLayout.LayoutParams)
val textParams = binding.profileQrCodeFragmentTitle.layoutParams as (LinearLayout.LayoutParams)
textParams.bottomMargin = (width / 2) - 24 /* 24 is space between screen border and QrCode */
binding.title.requestLayout() /* 24 is space between screen border and QrCode */
binding.profileQrCodeFragmentTitle.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
6 changes: 5 additions & 1 deletion ...src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionDispatcherViewMode
import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
import de.rki.coronawarnapp.util.ExternalActionHelper.openUrl
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.viewBinding
import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactoryProvider
Expand Down Expand Up @@ -108,7 +109,10 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa

private fun setButtonOnClickListener() {
binding.apply {
toolbar.setNavigationOnClickListener { viewModel.onBackPressed() }
toolbar.apply {
setNavigationOnClickListener { viewModel.onBackPressed() }
addTitleId(R.id.submission_dispatcher_fragment_title)
}
srsSelfTest.setOnClickListener { viewModel.onSrsTileClicked() }
positiveSelfTest.setOnClickListener { viewModel.onSrsTileClicked(positiveNoAnswer = true) }
submissionDispatcherQr.setOnClickListener { viewModel.onQRCodePressed() }
Expand Down
3 changes: 2 additions & 1 deletion Corona-Warn-App/src/main/res/layout/profile_qr_code_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
app:layout_collapseMode="parallax">

<TextView
android:id="@+id/title"
android:id="@+id/profile_qr_code_fragment_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/margin_24"
Expand Down Expand Up @@ -149,6 +149,7 @@

<TextView
style="@style/body2"
android:id="@+id/rat_qr_code_profile_description"
android:layout_width="match_parent"
9E88 android:layout_height="match_parent"
android:layout_marginTop="@dimen/margin_8"
Expand Down
4 changes: 4 additions & 0 deletions Corona-Warn-App/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@
<item name="trace_location_create_fragment_title_id" type="id" />
<item name="trace_location_create_fragment_subtitle_id" type="id" />
<item name="trace_location_organizer_trace_locations_list_fragment_title_id" type="id" />
<item name="submission_dispatcher_fragment_title" type="id" />
<item name="profile_onboarding_fragment_title" type="id" />
<item name="profile_list_fragment_title" type="id" />
<item name="profile_create_fragment_title" type="id" />

<declare-styleable name="ProgressLoadingButton">
<attr name="buttonText" format="string" />
Expand Down
0