Graph widget to show historical data

app/build.gradle.kts

@@ -118,6 +118,7 @@ android {
 
 dependencies {
     implementation(project(":common"))
+    implementation(libs.mpgraph)
 
     coreLibraryDesugaring(libs.tools.desugar.jdk)
 

app/src/main/AndroidManifest.xml

@@ -146,6 +146,20 @@
                 android:resource="@xml/entity_widget_info" />
         </receiver>
 
+        <receiver
+            android:name=".widgets.graph.GraphWidget"
+            android:exported="false"
+            android:label="@string/widget_graph_image_description">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+                <action android:name="io.homeassistant.companion.android.widgets.GraphWidget.RECEIVE_DATA" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/graph_widget_info" />
+        </receiver>
+
         <receiver android:name=".widgets.mediaplayer.MediaPlayerControlsWidget" android:label="@string/widget_media_player_description"
             android:exported="false">
             <intent-filter>
@@ -209,6 +223,14 @@
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".widgets.graph.GraphWidgetConfigureActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
         <activity android:name=".widgets.mediaplayer.MediaPlayerControlsWidgetConfigureActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true">

app/src/main/java/io/homeassistant/companion/android/HomeAssistantApplication.kt

@@ -25,6 +25,7 @@ import io.homeassistant.companion.android.util.LifecycleHandler
 import io.homeassistant.companion.android.websocket.WebsocketBroadcastReceiver
 import io.homeassistant.companion.android.widgets.button.ButtonWidget
 import io.homeassistant.companion.android.widgets.entity.EntityWidget
+import io.homeassistant.companion.android.widgets.graph.GraphWidget
 import io.homeassistant.companion.android.widgets.mediaplayer.MediaPlayerControlsWidget
 import io.homeassistant.companion.android.widgets.template.TemplateWidget
 import javax.inject.Inject
@@ -277,6 +278,7 @@ open class HomeAssistantApplication : Application() {
         // Update widgets when the screen turns on, updates are skipped if widgets were not added
         val buttonWidget = ButtonWidget()
         val entityWidget = EntityWidget()
+        val graphWidget = GraphWidget()
         val mediaPlayerWidget = MediaPlayerControlsWidget()
         val templateWidget = TemplateWidget()
 
@@ -286,6 +288,7 @@ open class HomeAssistantApplication : Application() {
 
         ContextCompat.registerReceiver(this, buttonWidget, screenIntentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
         ContextCompat.registerReceiver(this, entityWidget, screenIntentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
+        ContextCompat.registerReceiver(this, graphWidget, screenIntentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
         ContextCompat.registerReceiver(this, mediaPlayerWidget, screenIntentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
         ContextCompat.registerReceiver(this, templateWidget, screenIntentFilter, ContextCompat.RECEIVER_NOT_EXPORTED)
     }

app/src/main/java/io/homeassistant/companion/android/settings/widgets/ManageWidgetsViewModel.kt

@@ -16,6 +16,7 @@ import io.homeassistant.companion.android.database.widget.CameraWidgetDao
 import io.homeassistant.companion.android.database.widget.MediaPlayerControlsWidgetDao
 import io.homeassistant.companion.android.database.widget.StaticWidgetDao
 import io.homeassistant.companion.android.database.widget.TemplateWidgetDao
+import io.homeassistant.companion.android.database.widget.graph.GraphWidgetDao
 import javax.inject.Inject
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
@@ -25,6 +26,7 @@ class ManageWidgetsViewModel @Inject constructor(
     buttonWidgetDao: ButtonWidgetDao,
     cameraWidgetDao: CameraWidgetDao,
     staticWidgetDao: StaticWidgetDao,
+    graphWidgetDao: GraphWidgetDao,
     mediaPlayerControlsWidgetDao: MediaPlayerControlsWidgetDao,
     templateWidgetDao: TemplateWidgetDao,
     application: Application
@@ -39,6 +41,7 @@ class ManageWidgetsViewModel @Inject constructor(
     val buttonWidgetList = buttonWidgetDao.getAllFlow().collectAsState()
     val cameraWidgetList = cameraWidgetDao.getAllFlow().collectAsState()
     val staticWidgetList = staticWidgetDao.getAllFlow().collectAsState()
+    val graphWidgetList = graphWidgetDao.getAllFlow().collectAsState()
     val mediaWidgetList = mediaPlayerControlsWidgetDao.getAllFlow().collectAsState()
     val templateWidgetList = templateWidgetDao.getAllFlow().collectAsState()
     val supportsAddingWidgets: Boolean

app/src/main/java/io/homeassistant/companion/android/settings/widgets/views/ManageWidgetsView.kt

@@ -42,13 +42,15 @@ import io.homeassistant.companion.android.util.compose.MdcAlertDialog
 import io.homeassistant.companion.android.widgets.button.ButtonWidgetConfigureActivity
 import io.homeassistant.companion.android.widgets.camera.CameraWidgetConfigureActivity
 import io.homeassistant.companion.android.widgets.entity.EntityWidgetConfigureActivity
+import io.homeassistant.companion.android.widgets.graph.GraphWidgetConfigureActivity
 import io.homeassistant.companion.android.widgets.mediaplayer.MediaPlayerControlsWidgetConfigureActivity
 import io.homeassistant.companion.android.widgets.template.TemplateWidgetConfigureActivity
 
 enum class WidgetType(val widgetIcon: IIcon) {
     BUTTON(CommunityMaterial.Icon2.cmd_gesture_tap),
     CAMERA(CommunityMaterial.Icon.cmd_camera_image),
     STATE(CommunityMaterial.Icon3.cmd_shape),
+    GRAPH(CommunityMaterial.Icon2.cmd_file_chart),
     MEDIA(CommunityMaterial.Icon3.cmd_play_box_multiple),
     TEMPLATE(CommunityMaterial.Icon.cmd_code_braces);
 
@@ -57,6 +59,7 @@ enum class WidgetType(val widgetIcon: IIcon) {
         CAMERA -> CameraWidgetConfigureActivity::class.java
         MEDIA -> MediaPlayerControlsWidgetConfigureActivity::class.java
         STATE -> EntityWidgetConfigureActivity::class.java
+        GRAPH -> GraphWidgetConfigureActivity::class.java
         TEMPLATE -> TemplateWidgetConfigureActivity::class.java
     }
 }
@@ -82,6 +85,7 @@ fun ManageWidgetsView(
                 stringResource(R.string.widget_button_image_description) to WidgetType.BUTTON,
                 stringResource(R.string.widget_camera_description) to WidgetType.CAMERA,
                 stringResource(R.string.widget_static_image_description) to WidgetType.STATE,
+                stringResource(R.string.widget_graph_image_description) to WidgetType.GRAPH,
                 stringResource(R.string.widget_media_player_description) to WidgetType.MEDIA,
                 stringResource(R.string.template_widget) to WidgetType.TEMPLATE
             ).sortedBy { it.first }
@@ -110,7 +114,7 @@ fun ManageWidgetsView(
         ) {
             if (viewModel.buttonWidgetList.value.isEmpty() && viewModel.staticWidgetList.value.isEmpty() &&
                 viewModel.mediaWidgetList.value.isEmpty() && viewModel.templateWidgetList.value.isEmpty() &&
-                viewModel.cameraWidgetList.value.isEmpty()
+                viewModel.cameraWidgetList.value.isEmpty() && viewModel.graphWidgetList.value.isEmpty()
             ) {
                 item {
                     EmptyState(
@@ -144,6 +148,15 @@ fun ManageWidgetsView(
                     if (!label.isNullOrEmpty()) label else "${item.entityId} ${item.stateSeparator} ${item.attributeIds.orEmpty()}"
                 }
             )
+            widgetItems(
+                viewModel.graphWidgetList.value,
+                widgetType = WidgetType.GRAPH,
+                title = R.string.graph_state_widgets,
+                widgetLabel = { item ->
+                    val label = item.label
+                    if (!label.isNullOrEmpty()) label else item.entityId
+                }
+            )
             widgetItems(
                 viewModel.mediaWidgetList.value,
                 widgetType = WidgetType.MEDIA,

app/src/main/java/io/homeassistant/companion/android/widgets/BaseWidgetConfigureActivity.kt

@@ -10,18 +10,14 @@ import android.widget.Toast
 import io.homeassistant.companion.android.BaseActivity
 import io.homeassistant.companion.android.common.R
 import io.homeassistant.companion.android.common.data.servers.ServerManager
-import io.homeassistant.companion.android.database.widget.WidgetDao
 import javax.inject.Inject
 
 abstract class BaseWidgetConfigureActivity : BaseActivity() {
-
     @Inject
     lateinit var serverManager: ServerManager
 
     protected var appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID
 
-    abstract val dao: WidgetDao
-
     abstract val serverSelect: View
     abstract val serverSelectList: Spinner
 

app/src/main/java/io/homeassistant/companion/android/widgets/BaseWidgetProvider.kt

@@ -27,9 +27,9 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
 
     companion object {
         const val UPDATE_VIEW =
-            "io.homeassistant.companion.android.widgets.template.BaseWidgetProvider.UPDATE_VIEW"
+            "io.homeassistant.companion.android.widgets.BaseWidgetProvider.UPDATE_VIEW"
         const val RECEIVE_DATA =
-            "io.homeassistant.companion.android.widgets.template.TemplateWidget.RECEIVE_DATA"
+            "io.homeassistant.companion.android.widgets.BaseWidgetProvider.RECEIVE_DATA"
 
         var widgetScope: CoroutineScope? = null
         val widgetEntities = mutableMapOf<Int, List<String>>()
@@ -63,6 +63,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
             widgetScope?.launch {
                 val views = getWidgetRemoteViews(context, appWidgetId)
                 appWidgetManager.updateAppWidget(appWidgetId, views)
+                onRemoteViewsUpdated(context, appWidgetId, appWidgetManager)
             }
         }
     }
@@ -82,6 +83,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
                 )
                 onScreenOn(context)
             }
+
             Intent.ACTION_SCREEN_ON -> onScreenOn(context)
             Intent.ACTION_SCREEN_OFF -> onScreenOff()
         }
@@ -185,4 +187,5 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
     abstract suspend fun getAllWidgetIdsWithEntities(context: Context): Map<Int, Pair<Int, List<String>>>
     abstract fun saveEntityConfiguration(context: Context, extras: Bundle?, appWidgetId: Int)
     abstract suspend fun onEntityStateChanged(context: Context, appWidgetId: Int, entity: Entity<*>)
+    open suspend fun onRemoteViewsUpdated(context: Context, appWidgetId: Int, appWidgetManager: AppWidgetManager) {}
 }

app/src/main/java/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt

@@ -61,7 +61,6 @@ class ButtonWidgetConfigureActivity : BaseWidgetConfigureActivity() {
 
     @Inject
     lateinit var buttonWidgetDao: ButtonWidgetDao
-    override val dao get() = buttonWidgetDao
 
     private var actions = mutableMapOf<Int, HashMap<String, Action>>()
     private var entities = mutableMapOf<Int, HashMap<String, Entity<Any>>>()

app/src/main/java/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt

@@ -53,7 +53,6 @@ class CameraWidgetConfigureActivity : BaseWidgetConfigureActivity() {
 
     @Inject
     lateinit var cameraWidgetDao: CameraWidgetDao
-    override val dao get() = cameraWidgetDao
 
     private var entityAdapter: SingleItemArrayAdapter<Entity<Any>>? = null
 

app/src/main/java/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt

@@ -52,7 +52,6 @@ class EntityWidgetConfigureActivity : BaseWidgetConfigureActivity() {
 
     @Inject
     lateinit var staticWidgetDao: StaticWidgetDao
-    override val dao get() = staticWidgetDao
 
     private var entities = mutableMapOf<Int, List<Entity<Any>>>()