Merge branch 'master' into 767-rewrite-stack-widget

# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java

12 files changed, 45 insertions, 36 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 4bcdb2796..480b8e9c1 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;
@@ -115,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/drawable/widget_single_card_background.xml b/app/src/main/res/drawable/widget_single_card_background.xml
index 36f20f043..1d348b58e 100644
--- a/app/src/main/res/drawable/widget_single_card_background.xml
+++ b/app/src/main/res/drawable/widget_single_card_background.xml
@@ -1,7 +1,7 @@
 <?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="3dp" />
+    <corners android:radius="@dimen/widget_outer_radius" />
     <padding
         android:bottom="0dp"
         android:left="0dp"
diff --git a/app/src/main/res/drawable/widget_stack_entry_background.xml b/app/src/main/res/drawable/widget_stack_entry_background.xml
new file mode 100644
index 000000000..1d348b58e
--- /dev/null
+++ b/app/src/main/res/drawable/widget_stack_entry_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_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_stack_entry.xml b/app/src/main/res/layout/widget_stack_entry.xml
index f67a53e61..dbe139a7f 100644
--- a/app/src/main/res/layout/widget_stack_entry.xml
+++ b/app/src/main/res/layout/widget_stack_entry.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:padding="@dimen/widget_stack_card_padding"
-    android:background="@color/primary">
+    android:background="@drawable/widget_stack_entry_background">
 
         <TextView
             android:id="@+id/widget_entry_content_tv"
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 fb270e106..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_background">#cc212121</color>
-    <color name="widget_foreground">#ccf5f5f5</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 d7907027a..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_background">#ccf5f5f5</color>
-    <color name="widget_foreground">#212121</color>
+    <color name="widget_outer_background">#eef9f9f9</color>
+    <color name="widget_background">#ddffffff</color>
+    <color name="widget_foreground">#222222</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ac7a62c15..18aa2c9fc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -25,6 +25,8 @@
     <dimen name="icon_size_details">24dp</dimen>
     <dimen name="empty_content_font_size">26sp</dimen>
 
+    <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>
diff --git a/clearLocalBranches.sh b/clearLocalBranches.sh
new file mode 100644
index 000000000..4126fc8dc
--- /dev/null
+++ b/clearLocalBranches.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+git checkout master
+LANG=en_US
+git branch -vv | grep ': gone]'|  grep -v "\*" | awk '{ print $1; }' | xargs -r git branch -d
\ No newline at end of file