Skip to content

Support edge to edge in widget configure activities #5352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 27, 2025
Merged

Support edge to edge in widget configure activities #5352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8f979b7
Support edge to edge in widget configure activities
TimoPtr May 23, 2025
6c1b5ed
Add set clipToPadding to false
TimoPtr May 27, 2025
a0589c0
Handle inset in todo widget configure
TimoPtr May 27, 2025
9d91044
Merge branch 'main' into feature/edge-to-edge-configure-widget
TimoPtr May 27, 2025
6aa2f97
Safer handling of Insets in todo widget configure
TimoPtr May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions app/src/main/kotlin/io/homeassistant/companion/android/util/InsetsUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.runtime.Composable
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
Expand All @@ -20,6 +21,26 @@ fun WindowInsets.bottomPaddingValues(): PaddingValues {
return only(WindowInsetsSides.Bottom).asPaddingValues()
}

@Composable
fun safeBottomWindowInsets(): WindowInsets {
return WindowInsets.safeDrawing.only(WindowInsetsSides.Bottom + WindowInsetsSides.Horizontal)
}

@Composable
fun safeBottomPaddingValues(): PaddingValues {
return safeBottomWindowInsets().asPaddingValues()
}

@Composable
fun safeTopWindowInsets(): WindowInsets {
return WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal)
}

@Composable
fun safeTopPaddingValues(): PaddingValues {
return safeTopWindowInsets().asPaddingValues()
}
Comment on lines +24 to +42
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jpelgrom I think I should double check in settings screen the insets because I didn't handle the case of cutout corner like you've said in barcode PR.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After a quick look it's seems to be ok for SettingsActivity since I apply the safeDrawing except at the bottom and that's enough.


