From 2f2a340dfba2b936294fe3f1274f74cd783b8474 Mon Sep 17 00:00:00 2001
From: Aryan Kaushik <34372791+Aryan20@users.noreply.github.com>
Date: Sun, 3 Apr 2022 01:24:42 +0530
Subject: [PATCH] Fixes and UI consistency updates

---
 app/build.gradle                                     |  4 ++--
 .../browser/adapter/NotificationListAdapter.java     |  2 +-
 app/src/main/res/layout/card_wallet_balance.xml      |  2 --
 .../main/res/layout/card_wallet_receive_credits.xml  |  4 +---
 app/src/main/res/layout/card_wallet_send_credits.xml |  4 +---
 app/src/main/res/layout/container_comment_form.xml   |  4 +---
 .../res/layout/container_inline_channel_form.xml     |  4 +---
 .../res/layout/container_nothing_at_location.xml     |  3 ++-
 app/src/main/res/layout/dialog_create_support.xml    |  4 +---
 app/src/main/res/layout/dialog_customize_tags.xml    |  4 +---
 app/src/main/res/layout/dialog_discover.xml          |  4 ++--
 app/src/main/res/layout/dialog_repost_claim.xml      |  4 +---
 app/src/main/res/layout/fragment_channel.xml         | 10 ++++++----
 app/src/main/res/layout/fragment_channel_form.xml    |  4 +---
 app/src/main/res/layout/fragment_channel_manager.xml |  2 --
 app/src/main/res/layout/fragment_invites.xml         |  4 +---
 app/src/main/res/layout/fragment_publish_form.xml    |  2 --
 app/src/main/res/layout/fragment_rewards.xml         |  4 +---
 .../main/res/layout/fragment_verification_email.xml  |  9 ++-------
 .../main/res/layout/fragment_verification_phone.xml  |  4 ++--
 .../main/res/layout/fragment_verification_wallet.xml |  4 +---
 app/src/main/res/layout/fragment_wallet.xml          |  3 +--
 app/src/main/res/layout/list_item_notification.xml   |  7 ++++---
 app/src/main/res/layout/list_item_stream.xml         | 12 +++++++-----
 app/src/main/res/layout/list_item_transaction.xml    | 12 ++++++------
 app/src/main/res/values/styles.xml                   |  6 ++++++
 26 files changed, 52 insertions(+), 74 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a6f5a1cc..6f807bcf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId 'com.aryan.lbrybrowser'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 1706
-        versionName '0.17.6'
+        versionCode 1707
+        versionName '0.17.7'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java b/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java
index 760f9ed6..481edd72 100644
--- a/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java
+++ b/app/src/main/java/io/lbry/browser/adapter/NotificationListAdapter.java
@@ -175,7 +175,7 @@ private int getColorForRule(String rule) {
             return ContextCompat.getColor(context, R.color.nextAryanPurple);
         }
 
-        return ContextCompat.getColor(context, R.color.AryanPurple);
+        return ContextCompat.getColor(context, R.color.button);
     }
 
     @Override
diff --git a/app/src/main/res/layout/card_wallet_balance.xml b/app/src/main/res/layout/card_wallet_balance.xml
index 9f7b640c..928add7a 100644
--- a/app/src/main/res/layout/card_wallet_balance.xml
+++ b/app/src/main/res/layout/card_wallet_balance.xml
@@ -137,10 +137,8 @@
             android:layout_marginStart="12dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="12dp"
-            android:backgroundTint="@color/button"
             android:fontFamily="@font/opensans"
             android:text="@string/buy_lbc"
-            android:textColor="@color/text"
             android:textSize="16sp"
             lbry:iconTint="@color/button" />
 
diff --git a/app/src/main/res/layout/card_wallet_receive_credits.xml b/app/src/main/res/layout/card_wallet_receive_credits.xml
index db169b06..e140f78c 100644
--- a/app/src/main/res/layout/card_wallet_receive_credits.xml
+++ b/app/src/main/res/layout/card_wallet_receive_credits.xml
@@ -76,9 +76,7 @@
             android:layout_marginTop="8dp"
             android:fontFamily="@font/opensans"
             android:text="@string/get_new_address"
