commit fba3c7b8df2def0fd0b831b6b3ef4c2a5aae0beb parent cc63a75f981d0a4a2d543ad4c8236e493a089fe8 Author: William Lindholm <william_lindholm@outlook.com> Date: Sun, 7 May 2023 21:25:12 +0200 Moved popup inside scrollView to prevent on screen keyboard from messing with layout. Diffstat:
| M | app/src/main/res/layout/filter_popup.xml | | | 455 | ++++++++++++++++++++++++++++++++++++++++--------------------------------------- |
1 file changed, 229 insertions(+), 226 deletions(-)
diff --git a/app/src/main/res/layout/filter_popup.xml b/app/src/main/res/layout/filter_popup.xml @@ -6,275 +6,278 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/popup" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="50dp" - android:background="@color/white" - android:backgroundTint="#C1BDBD" - android:foregroundTint="#BD1B1B" - android:foregroundTintMode="add" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.494" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.494"> + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/filterLayout1" + android:id="@+id/popup" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="5dp" - app:layout_constraintTop_toBottomOf="@+id/divider"> + android:layout_margin="50dp" + android:background="@color/white" + android:backgroundTint="#ADB4B6" + android:foregroundTint="#BD1B1B" + android:foregroundTintMode="add"> - <TextView - android:id="@+id/textView2" - android:layout_width="wrap_content" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/filterLayout1" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginTop="10dp" - android:text="Range" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + android:layout_marginTop="5dp" + app:layout_constraintTop_toBottomOf="@+id/divider"> - <SeekBar - android:id="@+id/distanceBar" - android:layout_width="0dp" + <TextView + android:id="@+id/textView2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="10dp" + android:text="Range" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <SeekBar + android:id="@+id/distanceBar" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:layout_marginTop="10dp" + android:layout_marginEnd="5dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/distanceProgress" + app:layout_constraintStart_toEndOf="@+id/textView2" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/distanceProgress" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginEnd="20dp" + android:text="0km" + android:textSize="10sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/filterLayout2" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="5dp" - android:layout_marginTop="10dp" - android:layout_marginEnd="5dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/distanceProgress" - app:layout_constraintStart_toEndOf="@+id/textView2" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/filterLayout1"> + + <TextView + android:id="@+id/textView12" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="18dp" + android:text="Maximum Mass:" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <EditText + android:id="@+id/editTextNumber7" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:layout_marginEnd="20dp" + android:ems="10" + android:inputType="number" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/textView12" + app:layout_constraintTop_toTopOf="parent" /> + + <TextView + android:id="@+id/textView13" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="24dp" + android:layout_marginBottom="10dp" + android:text="Minimum Mass:" + app:layout_constraintBottom_toBottomOf="@+id/editTextNumber8" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView12" /> + + <EditText + android:id="@+id/editTextNumber8" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:ems="10" + android:inputType="number" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toEndOf="@+id/textView13" + app:layout_constraintStart_toStartOf="@+id/editTextNumber7" + app:layout_constraintTop_toBottomOf="@+id/editTextNumber7" /> + + <EditText + android:id="@+id/editTextNumber9" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:ems="10" + android:inputType="number" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/textView14" + app:layout_constraintStart_toStartOf="@+id/editTextNumber7" + app:layout_constraintTop_toBottomOf="@+id/editTextNumber8" /> + + <TextView + android:id="@+id/textView14" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="10dp" + android:text="Year from:" + app:layout_constraintBottom_toBottomOf="@+id/editTextNumber9" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView13" + app:layout_constraintVertical_bias="1.0" /> + + <TextView + android:id="@+id/textView15" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="10dp" + android:text="Year to:" + app:layout_constraintBottom_toBottomOf="@+id/editTextNumber11" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView14" /> + + <EditText + android:id="@+id/editTextNumber11" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:ems="10" + android:inputType="number" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@+id/editTextNumber7" + app:layout_constraintTop_toBottomOf="@+id/editTextNumber9" /> + </androidx.constraintlayout.widget.ConstraintLayout> <TextView - android:id="@+id/distanceProgress" + android:id="@+id/textView6" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginEnd="20dp" - android:text="0km" - android:textSize="10sp" + android:layout_marginTop="4dp" + android:text="Sorting options" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - </androidx.constraintlayout.widget.ConstraintLayout> + app:layout_constraintHorizontal_bias="0.497" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider2" /> - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/filterLayout2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintTop_toBottomOf="@+id/filterLayout1"> + <View + android:id="@+id/divider3" + android:layout_width="310dp" + android:layout_height="1dp" + android:layout_marginTop="5dp" + android:background="?android:attr/listDivider" + app:layout_constraintTop_toBottomOf="@+id/textView6" + tools:layout_editor_absoluteX="1dp" /> <TextView - android:id="@+id/textView12" + android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginTop="18dp" - android:text="Maximum Mass:" + android:layout_marginTop="4dp" + android:text="Filter Options" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - <EditText - android:id="@+id/editTextNumber7" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="5dp" - android:layout_marginEnd="20dp" - android:ems="10" - android:inputType="number" + <View + android:id="@+id/divider" + android:layout_width="310dp" + android:layout_height="1dp" + android:layout_marginTop="4dp" + android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/textView12" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView" /> - <TextView - android:id="@+id/textView13" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginTop="24dp" - android:layout_marginBottom="10dp" - android:text="Minimum Mass:" - app:layout_constraintBottom_toBottomOf="@+id/editTextNumber8" + <View + android:id="@+id/divider2" + android:layout_width="310dp" + android:layout_height="1dp" + android:layout_marginTop="10dp" + android:background="?android:attr/listDivider" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView12" /> + app:layout_constraintTop_toBottomOf="@+id/filterLayout2" /> - <EditText - android:id="@+id/editTextNumber8" + <RadioGroup + android:id="@+id/sortingGroup" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="20dp" android:layout_marginEnd="20dp" - android:ems="10" - android:inputType="number" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toEndOf="@+id/textView13" - app:layout_constraintStart_toStartOf="@+id/editTextNumber7" - app:layout_constraintTop_toBottomOf="@+id/editTextNumber7" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider3"> - <EditText - android:id="@+id/editTextNumber9" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginEnd="20dp" - android:ems="10" - android:inputType="number" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@+id/textView14" - app:layout_constraintStart_toStartOf="@+id/editTextNumber7" - app:layout_constraintTop_toBottomOf="@+id/editTextNumber8" /> + <RadioButton + android:id="@+id/radioButtonSortName" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Alphabetically" /> - <TextView - android:id="@+id/textView14" + <RadioButton + android:id="@+id/radioButtonSortLocation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Location" /> + + <RadioButton + android:id="@+id/radioButtonSortWeight" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Mass" /> + </RadioGroup> + + <Button + android:id="@+id/confirmFilterButton" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="10dp" - android:text="Year from:" - app:layout_constraintBottom_toBottomOf="@+id/editTextNumber9" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" + android:layout_marginBottom="20dp" + android:text="Confirm" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView13" + app:layout_constraintTop_toBottomOf="@+id/sortingGroup" app:layout_constraintVertical_bias="1.0" /> - <TextView - android:id="@+id/textView15" + <Button + android:id="@+id/cancelFilterButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginTop="20dp" - android:layout_marginBottom="10dp" - android:text="Year to:" - app:layout_constraintBottom_toBottomOf="@+id/editTextNumber11" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView14" /> - - <EditText - android:id="@+id/editTextNumber11" - android:layout_width="0dp" - android:layout_height="wrap_content" android:layout_marginEnd="20dp" - android:ems="10" - android:inputType="number" + android:layout_marginBottom="20dp" + android:foregroundTint="#CC1818" + android:text="cancel" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@+id/editTextNumber7" - app:layout_constraintTop_toBottomOf="@+id/editTextNumber9" /> - </androidx.constraintlayout.widget.ConstraintLayout> - - <TextView - android:id="@+id/textView6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="Sorting options" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.497" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider2" /> - - <View - android:id="@+id/divider3" - android:layout_width="310dp" - android:layout_height="1dp" - android:layout_marginTop="5dp" - android:background="?android:attr/listDivider" - app:layout_constraintTop_toBottomOf="@+id/textView6" - tools:layout_editor_absoluteX="1dp" /> - - <TextView - android:id="@+id/textView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:text="Filter Options" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <View - android:id="@+id/divider" - android:layout_width="310dp" - android:layout_height="1dp" - android:layout_marginTop="4dp" - android:background="?android:attr/listDivider" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView" /> - - <View - android:id="@+id/divider2" - android:layout_width="310dp" - android:layout_height="1dp" - android:layout_marginTop="10dp" - android:background="?android:attr/listDivider" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/filterLayout2" /> - - <RadioGroup - android:id="@+id/sortingGroup" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginEnd="20dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/divider3"> - - <RadioButton - android:id="@+id/radioButtonSortName" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Alphabetically" /> - - <RadioButton - android:id="@+id/radioButtonSortLocation" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Location" /> - - <RadioButton - android:id="@+id/radioButtonSortWeight" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Mass" /> - </RadioGroup> - - <Button - android:id="@+id/confirmFilterButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="20dp" - android:layout_marginBottom="20dp" - android:text="Confirm" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" /> - - <Button - android:id="@+id/cancelFilterButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="20dp" - android:layout_marginBottom="20dp" - android:foregroundTint="#CC1818" - android:text="cancel" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@+id/confirmFilterButton" /> + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@+id/confirmFilterButton" + app:layout_constraintTop_toBottomOf="@+id/sortingGroup" + app:layout_constraintVertical_bias="1.0" /> - </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> + </ScrollView> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file