From eace991859ed0094ce9864c4880e6e25166151d3 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 9 Apr 2020 15:56:42 -0400
Subject: [PATCH] For issue #8520: Improve add-ons UI

---
 .../fenix/addons/AddonsManagementFragment.kt  | 21 ++++++++++++-------
 .../layout/fragment_add_ons_management.xml    |  1 +
 .../fragment_installed_add_on_details.xml     |  5 +----
 3 files changed, 15 insertions(+), 12 deletions(-)

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 d75f86017..0732722aa 100644
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
@@ -4,9 +4,11 @@
 
 package org.mozilla.fenix.addons
 
+import android.content.Context
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
+import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
@@ -105,14 +107,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
                             requireContext().components.addonCollectionProvider,
                             this@AddonsManagementFragment,
                             addons,
-                            style = AddonsManagerAdapter.Style(
-                                ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()),
-                                ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()),
-                                ThemeManager.resolveAttribute(
-                                    R.attr.secondaryText,
-                                    requireContext()
-                                )
-                            )
+                            style = createAddonStyle(requireContext())
                         )
                         isInstallationInProgress = false
                         view.add_ons_progress_bar.isVisible = false
@@ -134,6 +129,16 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
         }
     }
 
+    private fun createAddonStyle(context: Context): AddonsManagerAdapter.Style {
+        return AddonsManagerAdapter.Style(
+            sectionsTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context),
+            addonNameTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context),
+            addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context),
+            sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold),
+            addonBackgroundIconColor = ThemeManager.resolveAttribute(R.attr.inset, requireContext())
+        )
+    }
+
     private fun showInstalledAddonDetailsFragment(addon: Addon) {
         val directions =
             AddonsManagementFragmentDirections.actionAddonsManagementFragmentToInstalledAddonDetails(
diff --git a/app/src/main/res/layout/fragment_add_ons_management.xml b/app/src/main/res/layout/fragment_add_ons_management.xml
index a10bd1110..29f6c69b1 100644
--- a/app/src/main/res/layout/fragment_add_ons_management.xml
+++ b/app/src/main/res/layout/fragment_add_ons_management.xml
@@ -12,6 +12,7 @@
         android:id="@+id/add_ons_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="2dp"
         tools:context=".BrowserActivity" />
 
     <include
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 ebe6e1d17..df24ad0ba 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
@@ -6,7 +6,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp"
     android:layout_marginBottom="6dp">
 
     <ScrollView
@@ -16,9 +15,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+            android:orientation="vertical">
 
             <Switch
                 android:id="@+id/enable_switch"