1
0
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2024-09-20 03:29:08 -05:00

New timetable widget design (#1384)

This commit is contained in:
killerkeemstar 2021-08-23 18:02:21 +02:00 committed by GitHub
parent 076948a680
commit aba2068a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 59 additions and 21 deletions

View File

@ -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'

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -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>

View File

@ -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>

View File

@ -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" />

View File

@ -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" />

View File

@ -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>

View File

@ -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>