github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-06-20 17:18:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UI/Timetable] Update date selection algorithm and no lessons info. Show empty timetable info in widget.

Browse Source
This commit is contained in:
Kuba Szczodrzyński
2019-12-21 22:56:54 +01:00
parent b66bd6fec9
commit 0aae2174c1
11 changed files with 238 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
<LinearLayout 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"
android:id="@+id/root"
android:layout_width="match_parent"
@ -65,17 +64,18 @@
</LinearLayout>
<FrameLayout
android:id="@+id/widgetTimetableBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/widget_background_bottom">
<ListView
android:id="@+id/widgetTimetableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/secondaryTextLight"
android:background="@drawable/widget_background_bottom"
android:dividerHeight="1.0dip" ><!--#b5ffffff-->
</ListView>
android:dividerHeight="1.0dip"
tools:listitem="@layout/row_widget_timetable_item"/><!--#b5ffffff-->
<TextView
android:id="@+id/widgetTimetableLoading"
@ -84,7 +84,34 @@
android:textColor="@color/primaryTextLight"
android:layout_gravity="center"
android:textStyle="italic"
android:text="@string/widget_loading" />
android:text="@string/widget_loading"
tools:visibility="gone"/>
<TextView
android:id="@+id/widgetTimetableNoTimetable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="16sp"
android:text="@string/widget_timetable_no_timetable"
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/widgetTimetableNoLessons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="16sp"
android:text="@string/widget_timetable_no_lessons_found"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

39
app/src/main/res/layout/widget_timetable_big.xml
View File

@ -1,5 +1,4 @@
<LinearLayout 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"
android:id="@+id/root"
android:layout_width="match_parent"
@ -65,17 +64,18 @@
</LinearLayout>
<FrameLayout
android:id="@+id/widgetTimetableBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/widget_background_bottom">
<ListView
android:id="@+id/widgetTimetableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/secondaryTextLight"
android:background="@drawable/widget_background_bottom"
android:dividerHeight="1.0dip" ><!--#b5ffffff-->
</ListView>
android:dividerHeight="1.0dip"
tools:listitem="@layout/row_widget_timetable_big_item"/><!--#b5ffffff-->
<TextView
android:id="@+id/widgetTimetableLoading"
@ -85,7 +85,34 @@
android:text="@string/widget_loading"
android:textColor="@color/primaryTextLight"
android:textSize="22sp"
android:textStyle="italic" />
android:textStyle="italic"
tools:visibility="gone"/>
<TextView
android:id="@+id/widgetTimetableNoTimetable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="24sp"
android:text="@string/widget_timetable_no_timetable"
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/widgetTimetableNoLessons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="24sp"
android:text="@string/widget_timetable_no_lessons_found"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

39
app/src/main/res/layout/widget_timetable_dark.xml
View File

@ -1,5 +1,4 @@
<LinearLayout 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"
android:id="@+id/root"
android:layout_width="match_parent"
@ -65,17 +64,18 @@
</LinearLayout>
<FrameLayout
android:id="@+id/widgetTimetableBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/widget_background_dark_bottom">
<ListView
android:id="@+id/widgetTimetableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/secondaryTextDark"
android:background="@drawable/widget_background_dark_bottom"
android:dividerHeight="1.0dip" ><!--#b5ffffff-->
</ListView>
android:dividerHeight="1.0dip"
tools:listitem="@layout/row_widget_timetable_dark_item"/><!--#b5ffffff-->
<TextView
android:id="@+id/widgetTimetableLoading"
@ -84,7 +84,34 @@
android:textColor="@color/primaryTextDark"
android:layout_gravity="center"
android:textStyle="italic"
android:text="@string/widget_loading" />
android:text="@string/widget_loading"
tools:visibility="gone"/>
<TextView
android:id="@+id/widgetTimetableNoTimetable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="16sp"
android:text="@string/widget_timetable_no_timetable"
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/widgetTimetableNoLessons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextLight"
android:gravity="center"
android:textSize="16sp"
android:text="@string/widget_timetable_no_lessons_found"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>

39
app/src/main/res/layout/widget_timetable_dark_big.xml
View File

@ -1,5 +1,4 @@
<LinearLayout 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"
android:id="@+id/root"
android:layout_width="match_parent"
@ -65,17 +64,18 @@
</LinearLayout>
<FrameLayout
android:id="@+id/widgetTimetableBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/widget_background_dark_bottom">
<ListView
android:id="@+id/widgetTimetableListView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/secondaryTextDark"
android:background="@drawable/widget_background_dark_bottom"
android:dividerHeight="1.0dip" ><!--#b5ffffff-->
</ListView>
android:dividerHeight="1.0dip"
tools:listitem="@layout/row_widget_timetable_dark_big_item"/><!--#b5ffffff-->
<TextView
android:id="@+id/widgetTimetableLoading"
@ -85,7 +85,34 @@
android:text="@string/widget_loading"
android:textColor="@color/primaryTextDark"
android:textSize="22sp"
android:textStyle="italic" />
android:textStyle="italic"
tools:visibility="gone"/>
<TextView
android:id="@+id/widgetTimetableNoTimetable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextDark"
android:gravity="center"
android:textSize="24sp"
android:text="@string/widget_timetable_no_timetable"
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/widgetTimetableNoLessons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="8dp"
android:textColor="@color/primaryTextDark"
android:gravity="center"
android:textSize="24sp"
android:text="@string/widget_timetable_no_lessons_found"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>