For #5073 - Fixes visual alignment when certificate authority breaks into a new line
This commit is contained in:
parent
7a16192fd1
commit
a42ad7603b
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,14 +29,31 @@
|
|||
android:paddingTop="8dp"
|
||||
tools:text="https://wikipedia.org" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
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.Icon"
|
||||
style="@style/QuickSettingsText"
|
||||
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"
|
||||
android:paddingStart="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
tools:text="Secure connection" />
|
||||
|
||||
<TextView
|
||||
|
@ -49,7 +66,7 @@
|
|||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:paddingTop="0dp"
|
||||
android:paddingBottom="2dp"
|
||||
tools:text="Verified By:" />
|
||||
|
||||
|
||||
tools:text="Verified By: E-Corp" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue
Block a user