fun PreferenceFragmentCompat.applyBottomSafeDrawingInsets(consumeInsets: Boolean = true) {
listView.applySafeDrawingInsets(
applyLeft = false,
Expand Down
7 changes: 7 additions & 0 deletions ...src/main/kotlin/io/homeassistant/companion/android/widgets/BaseWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package io.homeassistant.companion.android.widgets

import android.appwidget.AppWidgetManager
import android.os.Bundle
import android.view.View
import android.widget.AdapterView
import android.widget.AdapterView.OnItemSelectedListener
import android.widget.ArrayAdapter
import android.widget.Spinner
import android.widget.Toast
import androidx.activity.enableEdgeToEdge
import io.homeassistant.companion.android.BaseActivity
import io.homeassistant.companion.android.common.R
import io.homeassistant.companion.android.common.data.servers.ServerManager
Expand All @@ -27,6 +29,11 @@ abstract class BaseWidgetConfigureActivity : BaseActivity() {

var selectedServerId: Int? = null

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
}

protected fun setupServerSelect(widgetServerId: Int?) {
val servers = serverManager.defaultServers
val activeServerId = serverManager.getServer()?.id
Expand Down
2 changes: 2 additions & 0 deletions ...kotlin/io/homeassistant/companion/android/widgets/button/ButtonWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import io.homeassistant.companion.android.database.widget.ButtonWidgetDao
import io.homeassistant.companion.android.database.widget.WidgetBackgroundType
import io.homeassistant.companion.android.databinding.WidgetButtonConfigureBinding
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
import io.homeassistant.companion.android.util.applySafeDrawingInsets
import io.homeassistant.companion.android.util.getHexForColor
import io.homeassistant.companion.android.util.icondialog.IconDialogFragment
import io.homeassistant.companion.android.util.icondialog.getIconByMdiName
Expand Down Expand Up @@ -202,6 +203,7 @@ class ButtonWidgetConfigureActivity : BaseWidgetConfigureActivity() {

binding = WidgetButtonConfigureBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.root.applySafeDrawingInsets()

// Find the widget id from the intent.
val intent = intent
Expand Down
2 changes: 2 additions & 0 deletions ...kotlin/io/homeassistant/companion/android/widgets/camera/CameraWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import io.homeassistant.companion.android.database.widget.CameraWidgetDao
import io.homeassistant.companion.android.database.widget.WidgetTapAction
import io.homeassistant.companion.android.databinding.WidgetCameraConfigureBinding
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
import io.homeassistant.companion.android.util.applySafeDrawingInsets
import io.homeassistant.companion.android.widgets.BaseWidgetConfigureActivity
import io.homeassistant.companion.android.widgets.common.SingleItemArrayAdapter
import javax.inject.Inject
Expand Down Expand Up @@ -65,6 +66,7 @@ class CameraWidgetConfigureActivity : BaseWidgetConfigureActivity() {

binding = WidgetCameraConfigureBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.root.applySafeDrawingInsets()

binding.addButton.setOnClickListener {
if (requestLauncherSetup) {
Expand Down
2 changes: 2 additions & 0 deletions ...kotlin/io/homeassistant/companion/android/widgets/entity/EntityWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import io.homeassistant.companion.android.database.widget.WidgetBackgroundType
import io.homeassistant.companion.android.database.widget.WidgetTapAction
import io.homeassistant.companion.android.databinding.WidgetStaticConfigureBinding
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
import io.homeassistant.companion.android.util.applySafeDrawingInsets
import io.homeassistant.companion.android.util.getHexForColor
import io.homeassistant.companion.android.widgets.BaseWidgetConfigureActivity
import io.homeassistant.companion.android.widgets.BaseWidgetProvider
Expand Down Expand Up @@ -81,6 +82,7 @@ class EntityWidgetConfigureActivity : BaseWidgetConfigureActivity() {

binding = WidgetStaticConfigureBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.root.applySafeDrawingInsets()

binding.addButton.setOnClickListener {
if (requestLauncherSetup) {
Expand Down
2 changes: 2 additions & 0 deletions ...stant/companion/android/widgets/mediaplayer/MediaPlayerControlsWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import io.homeassistant.companion.android.database.widget.MediaPlayerControlsWid
import io.homeassistant.companion.android.database.widget.WidgetBackgroundType
import io.homeassistant.companion.android.databinding.WidgetMediaControlsConfigureBinding
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
import io.homeassistant.companion.android.util.applySafeDrawingInsets
import io.homeassistant.companion.android.widgets.BaseWidgetConfigureActivity
import io.homeassistant.companion.android.widgets.common.SingleItemArrayAdapter
import io.homeassistant.companion.android.widgets.common.WidgetUtils
Expand Down Expand Up @@ -66,6 +67,7 @@ class MediaPlayerControlsWidgetConfigureActivity : BaseWidgetConfigureActivity()

binding = WidgetMediaControlsConfigureBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.root.applySafeDrawingInsets()

binding.addButton.setOnClickListener {
if (requestLauncherSetup) {
Expand Down
2 changes: 2 additions & 0 deletions ...in/io/homeassistant/companion/android/widgets/template/TemplateWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import io.homeassistant.companion.android.database.widget.TemplateWidgetDao
import io.homeassistant.companion.android.database.widget.WidgetBackgroundType
import io.homeassistant.companion.android.databinding.WidgetTemplateConfigureBinding
import io.homeassistant.companion.android.settings.widgets.ManageWidgetsViewModel
import io.homeassistant.companion.android.util.applySafeDrawingInsets
import io.homeassistant.companion.android.util.getHexForColor
import io.homeassistant.companion.android.widgets.BaseWidgetConfigureActivity
import io.homeassistant.companion.android.widgets.common.WidgetUtils
Expand Down Expand Up @@ -62,6 +63,7 @@ class TemplateWidgetConfigureActivity : BaseWidgetConfigureActivity() {

binding = WidgetTemplateConfigureBinding.inflate(layoutInflater)
setContentView(binding.root)
binding.root.applySafeDrawingInsets()

// Find the widget id from the intent.
val intent = intent
Expand Down
7 changes: 7 additions & 0 deletions ...ain/kotlin/io/homeassistant/companion/android/widgets/todo/TodoWidgetConfigureActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.os.Build
import android.os.Bundle
import android.widget.Toast
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.activity.viewModels
import androidx.annotation.RequiresApi
import androidx.compose.foundation.clickable
Expand All @@ -16,6 +17,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Button
Expand Down Expand Up @@ -52,6 +54,8 @@ import io.homeassistant.companion.android.util.previewEntity1
import io.homeassistant.companion.android.util.previewEntity2
import io.homeassistant.companion.android.util.previewServer1
import io.homeassistant.companion.android.util.previewServer2
import io.homeassistant.companion.android.util.safeBottomWindowInsets
import io.homeassistant.companion.android.util.safeTopWindowInsets
import kotlinx.coroutines.launch
import timber.log.Timber

Expand All @@ -69,6 +73,7 @@ class TodoWidgetConfigureActivity : BaseActivity() {
)

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)

// Set the result to CANCELED. This will cause the widget host to cancel
Expand Down Expand Up @@ -207,13 +212,15 @@ private fun TodoWidgetConfigureView(
topBar = {
TopAppBar(
title = { Text(stringResource(R.string.widget_todo_label)) },
windowInsets = safeTopWindowInsets(),
backgroundColor = colorResource(R.color.colorBackground),
contentColor = colorResource(R.color.colorOnBackground),
)
},
) { padding ->
Column(
modifier = Modifier
.windowInsetsPadding(safeBottomWindowInsets())
.padding(padding)
.verticalScroll(rememberScrollState())
.padding(all = 16.dp),
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/widget_button_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clipToPadding="false">

<LinearLayout
android:layout_width="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/widget_camera_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipToPadding="false">

<LinearLayout
android:layout_width="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/widget_media_controls_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipToPadding="false">

<LinearLayout
android:layout_width="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/widget_static_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clipToPadding="false">

<LinearLayout
android:layout_width="match_parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/widget_template_configure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
xmlns:tools="http://schemas.android.com/tools"
android:clipToPadding="false">

<LinearLayout
android:layout_width="match_parent"
Expand Down