From de1e52a2344257dd2a0e1844e8b984f4fc93abf5 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 17 Dec 2021 13:10:44 +0800 Subject: [PATCH] [fenix] Add default topsite MeiTuan for MozillaOnline builds --- .../java/org/mozilla/fenix/components/Core.kt | 7 +++++++ .../fenix/home/topsites/TopSiteItemViewHolder.kt | 3 +++ .../org/mozilla/fenix/settings/SupportUtils.kt | 1 + app/src/main/res/drawable/ic_meituan.png | Bin 0 -> 6170 bytes .../main/res/values-zh-rCN/mozonline_strings.xml | 2 ++ app/src/main/res/values/mozonline_strings.xml | 2 ++ 6 files changed, 15 insertions(+) create mode 100644 app/src/main/res/drawable/ic_meituan.png diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 35761acac3..e7d868be1f 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -365,6 +365,13 @@ class Core( SupportUtils.TC_URL ) ) + + defaultTopSites.add( + Pair( + context.getString(R.string.default_top_site_meituan), + SupportUtils.MEITUAN_URL + ) + ) } else { defaultTopSites.add( Pair( diff --git a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt index 2e2b2b8eb2..775c485c71 100644 --- a/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt @@ -88,6 +88,9 @@ class TopSiteItemViewHolder( SupportUtils.TC_URL -> { binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_tc)) } + SupportUtils.MEITUAN_URL -> { + binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_meituan)) + } else -> { itemView.context.components.core.icons.loadIntoView(binding.faviconImage, topSite.url) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt index 7fffad4984..225cee8148 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -35,6 +35,7 @@ object SupportUtils { const val PDD_URL = "https://mobile.yangkeduo.com/duo_cms_mall.html?pid=13289095_194240604&" + "cpsSign=CM_210309_13289095_194240604_8bcfd56d5db3c43d983014d2658ec26e&duoduo_type=2" const val TC_URL = "https://jumpluna.58.com/i/29HU" + const val MEITUAN_URL = "https://tb.j5k6.com/6ZSOp" const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts" const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts" diff --git a/app/src/main/res/drawable/ic_meituan.png b/app/src/main/res/drawable/ic_meituan.png new file mode 100644 index 0000000000000000000000000000000000000000..29e4437abaf699663331f81f1dffd09a2618479e GIT binary patch literal 6170 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 s_拼多多 58同城 + + 美团 diff --git a/app/src/main/res/values/mozonline_strings.xml b/app/src/main/res/values/mozonline_strings.xml index 5c9b424264..b2c946d4d7 100644 --- a/app/src/main/res/values/mozonline_strings.xml +++ b/app/src/main/res/values/mozonline_strings.xml @@ -30,6 +30,8 @@ PDD 58 + + meituan