diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-03-08 00:10:27 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2021-03-08 00:18:20 +0300 |
commit | ac08eafa89d7cafe02aabd510e41d6ce921b1995 (patch) | |
tree | 7cb5b57e81a00961ed501eb505724b867ab50a80 | |
parent | 219522052fe96577ec0ce35aceebe4b1f1b75977 (diff) |
Adjust styles and remove unused code
Signed-off-by: Stefan Niedermann <info@niedermann.it>
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java | 5 | ||||
-rw-r--r-- | app/src/main/res/drawable/widget_outer_background.xml | 10 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_separator.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_stack.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/layout/widget_upcoming.xml | 28 | ||||
-rw-r--r-- | app/src/main/res/values-night/colors.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 1 |
7 files changed, 23 insertions, 31 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java index a48275b28..0cd668722 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java @@ -25,7 +25,6 @@ import it.niedermann.nextcloud.deck.model.widget.filter.FilterWidgetAccount; import it.niedermann.nextcloud.deck.model.widget.filter.FilterWidgetSort; import it.niedermann.nextcloud.deck.model.widget.filter.FilterWidgetUser; import it.niedermann.nextcloud.deck.persistence.sync.SyncManager; -import it.niedermann.nextcloud.deck.ui.MainActivity; import it.niedermann.nextcloud.deck.ui.card.EditActivity; import static android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE; @@ -80,7 +79,6 @@ public class UpcomingWidget extends AppWidgetProvider { if (ACTION_APPWIDGET_UPDATE.equals(intent.getAction())) { if (intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) { - @SuppressWarnings("ConstantConditions") int appWidgetId = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1); DeckLog.verbose(ACTION_APPWIDGET_UPDATE + " for " + UpcomingWidget.class.getSimpleName() + " with id " + appWidgetId + ", perform update."); updateAppWidget(context, awm, new int[]{appWidgetId}); @@ -116,12 +114,9 @@ public class UpcomingWidget extends AppWidgetProvider { serviceIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME))); - final Intent intent = new Intent(Intent.ACTION_MAIN).setComponent(new ComponentName(context.getPackageName(), MainActivity.class.getName())); - final PendingIntent pendingIntent = PendingIntent.getActivity(context, PENDING_INTENT_OPEN_APP_RQ, intent, PendingIntent.FLAG_UPDATE_CURRENT); final PendingIntent templatePI = PendingIntent.getActivity(context, PENDING_INTENT_EDIT_CARD_RQ, new Intent(context, EditActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); - views.setOnClickPendingIntent(R.id.widget_upcoming_header_rl, pendingIntent); views.setPendingIntentTemplate(R.id.upcoming_widget_lv, templatePI); views.setRemoteAdapter(R.id.upcoming_widget_lv, serviceIntent); views.setEmptyView(R.id.upcoming_widget_lv, R.id.widget_upcoming_placeholder_iv); diff --git a/app/src/main/res/drawable/widget_outer_background.xml b/app/src/main/res/drawable/widget_outer_background.xml new file mode 100644 index 000000000..a3fbd6bcd --- /dev/null +++ b/app/src/main/res/drawable/widget_outer_background.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@color/widget_outer_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 diff --git a/app/src/main/res/layout/widget_separator.xml b/app/src/main/res/layout/widget_separator.xml index 2ff691505..e4269331d 100644 --- a/app/src/main/res/layout/widget_separator.xml +++ b/app/src/main/res/layout/widget_separator.xml @@ -14,9 +14,13 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_weight="1" + android:paddingStart="@dimen/spacer_1hx" + android:paddingTop="@dimen/spacer_1x" + android:paddingEnd="@null" android:textAppearance="?attr/textAppearanceListItem" android:textColor="@color/widget_foreground" android:textSize="16sp" + android:textStyle="bold" tools:maxLength="60" tools:text="@tools:sample/lorem/random" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/widget_stack.xml b/app/src/main/res/layout/widget_stack.xml index 54adef067..fba08eff0 100644 --- a/app/src/main/res/layout/widget_stack.xml +++ b/app/src/main/res/layout/widget_stack.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/widget_single_card_background" + android:background="@drawable/widget_outer_background" android:orientation="vertical"> <!-- Widget header --> @@ -30,7 +30,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:textAppearance="?attr/textAppearanceBody1" - android:textSize="18sp" + android:textSize="16sp" + android:textStyle="bold" android:layout_toEndOf="@id/widget_stack_header_icon" android:gravity="center_vertical" android:paddingStart="@dimen/widget_stack_card_padding" diff --git a/app/src/main/res/layout/widget_upcoming.xml b/app/src/main/res/layout/widget_upcoming.xml index d26d41dc8..f1424721f 100644 --- a/app/src/main/res/layout/widget_upcoming.xml +++ b/app/src/main/res/layout/widget_upcoming.xml @@ -4,38 +4,18 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/widget_single_card_background" + android:background="@drawable/widget_outer_background" android:orientation="vertical"> - <!-- Widget header --> - <RelativeLayout - android:id="@+id/widget_upcoming_header_rl" - android:layout_width="match_parent" - android:layout_height="@dimen/widget_stack_header_height" - android:padding="@dimen/widget_stack_card_padding"> - - <TextView - android:id="@+id/widget_upcoming_title_tv" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="center_vertical" - android:paddingStart="@dimen/widget_stack_card_padding" - android:paddingEnd="@dimen/widget_stack_card_padding" - android:text="@string/widget_upcoming_title" - android:textAppearance="?attr/textAppearanceBody1" - android:textColor="@color/widget_foreground" - android:textSize="18sp" /> - - </RelativeLayout> - <!-- End header --> - <ListView android:id="@+id/upcoming_widget_lv" android:layout_width="match_parent" android:layout_height="wrap_content" android:divider="@android:color/transparent" android:dividerHeight="@dimen/spacer_1x" - android:padding="@dimen/spacer_1x" + android:paddingStart="@dimen/spacer_1x" + android:paddingEnd="@dimen/spacer_1x" + android:paddingBottom="@dimen/spacer_1x" tools:listitem="@layout/widget_stack_entry" /> <ImageView diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 063578805..a00be4a9e 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -8,6 +8,7 @@ <color name="bg_card">#121212</color> <color name="bg_card_wrapper">@color/primary</color> + <color name="widget_outer_background">#dd121212</color> <color name="widget_background">#dd000000</color> <color name="widget_foreground">#d8d8d8</color> </resources> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2ebe47f57..cd9dc5e06 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -39,6 +39,7 @@ <item>#8855a8</item> </string-array> + <color name="widget_outer_background">#eef9f9f9</color> <color name="widget_background">#ddffffff</color> <color name="widget_foreground">#222222</color> </resources> |