1
0
Fork 0

For #12509: Set height of remove add on button to 36dp

master
Hakkı Kaan Çalışkan 2020-07-14 11:30:08 +03:00 committed by Kainalu Hagiwara
parent 455e7b8f99
commit aa7655f4d6
2 changed files with 5 additions and 5 deletions

View File

@ -8,13 +8,13 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Switch
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.navigation.Navigation import androidx.navigation.Navigation
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import com.google.android.material.switchmaterial.SwitchMaterial
import kotlinx.android.synthetic.main.fragment_installed_add_on_details.view.* import kotlinx.android.synthetic.main.fragment_installed_add_on_details.view.*
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -301,7 +301,7 @@ class InstalledAddonDetailsFragment : Fragment() {
view.remove_add_on.isClickable = clickable view.remove_add_on.isClickable = clickable
} }
private fun Switch.setState(checked: Boolean) { private fun SwitchMaterial.setState(checked: Boolean) {
val text = if (checked) { val text = if (checked) {
R.string.mozac_feature_addons_enabled R.string.mozac_feature_addons_enabled
} else { } else {

View File

@ -19,7 +19,7 @@
android:visibility="gone" android:visibility="gone"
android:orientation="vertical"> android:orientation="vertical">
<Switch <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/enable_switch" android:id="@+id/enable_switch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -34,7 +34,7 @@
android:textColor="?primaryText" android:textColor="?primaryText"
android:textSize="16sp" /> android:textSize="16sp" />
<Switch <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/allow_in_private_browsing_switch" android:id="@+id/allow_in_private_browsing_switch"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -93,7 +93,7 @@
android:textSize="16sp" android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_permission" /> app:drawableStartCompat="@drawable/ic_permission" />
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/remove_add_on" android:id="@+id/remove_add_on"
style="@style/DestructiveButton" style="@style/DestructiveButton"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"