From 378fdfbabe2ecd2ff009c9efb9a0c5e91fe95397 Mon Sep 17 00:00:00 2001
From: arpit khurana <arpitkh96@gmail.com>
Date: Fri, 3 Oct 2014 18:41:04 +0530
Subject: [PATCH] Fixing messed up dark theme

---
 res/layout/main_frag.xml                       |  7 ++++---
 res/values-v19/styles.xml                      |  1 +
 res/xml/preferences.xml                        | 17 -----------------
 .../filemanager/activities/Preferences.java    |  2 +-
 src/com/amaze/filemanager/fragments/Main.java  |  5 +++--
 .../amaze/filemanager/fragments/Preffrag.java  | 18 ------------------
 6 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/res/layout/main_frag.xml b/res/layout/main_frag.xml
index 14b3601fe..6aea1b6ae 100644
--- a/res/layout/main_frag.xml
+++ b/res/layout/main_frag.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:id="@+id/main_frag"
+    android:layout_height="match_parent"
+    android:background="#e6e6e6">
 
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#e6e6e6" />
+        android:layout_height="match_parent" />
 
     <GridView
         android:id="@+id/gridView"
diff --git a/res/values-v19/styles.xml b/res/values-v19/styles.xml
index b0d147c24..b10e0d49c 100644
--- a/res/values-v19/styles.xml
+++ b/res/values-v19/styles.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="DarkTheme" parent="android:Theme.Holo">
+        <item name="android:windowTranslucentStatus">true</item>
     </style>
 
     <style name="LightTheme" parent="android:Theme.Holo.Light.DarkActionBar">
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 1b749496c..f1817682c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -61,12 +61,6 @@
             android:entryValues="@array/ints2"
             android:key="sortby"
             android:title="@string/sortby" />
-        <ListPreference
-            android:defaultValue="1"
-            android:entries="@array/folder"
-            android:entryValues="@array/ints1"
-            android:key="folder"
-            android:title="@string/foldercolor" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="rootmode"
@@ -75,15 +69,4 @@
     
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/imagegallery">
-
-        <EditTextPreference
-            android:key="Ipath"
-            android:title="@string/changegallerypath" />
-           
-        <CheckBoxPreference
-            android:defaultValue="true"
-            android:key="Ipathset"
-            android:title="@string/usedefaultgallerypath"/>
-        </PreferenceCategory>
     </PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/amaze/filemanager/activities/Preferences.java b/src/com/amaze/filemanager/activities/Preferences.java
index a495403de..f14414415 100644
--- a/src/com/amaze/filemanager/activities/Preferences.java
+++ b/src/com/amaze/filemanager/activities/Preferences.java
@@ -24,7 +24,7 @@ public class Preferences extends Activity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.prefsfrag);
 
-        String skin = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("skin_color", "#009688");
+        String skin = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getString("skin_color", "#607d8b");
         getActionBar().setIcon(R.drawable.ic_launcher1);
         getActionBar().setBackgroundDrawable(new ColorDrawable(Color.parseColor(skin)));
         getActionBar().setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE);
diff --git a/src/com/amaze/filemanager/fragments/Main.java b/src/com/amaze/filemanager/fragments/Main.java
index 3af9898bb..2513892bd 100644
--- a/src/com/amaze/filemanager/fragments/Main.java
+++ b/src/com/amaze/filemanager/fragments/Main.java
@@ -112,13 +112,13 @@ public class Main extends android.support.v4.app.Fragment {
     private ArrayAdapter<String> adapter1;
     private MainActivity mainActivity;
     private String skin;
-
+    int theme;
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
         aBoolean = Sp.getBoolean("view", true);
-
+        theme=Integer.parseInt(Sp.getString("theme","0"));
         mainActivity=(MainActivity)getActivity();
         tabHandler = new TabHandler(getActivity(), null, null, 1);
         showPermissions=Sp.getBoolean("showPermissions",false);
@@ -143,6 +143,7 @@ public class Main extends android.support.v4.app.Fragment {
         gridView = (GridView) rootView.findViewById(R.id.gridView);
         showThumbs=Sp.getBoolean("showThumbs",true);
         ic=new IconHolder(getActivity(),showThumbs,!aBoolean);
+        if(theme==1)rootView.findViewById(R.id.main_frag).setBackgroundColor(getResources().getColor(android.R.color.background_dark));
         if (aBoolean) {
             listView.setVisibility(View.VISIBLE);
             gridView.setVisibility(View.GONE);
diff --git a/src/com/amaze/filemanager/fragments/Preffrag.java b/src/com/amaze/filemanager/fragments/Preffrag.java
index 14c4731ab..131053a89 100644
--- a/src/com/amaze/filemanager/fragments/Preffrag.java
+++ b/src/com/amaze/filemanager/fragments/Preffrag.java
@@ -27,7 +27,6 @@ public class Preffrag extends PreferenceFragment {
         addPreferencesFromResource(R.xml.preferences);
 
         final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        final EditTextPreference b = (EditTextPreference) findPreference("Ipath");
         final ListPreference ui = (ListPreference) findPreference("uimode");
         int vl = Integer.parseInt(sharedPref.getString("theme", "0"));
         if (vl == 1) {
@@ -155,23 +154,6 @@ public class Preffrag extends PreferenceFragment {
             }
         });
 
-        final CheckBoxPreference a = (CheckBoxPreference) findPreference("Ipathset");
-        b.setEnabled(!a.isChecked());
-
-        a.setOnPreferenceChangeListener(new CheckBoxPreference.OnPreferenceChangeListener() {
-
-            public boolean onPreferenceChange(Preference p1, Object p2) {
-                if (a.isChecked()) {
-                    b.setEnabled(true);
-                } else {
-                    b.setEnabled(false);
-                    sharedPref.edit().putString("Ipath", Environment.getExternalStorageDirectory().getPath() + "/" + Environment.DIRECTORY_DCIM).commit();
-                }
-                // TODO: Implement this method
-                return true;
-            }
-        });
-        
         final CheckBoxPreference rootmode = (CheckBoxPreference) findPreference("rootmode");
         rootmode.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override