From 42d6c4b5e0c1176319e2321edfbb4c25e6eb15b4 Mon Sep 17 00:00:00 2001 From: akliuxingyuan Date: Thu, 19 Jan 2023 18:40:54 +0800 Subject: [PATCH] fix build --- .../components/PagedAddonInstallationDialogFragment.kt | 8 +++++--- .../iceraven/components/PagedAddonsManagerAdapter.kt | 3 ++- app/src/main/java/org/mozilla/fenix/utils/Settings.kt | 10 ---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt index 7c611034a..a802c0e8b 100644 --- a/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt +++ b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonInstallationDialogFragment.kt @@ -33,11 +33,13 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import mozilla.components.feature.addons.Addon import mozilla.components.feature.addons.R +import mozilla.components.ui.icons.R as iconsR import mozilla.components.feature.addons.databinding.MozacFeatureAddonsFragmentDialogAddonInstalledBinding import mozilla.components.feature.addons.ui.translateName import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.ktx.android.content.appName import mozilla.components.support.ktx.android.content.res.resolveAttribute +import mozilla.components.support.utils.ext.getParcelableCompat import java.io.IOException @VisibleForTesting internal const val KEY_INSTALLED_ADDON = "KEY_ADDON" @@ -76,7 +78,7 @@ class PagedAddonInstallationDialogFragment : AppCompatDialogFragment() { private val safeArguments get() = requireNotNull(arguments) - internal val addon get() = requireNotNull(safeArguments.getParcelable(KEY_ADDON)) + internal val addon get() = requireNotNull(safeArguments.getParcelableCompat(KEY_ADDON, Addon::class.java)) private var allowPrivateBrowsing: Boolean = false internal val confirmButtonRadius @@ -167,7 +169,7 @@ class PagedAddonInstallationDialogFragment : AppCompatDialogFragment() { requireContext().appName, ) - val icon = safeArguments.getParcelable(KEY_ICON) + val icon = safeArguments.getParcelableCompat(KEY_ICON, Bitmap::class.java) if (icon != null) { binding.icon.setImageDrawable(BitmapDrawable(resources, icon)) } else { @@ -229,7 +231,7 @@ class PagedAddonInstallationDialogFragment : AppCompatDialogFragment() { val att = context.theme.resolveAttribute(android.R.attr.textColorPrimary) iconView.setColorFilter(ContextCompat.getColor(context, att)) iconView.setImageDrawable( - ContextCompat.getDrawable(context, R.drawable.mozac_ic_extensions), + ContextCompat.getDrawable(context, iconsR.drawable.mozac_ic_extensions), ) } logger.error("Attempt to fetch the ${addon.id} icon failed", e) diff --git a/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt index 1acd66bad..6a8530b91 100644 --- a/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt +++ b/app/src/main/java/io/github/forkmaintainers/iceraven/components/PagedAddonsManagerAdapter.kt @@ -30,6 +30,7 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.launch import mozilla.components.feature.addons.Addon import mozilla.components.feature.addons.R +import mozilla.components.ui.icons.R as iconsR import mozilla.components.feature.addons.ui.AddonsManagerAdapterDelegate import mozilla.components.feature.addons.ui.CustomViewHolder import mozilla.components.feature.addons.ui.CustomViewHolder.AddonViewHolder @@ -269,7 +270,7 @@ class PagedAddonsManagerAdapter( val context = iconView.context val att = context.theme.resolveAttribute(android.R.attr.textColorPrimary) iconView.setColorFilter(ContextCompat.getColor(context, att)) - iconView.setImageDrawable(context.getDrawable(R.drawable.mozac_ic_extensions)) + iconView.setImageDrawable(context.getDrawable(iconsR.drawable.mozac_ic_extensions)) } logger.error("Attempt to fetch the ${addon.id} icon failed", e) } diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 36c5f366d..d0c884794 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -1506,14 +1506,4 @@ class Settings(private val appContext: Context) : PreferencesHolder { key = appContext.getPreferenceKey(R.string.pref_key_growth_ad_click_sent), default = false, ) - - var firstWeekSeriesGrowthSent by booleanPreference( - key = appContext.getPreferenceKey(R.string.pref_key_growth_first_week_series_sent), - default = false, - ) - - var firstWeekDaysOfUseGrowthData by stringSetPreference( - key = appContext.getPreferenceKey(R.string.pref_key_growth_first_week_days_of_use), - default = setOf(), - ) }