Improve widget's lesson list data retrieval

alllexey · alllexey · commit 2631d7bd11db · 2025-09-30T12:18:26.000+03:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -41,6 +41,7 @@ android {
 dependencies {
     implementation("io.nayuki:qrcodegen:1.8.0")
     implementation("io.github.alllexey123:my-itmo-api:1.2.3")
+    implementation("androidx.datastore:datastore-preferences:1.1.1")
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/AppContainer.kt b/app/src/main/java/me/alllexey123/itmowidgets/AppContainer.kt
@@ -11,6 +11,7 @@ import me.alllexey123.itmowidgets.data.remote.ScheduleRemoteDataSourceImpl
 import me.alllexey123.itmowidgets.data.repository.QrCodeRepository
 import me.alllexey123.itmowidgets.data.repository.ScheduleRepository
 import me.alllexey123.itmowidgets.data.PreferencesStorage
+import me.alllexey123.itmowidgets.ui.widgets.data.LessonListRepository
 import me.alllexey123.itmowidgets.util.QrBitmapRenderer
 import me.alllexey123.itmowidgets.util.QrCodeGenerator
 import java.io.File
@@ -31,6 +32,8 @@ class AppContainer(context: Context) {
         }
     }
 
+    val lessonListRepository by lazy { LessonListRepository(context) }
+
     val scheduleRepository: ScheduleRepository by lazy {
         ScheduleRepository(
             localDataSource = ScheduleLocalDataSourceImpl(
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/settings/SettingsFragment.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/settings/SettingsFragment.kt
@@ -82,7 +82,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         listOf("single_lesson_widget_style", "list_lesson_widget_style")
             .map { s -> findPreference<ListPreference>(s) }.forEach { preference ->
                 preference?.setOnPreferenceChangeListener { pref, newValue ->
-                    storage.setLessonWidgetStyleChanged(true)
                     updateAllWidgets()
                     true
                 }
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidget.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidget.kt
@@ -9,8 +9,6 @@ import androidx.core.net.toUri
 import me.alllexey123.itmowidgets.ItmoWidgetsApp
 import me.alllexey123.itmowidgets.R
 import me.alllexey123.itmowidgets.ui.schedule.ScheduleActivity
-import me.alllexey123.itmowidgets.ui.widgets.data.LessonListDataHolder
-import me.alllexey123.itmowidgets.ui.widgets.data.LessonListWidgetData
 import me.alllexey123.itmowidgets.workers.LessonWidgetUpdateWorker
 
 
@@ -33,12 +31,9 @@ class LessonListWidget : AppWidgetProvider() {
             context: Context,
             appWidgetManager: AppWidgetManager,
             appWidgetId: Int,
-            widgetData: LessonListWidgetData,
             layoutId: Int,
             onlyDataChanged: Boolean
         ) {
-            LessonListDataHolder.setData(widgetData)
-
             if (!onlyDataChanged){
                 val intent = Intent(context, LessonListWidgetService::class.java).apply {
                     putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
@@ -52,8 +47,9 @@ class LessonListWidget : AppWidgetProvider() {
                 views.setRemoteAdapter(R.id.lesson_list, intent)
 
                 appWidgetManager.updateAppWidget(appWidgetId, views)
+            } else {
+                appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.lesson_list)
             }
-            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.lesson_list)
         }
 
 
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidgetService.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidgetService.kt
@@ -6,8 +6,10 @@ import android.view.View
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import androidx.core.content.ContextCompat
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import me.alllexey123.itmowidgets.ItmoWidgetsApp
 import me.alllexey123.itmowidgets.R
-import me.alllexey123.itmowidgets.ui.widgets.data.LessonListDataHolder
 import me.alllexey123.itmowidgets.ui.widgets.data.LessonListWidgetData
 import me.alllexey123.itmowidgets.ui.widgets.data.LessonListWidgetEntry
 import me.alllexey123.itmowidgets.util.ScheduleUtils
@@ -20,23 +22,31 @@ class LessonListWidgetService : RemoteViewsService() {
 
     class ViewsFactory(private val context: Context) : RemoteViewsFactory {
 
-        private var data: LessonListWidgetData = LessonListDataHolder.getData()
+        private val lessonListRepository =
+            (context.applicationContext as ItmoWidgetsApp).appContainer.lessonListRepository
+
+        private var data: LessonListWidgetData = LessonListWidgetData(listOf())
 
         override fun onCreate() {
-            loadData()
         }
 
         override fun onDataSetChanged() {
             loadData()
         }
 
         private fun loadData() {
-            data = LessonListDataHolder.getData()
+            runBlocking {
+                data = lessonListRepository.data.first()
+            }
         }
 
         override fun getCount(): Int = data.entries.size
 
         override fun getViewAt(position: Int): RemoteViews? {
+            if (position >= data.entries.size) {
+                return null
+            }
+
             val entry = data.entries[position]
 
             val rv = RemoteViews(context.packageName, entry.layoutId)
@@ -71,7 +81,7 @@ class LessonListWidgetService : RemoteViewsService() {
         }
 
         override fun getLoadingView(): RemoteViews? = null
-        override fun getViewTypeCount(): Int = 3
+        override fun getViewTypeCount(): Int = 9
         override fun hasStableIds(): Boolean = true
         override fun getItemId(position: Int): Long = position.toLong()
         override fun onDestroy() {}
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonListRepository.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonListRepository.kt
@@ -1,14 +1,40 @@
 package me.alllexey123.itmowidgets.ui.widgets.data
 
-object LessonListDataHolder {
-    @Volatile
-    private var data: LessonListWidgetData = LessonListWidgetData(
-        listOf(LessonListWidgetEntry.Updating)
-    )
-
-    fun setData(newData: LessonListWidgetData) {
-        data = newData
+import android.content.Context
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import me.alllexey123.itmowidgets.util.RuntimeTypeAdapterFactory
+
+val Context.lessonListDataStore by preferencesDataStore(name = "lesson_list_data")
+
+class LessonListRepository(private val context: Context) {
+    private val gson: Gson by lazy {
+        val lessonListEntryAdapterFactory = RuntimeTypeAdapterFactory.of(LessonListWidgetEntry::class.java)
+                .registerSubtype(LessonListWidgetEntry.Error::class.java, "error")
+                .registerSubtype(LessonListWidgetEntry.FullDayEmpty::class.java, "full_day_empty")
+                .registerSubtype(LessonListWidgetEntry.NoMoreLessons::class.java, "no_more_lessons")
+                .registerSubtype(LessonListWidgetEntry.LessonListEnd::class.java, "lesson_list_end")
+                .registerSubtype(LessonListWidgetEntry.LessonData::class.java, "lesson_data")
+        GsonBuilder()
+            .registerTypeAdapterFactory(lessonListEntryAdapterFactory)
+            .create()
     }
+    private val KEY = stringPreferencesKey("lesson_list_json")
 
-    fun getData(): LessonListWidgetData = data
+    val data: Flow<LessonListWidgetData> =
+        context.lessonListDataStore.data.map { prefs ->
+            prefs[KEY]?.let { gson.fromJson(it, LessonListWidgetData::class.java) }
+                ?: LessonListWidgetData(listOf(LessonListWidgetEntry.Updating))
+        }
+
+    suspend fun setData(newData: LessonListWidgetData) {
+        context.lessonListDataStore.edit { prefs ->
+            prefs[KEY] = gson.toJson(newData)
+        }
+    }
 }
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonListWidgetEntry.kt b/app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/data/LessonListWidgetEntry.kt
@@ -2,12 +2,24 @@ package me.alllexey123.itmowidgets.ui.widgets.data
 
 import me.alllexey123.itmowidgets.R
 
-sealed class LessonListWidgetEntry(open val layoutId: Int) {
-    object Error : LessonListWidgetEntry(R.layout.item_lesson_list_error)
-    object FullDayEmpty : LessonListWidgetEntry(R.layout.item_lesson_list_empty)
-    object NoMoreLessons : LessonListWidgetEntry(R.layout.item_lesson_list_no_more)
-    object LessonListEnd : LessonListWidgetEntry(R.layout.item_lesson_list_end)
-    object Updating : LessonListWidgetEntry(R.layout.item_lesson_list_updating)
+sealed class LessonListWidgetEntry {
+    abstract val layoutId: Int
+
+    object Error : LessonListWidgetEntry() {
+        override val layoutId: Int = R.layout.item_lesson_list_error
+    }
+    object FullDayEmpty : LessonListWidgetEntry() {
+        override val layoutId: Int = R.layout.item_lesson_list_empty
+    }
+    object NoMoreLessons : LessonListWidgetEntry() {
+        override val layoutId: Int = R.layout.item_lesson_list_no_more
+    }
+    object LessonListEnd : LessonListWidgetEntry() {
+        override val layoutId: Int = R.layout.item_lesson_list_end
+    }
+    object Updating : LessonListWidgetEntry() {
+        override val layoutId: Int = R.layout.item_lesson_list_updating
+    }
 
     // null to hide
     data class LessonData(
@@ -18,5 +30,5 @@ sealed class LessonListWidgetEntry(open val layoutId: Int) {
         val room: String? = null,
         val building: String? = null,
         override val layoutId: Int,
-    ) : LessonListWidgetEntry(layoutId)
+    ) : LessonListWidgetEntry()
 }
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/util/RuntimeTypeAdapterFactory.kt b/app/src/main/java/me/alllexey123/itmowidgets/util/RuntimeTypeAdapterFactory.kt
@@ -0,0 +1,91 @@
+package me.alllexey123.itmowidgets.util
+
+import com.google.gson.Gson
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.google.gson.JsonPrimitive
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.reflect.TypeToken
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import kotlin.collections.iterator
+
+class RuntimeTypeAdapterFactory<T> private constructor(
+    private val baseType: Class<*>,
+    private val typeFieldName: String,
+    private val maintainType: Boolean
+) : TypeAdapterFactory {
+    private val labelToSubtype: MutableMap<String, Class<*>> = LinkedHashMap()
+    private val subtypeToLabel: MutableMap<Class<*>, String> = LinkedHashMap()
+
+    companion object {
+        fun <T> of(baseType: Class<T>, typeFieldName: String = "type", maintainType: Boolean = false): RuntimeTypeAdapterFactory<T> {
+            return RuntimeTypeAdapterFactory(baseType, typeFieldName, maintainType)
+        }
+    }
+
+    fun registerSubtype(subtype: Class<out T>, label: String): RuntimeTypeAdapterFactory<T> {
+        if (subtypeToLabel.containsKey(subtype) || labelToSubtype.containsKey(label)) {
+            throw IllegalArgumentException("types and labels must be unique")
+        }
+        labelToSubtype[label] = subtype
+        subtypeToLabel[subtype] = label
+        return this
+    }
+
+    override fun <R> create(gson: Gson, type: TypeToken<R>): TypeAdapter<R>? {
+        if (type.rawType != baseType) {
+            return null
+        }
+
+        val labelToDelegate: MutableMap<String, TypeAdapter<*>> = LinkedHashMap()
+        val subtypeToDelegate: MutableMap<Class<*>, TypeAdapter<*>> = LinkedHashMap()
+        for ((key, value) in labelToSubtype) {
+            val delegate = gson.getDelegateAdapter(this, TypeToken.get(value))
+            labelToDelegate[key] = delegate
+            subtypeToDelegate[value] = delegate
+        }
+
+        return object : TypeAdapter<R>() {
+            override fun read(input: JsonReader): R {
+                val jsonElement = gson.fromJson<JsonElement>(input, JsonElement::class.java)
+                val labelJsonElement: JsonElement?
+                labelJsonElement = if (maintainType) {
+                    jsonElement.asJsonObject.get(typeFieldName)
+                } else {
+                    jsonElement.asJsonObject.remove(typeFieldName)
+                }
+                if (labelJsonElement == null) {
+                    throw JsonParseException("cannot deserialize ${baseType} because it does not define a field named ${typeFieldName}")
+                }
+                val label = labelJsonElement.asString
+                val delegate = labelToDelegate[label]
+                    ?: throw JsonParseException("cannot deserialize ${baseType} subtype named ${label}; did you forget to register a subtype?")
+                return delegate.fromJsonTree(jsonElement) as R
+            }
+
+            override fun write(out: JsonWriter, value: R) {
+                val srcType = value!!::class.java
+                val label = subtypeToLabel[srcType]
+                    ?: throw JsonParseException("cannot serialize ${srcType.name}; did you forget to register a subtype?")
+                val delegate = subtypeToDelegate[srcType] as TypeAdapter<R>
+                var jsonObject = delegate.toJsonTree(value).asJsonObject
+                if (maintainType) {
+                    gson.toJson(jsonObject, out)
+                    return
+                }
+                val clone = JsonObject()
+                if (jsonObject.has(typeFieldName)) {
+                    throw JsonParseException("cannot serialize ${srcType.name} because it already defines a field named ${typeFieldName}")
+                }
+                clone.add(typeFieldName, JsonPrimitive(label))
+                for ((key, value1) in jsonObject.entrySet()) {
+                    clone.add(key, value1)
+                }
+                gson.toJson(clone, out)
+            }
+        }.nullSafe() as TypeAdapter<R>
+    }
+}
diff --git a/app/src/main/java/me/alllexey123/itmowidgets/workers/LessonWidgetUpdateWorker.kt b/app/src/main/java/me/alllexey123/itmowidgets/workers/LessonWidgetUpdateWorker.kt
@@ -12,6 +12,7 @@ import me.alllexey123.itmowidgets.ItmoWidgetsApp
 import me.alllexey123.itmowidgets.ui.widgets.LessonListWidget
 import me.alllexey123.itmowidgets.ui.widgets.SingleLessonWidget
 import me.alllexey123.itmowidgets.ui.widgets.data.LessonListWidgetData
+import me.alllexey123.itmowidgets.ui.widgets.data.LessonListWidgetEntry
 import me.alllexey123.itmowidgets.ui.widgets.data.LessonWidgetDataManager
 import me.alllexey123.itmowidgets.ui.widgets.data.SingleLessonWidgetData
 import java.time.Duration
@@ -29,6 +30,7 @@ class LessonWidgetUpdateWorker(
         val appContainer = (appContext as ItmoWidgetsApp).appContainer
         val storage = appContainer.storage
         val repository = appContainer.scheduleRepository
+        val lessonListRepository = appContainer.lessonListRepository
         storage.setLastUpdateTimestamp(System.currentTimeMillis())
 
         val appWidgetManager = AppWidgetManager.getInstance(appContext)
@@ -49,7 +51,7 @@ class LessonWidgetUpdateWorker(
 
             val dataManager = LessonWidgetDataManager(repository, storage)
             val widgetsState = dataManager.getLessonWidgetsState()
-
+            lessonListRepository.setData(widgetsState.lessonListWidgetData)
             updateSingleLessonWidgets(
                 appWidgetManager,
                 singleWidgetIds,
@@ -59,16 +61,16 @@ class LessonWidgetUpdateWorker(
             updateLessonListWidgets(
                 appWidgetManager,
                 listWidgetIds,
-                widgetsState.lessonListWidgetData,
                 onlyDataChanged
             )
 
             storage.setLessonWidgetStyleChanged(false)
 
             scheduleNextUpdate(appContext, widgetsState.nextUpdateAt.plusSeconds(3))
         } catch (e: Exception) {
+            e.printStackTrace()
             storage.setErrorLog("[${javaClass.name}]: ${e.stackTraceToString()}}")
-
+            lessonListRepository.setData(LessonListWidgetData(listOf(LessonListWidgetEntry.Error)))
             scheduleNextUpdate(appContext, null)
         }
 
@@ -88,13 +90,12 @@ class LessonWidgetUpdateWorker(
     private fun updateLessonListWidgets(
         appWidgetManager: AppWidgetManager,
         widgetIds: IntArray,
-        data: LessonListWidgetData,
         onlyDataChanged: Boolean
     ) {
         widgetIds.forEach { appWidgetId ->
             val providerInfo = appWidgetManager.getAppWidgetInfo(appWidgetId)
             val outerLayoutId = providerInfo.initialLayout
-            LessonListWidget.updateAppWidget(appContext, appWidgetManager, appWidgetId, data, outerLayoutId, onlyDataChanged)
+            LessonListWidget.updateAppWidget(appContext, appWidgetManager, appWidgetId, outerLayoutId, onlyDataChanged)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ class SettingsFragment : PreferenceFragmentCompat() {`
`82`	`82`	`listOf("single_lesson_widget_style", "list_lesson_widget_style")`
`83`	`83`	`.map { s -> findPreference<ListPreference>(s) }.forEach { preference ->`
`84`	`84`	`preference?.setOnPreferenceChangeListener { pref, newValue ->`
`85`		`- storage.setLessonWidgetStyleChanged(true)`
`86`	`85`	`updateAllWidgets()`
`87`	`86`	`true`
`88`	`87`	`}`