From 6be8d873e741756dfda850522354e3f4c6345f24 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Wed, 12 Feb 2020 21:53:16 +0100
Subject: [PATCH 1/6] put androidExtensions experimental=true back in to fix
 crash

---
 app/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 87efbb2a1..8666369cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,6 +63,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    androidExtensions {
+        experimental = true
+    }
     testOptions {
         unitTests {
             returnDefaultValues = true

From 3edb93ff7c84ddf915b962482448f5e1f7f87e61 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 14 Feb 2020 19:03:01 +0100
Subject: [PATCH 2/6] increase tab page margin (#1684)

---
 app/src/main/res/layout-sw640dp/fragment_timeline.xml       | 4 ++--
 app/src/main/res/layout/activity_main.xml                   | 2 +-
 app/src/main/res/layout/fragment_timeline_notifications.xml | 3 ++-
 app/src/main/res/values/dimens.xml                          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline.xml b/app/src/main/res/layout-sw640dp/fragment_timeline.xml
index e150a2d1c..e85798eb5 100644
--- a/app/src/main/res/layout-sw640dp/fragment_timeline.xml
+++ b/app/src/main/res/layout-sw640dp/fragment_timeline.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:background="?attr/windowBackgroundColor"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/windowBackgroundColor">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="640dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2ecbd3483..4ea46117f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -36,7 +36,7 @@
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"
-        android:background="?android:windowBackground"
+        android:background="?attr/windowBackgroundColor"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/tab_layout"
diff --git a/app/src/main/res/layout/fragment_timeline_notifications.xml b/app/src/main/res/layout/fragment_timeline_notifications.xml
index f3bcea0f3..0fd674e99 100644
--- a/app/src/main/res/layout/fragment_timeline_notifications.xml
+++ b/app/src/main/res/layout/fragment_timeline_notifications.xml
@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarOptions"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f8bbe3d48..daa6252ad 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,7 @@
     <dimen name="compose_media_preview_size">120dp</dimen>
     <dimen name="compose_options_margin">8dp</dimen>
     <dimen name="account_avatar_margin">14dp</dimen>
-    <dimen name="tab_page_margin">8dp</dimen>
+    <dimen name="tab_page_margin">16dp</dimen>
     <dimen name="status_line_margin_start">36dp</dimen>
     <dimen name="text_content_margin">16dp</dimen>
     <dimen name="status_sensitive_media_button_padding">5dp</dimen>

From 28e128a4dd73a588431c908364c792066d66a5a5 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 14 Feb 2020 19:03:18 +0100
Subject: [PATCH 3/6] [Tusky10] adjust poll result background, status divider &
 button outline color (#1685)

* adjust poll result background, status divider & button outline color

* fix navigationBarDividerColor
---
 app/src/main/res/drawable/status_divider.xml   | 2 +-
 app/src/main/res/values-night/theme_colors.xml | 1 +
 app/src/main/res/values-v27/styles.xml         | 6 +++---
 app/src/main/res/values/attrs.xml              | 1 +
 app/src/main/res/values/styles.xml             | 9 ++++++---
 app/src/main/res/values/theme_colors.xml       | 3 ++-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/drawable/status_divider.xml b/app/src/main/res/drawable/status_divider.xml
index cb6cf0741..37fbbab1c 100644
--- a/app/src/main/res/drawable/status_divider.xml
+++ b/app/src/main/res/drawable/status_divider.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <size android:height="1dp" />
-    <solid android:color="?attr/colorBackgroundAccent" />
+    <solid android:color="?attr/dividerColor" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml
index 03fc6a06d..11ad69c3c 100644
--- a/app/src/main/res/values-night/theme_colors.xml
+++ b/app/src/main/res/values-night/theme_colors.xml
@@ -15,6 +15,7 @@
     <color name="iconColor">@color/tusky_grey_70</color>
 
     <color name="colorBackgroundAccent">@color/tusky_grey_30</color>
+    <color name="dividerColor">@color/tusky_grey_25</color>
 
     <color name="favoriteButtonActiveColor">@color/tusky_orange</color>
 
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index eaea6ccc0..78d327474 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -7,20 +7,20 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">@color/tusky_grey_20</item>
-        <item name="android:navigationBarDividerColor">@color/tusky_grey_30</item>
+        <item name="android:navigationBarDividerColor">@color/tusky_grey_25</item>
     </style>
 
     <style name="TuskyTheme" parent="TuskyBaseTheme">
         <item name="android:windowLightNavigationBar">@bool/lightNavigationBar</item>
         <item name="android:navigationBarColor">@color/colorBackground</item>
-        <item name="android:navigationBarDividerColor">@color/colorBackgroundAccent</item>
+        <item name="android:navigationBarDividerColor">?attr/dividerColor</item>
     </style>
 
     <!--Black Application Theme Styles-->
     <style name="TuskyBlackTheme" parent="TuskyBlackThemeBase">
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">@color/black</item>
-        <item name="android:navigationBarDividerColor">@color/tusky_grey_05</item>
+        <item name="android:navigationBarDividerColor">?attr/dividerColor</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5de7712a5..3dd3e30f1 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,6 +13,7 @@
     <attr name="textColorDisabled" format="reference|color" />
     <attr name="iconColor" format="reference|color" />
     <attr name="windowBackgroundColor" format="reference|color" />
+    <attr name="dividerColor" format="reference|color" />
 
     <attr name="status_text_small" format="dimension" />
     <attr name="status_text_medium" format="dimension" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f961a9c32..14d8e102c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -63,6 +63,7 @@
         <item name="iconColor">@color/iconColor</item>
 
         <item name="android:listDivider">@drawable/status_divider</item>
+        <item name="dividerColor">@color/dividerColor</item>
 
         <item name="textColorDisabled">@color/textColorDisabled</item>
 
@@ -71,7 +72,7 @@
         <item name="material_drawer_primary_icon">@color/iconColor</item>
         <item name="material_drawer_secondary_text">@color/textColorTertiary</item>
         <item name="material_drawer_hint_text">@color/textColorTertiary</item>
-        <item name="material_drawer_divider">@color/colorBackgroundAccent</item>
+        <item name="material_drawer_divider">?attr/dividerColor</item>
         <item name="material_drawer_header_selection_text">@color/white</item>
         <item name="material_drawer_header_selection_subtext">@color/white</item>
 
@@ -115,6 +116,7 @@
     </style>
 
     <style name="TuskyButton.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="strokeColor">?attr/colorBackgroundAccent</item>
         <item name="android:letterSpacing">0</item>
     </style>
 
@@ -137,11 +139,12 @@
         <item name="colorSurface">@color/tusky_grey_10</item>
 
         <item name="iconColor">@color/tusky_grey_40</item>
-        <item name="colorBackgroundAccent">@color/tusky_grey_05</item>
+        <item name="colorBackgroundAccent">@color/tusky_grey_20</item>
+
+        <item name="dividerColor">@color/tusky_grey_10</item>
 
         <item name="material_drawer_background">@color/black</item>
         <item name="material_drawer_primary_icon">@color/tusky_grey_40</item>
-        <item name="material_drawer_divider">@color/tusky_grey_05</item>
     </style>
 
     <style name="TuskyBlackTheme" parent="TuskyBlackThemeBase" />
diff --git a/app/src/main/res/values/theme_colors.xml b/app/src/main/res/values/theme_colors.xml
index de20373e0..df8dfc0dc 100644
--- a/app/src/main/res/values/theme_colors.xml
+++ b/app/src/main/res/values/theme_colors.xml
@@ -14,7 +14,8 @@
 
     <color name="iconColor">@color/tusky_grey_50</color>
 
-    <color name="colorBackgroundAccent">@color/tusky_grey_80</color>
+    <color name="colorBackgroundAccent">@color/tusky_grey_70</color>
+    <color name="dividerColor">@color/tusky_grey_80</color>
 
     <color name="favoriteButtonActiveColor">@color/tusky_orange_light</color>
 

From 3a75ca25a3a163360beccb87f282d0219a4536c5 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Fri, 14 Feb 2020 19:03:42 +0100
Subject: [PATCH 4/6] [Tusky10] fix crash when bookmarking a conversation while
 offline (#1686)

---
 .../tusky/components/conversation/ConversationsViewModel.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
index 0205ddec2..c6fa84b40 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsViewModel.kt
@@ -74,6 +74,7 @@ class ConversationsViewModel @Inject constructor(
                     }
                     .subscribeOn(Schedulers.io())
                     .doOnError { t -> Log.w("ConversationViewModel", "Failed to bookmark conversation", t) }
+                    .onErrorReturnItem(0)
                     .subscribe()
                     .autoDispose()
         }
@@ -127,7 +128,7 @@ class ConversationsViewModel @Inject constructor(
     }
 
     fun remove(position: Int) {
-        conversations.value?.getOrNull(position)?.let { conversation ->
+        conversations.value?.getOrNull(position)?.let {
             refresh()
         }
     }

From 185bfeb9f3fd08e8e2aef81acb999e99ae921efe Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 14 Feb 2020 19:03:59 +0100
Subject: [PATCH 5/6] [Tusky10] Fix descriptions of audio attachments when
 expanding/collapsing status content (#1688)

---
 .../tusky/adapter/StatusBaseViewHolder.java   | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 6f8096376..2450a80a3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -73,6 +73,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private TextView sensitiveMediaWarning;
     private View sensitiveMediaShow;
     protected TextView[] mediaLabels;
+    protected CharSequence[] mediaDescriptions;
     private MaterialButton contentWarningButton;
     private ImageView avatarInset;
 
@@ -133,6 +134,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                 itemView.findViewById(R.id.status_media_label_2),
                 itemView.findViewById(R.id.status_media_label_3)
         };
+        mediaDescriptions = new CharSequence[mediaLabels.length];
         contentWarningDescription = itemView.findViewById(R.id.status_content_warning_description);
         contentWarningButton = itemView.findViewById(R.id.status_content_warning_button);
         avatarInset = itemView.findViewById(R.id.status_avatar_inset);
@@ -181,11 +183,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                                         @Nullable PollViewData poll,
                                         @NonNull StatusDisplayOptions statusDisplayOptions,
                                         final StatusActionListener listener) {
-        if (TextUtils.isEmpty(spoilerText)) {
-            contentWarningDescription.setVisibility(View.GONE);
-            contentWarningButton.setVisibility(View.GONE);
-            this.setTextVisible(true, content, mentions, emojis, poll, statusDisplayOptions, listener);
-        } else {
+        boolean sensitive = !TextUtils.isEmpty(spoilerText);
+        if (sensitive) {
             CharSequence emojiSpoiler = CustomEmojiHelper.emojifyString(spoilerText, emojis, contentWarningDescription);
             contentWarningDescription.setText(emojiSpoiler);
             contentWarningDescription.setVisibility(View.VISIBLE);
@@ -198,9 +197,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                 }
                 setContentWarningButtonText(!expanded);
 
-                this.setTextVisible(!expanded, content, mentions, emojis, poll, statusDisplayOptions, listener);
+                this.setTextVisible(sensitive, !expanded, content, mentions, emojis, poll, statusDisplayOptions, listener);
             });
-            this.setTextVisible(expanded, content, mentions, emojis, poll, statusDisplayOptions, listener);
+            this.setTextVisible(sensitive, expanded, content, mentions, emojis, poll, statusDisplayOptions, listener);
+        } else {
+            contentWarningDescription.setVisibility(View.GONE);
+            contentWarningButton.setVisibility(View.GONE);
+            this.setTextVisible(sensitive, true, content, mentions, emojis, poll, statusDisplayOptions, listener);
         }
     }
 
@@ -212,7 +215,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         }
     }
 
