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

Remove tan warn others (EXPOSUREAPP-14492) #5774

Merged
merged 2 commits into from
Dec 21, 2022
Merged

Remove tan warn others (EXPOSUREAPP-14492) #5774

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
4b002e9
Remove tan references from trace location.
SamuraiKek Dec 21, 2022
0f6a3ed
Merge branch 'release/3.0.x' into feature/14492-remove-tan-warn-others
mtwalli Dec 21, 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: 0 additions & 8 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 @@ -168,14 +168,6 @@ class TraceLocationsFragment : Fragment(R.layout.trace_location_organizer_trace_
true
}

R.id.menu_warn_guests -> {
setupAxisTransition()
findNavController().navigate(
R.id.action_traceLocationsFragment_to_traceLocationWarnInfoFragment
)
true
}

R.id.menu_remove_all -> {
showDeleteAllDialog()
true
Expand Down
24 changes: 1 addition & 23 deletions Corona-Warn-App/src/main/res/layout/trace_location_organizer_qr_code_info_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,28 +136,6 @@
app:layout_constraintStart_toEndOf="@id/trace_location_qr_time_sheet_icon"
app:layout_constraintTop_toTopOf="@id/trace_location_qr_time_sheet_icon" />

<ImageView
android:id="@+id/trace_location_qr_people_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:importantForAccessibility="no"
app:layout_constraintStart_toStartOf="@id/trace_location_qr_time_sheet_icon"
app:layout_constraintTop_toBottomOf="@id/trace_location_qr_time_sheet_text"
app:srcCompat="@drawable/ic_two_people_icon" />

<TextView
android:id="@+id/trace_location_qr_people_text"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_small"
android:layout_marginEnd="@dimen/spacing_normal"
android:text="@string/trace_location_qr_info_warn_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/trace_location_qr_people_icon"
app:layout_constraintTop_toTopOf="@id/trace_location_qr_people_icon" />

<include
android:id="@+id/privacy_card"
layout="@layout/trace_location_privacy_card"
Expand All @@ -168,7 +146,7 @@
android:layout_marginEnd="@dimen/spacing_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/trace_location_qr_people_text" />
app:layout_constraintTop_toBottomOf="@id/trace_location_qr_time_sheet_text" />

<de.rki.coronawarnapp.ui.view.MoreInformationView
android:id="@+id/privacy_information"
Expand Down
3 changes: 0 additions & 3 deletions Corona-Warn-App/src/main/res/menu/menu_trace_location_organizer_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
<item
android:id="@+id/menu_information"
android:title="@string/trace_location_organizer_list_menu_information_btn" />
<item
android:id="@+id/menu_warn_guests"
android:title="@string/trace_location_organizer_list_menu_warn_guests_btn" />
<item
android:id="@+id/menu_remove_all"
android:title="@string/trace_location_organizer_list_menu_remove_all_btn" />
Expand Down