Merge branch 'develop' into extract-queue-item-view

4 files changed, 50 insertions, 43 deletions

diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 93919435a..47460a28f 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -105,50 +105,55 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginEnd="16dp"
             android:orientation="horizontal"
+            android:gravity="center_vertical"
             tools:background="@android:color/holo_blue_bright">
 
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
-
-            <Button
-                android:id="@+id/butAction1"
-                style="?attr/buttonBarButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:ellipsize="end"
-                android:drawablePadding="8dp"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:text="Button 1"
-                tools:background="@android:color/holo_red_light" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
-
-            <Button
-                android:id="@+id/butAction2"
-                style="?attr/buttonBarButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:drawablePadding="8dp"
-                android:ellipsize="end"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:text="Button 2"
-                tools:background="@android:color/holo_orange_dark" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_weight="1" />
-
+            <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:id="@+id/butAction1"
+                    android:orientation="horizontal"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center">
+                <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:id="@+id/butAction1Icon"
+                        android:layout_margin="12dp"
+                        tools:src="@drawable/ic_settings_grey600_24dp"/>
+                <TextView
+                        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                        android:id="@+id/butAction1Text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="?android:attr/textColorPrimary"
+                        tools:text="Button 1"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:id="@+id/butAction2"
+                    android:orientation="horizontal"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:gravity="center">
+                <ImageView
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:id="@+id/butAction2Icon"
+                        android:layout_margin="12dp"
+                        tools:src="@drawable/ic_settings_grey600_24dp"/>
+                <TextView
+                        android:textAppearance="@style/TextAppearance.AppCompat.Button"
+                        android:id="@+id/butAction2Text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="?android:attr/textColorPrimary"
+                        tools:text="Button 2"/>
+            </LinearLayout>
         </LinearLayout>
 
         <View
diff --git a/app/src/main/res/layout/opml_selection.xml b/app/src/main/res/layout/opml_selection.xml
index f8f37b5ac..e018ffde3 100644
--- a/app/src/main/res/layout/opml_selection.xml
+++ b/app/src/main/res/layout/opml_selection.xml
@@ -37,6 +37,7 @@
             android:layout_toLeftOf="@id/horizontal_divider"
             android:layout_toStartOf="@id/horizontal_divider"
             android:background="?android:attr/selectableItemBackground"
+            android:textColor="?android:attr/textColorPrimary"
             android:text="@string/cancel_label" />
 
         <Button
@@ -50,6 +51,7 @@
             android:layout_toRightOf="@id/horizontal_divider"
             android:layout_toEndOf="@id/horizontal_divider"
             android:background="?android:attr/selectableItemBackground"
+            android:textColor="?android:attr/textColorPrimary"
             android:text="@string/confirm_label" />
     </RelativeLayout>
 
diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml
index 7a7535dda..32bf383d7 100644
--- a/app/src/main/res/xml/preferences_playback.xml
+++ b/app/src/main/res/xml/preferences_playback.xml
@@ -35,7 +35,7 @@
                 android:summary="@string/pref_resumeAfterCall_sum"
                 android:title="@string/pref_resumeAfterCall_title"/>
         <ListPreference
-                android:defaultValue="stop"
+                android:defaultValue="pip"
                 android:entries="@array/video_background_behavior_options"
                 android:entryValues="@array/video_background_behavior_values"
                 android:key="prefVideoBehavior"
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index ee73aca8d..0861ecdae 100644
--- a/app/src/main/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-            android:hint="@string/search_hint"
+            android:hint="@string/search_label"
             android:label="@string/app_name"/>
\ No newline at end of file