From 95b80fb6458bcb10dda155b25a1b8a375cb6d06b Mon Sep 17 00:00:00 2001
From: sictiru <dan.andrei91@gmail.com>
Date: Tue, 8 Mar 2022 21:50:20 -0800
Subject: [PATCH] #1600 Mark story as read button width

---
 .../res/layout/fragment_readingitem.xml       | 11 -------
 .../res/layout/reading_item_actions.xml       | 29 ++++++++++++++-----
 .../android/NewsBlur/res/values/styles.xml    |  4 ---
 .../newsblur/fragment/ReadingItemFragment.kt  |  8 ++---
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/clients/android/NewsBlur/res/layout/fragment_readingitem.xml b/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
index 4f182082c..681ecb657 100644
--- a/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_readingitem.xml
@@ -211,17 +211,6 @@
                     android:layout_marginTop="12dp"
                     android:scrollbars="none" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/mark_read_story_button"
-                    style="?storyButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="44dp"
-                    android:layout_marginHorizontal="31dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="-15dp"
-                    android:text="@string/story_mark_read_state"
-                    android:visibility="gone" />
-
                 <include layout="@layout/reading_item_actions" />
 
             </LinearLayout>
diff --git a/clients/android/NewsBlur/res/layout/reading_item_actions.xml b/clients/android/NewsBlur/res/layout/reading_item_actions.xml
index afda956b4..b312f9ad9 100644
--- a/clients/android/NewsBlur/res/layout/reading_item_actions.xml
+++ b/clients/android/NewsBlur/res/layout/reading_item_actions.xml
@@ -2,26 +2,39 @@
 <merge xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="15dp"
-        android:baselineAligned="false" >
+        android:gravity="center_horizontal"
+        android:layout_gravity="center_horizontal">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/mark_read_story_button"
+            style="?storyButtons"
+            android:layout_width="wrap_content"
+            android:layout_height="44dp"
+            android:layout_alignStart="@+id/train_story_button"
+            android:layout_alignEnd="@+id/save_story_button"
+            android:text="@string/story_mark_read_state"
+            android:visibility="gone" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/train_story_button"
             style="?storyButtons"
             android:layout_width="wrap_content"
             android:layout_height="44dp"
+            android:layout_below="@+id/mark_read_story_button"
             android:text="@string/train_this"
-            app:icon="@drawable/ic_train"/>
+            app:icon="@drawable/ic_train" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/share_story_button"
             style="?storyButtons"
+            android:layout_marginHorizontal="12dp"
+            android:layout_toEndOf="@+id/train_story_button"
+            android:layout_below="@+id/mark_read_story_button"
             android:layout_width="wrap_content"
             android:layout_height="44dp"
             android:text="@string/share_this"
@@ -30,12 +43,14 @@
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_story_button"
             style="?storyButtons"
+            android:layout_toEndOf="@+id/share_story_button"
+            android:layout_below="@+id/mark_read_story_button"
             android:layout_width="wrap_content"
             android:layout_height="44dp"
             android:text="@string/save_this"
             app:icon="@drawable/ic_clock" />
 
-    </LinearLayout>
+    </RelativeLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index bb7d8539c..72b8d3593 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -184,8 +184,6 @@
 
     <style name="storyButtons" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textSize">14sp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
         <item name="android:textColor">@color/gray75</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0</item>
@@ -195,8 +193,6 @@
     </style>
     <style name="storyButtons.dark" parent="Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:textSize">14sp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
         <item name="android:textColor">@color/gray46</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0</item>
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.kt b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.kt
index 89bf736c0..3fd049277 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.kt
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ReadingItemFragment.kt
@@ -175,7 +175,7 @@ class ReadingItemFragment : NbFragment(), PopupMenu.OnMenuItemClickListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.storyContextMenuButton.setOnClickListener { onClickMenuButton() }
-        binding.markReadStoryButton.setOnClickListener { clickMarkStoryRead() }
+        readingItemActionsBinding.markReadStoryButton.setOnClickListener { clickMarkStoryRead() }
         readingItemActionsBinding.trainStoryButton.setOnClickListener { clickTrain() }
         readingItemActionsBinding.saveStoryButton.setOnClickListener { clickSave() }
         readingItemActionsBinding.shareStoryButton.setOnClickListener { clickShare() }
@@ -343,10 +343,10 @@ class ReadingItemFragment : NbFragment(), PopupMenu.OnMenuItemClickListener {
 
     private fun updateMarkReadButton() {
         if (markStoryReadBehavior == MarkStoryReadBehavior.MANUALLY) {
-            binding.markReadStoryButton.visibility = View.VISIBLE
-            binding.markReadStoryButton.setStoryReadState(requireContext(), story!!.read)
+            readingItemActionsBinding.markReadStoryButton.visibility = View.VISIBLE
+            readingItemActionsBinding.markReadStoryButton.setStoryReadState(requireContext(), story!!.read)
         } else {
-            binding.markReadStoryButton.visibility = View.GONE
+            readingItemActionsBinding.markReadStoryButton.visibility = View.GONE
         }
     }