New timetable widget design (#1384)

app/build.gradle

@@ -164,7 +164,7 @@ ext {
 }
 
 dependencies {
-    implementation "io.github.wulkanowy:sdk:496dc01d15"
+    implementation "io.github.wulkanowy:sdk:b991d0c"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 

app/src/main/res/drawable/background_widget_header_timetable.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimary" />
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+</shape>

app/src/main/res/drawable/background_widget_header_timetable_dark.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorWidgetTopBar" />
+    <corners
+        android:topLeftRadius="8dp"
+        android:topRightRadius="8dp" />
+</shape>

app/src/main/res/drawable/background_widget_item_timetable.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/white" />
+    <corners android:radius="3dp" />
+</shape>

app/src/main/res/drawable/background_widget_item_timetable_dark.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorWidgetTopBar" />
+    <corners android:radius="3dp" />
+</shape>

app/src/main/res/drawable/background_widget_timetable.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#bbffffff" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/drawable/background_widget_timetable_dark.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#BB191919" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/layout/item_widget_timetable.xml

@@ -6,12 +6,12 @@
     android:layout_height="wrap_content"
     android:minHeight="45dp"
     android:orientation="vertical"
+    android:background="@drawable/background_widget_item_timetable"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
         android:paddingStart="6dp"
         android:paddingLeft="6dp"
         android:paddingTop="6dp"
@@ -126,9 +126,4 @@
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
             tools:visibility="gone" />
     </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDivider" />
 </LinearLayout>

app/src/main/res/layout/item_widget_timetable_dark.xml

@@ -6,12 +6,12 @@
     android:layout_height="wrap_content"
     android:minHeight="45dp"
     android:orientation="vertical"
+    android:background="@drawable/background_widget_item_timetable_dark"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetFactory">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/colorWidgetBackground"
         android:paddingStart="6dp"
         android:paddingTop="6dp"
         android:paddingEnd="12dp"
@@ -111,9 +111,4 @@
             tools:text="Lekcja odwołana: uczniowie zwolnieni do domu"
             tools:visibility="gone" />
     </RelativeLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorDividerInverse" />
 </LinearLayout>

app/src/main/res/layout/item_widget_timetable_small.xml

@@ -91,7 +91,7 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <FrameLayout
+    <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/colorDivider" />

app/src/main/res/layout/item_widget_timetable_small_dark.xml

@@ -90,7 +90,7 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <FrameLayout
+    <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/colorDividerInverse" />

app/src/main/res/layout/widget_timetable.xml

@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white"
+    android:background="@drawable/background_widget_timetable"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:background="@color/colorPrimary">
+        android:background="@drawable/background_widget_header_timetable">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -45,6 +45,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_marginEnd="4dp"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -77,7 +78,12 @@
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="66dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginBottom="10dp"
+        android:divider="#00ffffff"
+        android:dividerHeight="4dp"
         tools:listitem="@layout/item_widget_timetable" />
 
     <TextView
@@ -88,5 +94,6 @@
         android:text="@string/widget_timetable_no_items"
         android:textColor="@android:color/black"
         android:textSize="20sp"
+        android:translationY="28dp"
         tools:visibility="invisible" />
 </FrameLayout>

app/src/main/res/layout/widget_timetable_dark.xml

@@ -3,13 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorWidgetBackground"
+    android:background="@drawable/background_widget_timetable_dark"
     tools:context=".ui.modules.timetablewidget.TimetableWidgetProvider">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:background="@color/colorWidgetTopBar">
+        android:background="@drawable/background_widget_header_timetable_dark">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -45,6 +45,7 @@
             android:layout_width="50dp"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
+            android:layout_marginEnd="4dp"
             android:background="?android:selectableItemBackground"
             android:contentDescription="@string/account_title"
             android:src="@drawable/ic_widget_account" />
@@ -77,7 +78,12 @@
         android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="56dp"
+        android:layout_marginTop="66dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:divider="#00ffffff"
+        android:dividerHeight="4dp"
         tools:listitem="@layout/item_widget_timetable_dark" />
 
     <TextView
@@ -88,5 +94,6 @@
         android:text="@string/widget_timetable_no_items"
         android:textColor="@android:color/white"
         android:textSize="20sp"
+        android:translationY="28dp"
         tools:visibility="invisible" />
 </FrameLayout>