From 804eb0f5ba48101158b7440cd6082bcc5dd5b4c0 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Thu, 26 Mar 2020 13:16:42 -0400 Subject: [PATCH] For issue #8520: Polish Add-on manager UIs --- .../fenix/addons/AddonDetailsFragment.kt | 2 +- .../addons/AddonPermissionsDetailsFragment.kt | 8 ++++- .../fenix/addons/AddonsManagementFragment.kt | 10 ++++++- .../addons/InstalledAddonDetailsFragment.kt | 8 ++--- .../res/layout/fragment_add_on_details.xml | 30 ++++++++++--------- .../layout/fragment_add_on_permissions.xml | 4 +-- .../fragment_installed_add_on_details.xml | 27 ++++++++++------- 7 files changed, 55 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt index e685c176e..2b43c901f 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt @@ -70,7 +70,7 @@ class AddonDetailsFragment : Fragment(R.layout.fragment_add_on_details) { } private fun bindWebsite(addon: Addon, view: View) { - view.home_page_text.setOnClickListener { + view.home_page_label.setOnClickListener { val intent = Intent(Intent.ACTION_VIEW).setData(Uri.parse(addon.siteUrl)) startActivity(intent) diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt index fb955b401..d248051a2 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt @@ -18,6 +18,7 @@ import mozilla.components.feature.addons.ui.AddonPermissionsAdapter import mozilla.components.feature.addons.ui.translate import org.mozilla.fenix.R import org.mozilla.fenix.ext.showToolbar +import org.mozilla.fenix.theme.ThemeManager private const val LEARN_MORE_URL = "https://support.mozilla.org/kb/permission-request-messages-firefox-extensions" @@ -44,7 +45,12 @@ class AddonPermissionsDetailsFragment : Fragment(R.layout.fragment_add_on_permis @StringRes val stringId = it getString(stringId) }.sorted() - adapter = AddonPermissionsAdapter(sortedPermissions) + adapter = AddonPermissionsAdapter( + sortedPermissions, + style = AddonPermissionsAdapter.Style( + ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()) + ) + ) } } diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index 0be757429..d75f86017 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -104,7 +104,15 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management), val adapter = AddonsManagerAdapter( requireContext().components.addonCollectionProvider, this@AddonsManagementFragment, - addons + addons, + style = AddonsManagerAdapter.Style( + ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()), + ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()), + ThemeManager.resolveAttribute( + R.attr.secondaryText, + requireContext() + ) + ) ) isInstallationInProgress = false view.add_ons_progress_bar.isVisible = false diff --git a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt index 3c189dd75..525c3375e 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt @@ -99,7 +99,7 @@ class InstalledAddonDetailsFragment : Fragment() { onSuccess = { runIfFragmentIsAttached { switch.isClickable = true - switch.setText(R.string.mozac_feature_addons_settings_on) + switch.setText(R.string.mozac_feature_addons_enabled) view.settings.isVisible = true view.remove_add_on.isEnabled = true this.addon = it @@ -133,7 +133,7 @@ class InstalledAddonDetailsFragment : Fragment() { onSuccess = { runIfFragmentIsAttached { switch.isClickable = true - switch.setText(R.string.mozac_feature_addons_settings_off) + switch.setText(R.string.mozac_feature_addons_disabled) view.remove_add_on.isEnabled = true this.addon = it showSnackBar( @@ -256,9 +256,9 @@ class InstalledAddonDetailsFragment : Fragment() { private fun Switch.setState(checked: Boolean) { val text = if (checked) { - R.string.mozac_feature_addons_settings_on + R.string.mozac_feature_addons_enabled } else { - R.string.mozac_feature_addons_settings_off + R.string.mozac_feature_addons_disabled } setText(text) isChecked = checked diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml index fd1b931ef..71dfc0623 100644 --- a/app/src/main/res/layout/fragment_add_on_details.xml +++ b/app/src/main/res/layout/fragment_add_on_details.xml @@ -22,6 +22,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="20dp" + android:textColor="?primaryText" + android:textColorLink="?aboutLink" tools:text="@tools:sample/lorem/random" /> - - diff --git a/app/src/main/res/layout/fragment_add_on_permissions.xml b/app/src/main/res/layout/fragment_add_on_permissions.xml index cb1bf2162..d7b1c9518 100644 --- a/app/src/main/res/layout/fragment_add_on_permissions.xml +++ b/app/src/main/res/layout/fragment_add_on_permissions.xml @@ -27,7 +27,7 @@ android:paddingStart="16dp" android:paddingEnd="16dp" android:text="@string/mozac_feature_addons_learn_more" - app:drawableEndCompat="@drawable/mozac_ic_link" - app:drawableTint="?android:attr/textColorPrimary" /> + style="@style/AboutHeaderContentText" + android:textColor="?aboutLink"/> diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml index e5c30e9fc..ebe6e1d17 100644 --- a/app/src/main/res/layout/fragment_installed_add_on_details.xml +++ b/app/src/main/res/layout/fragment_installed_add_on_details.xml @@ -29,9 +29,11 @@ android:checked="true" android:clickable="true" android:focusable="true" + android:layout_marginStart="54dp" android:padding="16dp" - android:text="@string/mozac_feature_addons_settings_on" - android:textSize="18sp" /> + android:text="@string/mozac_feature_addons_enabled" + android:textColor="?primaryText" + android:textSize="16sp" /> + android:textColor="?primaryText" + android:textSize="16sp" + app:drawableStartCompat="@drawable/ic_permission" />