From 9b01282f6161e3ebfb294d6ca0fbe19ea240a952 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Thu, 23 Jan 2020 10:25:22 +1100
Subject: [PATCH] Clean

---
 res/layout/view_profile_picture.xml                      | 9 ++++-----
 res/values-sw400dp/dimens.xml                            | 7 +++++++
 res/values/dimens.xml                                    | 6 +++---
 res/values/styles.xml                                    | 4 ++--
 .../securesms/loki/redesign/views/ProfilePictureView.kt  | 2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/res/layout/view_profile_picture.xml b/res/layout/view_profile_picture.xml
index 1a380db32b..2cae135b49 100644
--- a/res/layout/view_profile_picture.xml
+++ b/res/layout/view_profile_picture.xml
@@ -67,14 +67,13 @@
 
     </RelativeLayout>
 
-    <TextView
-        android:id="@+id/rssTextView"
+    <ImageView
+        android:id="@+id/rssImageView"
         android:layout_width="@dimen/medium_profile_picture_size"
         android:layout_height="@dimen/medium_profile_picture_size"
         android:gravity="center"
-        android:text="RSS"
-        android:textColor="@color/text"
-        android:textSize="@dimen/small_font_size"
+        android:src="@drawable/session_logo_white"
+        android:padding="12dp"
         android:background="@drawable/profile_picture_view_rss_medium_background" />
 
     <RelativeLayout
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index aee99d8491..4cd286a8bb 100644
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+    <!-- Session -->
+    <dimen name="medium_button_height">44dp</dimen>
+    <dimen name="tab_bar_height">48dp</dimen>
+    <dimen name="setting_button_height">72dp</dimen>
+    <!-- Session -->
+
     <dimen name="album_total_width">300dp</dimen>
     <dimen name="album_2_total_height">150dp</dimen>
     <dimen name="album_2_cell_width">149dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f8dd2e4723..a4ec3dff18 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -13,7 +13,7 @@
 
     <!-- Element Sizes -->
     <dimen name="small_button_height">34dp</dimen>
-    <dimen name="medium_button_height">44dp</dimen>
+    <dimen name="medium_button_height">38dp</dimen>
     <dimen name="accent_line_thickness">4dp</dimen>
     <dimen name="very_small_profile_picture_size">26dp</dimen>
     <dimen name="small_profile_picture_size">36dp</dimen>
@@ -23,12 +23,12 @@
     <dimen name="border_thickness">1dp</dimen>
     <dimen name="profile_picture_border_thickness">1dp</dimen>
     <dimen name="new_conversation_button_size">56dp</dimen>
-    <dimen name="tab_bar_height">48dp</dimen>
+    <dimen name="tab_bar_height">36dp</dimen>
     <dimen name="text_view_corner_radius">8dp</dimen>
     <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
     <dimen name="fake_chat_view_height">234dp</dimen>
-    <dimen name="setting_button_height">72dp</dimen>
+    <dimen name="setting_button_height">56dp</dimen>
     <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index d490519ad8..fe6bab3fc9 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -148,9 +148,9 @@
     <style name="SmallSessionEditText">
         <item name="android:background">@drawable/session_id_text_view_background</item>
         <item name="android:paddingLeft">@dimen/medium_spacing</item>
-        <item name="android:paddingTop">@dimen/large_spacing</item>
+        <item name="android:paddingTop">20dp</item>
         <item name="android:paddingRight">@dimen/medium_spacing</item>
-        <item name="android:paddingBottom">@dimen/large_spacing</item>
+        <item name="android:paddingBottom">20dp</item>
         <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:textColor">@color/text</item>
         <item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
diff --git a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
index 87fddbfb3e..94f1ccc121 100644
--- a/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/redesign/views/ProfilePictureView.kt
@@ -56,7 +56,7 @@ class ProfilePictureView : RelativeLayout {
         doubleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey != null && !isRSSFeed) View.VISIBLE else View.INVISIBLE
         singleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed && !isLarge) View.VISIBLE else View.INVISIBLE
         largeSingleModeImageViewContainer.visibility = if (additionalHexEncodedPublicKey == null && !isRSSFeed && isLarge) View.VISIBLE else View.INVISIBLE
-        rssTextView.visibility = if (isRSSFeed) View.VISIBLE else View.INVISIBLE
+        rssImageView.visibility = if (isRSSFeed) View.VISIBLE else View.INVISIBLE
         fun setProfilePictureIfNeeded(imageView: ImageView, hexEncodedPublicKey: String, @DimenRes sizeID: Int) {
             glide.clear(imageView)
             if (hexEncodedPublicKey.isNotEmpty()) {