From 9f50bef04f89bb19b5431914bc015cd28588828e Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Fri, 21 Apr 2017 00:56:09 +0530
Subject: [PATCH] More dark more fixes

Fixes some leftover items missed in the previous major update.
* Donate view in AppDetails
* What's new view in AppDetails
* The search view
---
 .../java/org/fdroid/fdroid/views/apps/AppListActivity.java  | 2 ++
 .../main/res/drawable/details_panel_light_background.xml    | 2 +-
 app/src/main/res/layout/app_details2_header.xml             | 2 +-
 app/src/main/res/layout/app_list_item.xml                   | 2 +-
 app/src/main/res/values/attrs.xml                           | 2 ++
 app/src/main/res/values/styles.xml                          | 6 +++++-
 6 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
index 991195d71..8850a675a 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
@@ -18,6 +18,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.Schema;
@@ -35,6 +36,7 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        ((FDroidApp) getApplication()).applyTheme(this);
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_app_list);
diff --git a/app/src/main/res/drawable/details_panel_light_background.xml b/app/src/main/res/drawable/details_panel_light_background.xml
index 8ccc278ab..ad2d047b3 100644
--- a/app/src/main/res/drawable/details_panel_light_background.xml
+++ b/app/src/main/res/drawable/details_panel_light_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="3dp" />
-    <solid android:color="@color/details_panel_light" />
+    <solid android:color="?attr/detailPanel" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 45c8d6301..f45bd2df8 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -173,7 +173,7 @@
             android:paddingBottom="16dp"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
-            android:background="@color/details_panel_light"
+            android:background="?attr/detailPanel"
             tools:text="NEW IN VERSION 1.0.2233\n\nA lot has happened since the last build:\n\n\t• Improved UI\n\t• Bug fixes"
             />
 
diff --git a/app/src/main/res/layout/app_list_item.xml b/app/src/main/res/layout/app_list_item.xml
index a7ff42cde..a88464c45 100644
--- a/app/src/main/res/layout/app_list_item.xml
+++ b/app/src/main/res/layout/app_list_item.xml
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         tools:text="F-Droid Application manager with a long name that will wrap and then ellipsize"
         android:textSize="18sp"
-        android:textColor="#424242"
+        android:textColor="?attr/appListItem"
         android:lines="2"
         android:ellipsize="end"
         app:layout_constraintStart_toEndOf="@+id/icon"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0c2ed749a..4d0afccee 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,5 +8,7 @@
         <attr name="mainTabSwapSplashTint" format="color" />
         <attr name="categoryName" format="color" />
         <attr name="installedApps" format="color" />
+        <attr name="detailPanel" format="color" />
+        <attr name="appListItem" format="color" />
     </declare-styleable>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 99cc251e6..75417081f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,11 +14,13 @@
         <item name="actionBarPopupTheme">@style/AppThemeLight.Toolbar</item>
         <item name="appDetailsBackground">#0c0c0c</item>
         <item name="appDetailsCardBackground">#000000</item>
-        <item name="categoryPreviewAppCardBackground">#000000</item>
+        <item name="categoryPreviewAppCardBackground">#212121</item>
         <item name="mainTabSwapBackground">#0a0a0a</item>
         <item name="mainTabSwapSplashTint">#050505</item>
         <item name="categoryName">#ffffff</item>
         <item name="installedApps">#ffffff</item>
+        <item name="detailPanel">#212121</item>
+        <item name="appListItem">#ffffff</item>
     </style>
 
     <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@@ -39,6 +41,8 @@
         <item name="mainTabSwapSplashTint">#f5f5f5</item>
         <item name="categoryName">#4a4a4a</item>
         <item name="installedApps">#424242</item>
+        <item name="detailPanel">#eff4f9</item>
+        <item name="appListItem">#424242</item>
     </style>
 
     <style name="AppThemeDark" parent="AppBaseThemeDark">