From 20de9c2030ed1c6e249e5fad50ca270666a8c612 Mon Sep 17 00:00:00 2001
From: LagradOst <balt.758@gmail.com>
Date: Sun, 6 Jun 2021 21:22:50 +0200
Subject: [PATCH] result UI

---
 .../res/drawable/ic_baseline_bookmark_24.xml  |  2 +-
 .../ic_baseline_bookmark_border_24.xml        |  5 ++
 .../res/drawable/ic_baseline_favorite_24.xml  |  5 ++
 .../ic_baseline_favorite_border_24.xml        |  5 ++
 .../res/drawable/ic_baseline_public_24.xml    |  5 ++
 .../ic_baseline_remove_red_eye_24.xml         |  5 ++
 .../drawable/ic_outline_remove_red_eye_24.xml |  5 ++
 .../main/res/drawable/ic_outline_share_24.xml |  5 ++
 app/src/main/res/layout/fragment_result.xml   | 75 +++++++++++++++----
 app/src/main/res/layout/result_tag.xml        |  4 +-
 app/src/main/res/values/strings.xml           |  2 +
 11 files changed, 99 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_favorite_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_favorite_border_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_public_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_remove_red_eye_24.xml
 create mode 100644 app/src/main/res/drawable/ic_outline_share_24.xml

diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
index 542456d8..8f0b1b18 100644
--- a/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_bookmark_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="?attr/white"
+<vector android:height="24dp" android:tint="#FFFFFF"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="@android:color/white" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml b/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml
new file mode 100644
index 00000000..95cd4cb6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_bookmark_border_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_favorite_24.xml b/app/src/main/res/drawable/ic_baseline_favorite_24.xml
new file mode 100644
index 00000000..2d9d13cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_favorite_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_favorite_border_24.xml b/app/src/main/res/drawable/ic_baseline_favorite_border_24.xml
new file mode 100644
index 00000000..996e16d0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_favorite_border_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_public_24.xml b/app/src/main/res/drawable/ic_baseline_public_24.xml
new file mode 100644
index 00000000..dce682a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_public_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml b/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml
new file mode 100644
index 00000000..b2add526
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_remove_red_eye_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_remove_red_eye_24.xml b/app/src/main/res/drawable/ic_outline_remove_red_eye_24.xml
new file mode 100644
index 00000000..fc95c21e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_remove_red_eye_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_outline_share_24.xml b/app/src/main/res/drawable/ic_outline_share_24.xml
new file mode 100644
index 00000000..d0d075a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_outline_share_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_result.xml b/app/src/main/res/layout/fragment_result.xml
index ab1466f1..48e106ef 100644
--- a/app/src/main/res/layout/fragment_result.xml
+++ b/app/src/main/res/layout/fragment_result.xml
@@ -102,30 +102,73 @@
 
                 </LinearLayout>
 
+
+            </LinearLayout>
+            <GridLayout android:layout_width="match_parent" android:layout_height="50dp">
+
                 <com.google.android.material.button.MaterialButton
-                        android:visibility="gone"
-                        android:layout_gravity="end"
-                        app:cornerRadius="1000dp"
+                        android:visibility="visible"
+                        android:layout_gravity="center_vertical"
+                        app:cornerRadius="4dp"
                         android:id="@+id/result_bookmark_button"
                         tools:text="Bookmark"
-                        app:rippleColor="@color/colorPrimary"
-                        app:strokeColor="@color/colorPrimary"
-                        android:textColor="@color/textColor"
+
+                        app:rippleColor="?attr/colorPrimary"
+                        android:textColor="?attr/textColor"
+                        app:iconTint="?attr/textColor"
                         android:textAllCaps="false"
-                        android:backgroundTint="@color/colorPrimary"
-                        style="@style/Widget.MaterialComponents.Button.TextButton"
+                        app:icon="@drawable/ic_outline_remove_red_eye_24"
+                        android:backgroundTint="@color/transparent"
+                        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                         android:layout_width="wrap_content"
                         android:layout_height="45dp">
                 </com.google.android.material.button.MaterialButton>
-            </LinearLayout>
 
-            <androidx.mediarouter.app.MediaRouteButton
-                    android:id="@+id/media_route_button"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:mediaRouteTypes="user"
-                    android:visibility="gone"
-            />
+
+                <!--<ImageView
+                        android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                        android:src="@drawable/ic_baseline_bookmark_border_24"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                </ImageView>-->
+                <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/media_route_button_holder"
+                        android:layout_gravity="center_vertical|end"
+                >
+                    <androidx.mediarouter.app.MediaRouteButton
+                            android:id="@+id/media_route_button"
+                            android:layout_width="50dp"
+                            android:layout_height="50dp"
+                            android:mediaRouteTypes="user"
+                            android:visibility="gone"
+                    />
+                    <ImageView
+                            android:id="@+id/result_browser"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_margin="5dp"
+                            android:elevation="10dp"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:src="@drawable/ic_baseline_public_24"
+                            android:layout_gravity="center" android:contentDescription="@string/result_open_in_browser">
+                    </ImageView>
+                    <ImageView
+                            android:id="@+id/result_share"
+                            android:layout_width="25dp"
+                            android:layout_height="25dp"
+                            android:layout_margin="5dp"
+                            android:elevation="10dp"
+                            android:background="?android:attr/selectableItemBackgroundBorderless"
+                            android:src="@drawable/ic_outline_share_24"
+                            android:layout_gravity="center" android:contentDescription="@string/result_share">
+                    </ImageView>
+
+                </LinearLayout>
+            </GridLayout>
+
             <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/result_tag.xml b/app/src/main/res/layout/result_tag.xml
index eb681178..4809a753 100644
--- a/app/src/main/res/layout/result_tag.xml
+++ b/app/src/main/res/layout/result_tag.xml
@@ -14,9 +14,9 @@
     <com.google.android.material.button.MaterialButton
             android:minHeight="0dp"
             android:minWidth="0dp"
-            android:layout_height="40dp"
+            android:layout_height="37dp"
             android:textAllCaps="false"
-            android:textSize="13sp"
+            android:textSize="12sp"
             android:layout_width="wrap_content"
             app:cornerRadius="100dp"
             tools:text="Test"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb91e1eb..1956de1e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,4 +18,6 @@
     <string name="result_poster">Poster</string>
     <string name="result_plot">Plot</string>
     <string name="result_tags">Genres</string>
+    <string name="result_share">Share</string>
+    <string name="result_open_in_browser">Open In Browser</string>
 </resources>
\ No newline at end of file