CMFM: Move hidden/folder/system/symlink settings into settings

This is in preparation of updating action bar

Change-Id: Ic743b0d6a91c109779bc273428c45e1e2413692a

10 files changed, 149 insertions, 85 deletions

diff --git a/res/layout/sort_view_options.xml b/res/layout/sort_view_options.xml
index 29768050..27e9a4a2 100644
--- a/res/layout/sort_view_options.xml
+++ b/res/layout/sort_view_options.xml
@@ -13,8 +13,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
  -->
-<com.cyanogenmod.filemanager.dialogs.SortViewOptions
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:orientation="vertical"
@@ -68,5 +67,4 @@
             android:layout_height="80dp"
             layout="@layout/sort_item" />
     </LinearLayout>
-
-</com.cyanogenmod.filemanager.dialogs.SortViewOptions>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 044c2a0f..3999156c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -902,4 +902,6 @@
     <string name="file">File</string>
     <string name="manager">Manager</string>
     <string name="welcome_desc">Simple, powerful access to all your data from anywhere.</string>
+
+    <string name="safe_mode_not_allowed">Setting not available in safe mode</string>
 </resources>
diff --git a/res/xml/preferences_general.xml b/res/xml/preferences_general.xml
index 961ac95a..27e86134 100644
--- a/res/xml/preferences_general.xml
+++ b/res/xml/preferences_general.xml
@@ -72,6 +72,33 @@
         android:persistent="true"
         android:defaultValue="false" />
 
+      <SwitchPreference
+          android:key="cm_filemanager_show_dirs_first"
+          android:title="@string/cm_filemanager_show_dirs_first"
+          android:persistent="true"
+          android:defaultValue="true" />
+
+      <SwitchPreference
+          android:key="cm_filemanager_show_hidden"
+          android:title="@string/cm_filemanager_show_hidden"
+          android:summary="@string/safe_mode_not_allowed"
+          android:persistent="true"
+          android:defaultValue="true" />
+
+      <SwitchPreference
+          android:key="cm_filemanager_show_system"
+          android:title="@string/cm_filemanager_show_system"
+          android:summary="@string/safe_mode_not_allowed"
+          android:persistent="true"
+          android:defaultValue="true" />
+
+      <SwitchPreference
+          android:key="cm_filemanager_show_symlinks"
+          android:title="@string/cm_filemanager_show_symlinks"
+          android:summary="@string/safe_mode_not_allowed"
+          android:persistent="true"
+          android:defaultValue="true" />
+
     </PreferenceCategory>
 
     <!-- Advanced settings -->
diff --git a/src/com/cyanogenmod/filemanager/activities/MainActivity.java b/src/com/cyanogenmod/filemanager/activities/MainActivity.java
index 3b657f45..633e36ac 100755
--- a/src/com/cyanogenmod/filemanager/activities/MainActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/MainActivity.java
@@ -49,6 +49,7 @@ import com.cyanogenmod.filemanager.dialogs.SortViewOptions;
 import com.cyanogenmod.filemanager.model.Bookmark;
 import com.cyanogenmod.filemanager.model.FileSystemObject;
 import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
+import com.cyanogenmod.filemanager.preferences.PreferenceHelper;
 import com.cyanogenmod.filemanager.preferences.Preferences;
 import com.cyanogenmod.filemanager.ui.ThemeManager;
 import com.cyanogenmod.filemanager.ui.fragments.HomeFragment;
@@ -442,14 +443,17 @@ public class MainActivity extends ActionBarActivity
                 //Navigation view options
                 //######################
                 case com.cyanogenmod.filemanager.R.id.ab_sort_mode:
-                    DialogHelper.createSortDialog(this,
+                    SortViewOptions.createSortDialog(this,
                             FileManagerSettings.SETTINGS_SORT_MODE,
                             new SortViewOptions.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int which, int result) {
                                     if (which == DialogInterface.BUTTON_POSITIVE) {
-                                        ((NavigationFragment) currentFragment).updateSetting(
-                                                FileManagerSettings.SETTINGS_SORT_MODE, result);
+                                        if (PreferenceHelper.getIntPreference(
+                                                FileManagerSettings.SETTINGS_SORT_MODE) != result) {
+                                            ((NavigationFragment) currentFragment).updateSetting(
+                                                    FileManagerSettings.SETTINGS_SORT_MODE, result);
+                                        }
                                     }
                                 }
                             })
diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
index c2ccd119..2ae703a3 100644
--- a/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/GeneralPreferenceFragment.java
@@ -50,9 +50,6 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
     private SwitchPreference mCaseSensitiveSort;
     private ListPreference mFiletimeFormatMode;
     private ListPreference mFreeDiskSpaceWarningLevel;
-    private SwitchPreference mComputeFolderStatistics;
-    private SwitchPreference mDisplayThumbs;
-    private SwitchPreference mUseFlinger;
     private ListPreference mAccessMode;
     private SwitchPreference mRestrictSecondaryUsersAccess;
     private SwitchPreference mDebugTraces;
@@ -132,6 +129,8 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
                 String[] summary = getResources().getStringArray(
                         R.array.access_mode_summaries);
                                     preference.setSummary(summary[valueId]);
+
+                updateAccessModePreferences(newMode.compareTo(AccessMode.SAFE) == 0);
             }
 
             // Restricted secondary users access
@@ -203,23 +202,20 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
         this.mOnChangeListener.onPreferenceChange(this.mFreeDiskSpaceWarningLevel, value);
         this.mFreeDiskSpaceWarningLevel.setOnPreferenceChangeListener(this.mOnChangeListener);
 
-        // Compute folder statistics
-        this.mComputeFolderStatistics =
-                (SwitchPreference)findPreference(
-                        FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS.getId());
-        this.mComputeFolderStatistics.setOnPreferenceChangeListener(this.mOnChangeListener);
-
-        // Display thumbs
-        this.mDisplayThumbs =
-                (SwitchPreference)findPreference(
-                        FileManagerSettings.SETTINGS_DISPLAY_THUMBS.getId());
-        this.mDisplayThumbs.setOnPreferenceChangeListener(this.mOnChangeListener);
-
-        // Use flinger
-        this.mUseFlinger =
-                (SwitchPreference)findPreference(
-                        FileManagerSettings.SETTINGS_USE_FLINGER.getId());
-        this.mUseFlinger.setOnPreferenceChangeListener(this.mOnChangeListener);
+        FileManagerSettings[] switchSettings = new FileManagerSettings[] {
+                FileManagerSettings.SETTINGS_COMPUTE_FOLDER_STATISTICS,
+                FileManagerSettings.SETTINGS_DISPLAY_THUMBS,
+                FileManagerSettings.SETTINGS_USE_FLINGER,
+                FileManagerSettings.SETTINGS_SHOW_DIRS_FIRST,
+                FileManagerSettings.SETTINGS_SHOW_HIDDEN,
+                FileManagerSettings.SETTINGS_SHOW_SYSTEM,
+                FileManagerSettings.SETTINGS_SHOW_SYMLINKS,
+        };
+
+        for (FileManagerSettings switchSetting : switchSettings) {
+            findPreference(switchSetting.getId())
+                    .setOnPreferenceChangeListener(this.mOnChangeListener);
+        }
 
         // Access mode
         this.mAccessMode =
@@ -275,6 +271,17 @@ public class GeneralPreferenceFragment extends TitlePreferenceFragment {
         }
     }
 
