github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Improve the display of changes in the timetable (#275)

Browse Source 
Closes #264
This commit is contained in:
Mikołaj Pich
2019-03-11 20:56:47 +01:00
committed by Rafał Borcz
parent 475e7dd6a3
commit 2621e5680d
13 changed files with 224 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/res/layout/dialog_timetable.xml
View File

@ -51,6 +51,17 @@
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/timetableDialogSubjectNew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/all_no_data"
android:textColor="@color/colorPrimary"
android:textIsSelectable="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/timetableDialogTeacherTitle"
android:layout_width="wrap_content"
@ -68,6 +79,17 @@
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/timetableDialogTeacherNew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/all_no_data"
android:textColor="@color/colorPrimary"
android:textIsSelectable="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/timetableDialogGroupTitle"
android:layout_width="wrap_content"
@ -102,6 +124,17 @@
android:textIsSelectable="true"
android:textSize="12sp" />
<TextView
android:id="@+id/timetableDialogRoomNew"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="@string/all_no_data"
android:textColor="@color/colorPrimary"
android:textIsSelectable="true"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

21
app/src/main/res/layout/item_widget_timetable.xml
View File

@ -6,7 +6,8 @@
android:layout_height="wrap_content"
android:background="@drawable/ic_all_divider"
android:minHeight="45dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:context=".ui.widgets.timetable.TimetableWidgetFactory">
<TextView
android:id="@+id/timetableWidgetItemNumber"
@ -19,7 +20,7 @@
android:maxLines="1"
android:textColor="@android:color/black"
android:textSize="25sp"
tools:text="0" />
tools:text="1" />
<TextView
android:id="@+id/timetableWidgetItemTime"
@ -31,9 +32,9 @@
android:layout_marginTop="10dp"
android:layout_toEndOf="@id/timetableWidgetItemNumber"
android:layout_toRightOf="@id/timetableWidgetItemNumber"
android:text="@string/app_name"
android:textColor="@android:color/secondary_text_light"
android:textSize="13sp" />
android:textSize="13sp"
tools:text="08:00 - 08:45" />
<TextView
android:id="@+id/timetableWidgetItemSubject"
@ -46,9 +47,9 @@
android:layout_marginRight="25dp"
android:layout_toEndOf="@id/timetableWidgetItemTime"
android:layout_toRightOf="@id/timetableWidgetItemTime"
android:text="@string/app_name"
android:textColor="@android:color/secondary_text_light"
android:textSize="13sp" />
android:textSize="13sp"
tools:text="Język polski" />
<TextView
android:id="@+id/timetableWidgetItemDescription"
@ -63,9 +64,9 @@
android:layout_marginBottom="5dp"
android:layout_toEndOf="@id/timetableWidgetItemTime"
android:layout_toRightOf="@id/timetableWidgetItemTime"
android:text="@string/app_name"
android:textColor="@color/colorPrimaryDark"
android:textSize="12sp" />
android:textSize="12sp"
tools:text="Lekcja odwołana: uczniowie zwolnieni do domu" />
<TextView
android:id="@+id/timetableWidgetItemRoom"
@ -78,7 +79,7 @@
android:layout_marginBottom="5dp"
android:layout_toEndOf="@id/timetableWidgetItemNumber"
android:layout_toRightOf="@id/timetableWidgetItemNumber"
android:text="@string/app_name"
android:textColor="@android:color/secondary_text_light"
android:textSize="12sp" />
android:textSize="12sp"
tools:text="Sala 25" />
</RelativeLayout>

24
app/src/main/res/layout/widget_timetable.xml
View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
android:background="@android:color/white"
tools:context=".ui.widgets.timetable.TimetableWidgetProvider">
<RelativeLayout
android:layout_width="match_parent"
@ -18,7 +20,8 @@
android:layout_marginLeft="5dp"
android:backgroundTint="@color/colorPrimaryDark"
android:contentDescription="@string/all_prev"
android:src="@drawable/ic_widget_chevron_24dp" />
android:src="@drawable/ic_widget_chevron_24dp"
tools:targetApi="lollipop" />
<TextView
android:id="@+id/timetableWidgetDay"
@ -32,9 +35,9 @@
android:layout_toRightOf="@id/timetableWidgetPrev"
android:gravity="center_horizontal"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@android:color/white"
android:textSize="15sp" />
android:textSize="15sp"
tools:text="Poniedziałek" />
<TextView
android:id="@+id/timetableWidgetDate"
@ -49,9 +52,9 @@
android:layout_toRightOf="@id/timetableWidgetPrev"
android:gravity="center_horizontal"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@android:color/white"
android:textSize="14sp" />
android:textSize="14sp"
tools:text="12.03.2019" />
<ImageButton
android:id="@+id/timetableWidgetNext"
@ -65,7 +68,8 @@
android:backgroundTint="@color/colorPrimaryDark"
android:contentDescription="@string/all_next"
android:rotation="180"
android:src="@drawable/ic_widget_chevron_24dp" />
android:src="@drawable/ic_widget_chevron_24dp"
tools:targetApi="lollipop" />
</RelativeLayout>
@ -73,7 +77,8 @@
android:id="@+id/timetableWidgetList"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/timetable_widget_bar_height" />
android:layout_marginTop="@dimen/timetable_widget_bar_height"
tools:listitem="@layout/item_widget_timetable" />
<TextView
android:id="@+id/timetableWidgetEmpty"
@ -82,5 +87,6 @@
android:layout_gravity="center"
android:text="@string/widget_timetable_no_items"
android:textColor="@android:color/black"
android:textSize="20sp" />
android:textSize="20sp"
tools:visibility="invisible" />
</FrameLayout>