From 46af52d254d0aa2f819969556322a9e99acd2a9c Mon Sep 17 00:00:00 2001
From: rxumoz <rxu@mozilla.com>
Date: Sat, 27 Mar 2021 00:18:46 +0800
Subject: [PATCH] Update top sites to add PDD for MozillaOnline builds (#18615)

---
 .../java/org/mozilla/fenix/components/Core.kt   |   7 +++++++
 .../topsites/TopSiteItemViewHolder.kt           |   3 +++
 .../org/mozilla/fenix/settings/SupportUtils.kt  |   2 ++
 app/src/main/res/drawable/ic_pdd.png            | Bin 0 -> 13419 bytes
 .../res/values-zh-rCN/mozonline_strings.xml     |  10 +++++++++-
 app/src/main/res/values-zh-rCN/strings.xml      |   4 ----
 app/src/main/res/values/mozonline_strings.xml   |  10 +++++++++-
 app/src/main/res/values/strings.xml             |   4 ----
 8 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_pdd.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 a560f1288..55713bcdf 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -335,6 +335,13 @@ class Core(
                             SupportUtils.JD_URL
                         )
                     )
+
+                    defaultTopSites.add(
+                        Pair(
+                            context.getString(R.string.default_top_site_pdd),
+                            SupportUtils.PDD_URL
+                        )
+                    )
                 } else {
                     defaultTopSites.add(
                         Pair(
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
index cb18fc20c..5ee55eb98 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSiteItemViewHolder.kt
@@ -80,6 +80,9 @@ class TopSiteItemViewHolder(
             SupportUtils.JD_URL -> {
                 favicon_image.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_jd))
             }
+            SupportUtils.PDD_URL -> {
+                favicon_image.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_pdd))
+            }
             else -> {
                 itemView.context.components.core.icons.loadIntoView(favicon_image, 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 7a7f3634d..5c6681103 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -32,6 +32,8 @@ object SupportUtils {
             "?e=&p=AyIGZRprFDJWWA1FBCVbV0IUWVALHFRBEwQAQB1AWQkFVUVXfFkAF14lRFRbJXstVWR3WQ1rJ08AZnhS" +
             "HDJBYh4LZR9eEAMUBlccWCUBEQZRGFoXCxc3ZRteJUl8BmUZWhQ" +
             "AEwdRGF0cMhIAVB5ZFAETBVAaXRwyFQdcKydLSUpaCEtYFAIXN2UrWCUyIgdVK1slXVZaCCtZFAMWDg%3D%3D"
+    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 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_pdd.png b/app/src/main/res/drawable/ic_pdd.png
new file mode 100644
index 0000000000000000000000000000000000000000..c96a7c5781db6ae76ff6846cb032e3161a48c800
GIT binary patch
literal 13419
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-zh-rCN/mozonline_strings.xml b/app/src/main/res/values-zh-rCN/mozonline_strings.xml
index d09a3e0b9..4a9cdea12 100644
--- a/app/src/main/res/values-zh-rCN/mozonline_strings.xml
+++ b/app/src/main/res/values-zh-rCN/mozonline_strings.xml
@@ -19,4 +19,12 @@
     <string name="privacy_notice_positive_button">同意并继续</string>
     <!-- Privacy Notice neutral button-->
     <string name="privacy_notice_neutral_button">退出应用</string>
-</resources>
\ No newline at end of file
+
+    <!-- Topsites-->
+    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
+    <string name="default_top_site_baidu">百度</string>
+    <!-- Default title for pinned JD top site that links to JD home page  -->
+    <string name="default_top_site_jd">京东</string>
+    <!-- Default title for pinned JD top site that links to PDD home page  -->
+    <string name="default_top_site_pdd">拼多多</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 21d9f1b27..e605f3ed4 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -23,10 +23,6 @@
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">您的隐私标签页将显示于此。</string>
 
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">百度</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">京东</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">打开了 1 个标签页，点击即可切换。</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->
diff --git a/app/src/main/res/values/mozonline_strings.xml b/app/src/main/res/values/mozonline_strings.xml
index 89c9fbc4c..1ca8fbf61 100644
--- a/app/src/main/res/values/mozonline_strings.xml
+++ b/app/src/main/res/values/mozonline_strings.xml
@@ -19,4 +19,12 @@
     <string name="privacy_notice_positive_button">Agree and Continue</string>
     <!-- Privacy Notice neutral button-->
     <string name="privacy_notice_neutral_button">Exit the App</string>
-</resources>
\ No newline at end of file
+
+    <!-- Topsites-->
+    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
+    <string name="default_top_site_baidu">Baidu</string>
+    <!-- Default title for pinned JD top site that links to JD home page  -->
+    <string name="default_top_site_jd">JD</string>
+    <!-- Default title for pinned JD top site that links to PDD home page  -->
+    <string name="default_top_site_pdd">PDD</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 48986c892..51b2a06f9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,10 +19,6 @@
     <string name="no_open_tabs_description">Your open tabs will be shown here.</string>
     <!-- No Private Tabs Message Description -->
     <string name="no_private_tabs_description">Your private tabs will be shown here.</string>
-    <!-- Default title for pinned Baidu top site that links to Baidu home page  -->
-    <string name="default_top_site_baidu">Baidu</string>
-    <!-- Default title for pinned JD top site that links to JD home page  -->
-    <string name="default_top_site_jd">JD</string>
     <!-- Message announced to the user when tab tray is selected with 1 tab -->
     <string name="open_tab_tray_single">1 open tab. Tap to switch tabs.</string>
     <!-- Message announced to the user when tab tray is selected with 0 or 2+ tabs -->