sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Fix Homework dialog buttons layout (#1297)

Browse Source
This commit is contained in:
Damian Czupryn 2021-04-19 18:09:14 +02:00 committed by GitHub
parent 6855296de4
commit 9a19ce9ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,13 @@
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:background="@drawable/ic_all_divider"
android:paddingHorizontal="10dp" android:gravity="end"
android:paddingVertical="5dp"> android:minHeight="52dp"
android:orientation="horizontal">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/homeworkDialogRead" android:id="@+id/homeworkDialogRead"
style="@style/Widget.MaterialComponents.Button.TextButton" style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -35,6 +36,7 @@
android:insetRight="0dp" android:insetRight="0dp"
android:insetBottom="0dp" android:insetBottom="0dp"
android:minWidth="88dp" android:minWidth="88dp"
android:layout_gravity="center_vertical"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:text="@string/homework_mark_as_done" android:text="@string/homework_mark_as_done"
@ -43,7 +45,7 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/homeworkDialogClose" android:id="@+id/homeworkDialogClose"
style="@style/Widget.MaterialComponents.Button.TextButton" style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
@ -54,6 +56,7 @@
android:insetRight="0dp" android:insetRight="0dp"
android:insetBottom="0dp" android:insetBottom="0dp"
android:minWidth="88dp" android:minWidth="88dp"
android:layout_gravity="center_vertical"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:text="@string/all_close" android:text="@string/all_close"

2
app/src/main/res/layout/dialog_mobile_device.xml
View File

@ -13,7 +13,7 @@
<View <View
android:layout_width="292dp" android:layout_width="292dp"
android:layout_height="416dp" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

1
app/src/test/java/io/github/wulkanowy/ui/modules/grade/GradeAverageProviderTest.kt
View File

@ -520,6 +520,7 @@ class GradeAverageProviderTest {
fun `calc all year average`() { fun `calc all year average`() {
every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR every { preferencesRepository.gradeAverageMode } returns GradeAverageMode.ALL_YEAR
every { preferencesRepository.gradeAverageForceCalc } returns false every { preferencesRepository.gradeAverageForceCalc } returns false
every { preferencesRepository.isOptionalArithmeticAverage } returns false
coEvery { coEvery {
gradeRepository.getGrades( gradeRepository.getGrades(
student, student,