From 7f6f632b735fab36f43d42077934c569d032323d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Borcz?= <RafalBO99@outlook.com>
Date: Fri, 2 Nov 2018 17:38:20 +0100
Subject: [PATCH] Timetable widget refactor (#171)

---
 .idea/codeStyles/Project.xml                  |   3 +-
 app/src/main/AndroidManifest.xml              |  14 +++
 .../wulkanowy/data/db/SharedPrefHelper.kt     |  16 +--
 .../io/github/wulkanowy/di/BuilderModule.kt   |   8 ++
 .../notification/GradeNotification.kt         |   4 +-
 .../widgets/TimetableWidgetService.kt         |  27 ++++
 .../ui/modules/grade/GradePresenter.kt        |   4 +-
 .../wulkanowy/ui/modules/main/MainActivity.kt |   5 +-
 .../ui/modules/main/MainPresenter.kt          |   4 +-
 .../timetable/TimetableWidgetFactory.kt       |  93 ++++++++++++++
 .../timetable/TimetableWidgetProvider.kt      | 119 ++++++++++++++++++
 .../res/drawable/ic_widget_chevron_24dp.png   | Bin 0 -> 130 bytes
 .../drawable/img_timetable_widget_preview.png | Bin 0 -> 3425 bytes
 .../img_timetable_widget_preview.webp         | Bin 10948 -> 0 bytes
 .../main/res/layout/item_widget_timetable.xml |  61 +++++----
 app/src/main/res/layout/widget_timetable.xml  |  87 +++++++------
 .../res/xml/provider_widget_timetable.xml     |   4 +-
 17 files changed, 363 insertions(+), 86 deletions(-)
 create mode 100644 app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
 create mode 100644 app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
 create mode 100644 app/src/main/res/drawable/ic_widget_chevron_24dp.png
 create mode 100644 app/src/main/res/drawable/img_timetable_widget_preview.png
 delete mode 100644 app/src/main/res/drawable/img_timetable_widget_preview.webp

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 89f657f27..7bfdc60b8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -160,7 +160,6 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
       <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="EXTENDS_LIST_WRAP" value="1" />
@@ -171,4 +170,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5c6e5a2b..5f21c0c0f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,20 @@
                 <action android:name="com.firebase.jobdispatcher.ACTION_EXECUTE" />
             </intent-filter>
         </service>
+        <service
+            android:name=".services.widgets.TimetableWidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver
+            android:name=".ui.widgets.timetable.TimetableWidgetProvider"
+            android:label="@string/timetable_title">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/provider_widget_timetable" />
+        </receiver>
 
         <meta-data
             android:name="io.fabric.ApiKey"
diff --git a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
index d4f9bb5ba..b3b6f5e3e 100644
--- a/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
+++ b/app/src/main/java/io/github/wulkanowy/data/db/SharedPrefHelper.kt
@@ -1,5 +1,6 @@
 package io.github.wulkanowy.data.db
 
+import android.annotation.SuppressLint
 import android.content.SharedPreferences
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -7,19 +8,18 @@ import javax.inject.Singleton
 @Singleton
 class SharedPrefHelper @Inject constructor(private val sharedPref: SharedPreferences) {
 
-    fun putLong(key: String, value: Long) {
-        sharedPref.edit().putLong(key, value).apply()
+    @SuppressLint("ApplySharedPref")
+    fun putLong(key: String, value: Long, sync: Boolean = false) {
+        sharedPref.edit().putLong(key, value).apply {
+            if (sync) commit() else apply()
+        }
     }
 
     fun getLong(key: String, defaultValue: Long): Long {
         return sharedPref.getLong(key, defaultValue)
     }
 
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
-        return sharedPref.getBoolean(key, defaultValue)
-    }
-
-    fun getString(key: String, defaultValue: String): String {
-        return sharedPref.getString(key, defaultValue) ?: defaultValue
+    fun delete(key: String) {
+        sharedPref.edit().remove(key).apply()
     }
 }
diff --git a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
index 694580f49..9f4ecb80f 100644
--- a/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
+++ b/app/src/main/java/io/github/wulkanowy/di/BuilderModule.kt
@@ -4,11 +4,13 @@ import dagger.Module
 import dagger.android.ContributesAndroidInjector
 import io.github.wulkanowy.di.scopes.PerActivity
 import io.github.wulkanowy.services.job.SyncWorker
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
 import io.github.wulkanowy.ui.modules.login.LoginActivity
 import io.github.wulkanowy.ui.modules.login.LoginModule
 import io.github.wulkanowy.ui.modules.main.MainActivity
 import io.github.wulkanowy.ui.modules.main.MainModule
 import io.github.wulkanowy.ui.modules.splash.SplashActivity
+import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetProvider
 
 @Module
 internal abstract class BuilderModule {
@@ -25,6 +27,12 @@ internal abstract class BuilderModule {
     @ContributesAndroidInjector(modules = [MainModule::class])
     abstract fun bindMainActivity(): MainActivity
 
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetService(): TimetableWidgetService
+
+    @ContributesAndroidInjector
+    abstract fun bindTimetableWidgetProvider(): TimetableWidgetProvider
+
     @ContributesAndroidInjector
     abstract fun bindSyncJob(): SyncWorker
 }
diff --git a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt b/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
index 8eec6a20e..df57ec28c 100644
--- a/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
+++ b/app/src/main/java/io/github/wulkanowy/services/notification/GradeNotification.kt
@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat
 import io.github.wulkanowy.R
 import io.github.wulkanowy.data.db.entities.Grade
 import io.github.wulkanowy.ui.modules.main.MainActivity
-import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_CARD_ID_KEY
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
 import timber.log.Timber
 
 class GradeNotification(context: Context) : BaseNotification(context) {
@@ -41,7 +41,7 @@ class GradeNotification(context: Context) : BaseNotification(context) {
             .setColor(ContextCompat.getColor(context, R.color.colorPrimary))
             .setContentIntent(
                 PendingIntent.getActivity(context, 0,
-                    MainActivity.getStartIntent(context).putExtra(EXTRA_CARD_ID_KEY, 0),
+                    MainActivity.getStartIntent(context).putExtra(EXTRA_START_MENU_INDEX, 0),
                     FLAG_UPDATE_CURRENT
                 )
             )
diff --git a/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
new file mode 100644
index 000000000..1e5ac71f3
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/services/widgets/TimetableWidgetService.kt
@@ -0,0 +1,27 @@
+package io.github.wulkanowy.services.widgets
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.repositories.SessionRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.ui.widgets.timetable.TimetableWidgetFactory
+import javax.inject.Inject
+
+class TimetableWidgetService : RemoteViewsService() {
+
+    @Inject
+    lateinit var timetableRepository: TimetableRepository
+
+    @Inject
+    lateinit var sessionRepository: SessionRepository
+
+    @Inject
+    lateinit var sharedPref: SharedPrefHelper
+
+    override fun onGetViewFactory(intent: Intent?): RemoteViewsFactory {
+        AndroidInjection.inject(this)
+        return TimetableWidgetFactory(timetableRepository, sessionRepository, sharedPref, applicationContext, intent)
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
index 85243b253..1dfced711 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/grade/GradePresenter.kt
@@ -77,9 +77,7 @@ class GradePresenter @Inject constructor(
                 }
                 .subscribeOn(schedulers.backgroundThread)
                 .observeOn(schedulers.mainThread)
-                .subscribe({ _ ->
-                    view?.let { loadChild(it.currentPageIndex) }
-                }) { errorHandler.proceed(it) })
+            .subscribe({ view?.run { loadChild(currentPageIndex) } }) { errorHandler.proceed(it) })
     }
 
     private fun loadChild(index: Int, forceRefresh: Boolean = false) {
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
index 13c11d288..32b7bf303 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainActivity.kt
@@ -32,7 +32,8 @@ class MainActivity : BaseActivity(), MainView {
     lateinit var navController: FragNavController
 
     companion object {
-        const val EXTRA_CARD_ID_KEY = "cardId"
+        const val EXTRA_START_MENU_INDEX = "extraStartMenuIndex"
+
         fun getStartIntent(context: Context) = Intent(context, MainActivity::class.java)
     }
 
@@ -53,7 +54,7 @@ class MainActivity : BaseActivity(), MainView {
         setSupportActionBar(mainToolbar)
         messageContainer = mainFragmentContainer
 
-        presenter.onAttachView(this, intent.getIntExtra(EXTRA_CARD_ID_KEY, -1))
+        presenter.onAttachView(this, intent.getIntExtra(EXTRA_START_MENU_INDEX, -1))
         navController.initialize(startMenuIndex, savedInstanceState)
     }
 
diff --git a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
index aa696f189..1defc4691 100644
--- a/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
+++ b/app/src/main/java/io/github/wulkanowy/ui/modules/main/MainPresenter.kt
@@ -12,12 +12,12 @@ class MainPresenter @Inject constructor(
     private val serviceHelper: ServiceHelper
 ) : BasePresenter<MainView>(errorHandler) {
 
-    fun onAttachView(view: MainView, init: Int) {
+    fun onAttachView(view: MainView, initMenuIndex: Int) {
         super.onAttachView(view)
 
         view.run {
             cancelNotifications()
-            startMenuIndex = if (init != -1) init else prefRepository.startMenuIndex
+            startMenuIndex = if (initMenuIndex != -1) initMenuIndex else prefRepository.startMenuIndex
             initView()
         }
 
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
new file mode 100644
index 000000000..6b9868f24
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetFactory.kt
@@ -0,0 +1,93 @@
+package io.github.wulkanowy.ui.widgets.timetable
+
+import android.content.Context
+import android.content.Intent
+import android.graphics.Paint.ANTI_ALIAS_FLAG
+import android.graphics.Paint.STRIKE_THRU_TEXT_FLAG
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.widget.AdapterView.INVALID_POSITION
+import android.widget.RemoteViews
+import android.widget.RemoteViewsService
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.data.db.entities.Timetable
+import io.github.wulkanowy.data.repositories.SessionRepository
+import io.github.wulkanowy.data.repositories.TimetableRepository
+import io.github.wulkanowy.utils.toFormattedString
+import io.reactivex.disposables.CompositeDisposable
+import org.threeten.bp.LocalDate
+import timber.log.Timber
+
+class TimetableWidgetFactory(
+    private val timetableRepository: TimetableRepository,
+    private val sessionRepository: SessionRepository,
+    private val sharedPref: SharedPrefHelper,
+    private val context: Context,
+    private val intent: Intent?
+) : RemoteViewsService.RemoteViewsFactory {
+
+    private val disposable: CompositeDisposable = CompositeDisposable()
+
+    private var lessons = emptyList<Timetable>()
+
+    override fun getLoadingView() = null
+
+    override fun hasStableIds() = true
+
+    override fun getCount() = lessons.size
+
+    override fun getViewTypeCount() = 1
+
+    override fun getItemId(position: Int) = position.toLong()
+
+    override fun onCreate() {}
+
+    override fun onDataSetChanged() {
+        intent?.action?.let { LocalDate.ofEpochDay(sharedPref.getLong(it, 0)) }
+            ?.let { date ->
+                if (sessionRepository.isSessionSaved) {
+                    disposable.add(sessionRepository.getSemesters()
+                        .map { it.single { item -> item.current } }
+                        .flatMap { timetableRepository.getTimetable(it, date, date) }
+                        .map { item -> item.sortedBy { it.number } }
+                        .subscribe({ lessons = it })
+                        { Timber.e(it, "An error has occurred while downloading data for the widget") })
+                }
+            }
+    }
+
+    override fun getViewAt(position: Int): RemoteViews? {
+        if (position == INVALID_POSITION) return null
+
+        return RemoteViews(context.packageName, R.layout.item_widget_timetable).apply {
+            lessons[position].let {
+                setTextViewText(R.id.timetableWidgetItemSubject, it.subject)
+                setTextViewText(R.id.timetableWidgetItemNumber, it.number.toString())
+                setTextViewText(R.id.timetableWidgetItemTime, it.start.toFormattedString("HH:mm") +
+                    " - ${it.end.toFormattedString("HH:mm")}")
+
+                if (it.room.isNotBlank()) {
+                    setTextViewText(R.id.timetableWidgetItemRoom, "${context.getString(R.string.timetable_room)} ${it.room}")
+                } else setTextViewText(R.id.timetableWidgetItemRoom, "")
+
+                if (it.info.isNotBlank()) {
+                    setViewVisibility(R.id.timetableWidgetItemDescription, VISIBLE)
+                    setTextViewText(R.id.timetableWidgetItemDescription, it.info.capitalize())
+                } else setViewVisibility(R.id.timetableWidgetItemDescription, GONE)
+
+                if (it.changes) {
+                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags",
+                        STRIKE_THRU_TEXT_FLAG or ANTI_ALIAS_FLAG)
+                } else {
+                    setInt(R.id.timetableWidgetItemSubject, "setPaintFlags", ANTI_ALIAS_FLAG)
+                }
+            }
+            setOnClickFillInIntent(R.id.timetableWidgetItemContainer, Intent())
+        }
+    }
+
+    override fun onDestroy() {
+        disposable.clear()
+    }
+}
diff --git a/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
new file mode 100644
index 000000000..c2175480f
--- /dev/null
+++ b/app/src/main/java/io/github/wulkanowy/ui/widgets/timetable/TimetableWidgetProvider.kt
@@ -0,0 +1,119 @@
+package io.github.wulkanowy.ui.widgets.timetable
+
+import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
+import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.widget.RemoteViews
+import dagger.android.AndroidInjection
+import io.github.wulkanowy.R
+import io.github.wulkanowy.data.db.SharedPrefHelper
+import io.github.wulkanowy.services.widgets.TimetableWidgetService
+import io.github.wulkanowy.ui.modules.main.MainActivity
+import io.github.wulkanowy.ui.modules.main.MainActivity.Companion.EXTRA_START_MENU_INDEX
+import io.github.wulkanowy.utils.nextOrSameSchoolDay
+import io.github.wulkanowy.utils.nextSchoolDay
+import io.github.wulkanowy.utils.previousSchoolDay
+import io.github.wulkanowy.utils.toFormattedString
+import io.github.wulkanowy.utils.weekDayName
+import org.threeten.bp.LocalDate
+import javax.inject.Inject
+
+class TimetableWidgetProvider : AppWidgetProvider() {
+
+    @Inject
+    lateinit var sharedPref: SharedPrefHelper
+
+    companion object {
+        const val EXTRA_TOGGLED_WIDGET_ID = "extraToggledWidget"
+
+        const val EXTRA_BUTTON_TYPE = "extraButtonType"
+
+        const val BUTTON_NEXT = "buttonNext"
+
+        const val BUTTON_PREV = "buttonPrev"
+
+        const val BUTTON_RESET = "buttonReset"
+    }
+
+    override fun onUpdate(context: Context?, appWidgetManager: AppWidgetManager?, appWidgetIds: IntArray?) {
+        appWidgetIds?.forEach {
+            val widgetKey = "timetable_widget_$it"
+            checkSavedWidgetDate(widgetKey)
+
+            val savedDate = LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0))
+            context?.run {
+                RemoteViews(packageName, R.layout.widget_timetable).apply {
+                    setTextViewText(R.id.timetableWidgetDay, savedDate.weekDayName.capitalize())
+                    setTextViewText(R.id.timetableWidgetDate, savedDate.toFormattedString())
+                    setEmptyView(R.id.timetableWidgetList, R.id.timetableWidgetEmpty)
+                    setRemoteAdapter(R.id.timetableWidgetList, Intent(context, TimetableWidgetService::class.java)
+                        .apply { action = widgetKey })
+                    setOnClickPendingIntent(R.id.timetableWidgetNext, createNavIntent(context, it, it, appWidgetIds, BUTTON_NEXT))
+                    setOnClickPendingIntent(R.id.timetableWidgetPrev, createNavIntent(context, -it, it, appWidgetIds, BUTTON_PREV))
+                    createNavIntent(context, Int.MAX_VALUE, it, appWidgetIds, BUTTON_RESET).let { intent ->
+                        setOnClickPendingIntent(R.id.timetableWidgetDate, intent)
+                        setOnClickPendingIntent(R.id.timetableWidgetDay, intent)
+                    }
+                    setPendingIntentTemplate(R.id.timetableWidgetList,
+                        PendingIntent.getActivity(context, 1, MainActivity.getStartIntent(context).apply {
+                            putExtra(EXTRA_START_MENU_INDEX, 3)
+                        }, FLAG_UPDATE_CURRENT))
+
+                }.also { view ->
+                    appWidgetManager?.apply {
+                        notifyAppWidgetViewDataChanged(it, R.id.timetableWidgetList)
+                        updateAppWidget(it, view)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        AndroidInjection.inject(this, context)
+        intent?.let {
+            val widgetKey = "timetable_widget_${it.getIntExtra(EXTRA_TOGGLED_WIDGET_ID, 0)}"
+            when (it.getStringExtra(EXTRA_BUTTON_TYPE)) {
+                BUTTON_NEXT -> {
+                    LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).nextSchoolDay
+                        .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
+                }
+                BUTTON_PREV -> {
+                    LocalDate.ofEpochDay(sharedPref.getLong(widgetKey, 0)).previousSchoolDay
+                        .let { date -> sharedPref.putLong(widgetKey, date.toEpochDay(), true) }
+                }
+                BUTTON_RESET -> sharedPref.putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
+            }
+        }
+        super.onReceive(context, intent)
+    }
+
+    override fun onDeleted(context: Context?, appWidgetIds: IntArray?) {
+        appWidgetIds?.forEach {
+            sharedPref.delete("timetable_widget_$it")
+        }
+    }
+
+    private fun createNavIntent(context: Context, code: Int, widgetId: Int, widgetIds: IntArray, buttonType: String): PendingIntent {
+        return PendingIntent.getBroadcast(context, code,
+            Intent(context, TimetableWidgetProvider::class.java).apply {
+                action = ACTION_APPWIDGET_UPDATE
+                putExtra(EXTRA_APPWIDGET_IDS, widgetIds)
+                putExtra(EXTRA_BUTTON_TYPE, buttonType)
+                putExtra(EXTRA_TOGGLED_WIDGET_ID, widgetId)
+            }, FLAG_UPDATE_CURRENT)
+    }
+
+    private fun checkSavedWidgetDate(widgetKey: String) {
+        sharedPref.run {
+            if (getLong(widgetKey, -1) == -1L) {
+                putLong(widgetKey, LocalDate.now().nextOrSameSchoolDay.toEpochDay(), true)
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/drawable/ic_widget_chevron_24dp.png b/app/src/main/res/drawable/ic_widget_chevron_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..34345521a5b5f97b7a8bb543c3f86104ac914c4e
GIT binary patch
literal 130
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaA@dWsUxVjhk{D%Ry`4>PMSW1HY
zf*JnRhX*Fk)C2MrJzX3_G|nd{Nc?H&<ZQQ4R@N&_i|TqjZNWaCPDi5*28OV844$uN
S7T*ObX7F_Nb6Mw<&;$SzaVre~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.png b/app/src/main/res/drawable/img_timetable_widget_preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..60a35ab6ac5a6e0f5a7b30055844efacf36e4a7c
GIT binary patch
literal 3425
zcmV-n4W9CeP)<h;3K|Lk000e1NJLTq00Bh+006%P0{{R3n<Uev00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#9#BkFMgRZ*(=INX0Ri^(^yA;(*0j6NU0;2DeXOIS
zR8&;mGk4Aa01V+tL_t(|+U=Z8bK*E2#{a#N!MQEdftuq?PtDXEHDg|H>cPfvQ!fUS
z8w^0@NR>^Q+*})Io7+?wiq5xP$#xQ;-{^!S?k&4qSh8j1mq(H%q{l!m>05z8%9t{y
zj45Nvm@<A3jD^W$z(4u^_9+;Dc=Orq=cBV4s_MI3uEX<u^{o_N{__#zo0Bl!1}3kB
zn%}T}L83P&XDn!qPR>wY71T!lUEy6483zSC>Ez3!SFZ;~{_S}J8T+bQ$mBZb?+UL9
zg<+xmdhlF~Z@#Il1>>ObDz7L5%}8i{jCC9hhB-q^E@S>}{*{qy=U!)?lJVz9F&0$y
z)w$Xp<ljDw@rR=r$A3SlKHhZ;ysb=fx%|5aG5*{=hVeJ!?+594Ksp*cOvk;y{yD}`
z<IM>e^Q8y&GvmhB8TVy;Fyn*!!h^s6NyhW?1D}s4Vtg|yf0c1uee<F^9@Mo@mv#Gv
z%ewvbvOcJ^&(3&EoB6~)@|=u6ANB0ne}+G|j>kR2-@I&_`Qb?z^Xj{Tp@|-_n=6cY
z7szA$WH&c%goh-IABQ<D8g&;-xpRddMa&pzg<?5392if}c!Z9f+$bLoa|T+jAchhm
zrsa&>q?{9@v?MTUVptY_d+FQ`cg{KPC|3|VYKdTM2u35KjTwzx%$VoporL-*bS#u}
zJ38jew~R(|>SHb%E#B(LW1>EC#ttv-(=a}6E``@QA!FfI$BBrE(&oqZ;D|PJ)LhEr
zwz2vyud0nvF4qki%OWNojC^t`uQrk~Z^jiIge4jk>mZB`PSy>jbEGL_%9t{yj49(2
zGfon}F+fC7kn)%ho<qFv1b6mFX0I?v{DxA-lrd#I6(b^m6n<2Q2!>~PR0#t-NaAE9
zKKIdv>C-cM9??Atcy6P)AD*drOrBff5@|WpID<8hih#O%uZYO($r(|Qb!{m?XH1v=
zsf3#NIH-|10(?bUcgePZZiLXj_#gy@s_R5BqR%LNGDc}CO>G?XYNVERvthC|taUP%
zseD1qTiMVJm9M~`OAa%AJa>9?Fumf{(v_Qx$L%L)G%py`pjKg7H)7mm{Q!YkBdZ%X
z&R{;RU0|z5eZ0;Z>uiu!*IB0HAY1KNS?Zmfu}JqBJ<p98WfwUvTEnK|+kmYzQpD>x
z1Isd7&|Fbp`rz4tJk8ST%GJ@vl&>i2U7eb-<gk6l00kh*n%$MP2`0$%)ipp|ifB5s
zTX@}~zP#zEg0a47x;mIMdCRhkixV?8on1z3W!*IjP>t#GG-@+*%o#m|I~VOGy47*2
zTP<l?V?GXWQ822!vFT6?<i+}ou1?HoF3eq3oh!0hxjz1|L0cz0Q(L)NXPu>Rw)5<n
z*4!4_-mnXIwTg7SxpHgMtShsN%J$~OjCI&!EY<<5pnyt6FifoSonQi31mg@SCPh&B
zX^QKJhS563RHlevMJ=AZ&6r<#>=FP3cfn6xzRTAnPt+HhC+ofO0us;obYqH?F=b2{
zpOf)$48`N$G8U%?$0Hc=*4ay4aa`GP`RBod@Em&ah#UWOFuG$<r2uFM-Me$0_$Yr&
zGK`P?Z(y{r1q2}MTL^%U*SfMcad5!+8}!011`+&II0i=$?--ycj)F1jo)Ex&h(tY8
z+#eA%j3P=u`Y!d^@gvz~M1k%w-Elp~cL>x`;KQ1H#5iHS4C_wF`^(~Q6VkmzlX2$#
z7*EF1WF$?74I*^JlTl+byqvHlKikB=l*_bx2{4(k$!IcYka1(u=2yFXzwA%`ZcoNX
zjl;QY?h;u`WQ!3t1CU)GX6WkR20R>c#!<!?mW^M^#_MvEl{2)Fq2(&;WM~hCW&JPO
zMP)X|!)2Lt%ksFIQD0{$<nh191dZkPkY5@}{SoSqa38vey*-X`>ku1k8<su}1fvN)
z%s{galJ&d2jPZN#(v?O(Ny~A!OCduV8In;i+iyu!(Yk+%$^s+&df9+-rqS$Vv~icg
zIr?P`k}EB)&v`Ow*oS@}_3;pO{(BswRih!Jy$l&8i&L&uSRXQ$FEhruQtER?c{x<d
z6h(~n;^iMi0e}%_qzWF!j1B3sy2xlleko*Z5cFgF9F&N0i28q0Y53QXjFRPRmZ@2h
zj=EZ}Xo0C6*2g~nJ;TPDI&P@HHtKn;H0p9jY0<43?=!}@MBu$T&Mf@D3@RAQ#uERU
zd7a@Y3H;dXk5OJF1KQQDhf@Di6Z=Fhjs8Q9`hLxzUGj<K6BS)c6q^15`&9DjN69pa
zmX<_Y;LZ}XCG-r5lu)l7?yO3n#P8{~o1JzWF_oW%Hf9pxDIvck23~eZ7kCB?GyYjx
zuug~dx<@fS$95h=j6V{nlbAWFQFO?-A6-d~j_Lg4ekN_P17HGxXfhck29jWuNEl8W
zBU0N?YU7T9OB9n*8<FHOO8NK7_<gZ+`Nwixrk7ngfjUb4KRW#k!^1yFudIn7MG_e^
zT_*L*G-SMdpHN1j;}}B5K1yU+|H|uQxAbdAFxD@-)dVu)an!CmMJS4Poy<0~A1^0S
zNA~%_K-yoYjQ^jEO47F?1657>#(<DyZ>e`CWlR}U#%~%Ck*8<${m47xIN(Lo_f?O{
zo(lkGcqPif{*-s72msIGovE>z6aWqY*3rzmhXY+%gYeGG@$DLW=$!!ofA?nnc^GfK
zGm=eU9j&o%VC{h~yfaFGZW%-GOwX4b*7Wh*YtDJ(&O75ji+4tmZ$6-#ZJ2fq8{ww_
zy{7zw;`!XjI}_BXudFM^x)M~1>k8A0|AgL|`pLaB+OmBgkp-j20M}beyW*m`3!!&r
z3&=j(VGO-9n()qS%*Z=a@`QIre-iJE>^M71TesdBfC}XiPzbDHjg6V`&MfX3r}m<S
zHlcTBX@s7S5Bj}#=G49vZ=rbiD;u$Q24q@Or?P0xFh^^^0m7ZtwSCuSrskb@2HkpR
z*i(6DkV8P;spFA%riVW`$XSK$y5_m~hKAmmi<KLtQl_<O3vaL3h3mxLnJxFuxY?=j
z&NwIb&fqzKG~0Q`wE-JY1g$QDVG09K9YXI655^gU-Wg4$m|`RH&XnpDGnoglVw~7J
zgA{;W#&6B(K1cwNP7Y2!d^;H9R;*KXgf^UPJ9s`O(g?86i035njJgd;XT<yNghVn{
z5-H<eyGC9jW!%%TI)lVBdJ9!m?;1AV&i7=kZW;Dpnh`n9?!X6ICF{=HLIC_?Q1xEA
zKB92`=Uzt(S^Ab$w#>WowxM?hbO3nab}c5-?jJ;JeYz}KesRrr;cJ#%NC4x0kGtK%
zo_9uv<S`z4XY7|^RKDb$nfjuvgGk4Usw7TF<id5;r+ha;?@Z5MKr@~1`HmUWx#pBH
zNgMt?bo?IHxxR<>!u0u=w(C^KRL3ti!DrU7x`3(;fP5dC@tb%mAfE#8Xw`S`XAa^y
zU714fnaAO?3pzI$;153DL~k_eTc~u_fM+Ic-7?~N(~6hjBnlr*5@7c!b(E&E72rU_
zQ;_3##Oo&L;7KZz-PV0F;EYWQO@;~dP#Z5n?bUr!>`{r7nj6w&Qd4{o73z3NPN}0b
zm8<{-nzXgE@jK#Rf(fQfkxnmeCp5&gs$ZSW<k`GJ!LKm0XSMuoFKGFjENwM6rP=&!
zUYdCocZDpyXFXC!RNsk+buL>D0AF8(j4FkQ5g@xI&C)+{I(<w07SU^@${9_ugtO7b
zN=}QIoUu4Pqpb=%qgi9RQl~c9kJGW}IWw}W<5Zsq0C1*rM&!5vF(Xvna7{ScnwH;k
z96ekQyV!6>-xQ2GX;lPc&2cKMMrGHYdCYO_$LXlg)SWlV@KhEx5oB6v#`O`x`Usdw
z?&6k_D{ONep#?>uqs|#;v5ps^jx`Ed&X{%Q?26crY}d%4u(S3d+I7hznrwTw?V2<4
zb}gwhoq1Zk7KdkC$BMnoE__iRWy@;@5u>rmF0P7p)$V1PY_G_QIAC_JAEl$H{nE}q
z+FU@X4Jz~&ch5%+uumnzqxkMUnx;=w6uvDZQBYwa`9uQ)UAKA+`5N>{FMRvv8Z=OM
zZhK&TQ~=~-3*)N`SkXckd4hiCWb0f2I(d?Q2CH5YhZuW0R-8o6+VB5{M$bvSjtN~w
zI_R(Q93aU$A|s)UyIuu{fHX_Ejt&ETr!U+cV2JpY4fy({>tn_7ogG=%`gE^38K$xd
zUb<bQo^R}2v5-~W5_wB{PV)nR4iZs=mv7g*g)7zz{gP#t0<XEzDfplOdT|{Ou529|
ztszD0Grn{~Q37<_W3*bthJ_8wXr0T1EKQt_mK^;az&c*%BH85WI7OE3xfPF-1~LQb
zgF}+0BM=~{4t!UDAOhhJHj!lMn9iG}I;J{)zdHU8o1jTTcRg%B00000NkvXXu0mjf
D@&A}Y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_timetable_widget_preview.webp b/app/src/main/res/drawable/img_timetable_widget_preview.webp
deleted file mode 100644
index e0b4a9735a3295c7e56d97669cd34208fba9a977..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10948
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

diff --git a/app/src/main/res/layout/item_widget_timetable.xml b/app/src/main/res/layout/item_widget_timetable.xml
index 6b0e73ee4..810f06e0e 100644
--- a/app/src/main/res/layout/item_widget_timetable.xml
+++ b/app/src/main/res/layout/item_widget_timetable.xml
@@ -1,67 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/timetable_widget_item_container"
+    android:id="@+id/timetableWidgetItemContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/ic_all_divider"
     android:minHeight="45dp"
     android:orientation="horizontal">
 
     <TextView
-        android:id="@+id/timetable_widget_item_time"
+        android:id="@+id/timetableWidgetItemNumber"
+        android:layout_width="55dp"
+        android:layout_height="45dp"
+        android:gravity="center"
+        android:text="0"
+        android:textSize="25sp" />
+
+    <TextView
+        android:id="@+id/timetableWidgetItemTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="5dp"
+        android:layout_toEndOf="@id/timetableWidgetItemNumber"
+        android:layout_toRightOf="@id/timetableWidgetItemNumber"
         android:text="@string/app_name"
         android:textColor="@color/second_text_color"
-        android:textSize="14sp" />
+        android:textSize="13sp" />
 
     <TextView
-        android:id="@+id/timetable_widget_item_subject"
+        android:id="@+id/timetableWidgetItemSubject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="25dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="25dp"
         android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_marginTop="5dp"
-        android:layout_toEndOf="@id/timetable_widget_item_time"
-        android:layout_toRightOf="@id/timetable_widget_item_time"
+        android:layout_marginEnd="25dp"
+        android:layout_marginRight="25dp"
+        android:layout_toEndOf="@id/timetableWidgetItemTime"
+        android:layout_toRightOf="@id/timetableWidgetItemTime"
         android:text="@string/app_name"
         android:textColor="@color/second_text_color"
-        android:textSize="14sp" />
+        android:textSize="13sp" />
 
     <TextView
-        android:id="@+id/timetable_widget_item_description"
+        android:id="@+id/timetableWidgetItemDescription"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/timetable_widget_item_subject"
-        android:layout_marginBottom="5dp"
-        android:layout_marginEnd="25dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="25dp"
+        android:layout_below="@id/timetableWidgetItemSubject"
         android:layout_marginStart="15dp"
+        android:layout_marginLeft="15dp"
         android:layout_marginTop="3dp"
-        android:layout_toEndOf="@id/timetable_widget_item_time"
-        android:layout_toRightOf="@id/timetable_widget_item_time"
+        android:layout_marginEnd="25dp"
+        android:layout_marginRight="25dp"
+        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" />
 
     <TextView
-        android:id="@+id/timetable_widget_item_room"
+        android:id="@+id/timetableWidgetItemRoom"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/timetable_widget_item_time"
-        android:layout_marginBottom="5dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
+        android:layout_below="@id/timetableWidgetItemTime"
         android:layout_marginTop="3dp"
+        android:layout_marginBottom="5dp"
+        android:layout_toEndOf="@id/timetableWidgetItemNumber"
+        android:layout_toRightOf="@id/timetableWidgetItemNumber"
         android:text="@string/app_name"
         android:textColor="@color/second_text_color"
         android:textSize="12sp" />
-
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_timetable.xml b/app/src/main/res/layout/widget_timetable.xml
index ddcb03fc5..8d415f66e 100644
--- a/app/src/main/res/layout/widget_timetable.xml
+++ b/app/src/main/res/layout/widget_timetable.xml
@@ -2,70 +2,81 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:foreground="@android:color/white">
+    android:background="@android:color/white">
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/timetable_widget_bar_height"
         android:background="@color/colorPrimary">
 
-        <Button
-            android:id="@+id/timetable_widget_toggle"
-            android:layout_width="100dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
+        <ImageButton
+            android:id="@+id/timetableWidgetPrev"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="5dp"
+            android:layout_marginLeft="5dp"
             android:backgroundTint="@color/colorPrimaryDark"
-            android:text="@string/widget_timetable_today"
-            android:textColor="@android:color/white"
-            android:textSize="12sp" />
+            android:contentDescription="@string/all_prev"
+            android:src="@drawable/ic_widget_chevron_24dp" />
 
         <TextView
-            android:id="@+id/timetable_widget_date"
+            android:id="@+id/timetableWidgetDay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginBottom="5dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginRight="10dp"
-            android:layout_toEndOf="@id/timetable_widget_title"
-            android:layout_toRightOf="@id/timetable_widget_title"
-            android:ellipsize="end"
-            android:gravity="center"
+            android:layout_alignTop="@+id/timetableWidgetPrev"
+            android:layout_centerHorizontal="true"
+            android:layout_toStartOf="@id/timetableWidgetNext"
+            android:layout_toLeftOf="@id/timetableWidgetNext"
+            android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
+            android:gravity="center_horizontal"
             android:maxLines="1"
             android:text="@string/app_name"
             android:textColor="@android:color/white"
-            android:textSize="13sp" />
+            android:textSize="15sp" />
 
         <TextView
-            android:id="@+id/timetable_widget_title"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/timetable_widget_bar_height"
-            android:layout_marginLeft="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_toLeftOf="@id/timetable_widget_toggle"
-            android:layout_toStartOf="@id/timetable_widget_toggle"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
+            android:id="@+id/timetableWidgetDate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/timetableWidgetDay"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="3dp"
+            android:layout_toStartOf="@id/timetableWidgetNext"
+            android:layout_toLeftOf="@id/timetableWidgetNext"
+            android:layout_toEndOf="@id/timetableWidgetPrev"
+            android:layout_toRightOf="@id/timetableWidgetPrev"
+            android:gravity="center_horizontal"
             android:maxLines="1"
-            android:text="@string/timetable_title"
+            android:text="@string/app_name"
             android:textColor="@android:color/white"
-            android:textSize="20sp" />
+            android:textSize="14sp" />
+
+        <ImageButton
+            android:id="@+id/timetableWidgetNext"
+            android:layout_width="70dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
+            android:backgroundTint="@color/colorPrimaryDark"
+            android:contentDescription="@string/all_next"
+            android:rotation="180"
+            android:src="@drawable/ic_widget_chevron_24dp" />
+
     </RelativeLayout>
 
     <ListView
-        android:id="@+id/timetable_widget_list"
+        android:id="@+id/timetableWidgetList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="@dimen/timetable_widget_bar_height" />
 
     <TextView
-        android:id="@+id/timetable_widget_empty"
+        android:id="@+id/timetableWidgetEmpty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/app/src/main/res/xml/provider_widget_timetable.xml b/app/src/main/res/xml/provider_widget_timetable.xml
index cffa24ff4..184b3f399 100644
--- a/app/src/main/res/xml/provider_widget_timetable.xml
+++ b/app/src/main/res/xml/provider_widget_timetable.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:initialLayout="@layout/widget_timetable"
-    android:minHeight="100dp"
     android:minWidth="150dp"
+    android:minHeight="100dp"
     android:previewImage="@drawable/img_timetable_widget_preview"
     android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="3600000"
+    android:updatePeriodMillis="7200000"
     android:widgetCategory="home_screen" />