From 563f08b0ab56808e70e4c931e80b837af5a9d128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sun, 10 Nov 2019 18:53:45 +0100
Subject: [PATCH] [UI] Update Timetable lesson layout. Add lesson number text.

---
 .../timetable/v2/day/TimetableDayFragment.kt  |  6 +--
 .../drawable/timetable_lesson_annotation.xml  |  6 ++-
 .../timetable_subject_color_rounded.xml       | 10 ++++
 app/src/main/res/layout/timetable_lesson.xml  | 52 ++++++++++++++-----
 4 files changed, 57 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/timetable_subject_color_rounded.xml

diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
index 92044328..bc5637eb 100644
--- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
+++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
@@ -129,10 +129,10 @@ class TimetableDayFragment(val date: Date) : Fragment() {
             //lb.subjectName.typeface = Typeface.create("sans-serif-light", Typeface.BOLD)
             when (lesson.type) {
                 Lesson.TYPE_NORMAL -> {
-                    lb.annotation.visibility = View.GONE
+                    lb.annotationVisible = false
                 }
                 Lesson.TYPE_CANCELLED -> {
-                    lb.annotation.visibility = View.VISIBLE
+                    lb.annotationVisible = true
                     lb.annotation.setText(R.string.timetable_lesson_cancelled)
                     lb.annotation.background.colorFilter = PorterDuffColorFilter(
                             getColorFromAttr(activity, R.attr.timetable_lesson_cancelled_color),
@@ -141,7 +141,7 @@ class TimetableDayFragment(val date: Date) : Fragment() {
                     //lb.subjectName.typeface = Typeface.DEFAULT
                 }
                 Lesson.TYPE_CHANGE -> {
-                    lb.annotation.visibility = View.VISIBLE
+                    lb.annotationVisible = true
                     if (lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId) {
                         lb.annotation.setText(
                                 R.string.timetable_lesson_change_format,
diff --git a/app/src/main/res/drawable/timetable_lesson_annotation.xml b/app/src/main/res/drawable/timetable_lesson_annotation.xml
index b22dc045..4c89f473 100644
--- a/app/src/main/res/drawable/timetable_lesson_annotation.xml
+++ b/app/src/main/res/drawable/timetable_lesson_annotation.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-10.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:shape="rectangle">
     <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
-    <solid android:color="#2196f3" tools:color="?timetable_lesson_cancelled_color" />
+    <solid android:color="#2196f3" tools:color="?timetable_lesson_change_color" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/timetable_subject_color_rounded.xml b/app/src/main/res/drawable/timetable_subject_color_rounded.xml
new file mode 100644
index 00000000..5466dfa2
--- /dev/null
+++ b/app/src/main/res/drawable/timetable_subject_color_rounded.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) Kuba Szczodrzyński 2019-11-10.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+    <solid android:color="#e91e63" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/timetable_lesson.xml b/app/src/main/res/layout/timetable_lesson.xml
index 4b857f8f..5fadc319 100644
--- a/app/src/main/res/layout/timetable_lesson.xml
+++ b/app/src/main/res/layout/timetable_lesson.xml
@@ -2,6 +2,11 @@
 <layout 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">
+    <data>
+        <variable
+            name="annotationVisible"
+            type="boolean"/>
+    </data>
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -24,41 +29,49 @@
                 android:fontFamily="sans-serif-condensed"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
+                android:text="@string/timetable_lesson_cancelled"
                 android:textColor="#000"
                 android:textSize="12sp"
                 android:textStyle="italic"
-                android:text="@string/timetable_lesson_cancelled"
-                android:visibility="gone"
-                tools:visibility="visible"/>
+                android:visibility="@{annotationVisible ? View.VISIBLE : View.GONE}"
+                tools:text="Zastępstwo: zamiast lekcji język polski z Adam Dodatkowy"
+                tools:visibility="gone" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
-                android:paddingTop="4dp"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:baselineAligned="false">
+                <!--tools:background="@drawable/timetable_subject_color_rounded"-->
 
                 <TextView
                     android:id="@+id/subjectName"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="4dp"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:fontFamily="sans-serif-light"
-                    android:maxLines="2"
+                    android:maxLines="@{annotationVisible ? 1 : 2}"
                     android:textSize="16sp"
                     android:textStyle="bold"
-                    tools:text="pracownia urządzeń techniki komputerowej nazwa przedmiotu jest bardzo długa i pewnie się tu nie zmieści w ogóle" />
+                    app:autoSizeMaxTextSize="16sp"
+                    app:autoSizeMinTextSize="12sp"
+                    app:autoSizeTextType="uniform"
+                    tools:maxLines="2"
+                    tools:text="pracownia urządzeń techniki komputerowej" />
 
                 <ImageView
                     android:id="@+id/attendanceIcon"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:layout_weight="0"
-                    tools:srcCompat="@sample/check"
+                    android:layout_gravity="center_vertical"
                     android:visibility="gone"
+                    tools:srcCompat="@sample/check"
                     tools:visibility="visible" />
 
                 <ImageView
@@ -69,6 +82,20 @@
                     app:srcCompat="@drawable/bg_circle"
                     android:visibility="gone" />
 
+                <TextView
+                    android:id="@+id/textView6"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:fontFamily="sans-serif-condensed-light"
+                    android:includeFontPadding="false"
+                    android:layout_marginTop="@{annotationVisible ? -4 : 4}"
+                    android:layout_marginBottom="@{annotationVisible ? -4 : 0}"
+                    android:paddingStart="4dp"
+                    android:paddingEnd="4dp"
+                    android:text="9"
+                    tools:textSize="28sp"/>
+
             </LinearLayout>
 
             <LinearLayout
@@ -76,15 +103,14 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:gravity="bottom"
+                android:orientation="vertical"
                 android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:orientation="vertical">
+                android:paddingEnd="8dp">
 
                 <TextView
                     android:id="@+id/detailsFirst"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     tools:text="8:10 - 8:55 • 015 językowa → 016 językowa" />