From 5cb050a3a49cd1fafdf23f186875e59df1b42914 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 16 Aug 2016 22:24:27 -0500
Subject: [PATCH] Fix file picker theme

---
 src/main/AndroidManifest.xml                            | 2 +-
 src/main/java/org/tasks/files/MyFilePickerActivity.java | 4 ++++
 src/main/res/values/styles.xml                          | 8 --------
 src/main/res/values/theme.xml                           | 2 ++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 651743bb5..edad1c4cf 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -385,7 +385,7 @@
         <activity
             android:name=".files.MyFilePickerActivity"
             android:label="@string/app_name"
-            android:theme="@style/FilePickerTheme">
+            android:theme="@style/Tasks">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/src/main/java/org/tasks/files/MyFilePickerActivity.java b/src/main/java/org/tasks/files/MyFilePickerActivity.java
index 43e28a0cf..a09d4a7cc 100644
--- a/src/main/java/org/tasks/files/MyFilePickerActivity.java
+++ b/src/main/java/org/tasks/files/MyFilePickerActivity.java
@@ -4,12 +4,15 @@ import android.os.Bundle;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
+import org.tasks.R;
 import org.tasks.injection.ActivityModule;
 import org.tasks.injection.InjectingApplication;
 import org.tasks.themes.Theme;
 
 import javax.inject.Inject;
 
+import static org.tasks.preferences.ResourceResolver.getData;
+
 public class MyFilePickerActivity extends FilePickerActivity {
 
     @Inject Theme theme;
@@ -23,5 +26,6 @@ public class MyFilePickerActivity extends FilePickerActivity {
         theme.applyThemeAndStatusBarColor(this, getDelegate());
         setTitle(null);
         super.onCreate(savedInstanceState);
+        getWindow().getDecorView().setBackgroundColor(getData(this, R.attr.asContentBackground));
     }
 }
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index e979c1c3b..4faf5f98c 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -108,16 +108,8 @@
         <item name="android:layout_gravity">end|bottom</item>
     </style>
 
-    <!-- ==================================================== TaskAdapter == -->
-
     <style name="task_list_container"/>
 
-    <style name="FilePickerTheme" parent="NNF_BaseTheme.Light">
-         <item name="nnf_toolbarTheme">?attr/overlay_theme</item>
-    </style>
-
-    <!-- ========================================================= Premium == -->
-
     <style name="TextAppearance.Medium">
         <item name="android:textSize">18sp</item>
     </style>
diff --git a/src/main/res/values/theme.xml b/src/main/res/values/theme.xml
index 98c5608d8..d3379b8a2 100644
--- a/src/main/res/values/theme.xml
+++ b/src/main/res/values/theme.xml
@@ -18,6 +18,8 @@
         <item name="android:textColorPrimary">@color/text_primary</item>
         <item name="android:textColorSecondary">@color/text_secondary</item>
         <item name="android:textColorTertiary">@color/text_tertiary</item>
+        <item name="nnf_toolbarTheme">?attr/overlay_theme</item>
+        <item name="nnf_separator_color">@color/nnf_light_separator_color</item>
     </style>
 
     <style name="TasksOverride" parent="Tasks">