https://github.com/nextcloud/news-android/issues/930

4 files changed, 36 insertions, 86 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
index 188910e8..e3f36162 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
@@ -80,48 +80,25 @@ public class NoteListWidget extends AppWidgetProvider {
 
                 Log.v(TAG, "-- data - " + data);
 
-                if (NotesApplication.isDarkThemeActive(context, darkTheme)) {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_note_list_dark);
-                    views.setTextViewText(R.id.widget_note_list_title_tv_dark, getWidgetTitle(context, data.getMode(), category));
-                    views.setOnClickPendingIntent(R.id.widget_note_header_icon_dark, openAppI);
-                    views.setOnClickPendingIntent(R.id.widget_note_list_title_tv_dark, openAppI);
-                    views.setOnClickPendingIntent(R.id.widget_note_list_create_icon_dark, newNoteI);
-                    views.setPendingIntentTemplate(R.id.note_list_widget_lv_dark, templatePI);
-                    views.setRemoteAdapter(R.id.note_list_widget_lv_dark, serviceIntent);
-                    views.setEmptyView(R.id.note_list_widget_lv_dark, R.id.widget_note_list_placeholder_tv_dark);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv_dark);
-                    if (BrandingUtil.isBrandingEnabled(context)) {
-                        views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", localAccount.getColor());
-                        views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", localAccount.getTextColor());
-                        views.setInt(R.id.widget_note_list_create_icon_dark, "setColorFilter", localAccount.getTextColor());
-                        views.setTextColor(R.id.widget_note_list_title_tv_dark, localAccount.getTextColor());
-                    } else {
-                        views.setInt(R.id.widget_note_header_dark, "setBackgroundColor", ContextCompat.getColor(context, R.color.defaultBrand));
-                        views.setInt(R.id.widget_note_header_icon_dark, "setColorFilter", Color.WHITE);
-                        views.setInt(R.id.widget_note_list_create_icon_dark, "setColorFilter", Color.WHITE);
-                        views.setTextColor(R.id.widget_note_list_title_tv_dark, Color.WHITE);
-                    }
+                views = new RemoteViews(context.getPackageName(), R.layout.widget_note_list);
+                views.setTextViewText(R.id.widget_note_list_title_tv, getWidgetTitle(context, data.getMode(), category));
+                views.setOnClickPendingIntent(R.id.widget_note_header_icon, openAppI);
+                views.setOnClickPendingIntent(R.id.widget_note_list_title_tv, openAppI);
+                views.setOnClickPendingIntent(R.id.widget_note_list_create_icon, newNoteI);
+                views.setPendingIntentTemplate(R.id.note_list_widget_lv, templatePI);
+                views.setRemoteAdapter(R.id.note_list_widget_lv, serviceIntent);
+                views.setEmptyView(R.id.note_list_widget_lv, R.id.widget_note_list_placeholder_tv);
+                awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv);
+                if (BrandingUtil.isBrandingEnabled(context)) {
+                    views.setInt(R.id.widget_note_header, "setBackgroundColor", localAccount.getColor());
+                    views.setInt(R.id.widget_note_header_icon, "setColorFilter", localAccount.getTextColor());
+                    views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", localAccount.getTextColor());
+                    views.setTextColor(R.id.widget_note_list_title_tv, localAccount.getTextColor());
                 } else {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_note_list);
-                    views.setTextViewText(R.id.widget_note_list_title_tv, getWidgetTitle(context, data.getMode(), category));
-                    views.setOnClickPendingIntent(R.id.widget_note_header_icon, openAppI);
-                    views.setOnClickPendingIntent(R.id.widget_note_list_title_tv, openAppI);
-                    views.setOnClickPendingIntent(R.id.widget_note_list_create_icon, newNoteI);
-                    views.setPendingIntentTemplate(R.id.note_list_widget_lv, templatePI);
-                    views.setRemoteAdapter(R.id.note_list_widget_lv, serviceIntent);
-                    views.setEmptyView(R.id.note_list_widget_lv, R.id.widget_note_list_placeholder_tv);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv);
-                    if (BrandingUtil.isBrandingEnabled(context)) {
-                        views.setInt(R.id.widget_note_header, "setBackgroundColor", localAccount.getColor());
-                        views.setInt(R.id.widget_note_header_icon, "setColorFilter", localAccount.getTextColor());
-                        views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", localAccount.getTextColor());
-                        views.setTextColor(R.id.widget_note_list_title_tv, localAccount.getTextColor());
-                    } else {
-                        views.setInt(R.id.widget_note_header, "setBackgroundColor", ContextCompat.getColor(context, R.color.defaultBrand));
-                        views.setInt(R.id.widget_note_header_icon, "setColorFilter", Color.WHITE);
-                        views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", Color.WHITE);
-                        views.setTextColor(R.id.widget_note_list_title_tv, Color.WHITE);
-                    }
+                    views.setInt(R.id.widget_note_header, "setBackgroundColor", ContextCompat.getColor(context, R.color.defaultBrand));
+                    views.setInt(R.id.widget_note_header_icon, "setColorFilter", Color.WHITE);
+                    views.setInt(R.id.widget_note_list_create_icon, "setColorFilter", Color.WHITE);
+                    views.setTextColor(R.id.widget_note_list_title_tv, Color.WHITE);
                 }
 
                 awm.updateAppWidget(appWidgetId, views);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
index 5fde5010..f4179d97 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
@@ -27,7 +27,6 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
 
     private final Context context;
     private final NoteListsWidgetData data;
-    private final boolean darkTheme;
     private NotesDatabase db;
     private List<DBNote> dbNotes;
 
