From a42ad7603bdc6ffb906bfb4fabfa2dcf275e53b8 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Thu, 6 Feb 2020 17:38:04 -0800
Subject: [PATCH] For #5073 - Fixes visual alignment when certificate authority
 breaks into a new line

---
 .../settings/quicksettings/WebsiteInfoView.kt |  3 +-
 .../res/layout/quicksettings_website_info.xml | 57 ++++++++++++-------
 app/src/main/res/values/styles.xml            |  1 -
 3 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
index 001c0eaff..0b48c7b39 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
@@ -14,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import kotlinx.android.extensions.LayoutContainer
 import kotlinx.android.synthetic.main.quicksettings_website_info.view.*
-import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
 import org.mozilla.fenix.R
 
 /**
@@ -63,6 +62,6 @@ class WebsiteInfoView(
         val icon = AppCompatResources.getDrawable(view.context, iconRes)
         icon?.setTint(ContextCompat.getColor(view.context, iconTintRes))
         view.securityInfo.setText(securityInfoRes)
-        view.securityInfo.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon)
+        view.securityInfoIcon.setImageResource(iconRes)
     }
 }
diff --git a/app/src/main/res/layout/quicksettings_website_info.xml b/app/src/main/res/layout/quicksettings_website_info.xml
index b44120e3d..dcdf5e697 100644
--- a/app/src/main/res/layout/quicksettings_website_info.xml
+++ b/app/src/main/res/layout/quicksettings_website_info.xml
@@ -29,27 +29,44 @@
         android:paddingTop="8dp"
         tools:text="https://wikipedia.org" />
 
-    <TextView
-        android:id="@+id/securityInfo"
-        style="@style/QuickSettingsText.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/quicksettings_item_height"
-        android:paddingTop="8dp"
-        tools:drawableStart="@drawable/mozac_ic_lock"
-        tools:drawableTint="@color/photonGreen50"
-        tools:text="Secure connection" />
-
-    <TextView
-        android:id="@+id/certificateInfo"
-        style="@style/QuickSettingsSmallText"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:paddingTop="0dp"
-        android:paddingBottom="2dp"
-        tools:text="Verified By:" />
-
+        android:orientation="horizontal"
+        style="@style/QuickSettingsText"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+        <ImageView
+            android:id="@+id/securityInfoIcon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:src="@drawable/mozac_ic_lock"
+            android:tint="@color/photonGreen50"
+            android:paddingEnd="8dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/securityInfo"
+                style="@style/QuickSettingsText"
+                android:layout_width="match_parent"
+                android:paddingStart="0dp"
+                android:layout_height="wrap_content"
+                tools:text="Secure connection" />
 
+            <TextView
+                android:id="@+id/certificateInfo"
+                style="@style/QuickSettingsSmallText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:paddingTop="0dp"
+                android:paddingBottom="2dp"
+                tools:text="Verified By: E-Corp" />
+        </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b1e86be4f..06aa95b53 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -297,7 +297,6 @@
     <style name="QuickSettingsSmallText">
         <item name="android:textColor">@color/photonGrey60</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:paddingStart">48dp</item>
         <item name="android:paddingEnd">16dp</item>
         <item name="android:gravity">top</item>
         <item name="android:layout_alignParentStart">true</item>