-    private void setTextVisible(boolean expanded,
+    private void setTextVisible(boolean sensitive,
+                                boolean expanded,
                                 Spanned content,
                                 Status.Mention[] mentions,
                                 List<Emoji> emojis,
@@ -222,6 +226,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         if (expanded) {
             Spanned emojifiedText = CustomEmojiHelper.emojifyText(content, emojis, this.content);
             LinkHelper.setClickableText(this.content, emojifiedText, mentions, listener);
+            for (int i = 0; i < mediaLabels.length; ++i) {
+                updateMediaLabel(i, sensitive, expanded);
+            }
             if (poll != null) {
                 setupPoll(poll, emojis, statusDisplayOptions, listener);
             } else {
@@ -519,6 +526,14 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         }
     }
 
+    private void updateMediaLabel(int index, boolean sensitive, boolean showingContent) {
+        Context context = itemView.getContext();
+        CharSequence label = (sensitive && !showingContent) ?
+                context.getString(R.string.status_sensitive_media_title) :
+                mediaDescriptions[index];
+        mediaLabels[index].setText(label);
+    }
+
     protected void setMediaLabel(List<Attachment> attachments, boolean sensitive,
                                  final StatusActionListener listener, boolean showingContent) {
         Context context = itemView.getContext();
@@ -527,12 +542,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             if (i < attachments.size()) {
                 Attachment attachment = attachments.get(i);
                 mediaLabel.setVisibility(View.VISIBLE);
-
-                if (sensitive && !showingContent) {
-                    mediaLabel.setText(R.string.status_sensitive_media_title);
-                } else {
-                    mediaLabel.setText(getAttachmentDescription(context, attachment));
-                }
+                mediaDescriptions[i] = getAttachmentDescription(context, attachment);
+                updateMediaLabel(i, sensitive, showingContent);
 
                 // Set the icon next to the label.
                 int drawableId = getLabelIcon(attachments.get(0).getType());

From 04275b4073b6956cd24f7844ad934463638da3e0 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 14 Feb 2020 19:04:14 +0100
Subject: [PATCH 6/6] [Tusky10] Fix recollapsing expanded sensitive content in
 the thread view (#1689)

---
 .../com/keylesspalace/tusky/fragment/ViewThreadFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index 081391670..094dd4cee 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -328,7 +328,7 @@ public final class ViewThreadFragment extends SFragment implements
                         .setIsExpanded(expanded)
                         .createStatusViewData();
         statuses.setPairedItem(position, newViewData);
-        adapter.setItem(position, newViewData, false);
+        adapter.setItem(position, newViewData, true);
         updateRevealIcon();
     }