feat: widget label & descriptions & style tweak

Author: JunkFood02

app/src/main/AndroidManifest.xml

@@ -122,6 +122,7 @@
 
         <receiver
             android:name=".ui.widget.ArticleListWidgetReceiver"
+            android:label="@string/list_widget_label"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -133,6 +134,7 @@
         </receiver>
         <receiver
             android:name=".ui.widget.ArticleCardWidgetReceiver"
+            android:label="@string/card_widget_label"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

app/src/main/java/me/ash/reader/ui/widget/ArticleCardWidget.kt

@@ -200,6 +200,7 @@ fun ArticleCard(article: Article?, bitmap: Bitmap?, modifier: GlanceModifier = G
                                 fontSize = 16.sp,
                                 fontWeight = FontWeight.Bold,
                             ),
+                        maxLines = 6
                     )
                 }
             }

app/src/main/java/me/ash/reader/ui/widget/ArticleListWidget.kt

@@ -161,9 +161,14 @@ fun Header(text: String, theme: Theme, modifier: GlanceModifier = GlanceModifier
             18.sp
         }
 
+    val topPadding = if (isLargeVariant) 28.dp else 24.dp
+
     val bottomPadding = if (isLargeVariant) 10.dp else 8.dp
 
-    Column(modifier = modifier.padding(bottom = bottomPadding).padding(horizontal = 12.dp)) {
+    Column(
+        modifier =
+            modifier.padding(top = topPadding, bottom = bottomPadding).padding(horizontal = 12.dp)
+    ) {
         Text(
             text = text,
             style =
@@ -192,7 +197,6 @@ fun ArticleList(
     val context = LocalContext.current
     if (items.isEmpty()) {
         Column(modifier = modifier.fillMaxSize().clickable(actionStartActivity<MainActivity>())) {
-            Spacer(modifier = GlanceModifier.height(24.dp))
             Header(title, theme)
             Text(
                 text = context.getString(R.string.no_unread_articles),
@@ -209,7 +213,6 @@ fun ArticleList(
         }
     } else {
         Column(modifier = modifier) {
-            Spacer(modifier = GlanceModifier.height(24.dp))
             Header(title, theme)
 
             LazyColumn() {

…ash/reader/ui/widget/FeedWidgetConfig.kt …/me/ash/reader/ui/widget/WidgetConfig.ktapp/src/main/java/me/ash/reader/ui/widget/FeedWidgetConfig.kt renamed to app/src/main/java/me/ash/reader/ui/widget/WidgetConfig.kt app/src/main/java/me/ash/reader/ui/widget/FeedWidgetConfig.kt renamed to app/src/main/java/me/ash/reader/ui/widget/WidgetConfig.kt

@@ -3,10 +3,10 @@ package me.ash.reader.ui.widget
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class FeedWidgetConfig(val theme: Theme, val dataSource: DataSource) {
+data class WidgetConfig(val theme: Theme, val dataSource: DataSource) {
     companion object {
         fun default(accountId: Int) =
-            FeedWidgetConfig(theme = Theme.SansSerif, dataSource = DataSource.Account(accountId))
+            WidgetConfig(theme = Theme.SansSerif, dataSource = DataSource.Account(accountId))
     }
 }
 

app/src/main/java/me/ash/reader/ui/widget/WidgetConfigActivity.kt

@@ -98,7 +98,7 @@ class WidgetConfigActivity : ComponentActivity() {
         setContent {
             settingsProvider.ProvidesSettings {
                 AppTheme(useDarkTheme = LocalDarkTheme.current.isDarkTheme()) {
-                    var config: FeedWidgetConfig by remember { mutableStateOf(config) }
+                    var config: WidgetConfig by remember { mutableStateOf(config) }
 
                     val dataSources =
                         repository.getCurrentDataSources().collectAsStateValue(emptyList())
@@ -187,7 +187,7 @@ class WidgetConfigActivity : ComponentActivity() {
     }
 
     fun updateWidget(
-        config: FeedWidgetConfig,
+        config: WidgetConfig,
         glanceId: GlanceId,
         appWidgetId: Int,
         isCard: Boolean,
@@ -289,7 +289,7 @@ fun SingleChoiceItem(
                 .padding(vertical = 16.dp, horizontal = 24.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        Column {
+        Column(modifier = Modifier.weight(1f)) {
             Text(
                 title,
                 style = MaterialTheme.typography.bodyLargeEmphasized,
@@ -302,7 +302,6 @@ fun SingleChoiceItem(
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
             )
         }
-        Spacer(modifier = Modifier.weight(1f))
         RadioButton(selected = selected, onClick = null, interactionSource = interactionSource)
     }
 }

app/src/main/java/me/ash/reader/ui/widget/WidgetRepository.kt

@@ -50,17 +50,17 @@ constructor(
 
     private fun Context.getConfigFlow(
         widgetId: Int,
-        default: FeedWidgetConfig = FeedWidgetConfig.default(accountService.getCurrentAccountId()),
-    ): Flow<FeedWidgetConfig> =
+        default: WidgetConfig = WidgetConfig.default(accountService.getCurrentAccountId()),
+    ): Flow<WidgetConfig> =
         widgetDataStore.data.map {
             val string = it[stringPreferencesKey(widgetId.toString())]
             if (string == null) default
             else
-                runCatching { json.decodeFromString<FeedWidgetConfig>(string) }
+                runCatching { json.decodeFromString<WidgetConfig>(string) }
                     .getOrDefault(default)
         }
 
-    private suspend fun Context.writeConfig(widgetId: Int, config: FeedWidgetConfig) =
+    private suspend fun Context.writeConfig(widgetId: Int, config: WidgetConfig) =
         withContext(Dispatchers.IO) {
             widgetDataStore.edit { preferences ->
                 val configString =
@@ -85,14 +85,14 @@ constructor(
             }
         }
 
-    fun getDefaultConfig() = FeedWidgetConfig.default(accountService.getCurrentAccountId())
+    fun getDefaultConfig() = WidgetConfig.default(accountService.getCurrentAccountId())
 
-    suspend fun writeConfig(widgetId: Int, config: FeedWidgetConfig) =
+    suspend fun writeConfig(widgetId: Int, config: WidgetConfig) =
         context.writeConfig(widgetId, config)
 
-    suspend fun getConfig(widgetId: Int): FeedWidgetConfig = getConfigFlow(widgetId).first()
+    suspend fun getConfig(widgetId: Int): WidgetConfig = getConfigFlow(widgetId).first()
 
-    fun getConfigFlow(widgetId: Int): Flow<FeedWidgetConfig> = context.getConfigFlow(widgetId)
+    fun getConfigFlow(widgetId: Int): Flow<WidgetConfig> = context.getConfigFlow(widgetId)
 
     fun clearConfig(widgetIds: IntArray) =
         coroutineScope.launch(Dispatchers.IO) {

app/src/main/res/values/strings.xml

@@ -372,4 +372,7 @@
     <string name="done">Done</string>
     <string name="last_updated">Last updated</string>
     <string name="no_unread_articles">No unread articles</string>
+    <string name="list_widget_label">List view</string>
+    <string name="card_widget_label">Card view</string>"
+    <string name="widget_description">View latest unread articles from selected sources</string>
 </resources>

app/src/main/res/xml/article_card_widget_info.xml

@@ -1,5 +1,6 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="me.ash.reader.ui.widget.WidgetConfigActivity"
+    android:description="@string/widget_description"
     android:initialLayout="@layout/glance_default_loading_layout"
     android:maxResizeWidth="180dp"
     android:maxResizeHeight="150dp"

app/src/main/res/xml/article_list_widget_info.xml

@@ -1,5 +1,6 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
     android:configure="me.ash.reader.ui.widget.WidgetConfigActivity"
+    android:description="@string/widget_description"
     android:initialLayout="@layout/glance_default_loading_layout"
     android:maxResizeWidth="480dp"
     android:maxResizeHeight="800dp"