blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For issue #8520: Improve add-ons UI

master
Arturo Mejia 2020-04-09 15:56:42 -04:00
parent b8fba63be4
commit eace991859
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,11 @@
package org.mozilla.fenix.addons package org.mozilla.fenix.addons
import android.content.Context
import android.os.Bundle import android.os.Bundle
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
import androidx.core.content.res.ResourcesCompat
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
@ -105,14 +107,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
requireContext().components.addonCollectionProvider, requireContext().components.addonCollectionProvider,
this@AddonsManagementFragment, this@AddonsManagementFragment,
addons, addons,
style = AddonsManagerAdapter.Style( style = createAddonStyle(requireContext())
ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()),
ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()),
ThemeManager.resolveAttribute(
R.attr.secondaryText,
requireContext()
)
)
) )
isInstallationInProgress = false isInstallationInProgress = false
view.add_ons_progress_bar.isVisible = 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) { private fun showInstalledAddonDetailsFragment(addon: Addon) {
val directions = val directions =
AddonsManagementFragmentDirections.actionAddonsManagementFragmentToInstalledAddonDetails( AddonsManagementFragmentDirections.actionAddonsManagementFragmentToInstalledAddonDetails(

1
app/src/main/res/layout/fragment_add_ons_management.xml
View File

@ -12,6 +12,7 @@
android:id="@+id/add_ons_list" android:id="@+id/add_ons_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="2dp"
tools:context=".BrowserActivity" /> tools:context=".BrowserActivity" />
<include <include

5
app/src/main/res/layout/fragment_installed_add_on_details.xml
View File

@ -6,7 +6,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="6dp"> android:layout_marginBottom="6dp">
<ScrollView <ScrollView
@ -16,9 +15,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<Switch <Switch
android:id="@+id/enable_switch" android:id="@+id/enable_switch"