From cf00f77585625ff0591075783fc62d30f88814eb Mon Sep 17 00:00:00 2001
From: A117870935 <surinder.kumar@t-systems.com>
Date: Mon, 15 May 2023 18:27:42 +0530
Subject: [PATCH] Code refactoring.

---
 .../java/com/owncloud/android/MainApp.java    |  2 +-
 .../res/color/dialog_positive_btn_color.xml   |  2 -
 app/src/main/res/values-de/strings.xml        |  2 +
 app/src/main/res/values-night/colors.xml      | 67 ++++++++++++-
 app/src/main/res/values/colors.xml            | 94 ++++++++++++++++++-
 app/src/main/res/values/dimens.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/values/styles.xml            |  4 +-
 8 files changed, 165 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
index 9585a5c3fea6..b1f2b7581fab 100644
--- a/app/src/main/java/com/owncloud/android/MainApp.java
+++ b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -284,7 +284,7 @@ public static AppComponent getAppComponent() {
     @SuppressFBWarnings("ST")
     @Override
     public void onCreate() {
-        //enableStrictMode();
+        enableStrictMode();
 
         viewThemeUtils = viewThemeUtilsProvider.get();
 
diff --git a/app/src/main/res/color/dialog_positive_btn_color.xml b/app/src/main/res/color/dialog_positive_btn_color.xml
index 061efcc9d9e4..5913e0da1a1d 100644
--- a/app/src/main/res/color/dialog_positive_btn_color.xml
+++ b/app/src/main/res/color/dialog_positive_btn_color.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item android:color="@color/primary" android:state_enabled="true" />
     <item android:color="@color/grey_30" />
-
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a0f6adb420fd..8e59a39826c8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -975,6 +975,7 @@
         <item quantity="one">%d ausgewählt</item>
         <item quantity="other">%d ausgewählt</item>
     </plurals>
+    <!-- conflict dialog strings start -->
     <string name="conflict_replace">Ersetzen</string>
     <string name="conflict_replace_all">Alle ersetzen</string>
     <string name="conflict_keep_both">Beide behalten</string>
@@ -985,4 +986,5 @@
     <string name="conflict_dialog_title_multiple">%d Dateikonflikte</string>
     <string name="conflict_dialog_message">%1$s ist im Zielordner bereits vorhanden. Möchten Sie die bestehende Datei behalten oder überschreiben?</string>
     <string name="conflict_dialog_message_multiple">Die Dateien sind im Zielordner bereits vorhanden. Möchten Sie die bestehenden Dateien behalten oder überschreiben?</string>
+    <!-- conflict dialog strings end -->
 </resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 0ec6735d4cc8..88a29668c4cd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -31,7 +31,6 @@
     <color name="bg_default">#121212</color>
     <color name="primary_button_text_color">#000000</color>
     <color name="grey_200">#818181</color>
-    <color name="alert_txt_color">@color/grey_0</color>
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
 
@@ -49,4 +48,70 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
+
+    <!-- NMC Colors -->
+    <color name="icon_color">#FFFFFF</color>
+    <color name="sort_text_color">@color/grey_30</color>
+    <color name="list_icon_color">@color/grey_30</color>
+    <color name="warning_icon_color">#CCCCCC</color>
+    <color name="divider_color">@color/grey_70</color>
+    <color name="spinner_bg_color">@color/grey_80</color>
+    <color name="refresh_layout_bg_color">#2D2D2D</color>
+    <color name="primary_button_disabled_color">@color/grey_70</color>
+    <color name="toolbar_divider_color">@color/grey_70</color>
+
+    <!-- Snackbar Colors -->
+    <color name="snackbar_bg_color">@color/grey_80</color>
+    <color name="snackbar_txt_color">@color/grey_0</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">@color/grey_80</color>
+    <color name="alert_txt_color">@color/grey_0</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">@color/grey_80</color>
+    <color name="bottom_sheet_icon_color">@color/grey_30</color>
+    <color name="bottom_sheet_txt_color">@color/grey_0</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">@color/grey_80</color>
+    <color name="popup_menu_txt_color">@color/grey_0</color>
+    <color name="overflow_bg_color">@color/grey_80</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_disabled">@color/grey_70</color>
+    <color name="switch_track_checked_disabled">@color/grey_60</color>
+    <color name="switch_thumb_unchecked_disabled">@color/grey_70</color>
+    <color name="switch_track_unchecked_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#FFFFFF</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">@color/grey_0</color>
+    <color name="share_search_border_color">@color/grey_0</color>
+    <color name="share_btn_txt_color">@color/grey_0</color>
+    <color name="share_list_item_txt_color">@color/grey_0</color>
+    <color name="share_disabled_txt_color">@color/grey_60</color>
+    <color name="share_txt_color">@color/grey_0</color>
+    <color name="share_et_divider">#FFFFFF</color>
+
+    <!-- Scan Colors -->
+    <color name="scan_doc_bg_color">#121212</color>
+    <color name="scan_text_color">@color/grey_0</color>
+    <color name="scan_edit_bottom_color">@color/grey_80</color>
+    <color name="scan_count_bg_color">@color/grey_80</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f036313412d0..1ddf1a93ca08 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,9 +39,7 @@
     <color name="actionbar_shadow">#222222</color>
     <color name="grey_200">#EEEEEE</color>
     <color name="grey_400">#BDBDBD</color>
-    <color name="grey_0">#F2F2F2</color>
     <color name="grey_600">#666666</color>
-    <color name="grey_30">#B2B2B2</color>
 
     <!-- standard material color definitions -->
 
@@ -59,7 +57,6 @@
     <color name="secondary_button_background_color">#D6D7D7</color>
     <color name="secondary_button_text_color">#000000</color>
     <color name="nc_grey">#ededed</color>
-    <color name="alert_txt_color">#191919</color>
     <color name="icon_on_nc_grey">#000000</color>
 
     <color name="process_dialog_background">#ffffff</color>
@@ -84,4 +81,95 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
+
+    <!--  NMC Colors  -->
+    <color name="icon_color">#191919</color>
+    <color name="sort_text_color">@color/primary</color>
+    <color name="list_icon_color">#191919</color>
+    <color name="warning_icon_color">#191919</color>
+    <color name="divider_color">@color/grey_30</color>
+    <color name="spinner_bg_color">@android:color/white</color>
+    <color name="refresh_layout_bg_color">#FFFFFF</color>
+    <color name="primary_button_disabled_color">@color/grey_0</color>
+    <color name="toolbar_divider_color">#CCCCCC</color>
+    <color name="et_highlight_color">#77c4ff</color>
+    <color name="white_trans_70">#B3FFFFFF</color>
+    <color name="progress_bar_background">@color/grey_10</color>
+
+    <!-- Grey Colors -->
+    <color name="dark_grey">#101010</color>
+    <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
+    <color name="grey_30">#B2B2B2</color>
+    <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
+    <color name="grey_80">#333333</color>
+
+    <!-- Snackbar Colors  -->
+    <color name="snackbar_bg_color">@color/design_snackbar_background_color</color>
+    <color name="snackbar_txt_color">@color/white</color>
+
+    <!-- Alert Dialog Colors -->
+    <color name="alert_bg_color">#FFFFFF</color>
+    <color name="alert_txt_color">#191919</color>
+
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_0</color>
+    <color name="nav_txt_unselected_color">#191919</color>
+    <color name="nav_txt_selected_color">@color/primary</color>
+    <color name="nav_icon_unselected_color">#191919</color>
+    <color name="nav_icon_selected_color">@color/primary</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/white</color>
+    <color name="drawer_quota_txt_color">#191919</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
+    <color name="bottom_sheet_txt_color">#191919</color>
+
+    <!-- Popup Menu Colors -->
+    <color name="popup_menu_bg">#FFFFFF</color>
+    <color name="popup_menu_txt_color">#191919</color>
+    <color name="overflow_bg_color">#FFFFFF</color>
+
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_checked_disabled">@color/grey_0</color>
+    <color name="switch_track_checked_disabled">@color/grey_0</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_unchecked_disabled">@color/grey_0</color>
+    <color name="switch_track_unchecked_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
+    <!-- Share Colors -->
+    <color name="share_title_txt_color">#191919</color>
+    <color name="share_subtitle_txt_color">@color/grey_30</color>
+    <color name="share_info_txt_color">#191919</color>
+    <color name="share_search_border_color">#191919</color>
+    <color name="share_btn_txt_color">#191919</color>
+    <color name="share_list_item_txt_color">#191919</color>
+    <color name="share_disabled_txt_color">@color/grey_30</color>
+    <color name="share_txt_color">#191919</color>
+    <color name="share_et_divider">#000000</color>
+    <color name="share_warning_txt_color">#191919</color>
+    <color name="sharing_warning_bg_color">#F6E5EB</color>
+    <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
+    <color name="shared_with_me_color">#0099ff</color>
+
+    <!--  Scan Colors  -->
+    <color name="scan_doc_bg_color">@color/grey_0</color>
+    <color name="scan_text_color">#191919</color>
+    <color name="scan_edit_bottom_color">@color/grey_0</color>
+    <color name="scan_count_bg_color">@color/grey_30</color>
+    <color name="neptune">#77b6bb</color>
+    <color name="neptune_50">#5077b6bb</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d976f96e19d6..7c23544141a7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,4 +31,4 @@
     <dimen name="notification_row_item_height">145dp</dimen>
     <dimen name="button_stroke_width">1dp</dimen>
     <dimen name="txt_size_13sp">13sp</dimen>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b69fcad68a2..e7a403fd36de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1078,6 +1078,7 @@
     <string name="document_scan_export_dialog_images">Multiple images</string>
     <string name="download_cannot_create_file">Cannot create local file</string>
     <string name="download_download_invalid_local_file_name">Invalid filename for local file</string>
+    <!-- conflict dialog strings start -->
     <string name="conflict_replace">Replace</string>
     <string name="conflict_replace_all">Replace all</string>
     <string name="conflict_keep_both">Keep both</string>
@@ -1089,6 +1090,7 @@
     <string name="conflict_dialog_message">%1$s already exists in this location. Do you want to replace it with the
         file you are moving?</string>
     <string name="conflict_dialog_message_multiple">The files already exist in this location. Do you want to replace them with the files you are moving?</string>
+    <!-- conflict dialog strings end -->
     <string name="drawer_item_groupfolders">Groupfolders</string>
     <string name="tags_more" translatable="false">+%1$d</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2b800145229c..2d03c476d83b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -486,11 +486,11 @@
         <item name="android:textColor">@color/white</item>
     </style>
 
-    <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+    <style name="PositiveButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
         <item name="android:textColor">@color/dialog_positive_btn_color</item>
     </style>
 
-    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+    <style name="NegativeButtonStyle" parent="Widget.Material3.Button.TextButton.Dialog">
         <item name="android:textColor">@color/alert_txt_color</item>
     </style>