From 765eac52517985dc8662adb0cc197f32495bdafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 14 Dec 2018 22:36:21 +0100
Subject: [PATCH] Fix blank number and change strikethrough lesson in widget
 (#198)

---
 .../timetable/TimetableWidgetFactory.kt        |  2 +-
 .../main/res/layout/item_widget_timetable.xml  | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
index de0913e8..fecdc42e 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
@@ -78,7 +78,7 @@ class TimetableWidgetFactory(
                     setTextViewText(R.id.timetableWidgetItemDescription, it.info.capitalize())
                 } else setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
 
-                if (it.changes) {
+                if (it.canceled) {
                     setInt(R.id.timetableWidgetItemSubject, "setPaintFlags",
                         STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG)
                 } else {
diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 2351e0b6..2007b323 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetableWidgetItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -9,18 +10,25 @@
 
     <TextView
         android:id="@+id/timetableWidgetItemNumber"
-        android:layout_width="55dp"
+        android:layout_width="45dp"
         android:layout_height="45dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
         android:gravity="center"
-        android:text="0"
-        android:textSize="25sp" />
+        android:maxLines="1"
+        android:textColor="@android:color/black"
+        android:textSize="25sp"
+        tools:text="0" />
 
     <TextView
         android:id="@+id/timetableWidgetItemTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginTop="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"
         android:layout_toRightOf="@id/timetableWidgetItemNumber"
         android:text="@string/app_name"
@@ -64,6 +72,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/timetableWidgetItemTime"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
         android:layout_marginTop="3dp"
         android:layout_marginBottom="5dp"
         android:layout_toEndOf="@id/timetableWidgetItemNumber"