For issue #8520: Polish Add-on manager UIs (804eb0f5) · Commits · Gaba / fenix

app/src/main/java/org/mozilla/fenix/addons/AddonDetailsFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -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())
		)
		)
		}
		}

app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt

+9 −1

Original line number	Diff line number	Diff line
		@@ -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

app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -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

app/src/main/res/layout/fragment_add_on_details.xml

+16 −14

Original line number	Diff line number	Diff line
		@@ -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" />

		<TextView
		@@ -29,6 +31,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/details"
		style="@style/AboutHeaderContentText"
		android:text="@string/mozac_feature_addons_authors" />

		<TextView
		@@ -37,6 +40,7 @@
		android:layout_height="wrap_content"
		android:layout_below="@+id/details"
		android:layout_alignParentEnd="true"
		style="@style/AboutHeaderContentText"
		tools:text="@tools:sample/full_names" />

		<View
		@@ -46,7 +50,7 @@
		android:layout_below="@+id/author_label"
		android:layout_marginTop="10dp"
		android:layout_marginBottom="10dp"
		android:background="@color/photonGrey40"
		android:background="?android:attr/listDivider"
		android:importantForAccessibility="no" />

		<TextView
		@@ -54,6 +58,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/author_divider"
		style="@style/AboutHeaderContentText"
		android:text="@string/mozac_feature_addons_version" />

		<TextView
		@@ -62,6 +67,7 @@
		android:layout_height="wrap_content"
		android:layout_below="@+id/author_divider"
		android:layout_alignParentEnd="true"
		style="@style/AboutHeaderContentText"
		tools:text="1.2.3" />

		<View
		@@ -71,7 +77,7 @@
		android:layout_below="@+id/version_label"
		android:layout_marginTop="10dp"
		android:layout_marginBottom="10dp"
		android:background="@color/photonGrey40"
		android:background="?android:attr/listDivider"
		android:importantForAccessibility="no" />

		<TextView
		@@ -79,6 +85,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/version_divider"
		style="@style/AboutHeaderContentText"
		android:text="@string/mozac_feature_addons_last_updated" />

		<TextView
		@@ -87,6 +94,7 @@
		android:layout_height="wrap_content"
		android:layout_below="@+id/version_divider"
		android:layout_alignParentEnd="true"
		style="@style/AboutHeaderContentText"
		tools:text="Oct 16, 2019" />

		<View
		@@ -96,7 +104,7 @@
		android:layout_below="@+id/last_updated_label"
		android:layout_marginTop="10dp"
		android:layout_marginBottom="10dp"
		android:background="@color/photonGrey40"
		android:background="?android:attr/listDivider"
		android:importantForAccessibility="no" />

		<TextView
		@@ -104,18 +112,10 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/last_updated_divider"
		style="@style/AboutHeaderContentText"
		android:textColor="?aboutLink"
		android:text="@string/mozac_feature_addons_home_page" />

		<ImageView
		android:id="@+id/home_page_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/last_updated_divider"
		android:layout_alignParentEnd="true"
		android:contentDescription="@string/mozac_feature_addons_home_page"
		app:srcCompat="@drawable/mozac_ic_link"
		android:tint="?android:attr/textColorPrimary" />

		<View
		android:id="@+id/home_page_divider"
		android:layout_width="match_parent"
		@@ -123,7 +123,7 @@
		android:layout_below="@+id/home_page_label"
		android:layout_marginTop="10dp"
		android:layout_marginBottom="10dp"
		android:background="@color/photonGrey40"
		android:background="?android:attr/listDivider"
		android:importantForAccessibility="no" />

		<TextView
		@@ -131,6 +131,7 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/home_page_divider"
		style="@style/AboutHeaderContentText"
		android:text="@string/mozac_feature_addons_rating" />

		<RatingBar
		@@ -150,6 +151,7 @@
		android:layout_below="@+id/home_page_divider"
		android:layout_alignParentEnd="true"
		android:layout_marginStart="6dp"
		style="@style/AboutHeaderContentText"
		tools:text="591,642" />
		</RelativeLayout>
		</ScrollView>