From 8c04d41b3bab0a7f8a725cdf94c61e4d12d64e6e Mon Sep 17 00:00:00 2001
From: Mike Scamell <mscamell@duckduckgo.com>
Date: Wed, 27 Nov 2024 16:37:27 +0000
Subject: [PATCH] add DuckDuckGo on Other Platforms item

We had duplicate ic_open_in_24 so I deleted the one in vpn and moved it to common-ui

I'll need it here later for the plugins work
---
 .../src/main/res/drawable/ic_open_in_24.xml        | 14 --------------
 .../main/res/layout/content_settings_new_other.xml |  8 ++++++++
 app/src/main/res/values/strings.xml                |  1 +
 .../src/main/res/drawable/ic_open_in_24.xml        |  2 +-
 4 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml
 rename {network-protection/network-protection-impl => common/common-ui}/src/main/res/drawable/ic_open_in_24.xml (97%)

diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml
deleted file mode 100644
index d1810c757de9..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_open_in_24.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M7,5C5.895,5 5,5.895 5,7V17C5,18.105 5.895,19 7,19H17C18.105,19 19,18.105 19,17V13C19,12.448 19.448,12 20,12C20.552,12 21,12.448 21,13V17C21,19.209 19.209,21 17,21H7C4.791,21 3,19.209 3,17V7C3,4.791 4.791,3 7,3H11C11.552,3 12,3.448 12,4C12,4.552 11.552,5 11,5H7Z"
-      android:fillColor="?attr/daxColorPrimaryIcon"
-      android:fillAlpha="0.84"/>
-  <path
-      android:pathData="M14,4C14,3.448 14.448,3 15,3H20C20.552,3 21,3.448 21,4V9C21,9.552 20.552,10 20,10C19.448,10 19,9.552 19,9V6.414L13.707,11.707C13.317,12.098 12.683,12.098 12.293,11.707C11.902,11.317 11.902,10.683 12.293,10.293L17.586,5H15C14.448,5 14,4.552 14,4Z"
-      android:fillColor="?attr/daxColorPrimaryIcon"
-      android:fillAlpha="0.84"/>
-</vector>
diff --git a/app/src/main/res/layout/content_settings_new_other.xml b/app/src/main/res/layout/content_settings_new_other.xml
index e2d2b3fc5ba8..1bf3fec4d50c 100644
--- a/app/src/main/res/layout/content_settings_new_other.xml
+++ b/app/src/main/res/layout/content_settings_new_other.xml
@@ -40,4 +40,12 @@
         app:primaryText="@string/leaveFeedback"
         app:leadingIcon="@drawable/ic_heart_gray_color_24" />
 
+    <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+        android:id="@+id/ddgOnOtherPlatformsSetting"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:leadingIcon="@drawable/ic_downloads_color_24"
+        app:primaryText="@string/settingsDDGOnOtherPlatforms"
+        app:trailingIcon="@drawable/ic_open_in_24" />
+
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4691f592dc5d..6018634f06fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -165,6 +165,7 @@
     <string name="settingsAddWidget" tools:ignore="MissingTranslation">Add Widget to HomeScreen</string>
     <string name="settingsAddressBarPosition" tools:ignore="MissingTranslation">Set Your Address Bar Position</string>
     <string name="settingsEnableVoiceSearch" tools:ignore="MissingTranslation">Enable Voice Search</string>
+    <string name="settingsDDGOnOtherPlatforms" tools:ignore="MissingTranslation">DuckDuckGo on Other Platforms</string>
 
     <!-- Private Search -->
     <string name="privateSearchActivityTitle">Private Search</string>
diff --git a/network-protection/network-protection-impl/src/main/res/drawable/ic_open_in_24.xml b/common/common-ui/src/main/res/drawable/ic_open_in_24.xml
similarity index 97%
rename from network-protection/network-protection-impl/src/main/res/drawable/ic_open_in_24.xml
rename to common/common-ui/src/main/res/drawable/ic_open_in_24.xml
index 12aa7eb8fadd..d581aac9ffb3 100644
--- a/network-protection/network-protection-impl/src/main/res/drawable/ic_open_in_24.xml
+++ b/common/common-ui/src/main/res/drawable/ic_open_in_24.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2023 DuckDuckGo
+  ~ Copyright (c) 2024 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.