-            android:textColor="@color/text"
-            android:textSize="14sp"
-            app:backgroundTint="@color/button" />
+            android:textSize="14sp" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_wallet_send_credits.xml b/app/src/main/res/layout/card_wallet_send_credits.xml
index 74c1a9a8..dca2613f 100644
--- a/app/src/main/res/layout/card_wallet_send_credits.xml
+++ b/app/src/main/res/layout/card_wallet_send_credits.xml
@@ -136,10 +136,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/send"
-                android:textColor="@color/text" />
+                android:text="@string/send" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/container_comment_form.xml b/app/src/main/res/layout/container_comment_form.xml
index 2aedcb46..45e61549 100644
--- a/app/src/main/res/layout/container_comment_form.xml
+++ b/app/src/main/res/layout/container_comment_form.xml
@@ -193,10 +193,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/comment_form_post"
-                android:textColor="@color/text" />
+                android:text="@string/comment_form_post" />
 
             <ProgressBar
                 android:id="@+id/comment_form_post_progress"
diff --git a/app/src/main/res/layout/container_inline_channel_form.xml b/app/src/main/res/layout/container_inline_channel_form.xml
index 26ac6e77..1cf17fb9 100644
--- a/app/src/main/res/layout/container_inline_channel_form.xml
+++ b/app/src/main/res/layout/container_inline_channel_form.xml
@@ -118,9 +118,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
-            android:backgroundTint="@color/button"
             android:fontFamily="@font/opensans"
-            android:text="@string/create"
-            android:textColor="@color/text" />
+            android:text="@string/create" />
     </RelativeLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/container_nothing_at_location.xml b/app/src/main/res/layout/container_nothing_at_location.xml
index 1311dc9e..3a8d3bd4 100644
--- a/app/src/main/res/layout/container_nothing_at_location.xml
+++ b/app/src/main/res/layout/container_nothing_at_location.xml
@@ -27,6 +27,7 @@
             android:fontFamily="@font/opensans"
             android:textSize="16sp"
             android:textAlignment="center" />
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/nothing_at_location_publish_button"
             android:layout_width="wrap_content"
@@ -34,9 +35,9 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="24dp"
             android:fontFamily="@font/opensans"
-            android:textSize="14sp"
             android:text="@string/publish_something_here"
             android:textFontWeight="300"
+            android:textSize="14sp"
             android:visibility="gone" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_create_support.xml b/app/src/main/res/layout/dialog_create_support.xml
index 9750ce72..5b233469 100644
--- a/app/src/main/res/layout/dialog_create_support.xml
+++ b/app/src/main/res/layout/dialog_create_support.xml
@@ -161,9 +161,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:backgroundTint="@color/button"
-                android:fontFamily="@font/opensans"
-                android:textColor="@color/text" />
+                android:fontFamily="@font/opensans" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_customize_tags.xml b/app/src/main/res/layout/dialog_customize_tags.xml
index 72bdb663..2b2dff9e 100644
--- a/app/src/main/res/layout/dialog_customize_tags.xml
+++ b/app/src/main/res/layout/dialog_customize_tags.xml
@@ -101,9 +101,7 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:backgroundTint="@color/button"
             android:fontFamily="@font/opensans"
-            android:text="@string/done"
-            android:textColor="@color/text" />
+            android:text="@string/done" />
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_discover.xml b/app/src/main/res/layout/dialog_discover.xml
index 83549dd5..5dc09f91 100644
--- a/app/src/main/res/layout/dialog_discover.xml
+++ b/app/src/main/res/layout/dialog_discover.xml
@@ -53,10 +53,10 @@
         android:layout_alignParentBottom="true"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
+        android:backgroundTint="@color/button"
         android:fontFamily="@font/opensans"
         android:text="@string/done"
         android:textColor="@color/text"
-        android:textSize="14sp"
-        app:backgroundTint="@color/button" />
+        android:textSize="14sp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_repost_claim.xml b/app/src/main/res/layout/dialog_repost_claim.xml
index e539f7f3..64bfdf05 100644
--- a/app/src/main/res/layout/dialog_repost_claim.xml
+++ b/app/src/main/res/layout/dialog_repost_claim.xml
@@ -187,10 +187,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/repost"
-                android:textColor="@color/text" />
+                android:text="@string/repost" />
         </RelativeLayout>
     </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 8751bf70..0009362f 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -155,12 +155,13 @@
                     android:layout_height="36dp"
                     android:layout_marginEnd="8dp"
                     android:visibility="gone">
