From 58b66f3b7503b0383b0dd55e60d0fed2184e8bbc Mon Sep 17 00:00:00 2001
From: Jagadesh P <jagadeshjai1999@gmail.com>
Date: Tue, 17 Dec 2024 00:20:29 +0530
Subject: [PATCH] [Android][Sync] Fix some minor UI issues as per design and
 remove unnecessary colors entries.

And move |GetBraveSyncServiceURL| and |GetBraveDefaultSyncServiceURL| to brave_sync_service_impl.cc
---
 ...e_sync_advanced_options_dialog_background.xml |  3 ++-
 .../res/drawable/brave_sync_btn_disabled.xml     |  2 +-
 .../drawable/brave_sync_btn_text_selector.xml    |  2 +-
 .../drawable/brave_sync_reset_btn_selector.xml   |  4 ++--
 .../brave_sync_advanced_options_dialog.xml       |  7 +++++--
 android/java/res/values-night/brave_colors.xml   | 13 ++++++-------
 android/java/res/values/brave_colors.xml         |  9 ++++-----
 .../components/sync/service/sync_service_impl.cc | 16 ++++------------
 .../components/sync/service/sync_service_impl.h  | 11 ++++++++---
 .../sync/service/brave_sync_service_impl.cc      | 11 +++++++++++
 .../sync/service/brave_sync_service_impl.h       |  3 +++
 11 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/android/java/res/drawable/brave_sync_advanced_options_dialog_background.xml b/android/java/res/drawable/brave_sync_advanced_options_dialog_background.xml
index 7412d2724aa9..9b7352894ea6 100644
--- a/android/java/res/drawable/brave_sync_advanced_options_dialog_background.xml
+++ b/android/java/res/drawable/brave_sync_advanced_options_dialog_background.xml
@@ -6,6 +6,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/brave_sync_advanced_options_dialog_bg_color" />
+    <solid android:color="@color/schemes_surface_container" />
     <size android:width="320dp" android:height="552dp" />
+    <corners android:radius="28dp" />
 </shape>
diff --git a/android/java/res/drawable/brave_sync_btn_disabled.xml b/android/java/res/drawable/brave_sync_btn_disabled.xml
index e7040f460b3f..cc2156d98eab 100644
--- a/android/java/res/drawable/brave_sync_btn_disabled.xml
+++ b/android/java/res/drawable/brave_sync_btn_disabled.xml
@@ -7,6 +7,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/brave_sync_disabled_button_bg_color" />
+    <solid android:color="@color/leo_color_button_disabled_20" />
     <corners android:radius="12dp" />
 </shape>
diff --git a/android/java/res/drawable/brave_sync_btn_text_selector.xml b/android/java/res/drawable/brave_sync_btn_text_selector.xml
index 8189a3dacf03..c5b33c29e538 100644
--- a/android/java/res/drawable/brave_sync_btn_text_selector.xml
+++ b/android/java/res/drawable/brave_sync_btn_text_selector.xml
@@ -7,5 +7,5 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true" android:color="@color/text_on_primary" />
-    <item android:state_enabled="false" android:color="@color/brave_sync_disabled_button_text_color" />
+    <item android:state_enabled="false" android:color="@color/leo_color_text_disabled_50" />
 </selector>
diff --git a/android/java/res/drawable/brave_sync_reset_btn_selector.xml b/android/java/res/drawable/brave_sync_reset_btn_selector.xml
index eb44078fc141..87a67f52922c 100644
--- a/android/java/res/drawable/brave_sync_reset_btn_selector.xml
+++ b/android/java/res/drawable/brave_sync_reset_btn_selector.xml
@@ -6,6 +6,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="@color/leo_reset_text_color" />
-    <item android:state_enabled="false" android:color="@color/brave_sync_disabled_button_color" />
+    <item android:state_enabled="true" android:color="@color/systemfeedback_error_text" />
+    <item android:state_enabled="false" android:color="@color/leo_color_text_disabled_50" />
 </selector>
diff --git a/android/java/res/layout/brave_sync_advanced_options_dialog.xml b/android/java/res/layout/brave_sync_advanced_options_dialog.xml
index c22b783ea9e6..b9953008d8e2 100644
--- a/android/java/res/layout/brave_sync_advanced_options_dialog.xml
+++ b/android/java/res/layout/brave_sync_advanced_options_dialog.xml
@@ -20,7 +20,8 @@
         android:orientation="vertical"
         android:clipToOutline="true"
         android:paddingHorizontal="24dp"
-        android:paddingVertical="16dp">
+        android:paddingTop="24dp"
+        android:paddingBottom="16dp">
 
         <TextView
             android:id="@+id/advanced_options_title"
@@ -76,7 +77,7 @@
                     android:textColor="@color/schemes_on_surface"
                     android:textSize="16sp"
                     android:autofillHints="url"
-                    android:textColorHint="@color/brave_sync_url_disabled_text_color" />
+                    android:textColorHint="@color/leo_color_text_tertiary" />
 
             </com.google.android.material.textfield.TextInputLayout>
         </com.google.android.material.card.MaterialCardView>
@@ -92,6 +93,8 @@
         <android.widget.Button android:id="@+id/brave_sync_save_and_relaunch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="0dp"
             android:text="@string/brave_sync_url_save_and_relaunch"
             android:enabled="false"
             style="@style/BraveSyncButton" />
diff --git a/android/java/res/values-night/brave_colors.xml b/android/java/res/values-night/brave_colors.xml
index 46ad2e7df11d..8a025a298857 100644
--- a/android/java/res/values-night/brave_colors.xml
+++ b/android/java/res/values-night/brave_colors.xml
@@ -37,7 +37,7 @@
 
     <color name="scan_qr_code_text_color">#F0F2FF</color>
     <color name="scan_qr_code_bg_color">#1E2029</color>
-    
+
     <!-- Day/Night brave wallet colors -->
     <color name="brave_wallet_onboarding_item_background_color">#A1ABBA</color>
     <color name="brave_wallet_day_night_toolbar_icon_color">@android:color/white</color>
@@ -90,11 +90,6 @@
     <color name="brave_sync_bg_color">@android:color/transparent</color>
     <color name="brave_sync_border_color">@color/modern_grey_800</color>
     <color name="brave_sync_bg_secondary_color">#212529</color>
-    <color name="brave_sync_advanced_options_dialog_bg_color">#1B1B1F</color>
-    <color name="brave_sync_url_disabled_text_color">#909094</color>
-    <color name="brave_sync_disabled_button_bg_color">#33EBEEF0</color>
-    <color name="brave_sync_disabled_button_text_color">#80EBEEF0</color>
-    <color name="brave_sync_disabled_button_color">#80EBEEF0</color>
 
     <color name="container_background">#0d1214</color>
     <color name="divider_interactive">#545ff8</color>
@@ -116,7 +111,7 @@
 
     <color name="shield_toggle_button_tint">#F0F2FF</color>
     <color name="shield_toggle_bg_color">#1E2029</color>
-    
+
     <color name="shield_thank_you_icon_color">#F0F2FF</color>
 
     <color name="filter_title_color">#EDEEF1</color>
@@ -278,9 +273,13 @@
     <color name="schemes_on_surface_variant">#c7c7cc</color>
     <color name="schemes_outline_variant">#3b3b3f</color>
     <color name="schemes_primary">#c1c4ff</color>
+    <color name="schemes_surface_container">#1b1b1f</color>
     <color name="schemes_surface_container_highest">#303034</color>
     <color name="text_interactive">#7c91ff</color>
     <color name="leo_color_text_interactive">#C1C4FF</color>
+    <color name="leo_color_text_tertiary">#909094</color>
+    <color name="leo_color_button_disabled_20">#33EBEEF0</color>
+    <color name="leo_color_text_disabled_50">#80EBEEF0</color>
 
     <color name="open_yt_dialog_bg">#000000</color>
 </resources>
diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml
index 04a3009a18bf..88f7943b294a 100644
--- a/android/java/res/values/brave_colors.xml
+++ b/android/java/res/values/brave_colors.xml
@@ -113,11 +113,6 @@
     <color name="brave_sync_main_button_color">@color/button_background</color>
     <color name="brave_sync_copy_words_text_color">@color/text_secondary</color>
     <color name="brave_sync_btn_transparent_text_color">@color/leo_color_text_interactive</color>
-    <color name="brave_sync_advanced_options_dialog_bg_color">#F0F0F4</color>
-    <color name="brave_sync_url_disabled_text_color">#76767A</color>
-    <color name="brave_sync_disabled_button_bg_color">#3346464A</color>
-    <color name="brave_sync_disabled_button_text_color">#8021272A</color>
-    <color name="brave_sync_disabled_button_color">#8021272A</color>
 
     <!-- Sync informer icon colors -->
     <color name="brave_informer_dark_theme_icon_color">@color/baseline_neutral_90</color>
@@ -431,8 +426,12 @@
     <color name="schemes_on_surface_variant">#46464a</color>
     <color name="schemes_outline_variant">#e3e3e8</color>
     <color name="schemes_primary">#3e37d4</color>
+    <color name="schemes_surface_container">#f0f0f4</color>
     <color name="schemes_surface_container_highest">#c7c7cc</color>
     <color name="leo_color_text_interactive">#3E37D4</color>
+    <color name="leo_color_text_tertiary">#76767A</color>
+    <color name="leo_color_button_disabled_20">#3346464A</color>
+    <color name="leo_color_text_disabled_50">#8021272A</color>
 
     <color name="open_yt_dialog_bg">#FFFFFF</color>
 </resources>
diff --git a/chromium_src/components/sync/service/sync_service_impl.cc b/chromium_src/components/sync/service/sync_service_impl.cc
index 0ef98eca84ca..507d769e7bff 100644
--- a/chromium_src/components/sync/service/sync_service_impl.cc
+++ b/chromium_src/components/sync/service/sync_service_impl.cc
@@ -17,9 +17,10 @@
 
 namespace syncer {
 
-GURL BraveGetSyncServiceURL(const base::CommandLine& command_line,
-                            version_info::Channel channel,
-                            PrefService* prefs) {
+GURL SyncServiceImpl::BraveGetSyncServiceURL(
+    const base::CommandLine& command_line,
+    version_info::Channel channel,
+    PrefService* prefs) {
   if (prefs) {
     std::string value = prefs->GetString(brave_sync::kCustomSyncServiceUrl);
     if (!value.empty()) {
@@ -55,15 +56,6 @@ GURL BraveGetSyncServiceURL(const base::CommandLine& command_line,
   return GetSyncServiceURL(command_line, channel);
 }
 
-GURL SyncServiceImpl::GetBraveSyncServiceURL() {
-  return BraveGetSyncServiceURL(*base::CommandLine::ForCurrentProcess(),
-                                channel_, sync_client_->GetPrefService());
-}
-
-GURL SyncServiceImpl::GetBraveDefaultSyncServiceURL() {
-  return GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(), channel_);
-}
-
 }  // namespace syncer
 
 #define SyncAuthManager BraveSyncAuthManager
diff --git a/chromium_src/components/sync/service/sync_service_impl.h b/chromium_src/components/sync/service/sync_service_impl.h
index 16ee07f81372..1935d7b262bb 100644
--- a/chromium_src/components/sync/service/sync_service_impl.h
+++ b/chromium_src/components/sync/service/sync_service_impl.h
@@ -9,10 +9,15 @@
 #include "base/gtest_prod_util.h"
 #include "components/signin/public/identity_manager/identity_manager.h"
 
+namespace base {
+class CommandLine;
+}
+
 #define BRAVE_SYNC_SERVICE_IMPL_H_                                             \
- public:                                                                       \
-  GURL GetBraveSyncServiceURL();                                               \
-  GURL GetBraveDefaultSyncServiceURL();                                        \
+ protected:                                                                    \
+  static GURL BraveGetSyncServiceURL(const base::CommandLine& command_line,    \
+                                     version_info::Channel channel,            \
+                                     PrefService* prefs);                      \
                                                                                \
  private:                                                                      \
   friend class BraveSyncServiceImpl;                                           \
diff --git a/components/sync/service/brave_sync_service_impl.cc b/components/sync/service/brave_sync_service_impl.cc
index fdacf1cdac9f..88b560a46c96 100644
--- a/components/sync/service/brave_sync_service_impl.cc
+++ b/components/sync/service/brave_sync_service_impl.cc
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/auto_reset.h"
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_functions.h"
 #include "base/strings/string_util.h"
@@ -19,6 +20,7 @@
 #include "brave/components/sync/service/sync_service_impl_delegate.h"
 #include "build/build_config.h"
 #include "components/prefs/pref_service.h"
+#include "components/sync/base/sync_util.h"
 #include "components/sync/engine/sync_protocol_error.h"
 #include "components/sync/model/type_entities_count.h"
 
@@ -439,4 +441,13 @@ bool BraveSyncServiceImpl::SetCustomSyncServiceURL(
   return false;
 }
 
+GURL BraveSyncServiceImpl::GetBraveSyncServiceURL() {
+  return BraveGetSyncServiceURL(*base::CommandLine::ForCurrentProcess(),
+                                channel_, sync_client_->GetPrefService());
+}
+
+GURL BraveSyncServiceImpl::GetBraveDefaultSyncServiceURL() {
+  return GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(), channel_);
+}
+
 }  // namespace syncer
diff --git a/components/sync/service/brave_sync_service_impl.h b/components/sync/service/brave_sync_service_impl.h
index a7b0622fe5b4..9db9e59c22de 100644
--- a/components/sync/service/brave_sync_service_impl.h
+++ b/components/sync/service/brave_sync_service_impl.h
@@ -76,6 +76,9 @@ class BraveSyncServiceImpl : public SyncServiceImpl {
   std::string GetCustomSyncServiceURL();
   bool SetCustomSyncServiceURL(std::string custom_sync_url);
 
+  GURL GetBraveSyncServiceURL();
+  GURL GetBraveDefaultSyncServiceURL();
+
  private:
   friend class BraveSyncServiceImplGACookiesTest;
   friend class BraveSyncServiceImplTest;