Skip to content
Snippets Groups Projects
Commit b49d0e0b authored by Oliver Zimmerman's avatar Oliver Zimmerman
Browse files

Got rid of includes

parent 26d38895
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/fragment/SubmissionDispatcherFragment.kt
+ 3
− 3
View file @ b49d0e0b
...@@ -59,13 +59,13 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa ...@@ -59,13 +59,13 @@ class SubmissionDispatcherFragment : Fragment(R.layout.fragment_submission_dispa
binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener { binding.submissionDispatcherHeader.headerButtonBack.buttonIcon.setOnClickListener {
viewModel.onBackPressed() viewModel.onBackPressed()
} }
binding.submissionDispatcherContent.submissionDispatcherQr.dispatcherCard.setOnClickListener { binding.submissionDispatcherQr.dispatcherCard.setOnClickListener {
viewModel.onQRCodePressed() viewModel.onQRCodePressed()
} }
binding.submissionDispatcherContent.submissionDispatcherTanCode.dispatcherCard.setOnClickListener { binding.submissionDispatcherTanCode.dispatcherCard.setOnClickListener {
viewModel.onTanPressed() viewModel.onTanPressed()
} }
binding.submissionDispatcherContent.submissionDispatcherTanTele.dispatcherCard.setOnClickListener { binding.submissionDispatcherTanTele.dispatcherCard.setOnClickListener {
viewModel.onTeleTanPressed() viewModel.onTeleTanPressed()
} }
} }
......
Corona-Warn-App/src/main/res/layout/fragment_submission_dispatcher.xml
+ 110
− 7
View file @ b49d0e0b
...@@ -20,17 +20,120 @@ ...@@ -20,17 +20,120 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/submission_dispatcher_scroll"
app:title="@{@string/submission_dispatcher_headline}" /> app:title="@{@string/submission_dispatcher_headline}" />
<include <ScrollView
android:id="@+id/submission_dispatcher_content" android:id="@+id/submission_dispatcher_scroll"
layout="@layout/include_submission_dispatcher" android:layout_width="match_parent"
android:layout_width="@dimen/match_constraint" android:layout_height="wrap_content"
android:layout_height="@dimen/match_constraint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header" /> app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_header">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:paddingBottom="@dimen/spacing_normal">
<ImageView
android:id="@+id/submission_dispatcher_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:src="@drawable/ic_illustration_test"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/submission_dispatcher_text"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_illustration" />
<TextView
android:id="@+id/submission_dispatcher_needs_testing_text"
style="@style/headline6"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_needs_testing_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
<include
android:id="@+id/submission_dispatcher_qr"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_qr_card_text}"
app:headline="@{@string/submission_dispatcher_card_qr}"
app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_needs_testing_text" />
<include
android:id="@+id/submission_dispatcher_tan_code"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_tan_code_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_code}"
app:illustration="@{@drawable/ic_submission_illustration_tan_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" />
<TextView
android:id="@+id/submission_dispatcher_already_positive_text"
style="@style/headline6"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_already_positive_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
<include
android:id="@+id/submission_dispatcher_tan_tele"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_tan_tele_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_tele}"
app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_already_positive_text" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_card" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
Corona-Warn-App/src/main/res/layout/include_submission_dispatcher.xml deleted 100644 → 0
+ 0
− 112
View file @ 26d38895
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:paddingBottom="@dimen/spacing_normal">
<ImageView
android:id="@+id/submission_dispatcher_illustration"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:src="@drawable/ic_illustration_test"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/submission_dispatcher_text"
style="@style/subtitle"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_illustration" />
<TextView
android:id="@+id/submission_dispatcher_needs_testing_text"
style="@style/headline6"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_needs_testing_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_text" />
<include
android:id="@+id/submission_dispatcher_qr"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_qr_card_text}"
app:headline="@{@string/submission_dispatcher_card_qr}"
app:illustration="@{@drawable/ic_submission_illustration_qr_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_needs_testing_text" />
<include
android:id="@+id/submission_dispatcher_tan_code"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_tan_code_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_code}"
app:illustration="@{@drawable/ic_submission_illustration_tan_code_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_qr" />
<TextView
android:id="@+id/submission_dispatcher_already_positive_text"
style="@style/headline6"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:text="@string/submission_dispatcher_already_positive_subheadline"
android:focusable="true"
app:layout_constraintEnd_toStartOf="@+id/guideline_end"
app:layout_constraintStart_toStartOf="@+id/guideline_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_tan_code" />
<include
android:id="@+id/submission_dispatcher_tan_tele"
layout="@layout/include_dispatcher_card"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:clickable="true"
android:focusable="true"
app:body="@{@string/submission_dispatcher_tan_tele_card_text}"
app:headline="@{@string/submission_dispatcher_card_tan_tele}"
app:illustration="@{@drawable/ic_submission_illustration_tan_hotline_card}"
app:layout_constraintEnd_toStartOf="@+id/guideline_card_end"
app:layout_constraintStart_toStartOf="@+id/guideline_card_start"
app:layout_constraintTop_toBottomOf="@+id/submission_dispatcher_already_positive_text" />
<include layout="@layout/merge_guidelines_side" />
<include layout="@layout/merge_guidelines_card" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment