From ad680324aed578aaab98b997cbdc47783aca040f Mon Sep 17 00:00:00 2001 From: arpit khurana Date: Sat, 23 May 2015 09:36:58 +0530 Subject: [PATCH] Hide divider preference --- src/main/java/com/amaze/filemanager/fragments/Main.java | 5 +++-- .../java/com/amaze/filemanager/fragments/RarViewer.java | 5 +++-- .../java/com/amaze/filemanager/fragments/ZipViewer.java | 5 +++-- .../amaze/filemanager/utils/DividerItemDecoration.java | 5 ++++- src/main/res/xml/preferences.xml | 9 ++++----- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/amaze/filemanager/fragments/Main.java b/src/main/java/com/amaze/filemanager/fragments/Main.java index 44d7d3e03..c56f5a229 100644 --- a/src/main/java/com/amaze/filemanager/fragments/Main.java +++ b/src/main/java/com/amaze/filemanager/fragments/Main.java @@ -136,7 +136,7 @@ public class Main extends android.support.v4.app.Fragment { public CountDownTimer timer; private View rootView; public android.support.v7.widget.RecyclerView listView; - public Boolean gobackitem,islist,showThumbs,coloriseIcons; + public boolean gobackitem,islist,showThumbs,coloriseIcons,showDividers; public IconHolder ic; public MainActivity mainActivity; public boolean showButtonOnStart = false; @@ -191,6 +191,7 @@ public class Main extends android.support.v4.app.Fragment { hidemode=Sp.getInt("hidemode", 0); showPermissions=Sp.getBoolean("showPermissions", false); showSize=Sp.getBoolean("showFileSize",false); + showDividers=Sp.getBoolean("showDividers",true); gobackitem=Sp.getBoolean("goBack_checkbox", false); circularImages=Sp.getBoolean("circularimages",true); showLastModified=Sp.getBoolean("showLastModified",true); @@ -530,7 +531,7 @@ public class Main extends android.support.v4.app.Fragment { listView.removeItemDecoration(headersDecor); addheader=true;} if(addheader && islist){ - dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST); + dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST,showDividers); listView.addItemDecoration(dividerItemDecoration); headersDecor = new StickyRecyclerHeadersDecoration(adapter); diff --git a/src/main/java/com/amaze/filemanager/fragments/RarViewer.java b/src/main/java/com/amaze/filemanager/fragments/RarViewer.java index 0f198fe9d..41e0869bc 100644 --- a/src/main/java/com/amaze/filemanager/fragments/RarViewer.java +++ b/src/main/java/com/amaze/filemanager/fragments/RarViewer.java @@ -96,7 +96,7 @@ public class RarViewer extends Fragment { LinearLayoutManager mLayoutManager; DividerItemDecoration dividerItemDecoration; - + boolean showDividers; public int paddingTop; int mToolbarHeight,hidemode; View mToolbarContainer; @@ -154,6 +154,7 @@ public class RarViewer extends Fragment { Calendar calendar = Calendar.getInstance(); showSize = Sp.getBoolean("showFileSize", false); showLastModified = Sp.getBoolean("showLastModified", true); + showDividers=Sp.getBoolean("showDividers",true); year = ("" + calendar.get(Calendar.YEAR)).substring(2, 4); skin = Sp.getString("skin_color", "#3f51b5"); iconskin=Sp.getString("icon_skin_color",skin); @@ -402,7 +403,7 @@ String path; addheader=true; } if(addheader ) { - dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST); + dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST,showDividers); listView.addItemDecoration(dividerItemDecoration); headersDecor = new StickyRecyclerHeadersDecoration(zipAdapter); diff --git a/src/main/java/com/amaze/filemanager/fragments/ZipViewer.java b/src/main/java/com/amaze/filemanager/fragments/ZipViewer.java index 883fe6cfe..ba3f36be1 100644 --- a/src/main/java/com/amaze/filemanager/fragments/ZipViewer.java +++ b/src/main/java/com/amaze/filemanager/fragments/ZipViewer.java @@ -90,7 +90,7 @@ public ArrayList elements = new ArrayList(); StickyRecyclerHeadersDecoration headersDecor; LinearLayoutManager mLayoutManager; DividerItemDecoration dividerItemDecoration; - + boolean showDividers; public int paddingTop; int mToolbarHeight,hidemode; View mToolbarContainer; @@ -148,6 +148,7 @@ public ArrayList elements = new ArrayList(); Calendar calendar = Calendar.getInstance(); showSize = Sp.getBoolean("showFileSize", false); showLastModified = Sp.getBoolean("showLastModified", true); + showDividers=Sp.getBoolean("showDividers",true); year = ("" + calendar.get(Calendar.YEAR)).substring(2, 4); skin = Sp.getString("skin_color", "#3f51b5"); iconskin=Sp.getString("icon_skin_color",skin); @@ -383,7 +384,7 @@ public boolean cangoBack(){ addheader=true; } if(addheader ) { - dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST); + dividerItemDecoration = new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST,showDividers); listView.addItemDecoration(dividerItemDecoration); headersDecor = new StickyRecyclerHeadersDecoration(zipAdapter); diff --git a/src/main/java/com/amaze/filemanager/utils/DividerItemDecoration.java b/src/main/java/com/amaze/filemanager/utils/DividerItemDecoration.java index 1caf857fd..7eb7e491a 100644 --- a/src/main/java/com/amaze/filemanager/utils/DividerItemDecoration.java +++ b/src/main/java/com/amaze/filemanager/utils/DividerItemDecoration.java @@ -25,11 +25,13 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { private Drawable mDivider; private int mOrientation; + boolean show; int pix=0,leftpix=0; - public DividerItemDecoration(Context context, int orientation) { + public DividerItemDecoration(Context context, int orientation,boolean show) { final TypedArray a = context.obtainStyledAttributes(ATTRS); mDivider = a.getDrawable(0); a.recycle(); + this.show=show; setOrientation(orientation); pix=(int)(16*(context.getResources().getDisplayMetrics().densityDpi/160f)); leftpix=(int)(72*(context.getResources().getDisplayMetrics().densityDpi/160f)); @@ -44,6 +46,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration { @Override public void onDraw(Canvas c, RecyclerView parent) { + if(!show)return; if (mOrientation == VERTICAL_LIST) { drawVertical(c, parent); } else { diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index ae174cf96..f24deb292 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -71,11 +71,10 @@ - +