blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #5073 - Fixes visual alignment when certificate authority breaks into a new line

master
Jeff Boek 2020-02-06 17:38:04 -08:00
parent 7a16192fd1
commit a42ad7603b
3 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoView.kt
View File

@ -14,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import kotlinx.android.extensions.LayoutContainer import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.quicksettings_website_info.view.* import kotlinx.android.synthetic.main.quicksettings_website_info.view.*
import mozilla.components.support.ktx.android.view.putCompoundDrawablesRelativeWithIntrinsicBounds
import org.mozilla.fenix.R import org.mozilla.fenix.R
/** /**
@ -63,6 +62,6 @@ class WebsiteInfoView(
val icon = AppCompatResources.getDrawable(view.context, iconRes) val icon = AppCompatResources.getDrawable(view.context, iconRes)
icon?.setTint(ContextCompat.getColor(view.context, iconTintRes)) icon?.setTint(ContextCompat.getColor(view.context, iconTintRes))
view.securityInfo.setText(securityInfoRes) view.securityInfo.setText(securityInfoRes)
view.securityInfo.putCompoundDrawablesRelativeWithIntrinsicBounds(start = icon) view.securityInfoIcon.setImageResource(iconRes)
} }
} }

57
app/src/main/res/layout/quicksettings_website_info.xml
View File

@ -29,27 +29,44 @@
android:paddingTop="8dp" android:paddingTop="8dp"
tools:text="https://wikipedia.org" /> tools:text="https://wikipedia.org" />
<TextView <LinearLayout
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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent" style="@style/QuickSettingsText"
app:layout_constraintTop_toTopOf="parent" android:paddingTop="8dp"
android:paddingTop="0dp" android:paddingBottom="8dp">
android:paddingBottom="2dp" <ImageView
tools:text="Verified By:" /> 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> </LinearLayout>

1
app/src/main/res/values/styles.xml
View File

@ -297,7 +297,6 @@
<style name="QuickSettingsSmallText"> <style name="QuickSettingsSmallText">
<item name="android:textColor">@color/photonGrey60</item> <item name="android:textColor">@color/photonGrey60</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:paddingStart">48dp</item>
<item name="android:paddingEnd">16dp</item> <item name="android:paddingEnd">16dp</item>
<item name="android:gravity">top</item> <item name="android:gravity">top</item>
<item name="android:layout_alignParentStart">true</item> <item name="android:layout_alignParentStart">true</item>