Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f4b5da authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

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

parent 00f06e93

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

+18 −41
Original line number Diff line number Diff line
@@ -80,28 +80,6 @@ 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);

                    }

                } 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);
@@ -122,7 +100,6 @@ public class NoteListWidget extends AppWidgetProvider { 
                    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);

            } catch (NoSuchElementException e) {

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

+7 −19
Original line number Diff line number Diff line
@@ -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);

        }



        return note_content;

app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java

+7 −16
Original line number Diff line number Diff line
@@ -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);

                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");

app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java

+4 −10
Original line number Diff line number Diff line
@@ -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()));

        }



        return note_content;

    }

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

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<shape xmlns:android="http://schemas.android.com/apk/res/android">

    <solid android:color="@color/widget_background" />

    <corners android:radius="@dimen/widget_outer_radius" />

    <padding

        android:bottom="0dp"

        android:left="0dp"

        android:right="0dp"

        android:top="0dp" />

</shape>
 
 No newline at end of file