+    private void updateAccessModePreferences(boolean safeMode) {
+        FileManagerSettings[] rootSettings = new FileManagerSettings[] {
+                FileManagerSettings.SETTINGS_SHOW_HIDDEN,
+                FileManagerSettings.SETTINGS_SHOW_SYSTEM,
+                FileManagerSettings.SETTINGS_SHOW_SYMLINKS,
+        };
+        for (FileManagerSettings setting : rootSettings) {
+            findPreference(setting.getId()).setEnabled(!safeMode);
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java b/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
index 884d8219..6c7df080 100644
--- a/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
+++ b/src/com/cyanogenmod/filemanager/activities/preferences/SearchPreferenceFragment.java
@@ -160,7 +160,7 @@ public class SearchPreferenceFragment extends TitlePreferenceFragment {
         this.mSortSearchResultMode.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                DialogHelper.createSortDialog(getActivity(),
+                SortViewOptions.createSortDialog(getActivity(),
                     FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE,
                     new SortViewOptions.OnClickListener() {
                         @Override
diff --git a/src/com/cyanogenmod/filemanager/dialogs/SortViewOptions.java b/src/com/cyanogenmod/filemanager/dialogs/SortViewOptions.java
index cc6f616c..b77fe201 100644
--- a/src/com/cyanogenmod/filemanager/dialogs/SortViewOptions.java
+++ b/src/com/cyanogenmod/filemanager/dialogs/SortViewOptions.java
@@ -15,22 +15,25 @@
  */
 package com.cyanogenmod.filemanager.dialogs;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.CheckBox;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.cyanogenmod.filemanager.FileManagerApplication;
 import com.cyanogenmod.filemanager.R;
+import com.cyanogenmod.filemanager.preferences.PreferenceHelper;
+import com.cyanogenmod.filemanager.preferences.AccessMode;
 import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
 import com.cyanogenmod.filemanager.preferences.NavigationSortMode;
-import com.cyanogenmod.filemanager.preferences.ObjectIdentifier;
-import com.cyanogenmod.filemanager.preferences.Preferences;
+import com.cyanogenmod.filemanager.util.DialogHelper;
 
-public class SortViewOptions extends LinearLayout {
+public class SortViewOptions {
     private Drawable mSelectedShape;
     private int mSelectedTextColor;
     private int mUnselectedTextColor;
@@ -46,6 +49,8 @@ public class SortViewOptions extends LinearLayout {
     private IconGroup[] mTopGroup;
     private IconGroup[] mBottomGroup;
 
+    private Context mContext;
+
     public abstract static class OnClickListener {
         public abstract void onClick(DialogInterface dialog, int which, int result);
     };
@@ -94,28 +99,21 @@ public class SortViewOptions extends LinearLayout {
         }
     };
 
-    public SortViewOptions(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        init();
-    }
-
-    public SortViewOptions(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
+    public SortViewOptions(Context ctx, View parent, FileManagerSettings settingType) {
+        mContext = ctx;
+        mSelectedShape = mContext.getResources().getDrawable(R.drawable.ic_sort_selector);
+        mSelectedTextColor = mContext.getResources().getColor(R.color.darker_black);
+        mUnselectedTextColor = mContext.getResources().getColor(R.color.lighter_black);
 
-    private void init() {
-        mSelectedShape = getResources().getDrawable(R.drawable.ic_sort_selector);
-        mSelectedTextColor = getResources().getColor(R.color.darker_black);
-        mUnselectedTextColor = getResources().getColor(R.color.lighter_black);
+        init(parent);
+        setSettingType(settingType);
     }
 
     /**
      * Sets the setting type of the dialog - this changes the options the user can choose from
      * @param settingType {@link FileManagerSettings} type
      */
-    public void setSettingType(FileManagerSettings settingType) {
+    private void setSettingType(FileManagerSettings settingType) {
         if (settingType == FileManagerSettings.SETTINGS_SORT_MODE) {
             mGroupRelevance.mGroup.setVisibility(View.GONE);
         } else if (settingType == FileManagerSettings.SETTINGS_SORT_SEARCH_RESULTS_MODE) {
@@ -126,8 +124,7 @@ public class SortViewOptions extends LinearLayout {
         }
 
         boolean ascending = true;
-        int defaultId = ((ObjectIdentifier) settingType.getDefaultValue()).getId();
-        int selected = Preferences.getSharedPreferences().getInt(settingType.getId(), defaultId);
+        int selected = PreferenceHelper.getIntPreference(settingType);
         NavigationSortMode selectedSortMode = NavigationSortMode.fromId(selected);
 
         for (IconGroup ig : mTopGroup) {
@@ -145,20 +142,17 @@ public class SortViewOptions extends LinearLayout {
         }
     }
 
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        mGroupRelevance = setupIcon(this, R.id.sort_item_relevance, R.drawable.ic_sort_relevance,
+    private void init(View parent) {
+        mGroupRelevance = setupIcon(parent, R.id.sort_item_relevance, R.drawable.ic_sort_relevance,
                 R.string.sort_by_relevance, NavigationSortMode.SEARCH_RELEVANCE_ASC,
                 NavigationSortMode.SEARCH_RELEVANCE_DESC);
-        mGroupABC = setupIcon(this, R.id.sort_item_abc, R.drawable.ic_sort_abc,
+        mGroupABC = setupIcon(parent, R.id.sort_item_abc, R.drawable.ic_sort_abc,
                 R.string.sort_by_name, NavigationSortMode.NAME_ASC, NavigationSortMode.NAME_DESC);
-        mGroupDate = setupIcon(this, R.id.sort_item_date, R.drawable.ic_sort_date,
+        mGroupDate = setupIcon(parent, R.id.sort_item_date, R.drawable.ic_sort_date,
                 R.string.sort_by_date, NavigationSortMode.DATE_ASC, NavigationSortMode.DATE_DESC);
-        mGroupSize = setupIcon(this, R.id.sort_item_size, R.drawable.ic_sort_size,
+        mGroupSize = setupIcon(parent, R.id.sort_item_size, R.drawable.ic_sort_size,
                 R.string.sort_by_size, NavigationSortMode.SIZE_ASC, NavigationSortMode.SIZE_DESC);
-        mGroupType = setupIcon(this, R.id.sort_item_type, R.drawable.ic_sort_type,
+        mGroupType = setupIcon(parent, R.id.sort_item_type, R.drawable.ic_sort_type,
                 R.string.sort_by_type, NavigationSortMode.TYPE_ASC, NavigationSortMode.TYPE_DESC);
 
         mTopGroup = new IconGroup[] {
@@ -174,9 +168,9 @@ public class SortViewOptions extends LinearLayout {
             ig.mGroup.setOnClickListener(topClickListener);
         }
 
-        mGroupAsc = setupIcon(this, R.id.sort_item_asc, R.drawable.ic_sort_asc,
+        mGroupAsc = setupIcon(parent, R.id.sort_item_asc, R.drawable.ic_sort_asc,
                 R.string.sort_by_asc, null, null);
-        mGroupDesc = setupIcon(this, R.id.sort_item_desc, R.drawable.ic_sort_desc,
+        mGroupDesc = setupIcon(parent, R.id.sort_item_desc, R.drawable.ic_sort_desc,
                 R.string.sort_by_desc, null, null);
 
         mBottomGroup = new IconGroup[] {
@@ -197,8 +191,8 @@ public class SortViewOptions extends LinearLayout {
         iconGroup.mIcon = (ImageView)iconGroup.mGroup.findViewById(R.id.sort_item_icon);
         iconGroup.mText = (TextView)iconGroup.mGroup.findViewById(R.id.sort_item_title);
 
-        iconGroup.mIcon.setImageDrawable(getResources().getDrawable(imageDrawableId));
-        iconGroup.mText.setText(getResources().getString(textId));
+        iconGroup.mIcon.setImageDrawable(mContext.getResources().getDrawable(imageDrawableId));
+        iconGroup.mText.setText(mContext.getResources().getString(textId));
 
         iconGroup.mAsc = asc;
         iconGroup.mDesc = desc;
@@ -222,4 +216,20 @@ public class SortViewOptions extends LinearLayout {
 
         return NavigationSortMode.NAME_ASC.getId();
     }
+
+    public static AlertDialog createSortDialog(Context context, FileManagerSettings setting,
+                                               final SortViewOptions.OnClickListener listener) {
+        LayoutInflater li =
+                (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        final View layout = li.inflate(R.layout.sort_view_options, null);
+        final SortViewOptions sortViewOptions = new SortViewOptions(context, layout, setting);
+        return DialogHelper.createTwoButtonsDialog(context,
+                R.string.ok, R.string.cancel, 0, context.getString(R.string.sort_options),
+                layout, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        listener.onClick(dialog, which, sortViewOptions.getSortId());
+                    }
+                });
+    }
 }
diff --git a/src/com/cyanogenmod/filemanager/preferences/PreferenceHelper.java b/src/com/cyanogenmod/filemanager/preferences/PreferenceHelper.java
new file mode 100644
index 00000000..234dcb8b
--- /dev/null
+++ b/src/com/cyanogenmod/filemanager/preferences/PreferenceHelper.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cyanogenmod.filemanager.preferences;
+
+public class PreferenceHelper {
+    public static boolean getBooleanPreference(FileManagerSettings setting) {
+        return Preferences.getSharedPreferences().getBoolean(setting.getId(),
+                        ((Boolean) setting.getDefaultValue()).booleanValue());
+    }
+
+    public static int getIntPreference(FileManagerSettings setting) {
+        int defaultId = ((ObjectIdentifier) setting.getDefaultValue()).getId();
+        return Preferences.getSharedPreferences().getInt(setting.getId(), defaultId);
+    }
+}
diff --git a/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java b/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
index 00acc2cf..663a0029 100644
--- a/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
+++ b/src/com/cyanogenmod/filemanager/ui/fragments/NavigationFragment.java
@@ -87,7 +87,6 @@ import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory;
 import com.cyanogenmod.filemanager.console.VirtualConsole;
 import com.cyanogenmod.filemanager.console.VirtualMountPointConsole;
 import com.cyanogenmod.filemanager.console.secure.SecureConsole;
-import com.cyanogenmod.filemanager.dialogs.SortViewOptions;
 import com.cyanogenmod.filemanager.listeners.OnHistoryListener;
 import com.cyanogenmod.filemanager.listeners.OnRequestRefreshListener;
 import com.cyanogenmod.filemanager.model.Bookmark;
@@ -253,9 +252,17 @@ public class NavigationFragment extends Fragment
                             return;
                         }
 
-                        // Case sensitive sort
+                        // Case sensitive sort, show dir first, show hidden, system, symlink files
                         if (key.compareTo(FileManagerSettings.
-                                SETTINGS_CASE_SENSITIVE_SORT.getId()) == 0) {
+                                SETTINGS_CASE_SENSITIVE_SORT.getId()) == 0
+                                || key.compareTo(FileManagerSettings.
+                                SETTINGS_SHOW_DIRS_FIRST.getId()) == 0
+                                || key.compareTo(FileManagerSettings.
+                                SETTINGS_SHOW_HIDDEN.getId()) == 0
+                                || key.compareTo(FileManagerSettings.
+                                SETTINGS_SHOW_SYSTEM.getId()) == 0
+                                || key.compareTo(FileManagerSettings.
+                                SETTINGS_SHOW_SYMLINKS.getId()) == 0) {
                             getCurrentNavigationView().refresh();
                             return;
                         }
diff --git a/src/com/cyanogenmod/filemanager/util/DialogHelper.java b/src/com/cyanogenmod/filemanager/util/DialogHelper.java
index 300937f2..cd5fc650 100644
--- a/src/com/cyanogenmod/filemanager/util/DialogHelper.java
+++ b/src/com/cyanogenmod/filemanager/util/DialogHelper.java
@@ -39,8 +39,6 @@ import android.widget.Toast;
 import com.cyanogenmod.filemanager.R;
 import com.cyanogenmod.filemanager.activities.MainActivity;
 import com.cyanogenmod.filemanager.adapters.CheckableListAdapter;
-import com.cyanogenmod.filemanager.dialogs.SortViewOptions;
-import com.cyanogenmod.filemanager.preferences.FileManagerSettings;
 import com.cyanogenmod.filemanager.ui.ThemeManager;
 import com.cyanogenmod.filemanager.ui.ThemeManager.Theme;
 
@@ -639,21 +637,4 @@ public final class DialogHelper {
     public static void showToast(Context context, int msgResourceId, int duration) {
         showToast(context, context.getString(msgResourceId), duration);
     }
-
-    public static AlertDialog createSortDialog(Context context, FileManagerSettings setting,
-                                               final SortViewOptions.OnClickListener listener) {
-        LayoutInflater li =
-                (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        final SortViewOptions sortViewOptions = (SortViewOptions) li.inflate(
-                R.layout.sort_view_options, null);
-        sortViewOptions.setSettingType(setting);
-        return DialogHelper.createTwoButtonsDialog(context,
-                R.string.ok, R.string.cancel, 0, context.getString(R.string.sort_options),
-                sortViewOptions, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        listener.onClick(dialog, which, sortViewOptions.getSortId());
-                    }
-                });
-    }
 }