+
                     <ImageView
-                        android:layout_centerInParent="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
+                        android:layout_centerInParent="true"
                         android:src="@drawable/ic_edit"
-                        app:tint="@color/foreground" />
+                        app:tint="@color/green" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_delete"
@@ -170,12 +171,13 @@
                     android:layout_height="36dp"
                     android:layout_marginEnd="8dp"
                     android:visibility="gone">
+
                     <ImageView
-                        android:layout_centerInParent="true"
                         android:layout_width="24dp"
                         android:layout_height="24dp"
+                        android:layout_centerInParent="true"
                         android:src="@drawable/ic_delete"
-                        app:tint="@color/foreground" />
+                        app:tint="@color/red" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_share"
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index db941e68..03a19a62 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -350,10 +350,8 @@
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
                             android:layout_centerVertical="true"
-                            android:backgroundTint="@color/button"
                             android:fontFamily="@font/opensans"
-                            android:text="@string/save"
-                            android:textColor="@color/text" />
+                            android:text="@string/save" />
                     </RelativeLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/fragment_channel_manager.xml b/app/src/main/res/layout/fragment_channel_manager.xml
index 0733a1f7..6dc6ace9 100644
--- a/app/src/main/res/layout/fragment_channel_manager.xml
+++ b/app/src/main/res/layout/fragment_channel_manager.xml
@@ -59,9 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/create_a_channel"
                 android:textColor="@color/text" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_invites.xml b/app/src/main/res/layout/fragment_invites.xml
index a8227b8a..a7b0a946 100644
--- a/app/src/main/res/layout/fragment_invites.xml
+++ b/app/src/main/res/layout/fragment_invites.xml
@@ -87,9 +87,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:fontFamily="@font/opensans"
-                android:text="@string/get_started"
-                android:textColor="@color/text"
-                app:backgroundTint="@color/button" />
+                android:text="@string/get_started" />
         </RelativeLayout>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index 429246bd..97526839 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -640,9 +640,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:backgroundTint="@color/button"
                     android:fontFamily="@font/opensans"
-                    android:text="@string/publish"
                     android:textColor="@color/text" />
             </RelativeLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_rewards.xml b/app/src/main/res/layout/fragment_rewards.xml
index 4d1512fb..6a913f54 100644
--- a/app/src/main/res/layout/fragment_rewards.xml
+++ b/app/src/main/res/layout/fragment_rewards.xml
@@ -155,10 +155,8 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/get_started"
-                android:textColor="@color/text" />
+                android:text="@string/get_started" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_verification_email.xml b/app/src/main/res/layout/fragment_verification_email.xml
index 4dca8e94..681875da 100644
--- a/app/src/main/res/layout/fragment_verification_email.xml
+++ b/app/src/main/res/layout/fragment_verification_email.xml
@@ -68,11 +68,8 @@
                 android:id="@+id/verification_email_continue_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/continue_text"
-                android:textColor="@color/text"
-                app:iconTint="@color/button" />
+                android:text="@string/continue_text" />
 
             <ProgressBar
                 android:id="@+id/verification_email_add_progress"
@@ -146,10 +143,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="3"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/resend"
-                app:iconTint="@color/button" />
+                android:text="@string/resend" />
 
             <View
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_verification_phone.xml b/app/src/main/res/layout/fragment_verification_phone.xml
index dd70f40b..2348de71 100644
--- a/app/src/main/res/layout/fragment_verification_phone.xml
+++ b/app/src/main/res/layout/fragment_verification_phone.xml
@@ -70,7 +70,6 @@
                 android:id="@+id/verification_phone_continue_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
                 android:text="@string/continue_text"
                 android:textColor="@color/text" />
@@ -139,7 +138,8 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:fontFamily="@font/opensans"
-                android:text="@string/verify" />
+                android:text="@string/verify"
+                android:textColor="@color/text" />
 
             <ProgressBar
                 android:id="@+id/verification_phone_verify_progress"
