Fixes, start ScheduleActivity on small widget click

Author: alllexey

app/src/main/java/me/alllexey123/itmowidgets/ui/schedule/DayScheduleAdapter.kt

@@ -50,7 +50,7 @@ class DayScheduleAdapter(private var schedules: List<Schedule>) :
     fun updateData(newDaySchedules: List<Schedule>) {
         val oldDaySchedules = this.schedules
         this.schedules = newDaySchedules
-        if (oldDaySchedules != newDaySchedules)notifyDataSetChanged()
+        if (oldDaySchedules != newDaySchedules) notifyDataSetChanged()
     }
 
     override fun getItemCount(): Int = schedules.size

app/src/main/java/me/alllexey123/itmowidgets/ui/schedule/ScheduleActivity.kt

@@ -1,7 +1,9 @@
 package me.alllexey123.itmowidgets.ui.schedule
 
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.View
 import android.widget.ProgressBar
 import android.widget.Toast
@@ -108,4 +110,16 @@ class ScheduleActivity : AppCompatActivity() {
         }
     }
 
+    companion object {
+        fun getOnClickPendingIntent(context: Context): PendingIntent? {
+            val clickIntent = Intent(context, ScheduleActivity::class.java)
+            return PendingIntent.getActivity(
+                context,
+                0,
+                clickIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+            )
+        }
+    }
+
 }

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidget.kt

@@ -1,6 +1,5 @@
 package me.alllexey123.itmowidgets.ui.widgets
 
-import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.Context
@@ -46,13 +45,7 @@ class LessonListWidget : AppWidgetProvider() {
                     data = ("widget://${appWidgetId}-${System.currentTimeMillis()}").toUri()
                 }
 
-                val clickIntent = Intent(context, ScheduleActivity::class.java)
-                val pendingIntent = PendingIntent.getActivity(
-                    context,
-                    0,
-                    clickIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
-                )
+                val pendingIntent = ScheduleActivity.getOnClickPendingIntent(context)
 
                 val views = RemoteViews(context.packageName, layoutId)
                 views.setPendingIntentTemplate(R.id.lesson_list, pendingIntent)

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/LessonListWidgetService.kt

@@ -59,7 +59,6 @@ class LessonListWidgetService : RemoteViewsService() {
                     setViewVisibility(R.id.location_layout, if (hideLocation) View.GONE else View.VISIBLE)
                     setViewVisibility(R.id.time_layout, if (entry.times.isNullOrEmpty()) View.GONE else View.VISIBLE)
 
-                    // Set the color indicator.
                     val color = ScheduleUtils.getWorkTypeColor(entry.workTypeId)
                     setInt(R.id.type_indicator, "setColorFilter", ContextCompat.getColor(context, color))
                 }

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/QrCodeWidget.kt

@@ -7,7 +7,6 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.widget.RemoteViews
-import androidx.work.WorkManager
 import me.alllexey123.itmowidgets.ItmoWidgetsApp
 import me.alllexey123.itmowidgets.R
 import me.alllexey123.itmowidgets.workers.QrWidgetUpdateWorker
@@ -49,14 +48,6 @@ class QrCodeWidget : AppWidgetProvider() {
         }
     }
 
-    override fun onEnabled(context: Context) {
-//        QrWidgetUpdateWorker.Companion.enqueueImmediateUpdate(context)
-    }
-
-    override fun onDisabled(context: Context) {
-        WorkManager.getInstance(context).cancelUniqueWork(QrWidgetUpdateWorker.Companion.WIDGET_UPDATE_WORK_NAME)
-    }
-
     companion object {
 
         const val PIXELS_PER_MODULE = 20

app/src/main/java/me/alllexey123/itmowidgets/ui/widgets/SingleLessonWidget.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
 import me.alllexey123.itmowidgets.R
+import me.alllexey123.itmowidgets.ui.schedule.ScheduleActivity
 import me.alllexey123.itmowidgets.ui.widgets.data.SingleLessonWidgetData
 import me.alllexey123.itmowidgets.util.ScheduleUtils
 import me.alllexey123.itmowidgets.workers.LessonWidgetUpdateWorker
@@ -21,14 +22,6 @@ open class SingleLessonWidget : AppWidgetProvider() {
         LessonWidgetUpdateWorker.Companion.enqueueImmediateUpdate(context)
     }
 
-    override fun onEnabled(context: Context) {
-        LessonWidgetUpdateWorker.Companion.enqueueImmediateUpdate(context)
-    }
-
-    override fun onDisabled(context: Context) {
-
-    }
-
     companion object {
         fun updateAppWidget(
             context: Context,
@@ -56,6 +49,9 @@ open class SingleLessonWidget : AppWidgetProvider() {
                 ContextCompat.getColor(context, colorId)
             )
 
+            val pendingIntent = ScheduleActivity.getOnClickPendingIntent(context)
+            views.setOnClickPendingIntent(R.id.lesson_widget_root, pendingIntent)
+
             appWidgetManager.updateAppWidget(appWidgetId, views)
         }
     }

app/src/main/java/me/alllexey123/itmowidgets/workers/LessonWidgetUpdateWorker.kt

@@ -65,7 +65,7 @@ class LessonWidgetUpdateWorker(
 
             storage.setLessonWidgetStyleChanged(false)
 
-            scheduleNextUpdate(appContext, widgetsState.nextUpdateAt)
+            scheduleNextUpdate(appContext, widgetsState.nextUpdateAt.plusSeconds(3))
         } catch (e: Exception) {
             storage.setErrorLog("[${javaClass.name}]: ${e.stackTraceToString()}}")
 

app/src/main/res/layout/single_lesson_widget_dash.xml

@@ -9,7 +9,8 @@
     android:padding="6dp"
     android:paddingStart="8dp"
     android:backgroundTint="?attr/colorSurface"
-    android:theme="@style/AppTheme">
+    android:theme="@style/AppTheme"
+    android:id="@+id/lesson_widget_root">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/single_lesson_widget_dot.xml

@@ -7,7 +7,8 @@
     android:orientation="vertical"
     android:padding="6dp"
     android:theme="@style/AppTheme"
-    android:backgroundTint="?attr/colorSurface">
+    android:backgroundTint="?attr/colorSurface"
+    android:id="@+id/lesson_widget_root">
 
     <LinearLayout
         android:layout_width="match_parent"