Skip to content

fix: move clickable to content element to fix Glance layout ID collision #20

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
wassupluke merged 2 commits into from
Apr 2, 2026
Merged

fix: move clickable to content element to fix Glance layout ID collision #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f218f70
fix: skip non-user-facing alarm sources in AlarmWidget
wassupluke Apr 2, 2026
7d460b1
fix: move clickable to content element to fix Glance layout ID collision
wassupluke Apr 2, 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
35 changes: 18 additions & 17 deletions app/src/main/java/com/wassupluke/widgets/widget/AlarmWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,25 @@ private fun AlarmWidgetContent(
modifier = GlanceModifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Box(modifier = GlanceModifier.clickable(tapAction)) {
Row(verticalAlignment = Alignment.CenterVertically) {
Image(
provider = ImageProvider(R.drawable.ic_alarm),
contentDescription = null,
modifier = GlanceModifier.size(fontSize.dp),
colorFilter = ColorFilter.tint(textColorProvider)
Row(
modifier = GlanceModifier.clickable(tapAction),
verticalAlignment = Alignment.CenterVertically
) {
Image(
provider = ImageProvider(R.drawable.ic_alarm),
contentDescription = null,
modifier = GlanceModifier.size(fontSize.dp),
colorFilter = ColorFilter.tint(textColorProvider)
)
Spacer(GlanceModifier.width(4.dp))
Text(
text = alarmText,
style = TextStyle(
fontSize = fontSize.sp,
fontWeight = FontWeight.Normal,
color = textColorProvider
)
Spacer(GlanceModifier.width(4.dp))
Text(
text = alarmText,
style = TextStyle(
fontSize = fontSize.sp,
fontWeight = FontWeight.Normal,
color = textColorProvider
)
)
}
)
}
}
}
17 changes: 16 additions & 1 deletion app/src/main/java/com/wassupluke/widgets/widget/AlarmWidgetReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.app.AlarmManager
import android.appwidget.AppWidgetManager
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import androidx.datastore.preferences.core.edit
import androidx.glance.appwidget.GlanceAppWidget
import androidx.glance.appwidget.GlanceAppWidgetReceiver
Expand Down Expand Up @@ -42,7 +43,13 @@ class AlarmWidgetReceiver : GlanceAppWidgetReceiver() {
val alarmText = if (nextAlarm == null) {
context.getString(R.string.widget_alarm_none)
Comment thread
wassupluke marked this conversation as resolved.
} else {
DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(nextAlarm.triggerTime))
val creator = nextAlarm.showIntent?.creatorPackage
val fromClockApp = creator != null && isUserFacingApp(context, creator)
if (fromClockApp) {
DateFormat.getTimeInstance(DateFormat.SHORT).format(Date(nextAlarm.triggerTime))
} else {
context.getString(R.string.widget_alarm_none)
}
}
context.dataStore.edit { it[WeatherDataStore.ALARM_TEXT] = alarmText }
AlarmWidget().updateAll(context)
Expand All @@ -51,4 +58,12 @@ class AlarmWidgetReceiver : GlanceAppWidgetReceiver() {
}
}
}

private fun isUserFacingApp(context: Context, packageName: String): Boolean {
val intent = Intent(Intent.ACTION_MAIN).apply {
addCategory(Intent.CATEGORY_LAUNCHER)
setPackage(packageName)
}
return context.packageManager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).isNotEmpty()
}
}
17 changes: 8 additions & 9 deletions app/src/main/java/com/wassupluke/widgets/widget/WeatherWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,14 @@ private fun WeatherWidgetContent(
modifier = GlanceModifier.fillMaxSize(),
contentAlignment = Alignment.Center
) {
Box(modifier = GlanceModifier.clickable(tapAction)) {
Text(
text = displayTemp,
style = TextStyle(
fontSize = fontSize.sp,
fontWeight = FontWeight.Normal,
color = textColorProvider
)
Text(
text = displayTemp,
modifier = GlanceModifier.clickable(tapAction),
style = TextStyle(
fontSize = fontSize.sp,
fontWeight = FontWeight.Normal,
color = textColorProvider
)
}
)
}
}
Loading