Widget adjustments

Signed-off-by: Stefan Niedermann <info@niedermann.it>

6 files changed, 57 insertions, 40 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
index ae8aca30f..dc4d98b6e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
@@ -20,6 +20,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.NoSuchElementException;
 
+import it.niedermann.android.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.DeckLog;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.model.Card;
@@ -34,6 +35,8 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
     private final Context context;
     private final int appWidgetId;
     private final SyncManager syncManager;
+    private final int headerHorizontalPadding;
+    private final int headerVerticalPaddingNth;
 
     @NonNull
     private final List<Object> data = new ArrayList<>();
@@ -42,6 +45,8 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
         this.context = context;
         this.appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
         this.syncManager = new SyncManager(context);
+        this.headerHorizontalPadding = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_1hx);
+        this.headerVerticalPaddingNth = DimensionUtil.INSTANCE.dpToPx(context, R.dimen.spacer_2x);
     }
 
     @Override
@@ -124,6 +129,11 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
             final Separator separator = (Separator) data.get(i);
             widget_entry = new RemoteViews(context.getPackageName(), R.layout.widget_separator);
             widget_entry.setTextViewText(R.id.widget_entry_content_tv, separator.title);
+            if(i == 0) {
+                widget_entry.setViewPadding(R.id.widget_entry_content_tv, headerHorizontalPadding, 0, headerHorizontalPadding, 0);
+            } else {
+                widget_entry.setViewPadding(R.id.widget_entry_content_tv, headerHorizontalPadding, headerVerticalPaddingNth, headerHorizontalPadding, 0);
+            }
         } else {
             final FullCard card = ((FilterWidgetCard) data.get(i)).getCard();
             widget_entry = new RemoteViews(context.getPackageName(), R.layout.widget_stack_entry);
diff --git a/app/src/main/res/layout/widget_separator.xml b/app/src/main/res/layout/widget_separator.xml
index e4269331d..294e97867 100644
--- a/app/src/main/res/layout/widget_separator.xml
+++ b/app/src/main/res/layout/widget_separator.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     android:background="@android:color/transparent"
     android:orientation="horizontal"
-    android:padding="@dimen/widget_stack_card_padding">
+    android:paddingStart="@dimen/widget_stack_card_padding"
+    android:paddingEnd="@dimen/widget_stack_card_padding">
 
     <TextView
         android:id="@+id/widget_entry_content_tv"
@@ -15,8 +16,8 @@
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:paddingStart="@dimen/spacer_1hx"
-        android:paddingTop="@dimen/spacer_1x"
-        android:paddingEnd="@null"
+        android:paddingTop="@dimen/spacer_2x"
+        android:paddingEnd="@dimen/spacer_1hx"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textColor="@color/widget_foreground"
         android:textSize="16sp"
diff --git a/app/src/main/res/layout/widget_single_card.xml b/app/src/main/res/layout/widget_single_card.xml
index 0b126936f..cf3bac763 100644
--- a/app/src/main/res/layout/widget_single_card.xml
+++ b/app/src/main/res/layout/widget_single_card.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/widget_single_card_background"
     android:orientation="vertical"
-    android:paddingTop="@dimen/spacer_1x"
+    android:paddingTop="@dimen/spacer_1hx"
     android:paddingBottom="@dimen/spacer_1x"
     android:paddingStart="@dimen/spacer_2x"
     android:paddingEnd="@dimen/spacer_2x"
@@ -25,9 +25,9 @@
             android:paddingTop="@dimen/spacer_1hx"
             android:paddingBottom="@dimen/spacer_1hx"
             android:textColor="@color/widget_foreground"
-            android:textSize="16sp"
+            android:textSize="@dimen/widget_font_size_header"
             android:textStyle="bold"
-            tools:maxLength="40"
+            tools:maxLength="30"
             tools:text="@tools:sample/lorem/random" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/widget_stack.xml b/app/src/main/res/layout/widget_stack.xml
index 5d89cf4a5..1805f24d4 100644
--- a/app/src/main/res/layout/widget_stack.xml
+++ b/app/src/main/res/layout/widget_stack.xml
@@ -7,42 +7,47 @@
     android:background="@drawable/widget_outer_background"
     android:orientation="vertical">
 
-    <!-- Widget header -->
-    <RelativeLayout
-        android:id="@+id/widget_stack_header_rl"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/widget_stack_header_height"
-        android:paddingTop="@dimen/spacer_1x"
+        android:layout_height="wrap_content"
         android:paddingStart="@dimen/spacer_1x"
+        android:paddingTop="@dimen/spacer_1x"
         android:paddingEnd="@dimen/spacer_1x">
 
-        <ImageView
-            android:id="@+id/widget_stack_header_icon"
-            android:layout_width="@dimen/widget_stack_icon_width"
-            android:layout_height="match_parent"
-            android:src="@drawable/circle_grey600_8dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:paddingStart="@dimen/widget_stack_card_padding"
-            android:paddingEnd="@dimen/widget_stack_card_padding"
-            android:contentDescription="@string/widget_stack_header_icon" />
+        <RelativeLayout
+            android:id="@+id/widget_stack_header_rl"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_1x"
+            tools:ignore="UselessParent">
+
+            <TextView
+                android:id="@+id/widget_stack_title_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_toStartOf="@id/widget_stack_header_icon"
+                android:gravity="center_vertical"
+                android:paddingStart="@null"
+                android:paddingEnd="@dimen/spacer_1x"
+                android:textAppearance="?attr/textAppearanceBody1"
+                android:textColor="@color/widget_foreground"
+                android:textSize="@dimen/widget_font_size_header"
+                android:textStyle="bold"
+                tools:text="@string/app_name" />
 
-        <TextView
-            android:id="@+id/widget_stack_title_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:textAppearance="?attr/textAppearanceBody1"
-            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"
-            android:paddingEnd="@dimen/widget_stack_card_padding"
-            android:textColor="@color/widget_foreground"
-            tools:text="@string/app_name"/>
+            <ImageView
+                android:id="@+id/widget_stack_header_icon"
+                android:layout_width="@dimen/widget_font_size_header"
+                android:layout_height="@dimen/widget_font_size_header"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:contentDescription="@string/widget_stack_header_icon"
+                android:src="@drawable/circle_grey600_8dp" />
 
-    </RelativeLayout>
-    <!-- End header -->
+        </RelativeLayout>
+    </LinearLayout>
 
     <ListView
         android:id="@+id/stack_widget_lv"
@@ -57,11 +62,11 @@
         android:id="@+id/widget_stack_placeholder_iv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:contentDescription="@string/widget_placeholder_icon"
         android:gravity="center"
         android:text="@string/app_name_short"
         android:textColor="@color/fg_secondary"
         app:srcCompat="@drawable/ic_local_movies_grey600_24dp"
-        tools:visibility="gone"
-        android:contentDescription="@string/widget_placeholder_icon" />
+        tools:visibility="gone" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/widget_upcoming.xml b/app/src/main/res/layout/widget_upcoming.xml
index f1424721f..4ae9ca4ad 100644
--- a/app/src/main/res/layout/widget_upcoming.xml
+++ b/app/src/main/res/layout/widget_upcoming.xml
@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         android:divider="@android:color/transparent"
         android:dividerHeight="@dimen/spacer_1x"
+        android:paddingTop="@dimen/spacer_1x"
         android:paddingStart="@dimen/spacer_1x"
         android:paddingEnd="@dimen/spacer_1x"
         android:paddingBottom="@dimen/spacer_1x"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 18aa2c9fc..b9f6663ca 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,6 +28,6 @@
     <dimen name="widget_outer_radius">@dimen/spacer_1x</dimen>
     <dimen name="widget_inner_radius">@dimen/spacer_1hx</dimen>
     <dimen name="widget_stack_card_padding">@dimen/spacer_1hx</dimen>
-    <dimen name="widget_stack_icon_width">30dp</dimen>
-    <dimen name="widget_stack_header_height">36dp</dimen>
+
+    <dimen name="widget_font_size_header">16sp</dimen>
 </resources>
\ No newline at end of file