github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-19 00:26:45 -06:00
Code

Add exam date field to exam details dialog (#1801)

Browse Source
This commit is contained in:
Mikołaj Pich 2022-03-13 22:47:54 +01:00 committed by GitHub
parent a04ba4ae10
commit 15537586c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/io/github/wulkanowy/ui/modules/exam/ExamDialog.kt
View File

@ -47,7 +47,8 @@ class ExamDialog : DialogFragment() {
examDialogSubjectValue.text = exam.subject
examDialogTypeValue.text = exam.type
examDialogTeacherValue.text = exam.teacher
examDialogDateValue.text = exam.entryDate.toFormattedString()
examDialogEntryDateValue.text = exam.entryDate.toFormattedString()
examDialogDeadlineDateValue.text = exam.date.toFormattedString()
examDialogDescriptionValue.text = exam.description.ifBlank {
getString(R.string.all_no_data)
}

45
app/src/main/res/layout/dialog_exam.xml
View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
tools:context=".ui.modules.exam.ExamDialog">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
@ -126,13 +128,13 @@
app:layout_constraintTop_toBottomOf="@id/examDialogTeacherTitle" />
<TextView
android:id="@+id/examDialogDateTitle"
android:id="@+id/examDialogDeadlineDateTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/exam_entry_date"
android:text="@string/all_date"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@ -141,7 +143,7 @@
app:layout_constraintTop_toBottomOf="@id/examDialogTeacherValue" />
<TextView
android:id="@+id/examDialogDateValue"
android:id="@+id/examDialogDeadlineDateValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
@ -154,7 +156,38 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/examDialogDateTitle" />
app:layout_constraintTop_toBottomOf="@id/examDialogDeadlineDateTitle" />
<TextView
android:id="@+id/examDialogEntryDateTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:text="@string/exam_entry_date"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/examDialogDeadlineDateValue" />
<TextView
android:id="@+id/examDialogEntryDateValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="24dp"
android:paddingStart="0dp"
android:paddingEnd="16dp"
android:text="@string/all_no_data"
android:textIsSelectable="true"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/examDialogEntryDateTitle" />
<TextView
android:id="@+id/examDialogDescriptionTitle"
@ -169,7 +202,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/examDialogDateValue" />
app:layout_constraintTop_toBottomOf="@id/examDialogEntryDateValue" />
<TextView
android:id="@+id/examDialogDescriptionValue"