diff --git a/app/src/main/res/layout/fragment_verification_wallet.xml b/app/src/main/res/layout/fragment_verification_wallet.xml
index d3a803c0..7e6cb236 100644
--- a/app/src/main/res/layout/fragment_verification_wallet.xml
+++ b/app/src/main/res/layout/fragment_verification_wallet.xml
@@ -112,10 +112,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
-                android:backgroundTint="@color/button"
                 android:fontFamily="@font/opensans"
-                android:text="@string/done"
-                android:textColor="@color/text" />
+                android:text="@string/done" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index a061a7dd..0150a5e4 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -101,8 +101,7 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:fontFamily="@font/opensans"
-                android:text="@string/sign_up"
-                app:backgroundTint="@color/button" />
+                android:text="@string/sign_up" />
         </RelativeLayout>
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_notification.xml b/app/src/main/res/layout/list_item_notification.xml
index 122197a9..05222775 100644
--- a/app/src/main/res/layout/list_item_notification.xml
+++ b/app/src/main/res/layout/list_item_notification.xml
@@ -6,14 +6,15 @@
     android:layout_marginStart="8dp"
     android:layout_marginEnd="8dp"
     android:layout_marginBottom="8dp"
-    android:background="?attr/selectableItemBackground"
     android:clickable="true"
-    app:cardCornerRadius="15dp">
+    app:cardBackgroundColor="#11ffffff"
+    app:cardCornerRadius="20dp">
 
     <LinearLayout
         android:id="@+id/notification_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/rounded_layout_bg"
         android:orientation="horizontal">
 
         <RelativeLayout
@@ -47,7 +48,7 @@
                     android:layout_height="36dp"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
-                    app:tint="@color/nextAryanPurple" />
+                    app:tint="@color/button" />
             </RelativeLayout>
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/list_item_stream.xml b/app/src/main/res/layout/list_item_stream.xml
index 4fc86a43..21fa8b86 100644
--- a/app/src/main/res/layout/list_item_stream.xml
+++ b/app/src/main/res/layout/list_item_stream.xml
@@ -3,16 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="8dp"
     android:background="@drawable/rounded_layout_bg"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
     android:orientation="vertical"
-    android:paddingStart="16dp"
+    android:paddingStart="10dp"
     android:paddingTop="8dp"
-    android:paddingEnd="16dp"
-    android:paddingBottom="8dp"
-    android:layout_margin="10dp">
+    android:paddingEnd="10dp"
+    android:paddingBottom="8dp">
 
     <LinearLayout
         android:id="@+id/claim_repost_info"
@@ -66,7 +66,8 @@
         <RelativeLayout
             android:id="@+id/claim_media_container"
             android:layout_width="160dp"
-            android:layout_height="90dp">
+            android:layout_height="90dp"
+            android:layout_centerVertical="true">
 
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
@@ -176,6 +177,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_marginStart="16dp"
             android:layout_toEndOf="@id/claim_media_container"
             android:orientation="vertical">
diff --git a/app/src/main/res/layout/list_item_transaction.xml b/app/src/main/res/layout/list_item_transaction.xml
index 5096c777..3ea4dbd8 100644
--- a/app/src/main/res/layout/list_item_transaction.xml
+++ b/app/src/main/res/layout/list_item_transaction.xml
@@ -46,20 +46,20 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:weightSum="10">
+
         <TextView
             android:id="@+id/transaction_claim"
-            android:clickable="true"
-            android:background="?attr/selectableItemBackground"
-            android:layout_weight="6"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="6"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
             android:ellipsize="end"
             android:fontFamily="@font/opensans"
             android:singleLine="true"
-            android:textColor="@color/AryanPurple"
-            android:textSize="14sp"
+            android:textColor="@color/button"
             android:textFontWeight="300"
-            />
+            android:textSize="14sp" />
         <TextView
             android:id="@+id/transaction_fee"
             android:gravity="end"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 195bf24e..9116e448 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,7 @@
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowBackground">@color/colorPrimaryDark</item>
         <item name="drawerArrowStyle">@style/AppTheme.DrawerArrowStyle</item>
+        <item name="materialButtonStyle">@style/AppTheme.buttonStyle</item>
         <!--item name="android:windowLightStatusBar">true</item-->
     </style>
 
@@ -17,6 +18,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.buttonStyle" parent="Widget.Material3.Button">
+        <item name="android:textColor">@color/text</item>
+        <item name="android:backgroundTint">@color/button</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />