From 7d31a49eef8de2d3f39586016d263d726b6b1d23 Mon Sep 17 00:00:00 2001
From: aayushimathur6 <92685651+aayushimathur6@users.noreply.github.com>
Date: Sat, 28 May 2022 02:00:41 +0530
Subject: [PATCH] Fixes#4184: Add dark mode support to
 ThirdPartyDependencyListActivity, LicenseListActivity and
 LicenseTextViewerActivity (#4289)

* removed Extra line

* Added dark mode support to ThirdPartyDependencyListActivity, LicenseListActivity and LicenseTextViewerActivity

* Added dark mode support to ThirdPartyDependencyListActivity, LicenseListActivity and LicenseTextViewerActivity

* updated the error in license text viewer activity

* updated the error in license text viewer activity

* removed the spaces in components file

* again added all components colors as misplaced due to merged conflicts

* updating

* added the divider lines

* added the divider lines in license item

* Updated with recent changes

* Correctly added the names for all the activity files dark mode colors

* added the space line
---
 .../general_item_background_border_black.xml        |  8 ++++++++
 app/src/main/res/layout/license_item.xml            |  5 +++--
 app/src/main/res/layout/license_list_fragment.xml   |  4 ++--
 .../res/layout/license_text_viewer_fragment.xml     |  4 +++-
 .../main/res/layout/third_party_dependency_item.xml |  5 +++--
 .../layout/third_party_dependency_list_fragment.xml |  4 ++--
 app/src/main/res/values/component_colors.xml        | 13 +++++++++++++
 7 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/drawable/general_item_background_border_black.xml

diff --git a/app/src/main/res/drawable/general_item_background_border_black.xml b/app/src/main/res/drawable/general_item_background_border_black.xml
new file mode 100644
index 00000000000..c9f61d667b0
--- /dev/null
+++ b/app/src/main/res/drawable/general_item_background_border_black.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle">
+  <solid android:color="@color/component_color_general_item_background_solid_color" />
+  <stroke
+    android:width="1dp"
+    android:color="@color/component_color_general_item_background_stroke_color" />
+</shape>
diff --git a/app/src/main/res/layout/license_item.xml b/app/src/main/res/layout/license_item.xml
index 93d4d180ab2..e88acc396bf 100644
--- a/app/src/main/res/layout/license_item.xml
+++ b/app/src/main/res/layout/license_item.xml
@@ -14,19 +14,20 @@
   <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/color_def_white">
+    android:background="@drawable/general_item_background_border_black">
 
     <TextView
       android:id="@+id/license_name_text_view"
       style="@style/Subtitle2ViewStart"
       android:layout_width="match_parent"
-      android:background="@drawable/general_item_background_border"
+      android:background="@drawable/general_item_background_border_black"
       android:fontFamily="sans-serif-smallcaps"
       android:onClick="@{() -> viewModel.clickOnLicenseItem()}"
       android:paddingStart="16dp"
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
+      android:textColor="@color/component_color_license_list_activity_license_name_text_view_color"
       android:text="@{viewModel.licenseName}"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/license_list_fragment.xml b/app/src/main/res/layout/license_list_fragment.xml
index 4a2a12c69eb..e6f483ea436 100644
--- a/app/src/main/res/layout/license_list_fragment.xml
+++ b/app/src/main/res/layout/license_list_fragment.xml
@@ -12,7 +12,7 @@
   <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/general_navigation_background"
+    android:background="@color/component_color_license_list_activity_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingBottom="@dimen/faq_list_scroll_padding_bottom"
@@ -25,7 +25,7 @@
       android:id="@+id/license_list_fragment_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/color_def_white"
+      android:background="@color/component_color_license_list_activity_license_name_background_color"
       android:clipToPadding="false"
       android:nestedScrollingEnabled="false"
       app:list="@{viewModel.licenseItemList}" />
diff --git a/app/src/main/res/layout/license_text_viewer_fragment.xml b/app/src/main/res/layout/license_text_viewer_fragment.xml
index 9bfba68fe36..179c968acb1 100644
--- a/app/src/main/res/layout/license_text_viewer_fragment.xml
+++ b/app/src/main/res/layout/license_text_viewer_fragment.xml
@@ -11,15 +11,17 @@
   <ScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_def_white">
+    android:background="@color/component_color_license_text_viewer_activity_background_color">
 
     <TextView
       android:id="@+id/copyright_license_text_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:background="@drawable/general_item_background_border_black"
       android:layout_gravity="center_horizontal"
       android:autoLink="web"
       android:padding="32dp"
+      android:textColor="@color/component_color_license_text_viewer_activity_text_color"
       android:text="@{viewModel.licenseText}" />
   </ScrollView>
 </layout>
diff --git a/app/src/main/res/layout/third_party_dependency_item.xml b/app/src/main/res/layout/third_party_dependency_item.xml
index 6f73ef969f3..e267fd897d6 100644
--- a/app/src/main/res/layout/third_party_dependency_item.xml
+++ b/app/src/main/res/layout/third_party_dependency_item.xml
@@ -19,7 +19,7 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@drawable/general_item_background_border"
+      android:background="@drawable/general_item_background_border_black"
       android:onClick="@{(v) -> viewModel.clickOnThirdPartyDependencyItem()}"
       android:orientation="vertical"
       app:layout_constraintStart_toStartOf="parent"
@@ -34,6 +34,7 @@
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:paddingBottom="4dp"
+        android:textColor="@color/component_color_third_party_dependency_list_activity_dependency_name_text_view_color"
         android:text="@{viewModel.dependencyName}" />
 
       <TextView
@@ -45,8 +46,8 @@
         android:paddingTop="4dp"
         android:paddingEnd="16dp"
         android:paddingBottom="16dp"
-        android:textColor="@color/color_def_accessible_grey"
         android:text="@{viewModel.dependencyVersion}"
+        android:textColor="@color/component_color_third_party_dependency_list_activity_dependency_version_text_color"
         android:textSize="12sp" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/third_party_dependency_list_fragment.xml b/app/src/main/res/layout/third_party_dependency_list_fragment.xml
index 58885869944..d4c864c7b5e 100644
--- a/app/src/main/res/layout/third_party_dependency_list_fragment.xml
+++ b/app/src/main/res/layout/third_party_dependency_list_fragment.xml
@@ -12,7 +12,7 @@
   <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/general_navigation_background"
+    android:background="@color/component_color_third_party_dependency_list_activity_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
     android:paddingBottom="@dimen/faq_list_scroll_padding_bottom"
@@ -25,7 +25,7 @@
       android:id="@+id/third_party_dependency_list_fragment_recycler_view"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@color/color_def_white"
+      android:background="@color/component_color_third_party_dependency_list_activity_background_color"
       android:clipToPadding="false"
       android:nestedScrollingEnabled="false"
       app:list="@{viewModel.thirdPartyDependencyItemList}" />
diff --git a/app/src/main/res/values/component_colors.xml b/app/src/main/res/values/component_colors.xml
index f6fe9c0e5fd..483639ceaa9 100644
--- a/app/src/main/res/values/component_colors.xml
+++ b/app/src/main/res/values/component_colors.xml
@@ -14,6 +14,8 @@
   <color name="component_color_shared_input_interaction_edit_text_text_color">@color/color_palette_primary_text_color</color>
   <color name="component_color_shared_text_input_layout_background_color">@color/color_palette_text_input_background_color</color>
   <color name="component_color_shared_text_input_layout_error_color">@color/color_palette_error_color</color>
+  <color name="component_color_general_item_background_solid_color">@color/color_palette_container_background_color</color>
+  <color name="component_color_general_item_background_stroke_color">@color/color_palette_dark_background_color</color>
   <!-- Admin Auth Activity -->
   <color name="component_color_admin_auth_secondary_text_color">@color/color_palette_description_text_color</color>
   <color name="component_color_admin_auth_layout_background_color">@color/color_palette_background_color</color>
@@ -83,4 +85,15 @@
   <color name="component_color_start_over_button_text_color">@color/color_palette_secondary_toolbar_color</color>
   <color name="component_color_start_over_button_stroke_color">@color/color_palette_secondary_toolbar_color</color>
   <color name="component_color_start_over_button_drawable_tint_color">@color/color_palette_secondary_toolbar_color</color>
+  <!-- Third Party Dependency List Activity -->
+  <color name="component_color_third_party_dependency_list_activity_background_color">@color/color_palette_dark_background_color</color>
+  <color name="component_color_third_party_dependency_list_activity_dependency_name_text_view_color">@color/color_palette_dark_text_color</color>
+  <color name="component_color_third_party_dependency_list_activity_dependency_version_text_color">@color/color_palette_primary_text_color</color>
+  <!-- License List Activity -->
+  <color name="component_color_license_list_activity_background_color">@color/color_palette_dark_background_color</color>
+  <color name="component_color_license_list_activity_license_name_background_color">@color/color_palette_container_background_color</color>
+  <color name="component_color_license_list_activity_license_name_text_view_color">@color/color_palette_dark_text_color</color>
+  <!-- License Text Viewer Activity -->
+  <color name="component_color_license_text_viewer_activity_background_color">@color/color_palette_dark_background_color</color>
+  <color name="component_color_license_text_viewer_activity_text_color">@color/color_palette_description_text_color</color>
 </resources>