github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-18 21:16:48 -06:00
Code

Fix visibility of dialog close button when homework content is l… (#774)

Browse Source
This commit is contained in:
Mikołaj Pich 2020-04-18 23:06:05 +02:00 committed by GitHub
parent 69be7ca412
commit b19084cb57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/layout/dialog_homework.xml
View File

@ -9,14 +9,18 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/homeworkDialogRecycler" android:id="@+id/homeworkDialogRecycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_weight="1"
android:minWidth="300dp" android:minWidth="300dp"
tools:itemCount="1" tools:itemCount="1"
tools:listitem="@layout/item_homework_dialog_details" /> tools:listitem="@layout/item_homework_dialog_details" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="@drawable/ic_all_divider"
android:paddingHorizontal="10dp"
android:paddingVertical="5dp">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/homeworkDialogRead" android:id="@+id/homeworkDialogRead"
@ -25,8 +29,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginStart="10dp"
android:layout_marginBottom="10dp"
android:text="@string/homework_mark_as_done" android:text="@string/homework_mark_as_done"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -38,8 +40,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:text="@string/all_close" android:text="@string/all_close"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />

4
app/src/main/res/layout/item_homework_dialog_details.xml
View File

@ -1,4 +1,5 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
@ -93,6 +94,7 @@
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:text="@string/all_no_data" android:text="@string/all_no_data"
android:textIsSelectable="true" android:textIsSelectable="true"
android:textSize="12sp" /> android:textSize="12sp"
tools:text="@tools:sample/lorem/random" />
</LinearLayout> </LinearLayout>