From 464dcf8bb39e10474318d367773c8265c8e53bc0 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 29 Jan 2026 11:23:04 +0100 Subject: [PATCH 1/3] fix(widget): content colors Signed-off-by: alperozturk96 --- .../widget/notelist/NoteListWidgetFactory.kt | 9 +++++++++ .../note_category_text_view_background.xml | 15 +++++++++++++++ app/src/main/res/layout/widget_entry.xml | 3 +-- app/src/main/res/values-night/colors.xml | 3 +++ app/src/main/res/values/colors.xml | 2 ++ 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable/note_category_text_view_background.xml diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt index 97f92ad94..eedb10253 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt @@ -14,7 +14,10 @@ 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.theme.utils.ColorRole +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 +151,12 @@ 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) + + if (PlatformThemeUtil.isDarkMode(context)) { + setTextColor(R.id.widget_entry_category,ContextCompat.getColor(context, R.color.text_color)) + } else { + setTextColor(R.id.widget_entry_category,ContextCompat.getColor(context, R.color.category_border)) + } } val starIconId = if (note.favorite) { diff --git a/app/src/main/res/drawable/note_category_text_view_background.xml b/app/src/main/res/drawable/note_category_text_view_background.xml new file mode 100644 index 000000000..28bb5983d --- /dev/null +++ b/app/src/main/res/drawable/note_category_text_view_background.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/app/src/main/res/layout/widget_entry.xml b/app/src/main/res/layout/widget_entry.xml index bde69e01b..e473d4ab0 100644 --- a/app/src/main/res/layout/widget_entry.xml +++ b/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/note_category_text_view_background" android:textSize="12sp" - android:textColor="@color/category_border" android:gravity="center" android:visibility="gone" tools:visibility="visible" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index fd7704512..30e7b5986 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -42,4 +42,7 @@ #1E1E1E @android:color/white #000000 + + @color/material_dynamic_secondary20 + @color/transparent \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b09134d24..2c7bfba0b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,4 +57,6 @@ #2D7B41 #DB0606 @color/high_emphasis_text + + @color/transparent From a41164d03dca96f2afa3ab0b681c1c064b84503c Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Thu, 29 Jan 2026 11:26:32 +0100 Subject: [PATCH 2/3] fix(widget): content colors Signed-off-by: alperozturk96 --- .../notes/widget/notelist/NoteListWidgetFactory.kt | 9 +++++---- ...iew_background.xml => category_widget_background.xml} | 2 +- app/src/main/res/layout/widget_entry.xml | 2 +- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) rename app/src/main/res/drawable/{note_category_text_view_background.xml => category_widget_background.xml} (88%) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt index eedb10253..ab5123bd7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.kt @@ -16,7 +16,6 @@ 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.theme.utils.ColorRole import com.nextcloud.android.common.ui.util.PlatformThemeUtil import it.niedermann.owncloud.notes.R import it.niedermann.owncloud.notes.edit.EditNoteActivity @@ -152,11 +151,13 @@ class NoteListWidgetFactory internal constructor(private val context: Context, i setViewVisibility(R.id.widget_entry_category, View.VISIBLE) setTextViewText(R.id.widget_entry_category, note.category) - if (PlatformThemeUtil.isDarkMode(context)) { - setTextColor(R.id.widget_entry_category,ContextCompat.getColor(context, R.color.text_color)) + val textColorId = if (PlatformThemeUtil.isDarkMode(context)) { + R.color.text_color } else { - setTextColor(R.id.widget_entry_category,ContextCompat.getColor(context, R.color.category_border)) + R.color.category_border } + val textColor = ContextCompat.getColor(context, textColorId) + setTextColor(R.id.widget_entry_category, textColor) } val starIconId = if (note.favorite) { diff --git a/app/src/main/res/drawable/note_category_text_view_background.xml b/app/src/main/res/drawable/category_widget_background.xml similarity index 88% rename from app/src/main/res/drawable/note_category_text_view_background.xml rename to app/src/main/res/drawable/category_widget_background.xml index 28bb5983d..4b08ebf06 100644 --- a/app/src/main/res/drawable/note_category_text_view_background.xml +++ b/app/src/main/res/drawable/category_widget_background.xml @@ -7,7 +7,7 @@ --> - + diff --git a/app/src/main/res/layout/widget_entry.xml b/app/src/main/res/layout/widget_entry.xml index e473d4ab0..fdcf82eba 100644 --- a/app/src/main/res/layout/widget_entry.xml +++ b/app/src/main/res/layout/widget_entry.xml @@ -45,7 +45,7 @@ android:layout_gravity="center_vertical" android:paddingHorizontal="8dp" android:paddingVertical="4dp" - android:background="@drawable/note_category_text_view_background" + android:background="@drawable/category_widget_background" android:textSize="12sp" android:gravity="center" android:visibility="gone" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 30e7b5986..0857691c8 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -43,6 +43,6 @@ @android:color/white #000000 - @color/material_dynamic_secondary20 + @color/material_dynamic_secondary20 @color/transparent \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2c7bfba0b..f3a39be8a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -58,5 +58,5 @@ #DB0606 @color/high_emphasis_text - @color/transparent + @color/transparent From e57a7f6cfdfd13888979e46be903cc5fcbceb678 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 29 Jan 2026 16:47:20 +0100 Subject: [PATCH 3/3] ci(action): Properly pin action Signed-off-by: Andy Scherzinger --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a01dd92d8..c63259e73 100644 --- a/.github/workflows/android.yml +++ b/.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