@@ -38,8 +37,6 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
 
         db = NotesDatabase.getInstance(context);
         data = db.getNoteListWidgetData(appWidgetId);
-
-        darkTheme = NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()));
     }
 
     @Override
@@ -99,27 +96,18 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
         DBNote note = dbNotes.get(position);
         final Intent fillInIntent = new Intent();
         final Bundle extras = new Bundle();
-
         extras.putLong(EditNoteActivity.PARAM_NOTE_ID, note.getId());
         extras.putLong(EditNoteActivity.PARAM_ACCOUNT_ID, note.getAccountId());
+
         fillInIntent.putExtras(extras);
         fillInIntent.setData(Uri.parse(fillInIntent.toUri(Intent.URI_INTENT_SCHEME)));
 
-        if (darkTheme) {
-            note_content = new RemoteViews(context.getPackageName(), R.layout.widget_entry_dark);
-            note_content.setOnClickFillInIntent(R.id.widget_note_list_entry_dark, fillInIntent);
-            note_content.setTextViewText(R.id.widget_entry_content_tv_dark, note.getTitle());
-            note_content.setImageViewResource(R.id.widget_entry_fav_icon_dark, note.isFavorite()
-                    ? R.drawable.ic_star_yellow_24dp
-                    : R.drawable.ic_star_grey_ccc_24dp);
-        } else {
-            note_content = new RemoteViews(context.getPackageName(), R.layout.widget_entry);
-            note_content.setOnClickFillInIntent(R.id.widget_note_list_entry, fillInIntent);
-            note_content.setTextViewText(R.id.widget_entry_content_tv, note.getTitle());
-            note_content.setImageViewResource(R.id.widget_entry_fav_icon, note.isFavorite()
-                    ? R.drawable.ic_star_yellow_24dp
-                    : R.drawable.ic_star_grey_ccc_24dp);
-        }
+        note_content = new RemoteViews(context.getPackageName(), R.layout.widget_entry);
+        note_content.setOnClickFillInIntent(R.id.widget_note_list_entry, fillInIntent);
+        note_content.setTextViewText(R.id.widget_entry_content_tv, note.getTitle());
+        note_content.setImageViewResource(R.id.widget_entry_fav_icon, note.isFavorite()
+                ? R.drawable.ic_star_yellow_24dp
+                : R.drawable.ic_star_grey_ccc_24dp);
 
         return note_content;
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
index 777cd25e..e5010f3b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
@@ -36,25 +36,16 @@ public class SingleNoteWidget extends AppWidgetProvider {
                 final PendingIntent templatePendingIntent = PendingIntent.getActivity(context, appWidgetId, templateIntent,
                         PendingIntent.FLAG_UPDATE_CURRENT);
 
-                Intent serviceIntent = new Intent(context, SingleNoteWidgetService.class);
+                final Intent serviceIntent = new Intent(context, SingleNoteWidgetService.class);
                 serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
                 serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
 
-                RemoteViews views;
-
-                if (NotesApplication.isDarkThemeActive(context, DarkModeSetting.fromModeID(data.getThemeMode()))) {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_dark);
-                    views.setPendingIntentTemplate(R.id.single_note_widget_lv_dark, templatePendingIntent);
-                    views.setRemoteAdapter(R.id.single_note_widget_lv_dark, serviceIntent);
-                    views.setEmptyView(R.id.single_note_widget_lv_dark, R.id.widget_single_note_placeholder_tv_dark);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv_dark);
-                } else {
-                    views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
-                    views.setPendingIntentTemplate(R.id.single_note_widget_lv, templatePendingIntent);
-                    views.setRemoteAdapter(R.id.single_note_widget_lv, serviceIntent);
-                    views.setEmptyView(R.id.single_note_widget_lv, R.id.widget_single_note_placeholder_tv);
-                    awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv);
-                }
+                final RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_single_note);
+                views.setPendingIntentTemplate(R.id.single_note_widget_lv, templatePendingIntent);
+                views.setRemoteAdapter(R.id.single_note_widget_lv, serviceIntent);
+                views.setEmptyView(R.id.single_note_widget_lv, R.id.widget_single_note_placeholder_tv);
+
+                awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.single_note_widget_lv);
                 awm.updateAppWidget(appWidgetId, views);
             } catch (NoSuchElementException e) {
                 Log.i(TAG, "onUpdate has been triggered before the user finished configuring the widget");
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
index 54182475..c78803c2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
@@ -98,16 +98,10 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
         extras.putLong(EditNoteActivity.PARAM_NOTE_ID, note.getId());
         extras.putLong(EditNoteActivity.PARAM_ACCOUNT_ID, note.getAccountId());
         fillInIntent.putExtras(extras);
-        if (darkModeActive) {
-            note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content_dark);
-            note_content.setOnClickFillInIntent(R.id.single_note_content_tv_dark, fillInIntent);
-            note_content.setTextViewText(R.id.single_note_content_tv_dark, MarkdownUtil.renderForRemoteView(context, note.getContent()));
-
-        } else {
-            note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content);
-            note_content.setOnClickFillInIntent(R.id.single_note_content_tv, fillInIntent);
-            note_content.setTextViewText(R.id.single_note_content_tv, MarkdownUtil.renderForRemoteView(context, note.getContent()));
-        }
+
+        note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content);
+        note_content.setOnClickFillInIntent(R.id.single_note_content_tv, fillInIntent);
+        note_content.setTextViewText(R.id.single_note_content_tv, MarkdownUtil.renderForRemoteView(context, note.getContent()));
 
         return note_content;
     }