Skip to content

Develop #155

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
sameerasw merged 3 commits into from
Jan 23, 2026
Merged

Develop #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f4ca28
Version upgrade
sameerasw Jan 23, 2026
b7a6e95
Fix #119 scaling of the battery widget
sameerasw Jan 23, 2026
b859fe5
Merge pull request #154 from sameerasw/experimental-glance
sameerasw Jan 23, 2026
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ android {
applicationId = "com.sameerasw.essentials"
minSdk = 26
targetSdk = 36
versionCode = 22
versionName = "10.1"
versionCode = 23
versionName = "10.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
111 changes: 41 additions & 70 deletions app/src/main/java/com/sameerasw/essentials/services/widgets/BatteriesWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,6 @@ class BatteriesWidget : GlanceAppWidget() {
val onSurface = GlanceTheme.colors.onSurface.getColor(configContext).toArgb()
val widgetBackgroundColor = GlanceTheme.colors.widgetBackground.getColor(configContext).toArgb()

val isNightMode = (systemConfig.uiMode and
android.content.res.Configuration.UI_MODE_NIGHT_MASK) ==
android.content.res.Configuration.UI_MODE_NIGHT_YES


val colors = ThemeColors(
primary = basePrimary,
error = baseError,
Expand All @@ -171,85 +166,61 @@ class BatteriesWidget : GlanceAppWidget() {
iconTint = onSurface
)


val backgroundModifier = if (isBackgroundEnabled) {
GlanceModifier.background(GlanceTheme.colors.widgetBackground)
} else {
GlanceModifier.background(android.graphics.Color.TRANSPARENT)
}

if (displayedItems.size > 1) {
val isGridCapable = width >= 200.dp && height >= 140.dp

if (isGridCapable) {
// GRID / WRAPPING LAYOUT
val itemWidth = 72.dp
val columns = (width / itemWidth).toInt().coerceAtLeast(1)
val rows = displayedItems.chunked(columns)

Column(
modifier = GlanceModifier
.fillMaxSize()
.then(backgroundModifier)
.padding(8.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalAlignment = Alignment.CenterVertically
) {
rows.forEachIndexed { rowIndex, rowItems ->
Row(
modifier = GlanceModifier.fillMaxWidth().defaultWeight(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalAlignment = Alignment.CenterVertically
) {
rowItems.forEachIndexed { colIndex, item ->
BatteryItemBox(configContext, item, colors, modifier = GlanceModifier.defaultWeight().fillMaxHeight())
if (colIndex < rowItems.size - 1) {
Spacer(modifier = GlanceModifier.width(8.dp))
}
}
if (rowItems.size < columns) {
repeat(columns - rowItems.size) {
Spacer(modifier = GlanceModifier.defaultWeight().fillMaxHeight())
if (it < (columns - rowItems.size - 1)) Spacer(modifier = GlanceModifier.width(8.dp))
}
}
}
if (rowIndex < rows.size - 1) {
Spacer(modifier = GlanceModifier.height(8.dp))
}
}
}
} else {
// STANDARD SINGLE ROW LAYOUT
val effectivePadding = if (width < 100.dp || height < 100.dp) 4.dp else 8.dp
val isSingleItem = displayedItems.size <= 1
val items = displayedItems.ifEmpty { listOf(BatteryItemData(androidLevel, R.drawable.rounded_mobile_24, "Android")) }

// Dynamic Grid Calculation
val itemMinWidth = if (isSingleItem) 120.dp else 72.dp
val columns = (width / itemMinWidth).toInt().coerceIn(1, items.size)
val rows = items.chunked(columns)

Column(
modifier = GlanceModifier
.fillMaxSize()
.then(backgroundModifier)
.padding(if (isSingleItem && width > 120.dp) 16.dp else effectivePadding),
horizontalAlignment = Alignment.CenterHorizontally,
verticalAlignment = Alignment.CenterVertically
) {
rows.forEachIndexed { rowIndex, rowItems ->
Row(
modifier = GlanceModifier
.fillMaxSize()
.then(backgroundModifier)
.padding(8.dp),
modifier = GlanceModifier.fillMaxWidth().defaultWeight(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalAlignment = Alignment.CenterVertically
) {
displayedItems.forEachIndexed { index, item ->
BatteryItemBox(configContext, item, colors, modifier = GlanceModifier.defaultWeight().fillMaxHeight())

if (index < displayedItems.size - 1) {
rowItems.forEachIndexed { colIndex, item ->
val itemResolution = if (isSingleItem) 512 else 340
BatteryItemBox(
configContext,
item,
colors,
size = itemResolution,
modifier = GlanceModifier.defaultWeight().fillMaxHeight()
)
if (colIndex < rowItems.size - 1 || rowItems.size < columns) {
Spacer(modifier = GlanceModifier.width(8.dp))
}
}
// Filler for consistent sizing
if (rowItems.size < columns) {
repeat(columns - rowItems.size) { i ->
Spacer(modifier = GlanceModifier.defaultWeight().fillMaxHeight())
if (i < (columns - rowItems.size - 1)) {
Spacer(modifier = GlanceModifier.width(8.dp))
}
}
}
}
if (rowIndex < rows.size - 1) {
Spacer(modifier = GlanceModifier.height(8.dp))
}
}
} else {
// Single item layout (Big)
val item = displayedItems.firstOrNull() ?: BatteryItemData(androidLevel, R.drawable.rounded_mobile_24, "Android")

Box(
modifier = GlanceModifier
.fillMaxSize()
.then(backgroundModifier)
.padding(16.dp),
contentAlignment = Alignment.Center
) {
BatteryItemBox(configContext, item, colors, size = 512, modifier = GlanceModifier.fillMaxSize())
}
}
}
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/res/xml/batteries_widget_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:description="@string/feat_batteries_desc"
android:initialLayout="@layout/glance_default_loading_layout"
android:minWidth="100dp"
android:minHeight="100dp"
android:minWidth="40dp"
android:minHeight="40dp"
android:resizeMode="horizontal|vertical"
android:minResizeWidth="40dp"
android:minResizeHeight="40dp"
android:targetCellWidth="1"
android:targetCellHeight="1"
android:updatePeriodMillis="1800000"
android:widgetCategory="home_screen" />