diff --git a/res/drawable/bg.xml b/res/drawable/bg.xml new file mode 100644 index 000000000..13c1dab32 --- /dev/null +++ b/res/drawable/bg.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/res/drawable/bg_card.xml b/res/drawable/bg_card.xml new file mode 100644 index 000000000..86aeb8ad4 --- /dev/null +++ b/res/drawable/bg_card.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_card_normal.xml b/res/drawable/bg_card_normal.xml new file mode 100644 index 000000000..0c1493848 --- /dev/null +++ b/res/drawable/bg_card_normal.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/res/drawable/bg_card_pressed.xml b/res/drawable/bg_card_pressed.xml new file mode 100644 index 000000000..c7e47f822 --- /dev/null +++ b/res/drawable/bg_card_pressed.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 2408b969c..4c31adb1d 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -15,6 +15,13 @@ android:key="viewmode" android:summary="Choose ListView Mode" android:title="@string/viewmode" /> + { if (checked) { holder.rl.setBackgroundColor(Color.parseColor("#5f33b5e5")); } else { + if (app.uimode == 0) { holder.rl.setBackgroundResource(R.drawable.listitem1); - + } else if (app.uimode == 1) { + holder.rl.setBackgroundResource(R.drawable.bg_card); + } } } return view; diff --git a/src/com/amaze/filemanager/adapters/IAdapter.java b/src/com/amaze/filemanager/adapters/IAdapter.java index 10e7eaf03..a507c2a81 100644 --- a/src/com/amaze/filemanager/adapters/IAdapter.java +++ b/src/com/amaze/filemanager/adapters/IAdapter.java @@ -165,7 +165,7 @@ public class IAdapter extends ArrayAdapter { holder.r.setBackgroundColor(Color.parseColor("#9f33b5e5")); } else { if (frag.theme == 0) { - holder.r.setBackgroundResource(R.drawable.listitem1); + holder.r.setBackgroundResource(R.drawable.bg_card); } else { holder.album.setBackgroundColor(Color.parseColor("#70000000")); holder.iname.setBackgroundColor(Color.parseColor("#70000000")); diff --git a/src/com/amaze/filemanager/adapters/MyAdapter.java b/src/com/amaze/filemanager/adapters/MyAdapter.java index 54790531c..a31169f93 100644 --- a/src/com/amaze/filemanager/adapters/MyAdapter.java +++ b/src/com/amaze/filemanager/adapters/MyAdapter.java @@ -134,9 +134,11 @@ public class MyAdapter extends ArrayAdapter { if (checked) { holder.rl.setBackgroundColor(Color.parseColor("#5fcccccc")); } else { - + if (main.uimode == 0) { holder.rl.setBackgroundResource(R.drawable.listitem1); - + } else if (main.uimode == 1) { + holder.rl.setBackgroundResource(R.drawable.bg_card); + } } } holder.rl.setOnClickListener(new View.OnClickListener() { diff --git a/src/com/amaze/filemanager/fragments/AppsList.java b/src/com/amaze/filemanager/fragments/AppsList.java index df56acfbc..a1f5e20dd 100644 --- a/src/com/amaze/filemanager/fragments/AppsList.java +++ b/src/com/amaze/filemanager/fragments/AppsList.java @@ -45,6 +45,7 @@ public class AppsList extends ListFragment { Futils utils = new Futils(); AppsList app = this; AppsAdapter adapter; + public int uimode; SharedPreferences Sp; public boolean selection = false; public ActionMode mActionMode; @@ -61,8 +62,23 @@ public class AppsList extends ListFragment { }; Sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + uimode = Integer.parseInt(Sp.getString("uimode", "0")); ListView vl = getListView(); - + if (uimode == 1) { + float scale = getResources().getDisplayMetrics().density; + int dpAsPixels = (int) (10 * scale + 0.5f); + vl.setPadding(dpAsPixels, 0, dpAsPixels, 0); + vl.setDivider(null); + vl.setDividerHeight(dpAsPixels); + View divider = getActivity().getLayoutInflater().inflate(R.layout.divider, null); + vl.addFooterView(divider); + vl.addHeaderView(divider); + vl.setCacheColorHint(android.R.color.transparent); + vl.setSelector(android.R.color.transparent); + vl.setHeaderDividersEnabled(true); + vl.setFooterDividersEnabled(true); + } + // vl.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_INSET); vl.setFastScrollEnabled(true); new LoadListTask().execute(); } diff --git a/src/com/amaze/filemanager/fragments/Main.java b/src/com/amaze/filemanager/fragments/Main.java index c6053c367..4a17b2f55 100644 --- a/src/com/amaze/filemanager/fragments/Main.java +++ b/src/com/amaze/filemanager/fragments/Main.java @@ -82,6 +82,7 @@ public class Main extends ListFragment { Resources res; public LinearLayout buttons; public int sortby, dsort, asc; + public int uimode; ArrayList COPY_PATH = null, MOVE_PATH = null; public String home, current = Environment.getExternalStorageDirectory().getPath(), sdetails; Shortcuts sh = new Shortcuts(); @@ -90,17 +91,26 @@ public class Main extends ListFragment { public HistoryManager history; IconUtils icons; HorizontalScrollView scroll; + ProgressBar p; public boolean rootMode, mountSystem; + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.mainlist, + container, false); + history = new HistoryManager(getActivity(), "Table1"); + p = (ProgressBar) rootView.findViewById(R.id.progressBar); + Sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + icons = new IconUtils(Sp, getActivity()); + return rootView; + } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); setHasOptionsMenu(true); utils = new Futils(); - history = new HistoryManager(getActivity(), "Table1"); - Sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); - icons = new IconUtils(Sp, getActivity()); res = getResources(); rootMode = Sp.getBoolean("rootmode", false); mountSystem = Sp.getBoolean("mountsystem", false); @@ -138,7 +148,18 @@ public class Main extends ListFragment { File f = new File(home); buttons = (LinearLayout) getActivity().findViewById(R.id.buttons); scroll = (HorizontalScrollView) getActivity().findViewById(R.id.scroll); + uimode = Integer.parseInt(Sp.getString("uimode", "0")); ListView vl = getListView(); + if (uimode == 1) { + float scale = getResources().getDisplayMetrics().density; + int dpAsPixels = (int) (5 * scale + 0.5f); + vl.setPadding(dpAsPixels, 0, dpAsPixels, 0); + View divider = getActivity().getLayoutInflater().inflate(R.layout.divider, null); + vl.setDivider(null); + vl.setDividerHeight(dpAsPixels); + vl.addFooterView(divider); + vl.addHeaderView(divider); + } vl.setFastScrollEnabled(true); if (savedInstanceState == null) loadlist(f, false); @@ -502,6 +523,7 @@ public class Main extends ListFragment { } } catch (Exception e) { } + p.setVisibility(View.GONE); getListView().setVisibility(View.VISIBLE); } diff --git a/src/com/amaze/filemanager/fragments/Preffrag.java b/src/com/amaze/filemanager/fragments/Preffrag.java index a2712128f..1b813fe74 100644 --- a/src/com/amaze/filemanager/fragments/Preffrag.java +++ b/src/com/amaze/filemanager/fragments/Preffrag.java @@ -26,13 +26,23 @@ public class Preffrag extends PreferenceFragment { 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) { + ui.setEnabled(false); + } ListPreference th = (ListPreference) findPreference("theme"); th.setOnPreferenceChangeListener(new ListPreference.OnPreferenceChangeListener() { public boolean onPreferenceChange(Preference p1, Object p2) { int value = Integer.parseInt(sharedPref.getString("theme", "0")); + if (value == 0) { + sharedPref.edit().putString("uimode", "0").commit(); + ui.setEnabled(false); + } else { + ui.setEnabled(true); + } restartPC(getActivity()); // TODO: Implement this method return true;