blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #5178 - Polish delete browsing data item layout

master
Emily Kager 2019-09-11 16:44:56 -07:00 committed by Emily Kager
parent 102a36bd7e
commit a5859e0028
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataItem.kt
View File

@ -7,6 +7,7 @@ package org.mozilla.fenix.settings
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.withStyledAttributes
@ -58,7 +59,9 @@ class DeleteBrowsingDataItem @JvmOverloads constructor(
)
title.text = resources.getString(titleId)
subtitle.text = resources.getString(subtitleId)
val subtitleText = resources.getString(subtitleId)
subtitle.text = subtitleText
if (subtitleText.isBlank()) subtitle.visibility = View.GONE
}
}

7
app/src/main/res/layout/delete_browsing_data_item.xml
View File

@ -7,8 +7,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
android:minHeight="@dimen/library_item_height"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
@ -16,7 +14,10 @@
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:layout_marginTop="@dimen/library_item_icon_margin_vertical"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/library_item_icon_margin_vertical"
android:clickable="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -27,6 +28,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
android:clickable="false"
android:textAppearance="@style/ListItemTextStyle"
app:layout_constraintBottom_toTopOf="@id/subtitle"
@ -41,6 +43,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/library_item_icon_margin_horizontal"
android:layout_marginEnd="@dimen/library_item_icon_margin_horizontal"
android:clickable="false"
android:textAppearance="@style/SubtitleTextStyle"
app:layout_constraintBottom_toBottomOf="parent"