Merge pull request #3026 from nextcloud/fix/widget-content

fix(widget): content color

Author: AndyScherzinger

.github/workflows/android.yml

@@ -74,7 +74,7 @@ jobs:
       - name: Build debug APK
         run: bash ./gradlew assembleDev --stacktrace --no-configuration-cache
       - name: Upload APK
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: app-dev-debug
           path: app/build/outputs/apk/dev/debug/app-dev-debug.apk

app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt

@@ -14,7 +14,9 @@ import android.util.Log
 import android.view.View
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService.RemoteViewsFactory
+import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
+import com.nextcloud.android.common.ui.util.PlatformThemeUtil
 import it.niedermann.owncloud.notes.R
 import it.niedermann.owncloud.notes.edit.EditNoteActivity
 import it.niedermann.owncloud.notes.persistence.NotesRepository
@@ -148,6 +150,14 @@ class NoteListWidgetFactory internal constructor(private val context: Context, i
             } else {
                 setViewVisibility(R.id.widget_entry_category, View.VISIBLE)
                 setTextViewText(R.id.widget_entry_category, note.category)
+
+                val textColorId = if (PlatformThemeUtil.isDarkMode(context)) {
+                    R.color.text_color
+                } else {
+                    R.color.category_border
+                }
+                val textColor = ContextCompat.getColor(context, textColorId)
+                setTextColor(R.id.widget_entry_category, textColor)
             }
 
             val starIconId = if (note.favorite) {

app/src/main/res/drawable/category_widget_background.xml

@@ -0,0 +1,15 @@
+<!--
+  ~ Nextcloud Notes - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2017-2026 Nextcloud GmbH and Nextcloud contributors
+  ~ SPDX-FileCopyrightText: 2017-2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/category_widget_background" />
+    <stroke
+        android:width="1dip"
+        android:color="@color/category_border" />
+    <corners android:radius="8dp" />
+</shape>

app/src/main/res/layout/widget_entry.xml

@@ -45,9 +45,8 @@
         android:layout_gravity="center_vertical"
         android:paddingHorizontal="8dp"
         android:paddingVertical="4dp"
-        android:background="@drawable/border"
+        android:background="@drawable/category_widget_background"
         android:textSize="12sp"
-        android:textColor="@color/category_border"
         android:gravity="center"
         android:visibility="gone"
         tools:visibility="visible"

app/src/main/res/values-night/colors.xml

@@ -42,4 +42,7 @@
     <color name="action_mode_background">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
     <color name="primary_button_text_color">#000000</color>
+
+    <color name="category_widget_background">@color/material_dynamic_secondary20</color>
+    <color name="category_border">@color/transparent</color>
 </resources>

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

@@ -57,4 +57,6 @@
     <color name="online">#2D7B41</color>
     <color name="busy">#DB0606</color>
     <color name="offline">@color/high_emphasis_text</color>
+
+    <color name="category_widget_background">@color/transparent</color>
 </resources>