From 5a03dbc3998664ce5d78e437fb16e8353a4239d3 Mon Sep 17 00:00:00 2001 From: mrgames13 Date: Mon, 9 Dec 2019 22:51:52 +0100 Subject: [PATCH 1/3] Internationalize date and time formats --- build.gradle | 2 +- .../controller/adapters/FileListAdapter.java | 13 ++++++++----- library/src/main/res/values/strings.xml | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 507ab77..832f394 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java b/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java index ff8a906..ade977e 100644 --- a/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java +++ b/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java @@ -10,6 +10,7 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; + import com.developer.filepicker.R; import com.developer.filepicker.controller.NotifyItemChecked; import com.developer.filepicker.model.DialogConfigs; @@ -18,10 +19,10 @@ import com.developer.filepicker.model.MarkedItemList; import com.developer.filepicker.widget.MaterialCheckbox; import com.developer.filepicker.widget.OnCheckedChangeListener; -import java.text.SimpleDateFormat; + +import java.text.DateFormat; import java.util.ArrayList; import java.util.Date; -import java.util.Locale; /** * @author akshay sunil masram @@ -105,14 +106,16 @@ public View getView(final int i, View view, ViewGroup viewGroup) { } holder.type_icon.setContentDescription(item.getFilename()); holder.name.setText(item.getFilename()); - SimpleDateFormat sdate = new SimpleDateFormat("dd/MM/yyyy", Locale.getDefault()); - SimpleDateFormat stime = new SimpleDateFormat("hh:mm aa", Locale.getDefault()); + DateFormat dateFormatter = android.text.format.DateFormat.getMediumDateFormat(context); + DateFormat timeFormatter = android.text.format.DateFormat.getTimeFormat(context); + //SimpleDateFormat sdate = new SimpleDateFormat("dd/MM/yyyy", Locale.getDefault()); + //SimpleDateFormat stime = new SimpleDateFormat("hh:mm aa", Locale.getDefault()); Date date = new Date(item.getTime()); if(i==0&&item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) { holder.type.setText(R.string.label_parent_directory); } else { - holder.type.setText(context.getString(R.string.last_edit) + sdate.format(date) + ", " + stime.format(date)); + holder.type.setText(String.format(context.getString(R.string.last_edit), dateFormatter.format(date), timeFormatter.format(date))); } if(holder.fmark.getVisibility()==View.VISIBLE) { if(i==0&&item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 76370aa..0ff5395 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Select /sdcard Parent Directory - Last edited: + Last edited: %1$s, %2$s Directory cannot be accessed .. \ No newline at end of file From 5f8ff25e8748c5ed155f769495891a680ce44404 Mon Sep 17 00:00:00 2001 From: mrgames13 Date: Mon, 9 Dec 2019 22:55:05 +0100 Subject: [PATCH 2/3] Add German translation --- library/src/main/res/values-de/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 library/src/main/res/values-de/strings.xml diff --git a/library/src/main/res/values-de/strings.xml b/library/src/main/res/values-de/strings.xml new file mode 100644 index 0000000..4a1a010 --- /dev/null +++ b/library/src/main/res/values-de/strings.xml @@ -0,0 +1,8 @@ + + + Zugriff auf Verzeichnis fehlgeschlagen + Abbrechen + Auswählen + Übergeordnetes Verzeichnis + Zuletzt bearbeitet: %1$s, %2$s + \ No newline at end of file From 88c5bf80c80c664cf9bca581094af9fb01b2e103 Mon Sep 17 00:00:00 2001 From: mrgames13 Date: Mon, 9 Dec 2019 23:02:35 +0100 Subject: [PATCH 3/3] Prettify code --- .../controller/adapters/FileListAdapter.java | 89 ++++++++---------- .../filepicker/view/FilePickerDialog.java | 10 +-- .../filepicker/view/FilePickerPreference.java | 90 +++++++++---------- .../filepicker/widget/MaterialCheckbox.java | 19 ++-- .../filepicker/file/FileListAdapter.java | 7 +- .../file/FilePickerApplication.java | 3 +- .../developer/filepicker/file/ListItem.java | 6 +- .../filepicker/file/MainActivity.java | 85 ++++++++---------- .../filepicker/file/SettingsActivity.java | 20 ++--- 9 files changed, 149 insertions(+), 180 deletions(-) diff --git a/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java b/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java index ade977e..d657fe8 100644 --- a/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java +++ b/library/src/main/java/com/developer/filepicker/controller/adapters/FileListAdapter.java @@ -27,7 +27,7 @@ /** * @author akshay sunil masram */ -public class FileListAdapter extends BaseAdapter{ +public class FileListAdapter extends BaseAdapter { private ArrayList listItem; private Context context; private DialogProperties properties; @@ -61,87 +61,74 @@ public View getView(final int i, View view, ViewGroup viewGroup) { view = LayoutInflater.from(context).inflate(R.layout.dialog_file_list_item, viewGroup, false); holder = new ViewHolder(view); view.setTag(holder); - } - else - { holder = (ViewHolder)view.getTag(); + } else { + holder = (ViewHolder) view.getTag(); } final FileListItem item = listItem.get(i); if (MarkedItemList.hasItem(item.getLocation())) { - Animation animation = AnimationUtils.loadAnimation(context,R.anim.marked_item_animation); + Animation animation = AnimationUtils.loadAnimation(context, R.anim.marked_item_animation); view.setAnimation(animation); - } - else { - Animation animation = AnimationUtils.loadAnimation(context,R.anim.unmarked_item_animation); + } else { + Animation animation = AnimationUtils.loadAnimation(context, R.anim.unmarked_item_animation); view.setAnimation(animation); } if (item.isDirectory()) { holder.type_icon.setImageResource(R.mipmap.ic_type_folder); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary,context.getTheme())); - } - else - { holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary)); + holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary, context.getTheme())); + } else { + holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorPrimary)); } - if(properties.selection_type == DialogConfigs.FILE_SELECT) - { holder.fmark.setVisibility(View.INVISIBLE); + if (properties.selection_type == DialogConfigs.FILE_SELECT) { + holder.fmark.setVisibility(View.INVISIBLE); + } else { + holder.fmark.setVisibility(View.VISIBLE); } - else - { holder.fmark.setVisibility(View.VISIBLE); - } - } - else { + } else { holder.type_icon.setImageResource(R.mipmap.ic_type_file); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent,context.getTheme())); - } - else - { holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent)); + holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent, context.getTheme())); + } else { + holder.type_icon.setColorFilter(context.getResources().getColor(R.color.colorAccent)); } - if(properties.selection_type == DialogConfigs.DIR_SELECT) - { holder.fmark.setVisibility(View.INVISIBLE); - } - else - { holder.fmark.setVisibility(View.VISIBLE); + if (properties.selection_type == DialogConfigs.DIR_SELECT) { + holder.fmark.setVisibility(View.INVISIBLE); + } else { + holder.fmark.setVisibility(View.VISIBLE); } } holder.type_icon.setContentDescription(item.getFilename()); holder.name.setText(item.getFilename()); DateFormat dateFormatter = android.text.format.DateFormat.getMediumDateFormat(context); DateFormat timeFormatter = android.text.format.DateFormat.getTimeFormat(context); - //SimpleDateFormat sdate = new SimpleDateFormat("dd/MM/yyyy", Locale.getDefault()); - //SimpleDateFormat stime = new SimpleDateFormat("hh:mm aa", Locale.getDefault()); Date date = new Date(item.getTime()); - if(i==0&&item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) { + if (i == 0 && item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) { holder.type.setText(R.string.label_parent_directory); - } - else { + } else { holder.type.setText(String.format(context.getString(R.string.last_edit), dateFormatter.format(date), timeFormatter.format(date))); } - if(holder.fmark.getVisibility()==View.VISIBLE) { - if(i==0&&item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) - { holder.fmark.setVisibility(View.INVISIBLE); + if (holder.fmark.getVisibility() == View.VISIBLE) { + if (i == 0 && item.getFilename().startsWith(context.getString(R.string.label_parent_dir))) { + holder.fmark.setVisibility(View.INVISIBLE); } if (MarkedItemList.hasItem(item.getLocation())) { holder.fmark.setChecked(true); - } - else { + } else { holder.fmark.setChecked(false); } } - + holder.fmark.setOnCheckedChangedListener(new OnCheckedChangeListener() { @Override public void onCheckedChanged(MaterialCheckbox checkbox, boolean isChecked) { item.setMarked(isChecked); if (item.isMarked()) { - if(properties.selection_mode == DialogConfigs.MULTI_MODE) { + if (properties.selection_mode == DialogConfigs.MULTI_MODE) { MarkedItemList.addSelectedItem(item); - } - else { + } else { MarkedItemList.addSingleFile(item); } - } - else { + } else { MarkedItemList.removeSelectedItem(item.getLocation()); } notifyItemChecked.notifyCheckBoxIsClicked(); @@ -150,16 +137,16 @@ public void onCheckedChanged(MaterialCheckbox checkbox, boolean isChecked) { return view; } - private class ViewHolder - { ImageView type_icon; - TextView name,type; + private class ViewHolder { + ImageView type_icon; + TextView name, type; MaterialCheckbox fmark; ViewHolder(View itemView) { - name= itemView.findViewById(R.id.fname); - type= itemView.findViewById(R.id.ftype); - type_icon= itemView.findViewById(R.id.image_type); - fmark= itemView.findViewById(R.id.file_mark); + name = itemView.findViewById(R.id.fname); + type = itemView.findViewById(R.id.ftype); + type_icon = itemView.findViewById(R.id.image_type); + fmark = itemView.findViewById(R.id.file_mark); } } diff --git a/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java b/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java index e999405..fe83e37 100644 --- a/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java +++ b/library/src/main/java/com/developer/filepicker/view/FilePickerDialog.java @@ -128,8 +128,7 @@ public void notifyCheckBoxIsClicked() { int color; if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { color = context.getResources().getColor(R.color.colorAccent, context.getTheme()); - } - else { + } else { color = context.getResources().getColor(R.color.colorAccent); } select.setTextColor(Color.argb(128, Color.red(color), Color.green(color), Color.blue(color))); @@ -139,8 +138,7 @@ public void notifyCheckBoxIsClicked() { int color; if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) { color = context.getResources().getColor(R.color.colorAccent, context.getTheme()); - } - else { + } else { color = context.getResources().getColor(R.color.colorAccent); } select.setTextColor(color); @@ -188,8 +186,8 @@ protected void onStart() { super.onStart(); positiveBtnNameStr = ( positiveBtnNameStr == null ? - context.getResources().getString(R.string.choose_button_label) : - positiveBtnNameStr + context.getResources().getString(R.string.choose_button_label) : + positiveBtnNameStr ); select.setText(positiveBtnNameStr); if (Utility.checkStorageAccessPermissions(context)) { diff --git a/library/src/main/java/com/developer/filepicker/view/FilePickerPreference.java b/library/src/main/java/com/developer/filepicker/view/FilePickerPreference.java index 5a8a367..053b64f 100644 --- a/library/src/main/java/com/developer/filepicker/view/FilePickerPreference.java +++ b/library/src/main/java/com/developer/filepicker/view/FilePickerPreference.java @@ -23,7 +23,7 @@ public class FilePickerPreference extends Preference implements DialogSelectionL private FilePickerDialog mDialog; private DialogProperties properties; - private String titleText=null; + private String titleText = null; public FilePickerPreference(Context context) { super(context); @@ -96,9 +96,9 @@ private void showDialog(Bundle state) { @Override public void onSelectedFilePaths(String[] files) { - StringBuilder buff=new StringBuilder(); - for(String path:files) - { buff.append(path).append(":"); + StringBuilder buff = new StringBuilder(); + for (String path : files) { + buff.append(path).append(":"); } String dFiles = buff.toString(); if (isPersistent()) { @@ -106,8 +106,7 @@ public void onSelectedFilePaths(String[] files) { } try { getOnPreferenceChangeListener().onPreferenceChange(this, dFiles); - } - catch (NullPointerException e) { + } catch (NullPointerException e) { e.printStackTrace(); } } @@ -118,8 +117,8 @@ public boolean onPreferenceClick(Preference preference) { return false; } - public void setProperties(DialogProperties properties) - { mDialog.setProperties(properties); + public void setProperties(DialogProperties properties) { + mDialog.setProperties(properties); } private static class SavedState extends BaseSavedState { @@ -141,56 +140,49 @@ public SavedState(Parcelable superState) { } public static final Creator CREATOR = - new Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; + new Creator() { + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } + + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; } private void initProperties(AttributeSet attrs) { - TypedArray tarr=getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.FilePickerPreference,0,0); + TypedArray tarr = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.FilePickerPreference, 0, 0); final int N = tarr.getIndexCount(); - for (int i = 0; i < N; ++i) - { int attr = tarr.getIndex(i); + for (int i = 0; i < N; ++i) { + int attr = tarr.getIndex(i); if (attr == R.styleable.FilePickerPreference_selection_mode) { - properties.selection_mode=tarr.getInteger(R.styleable.FilePickerPreference_selection_mode, DialogConfigs.SINGLE_MODE); - } - else if (attr == R.styleable.FilePickerPreference_selection_type) { - properties.selection_type=tarr.getInteger(R.styleable.FilePickerPreference_selection_type,DialogConfigs.FILE_SELECT); - } - else if (attr == R.styleable.FilePickerPreference_root_dir) { - String root_dir=tarr.getString(R.styleable.FilePickerPreference_root_dir); - if(root_dir!=null&&!root_dir.equals("")) - { properties.root=new File(root_dir); + properties.selection_mode = tarr.getInteger(R.styleable.FilePickerPreference_selection_mode, DialogConfigs.SINGLE_MODE); + } else if (attr == R.styleable.FilePickerPreference_selection_type) { + properties.selection_type = tarr.getInteger(R.styleable.FilePickerPreference_selection_type, DialogConfigs.FILE_SELECT); + } else if (attr == R.styleable.FilePickerPreference_root_dir) { + String root_dir = tarr.getString(R.styleable.FilePickerPreference_root_dir); + if (root_dir != null && !root_dir.equals("")) { + properties.root = new File(root_dir); } - } - else if (attr == R.styleable.FilePickerPreference_error_dir) { - String error_dir=tarr.getString(R.styleable.FilePickerPreference_error_dir); - if(error_dir!=null&&!error_dir.equals("")) - { properties.error_dir=new File(error_dir); + } else if (attr == R.styleable.FilePickerPreference_error_dir) { + String error_dir = tarr.getString(R.styleable.FilePickerPreference_error_dir); + if (error_dir != null && !error_dir.equals("")) { + properties.error_dir = new File(error_dir); } - } - else if (attr == R.styleable.FilePickerPreference_offset_dir) { - String offset_dir=tarr.getString(R.styleable.FilePickerPreference_offset_dir); - if(offset_dir!=null&&!offset_dir.equals("")) - { properties.offset=new File(offset_dir); + } else if (attr == R.styleable.FilePickerPreference_offset_dir) { + String offset_dir = tarr.getString(R.styleable.FilePickerPreference_offset_dir); + if (offset_dir != null && !offset_dir.equals("")) { + properties.offset = new File(offset_dir); } - } - else if (attr == R.styleable.FilePickerPreference_extensions) { - String extensions=tarr.getString(R.styleable.FilePickerPreference_extensions); - if(extensions!=null&&!extensions.equals("")) - { properties.extensions= extensions.split(":"); + } else if (attr == R.styleable.FilePickerPreference_extensions) { + String extensions = tarr.getString(R.styleable.FilePickerPreference_extensions); + if (extensions != null && !extensions.equals("")) { + properties.extensions = extensions.split(":"); } - } - else if (attr == R.styleable.FilePickerPreference_title_text) { - titleText=tarr.getString(R.styleable.FilePickerPreference_title_text); - } - else if (attr == R.styleable.FilePickerPreference_show_hidden_files) { + } else if (attr == R.styleable.FilePickerPreference_title_text) { + titleText = tarr.getString(R.styleable.FilePickerPreference_title_text); + } else if (attr == R.styleable.FilePickerPreference_show_hidden_files) { properties.show_hidden_files = tarr.getBoolean(R.styleable.FilePickerPreference_show_hidden_files, false); } } diff --git a/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java b/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java index c271e17..9fe11bf 100644 --- a/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java +++ b/library/src/main/java/com/developer/filepicker/widget/MaterialCheckbox.java @@ -9,6 +9,7 @@ import android.os.Build; import android.util.AttributeSet; import android.view.View; + import com.developer.filepicker.R; /** @@ -58,32 +59,30 @@ public void onClick(View v) { @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - if(isChecked()) { + if (isChecked()) { paint.reset(); paint.setAntiAlias(true); - bounds.set(minDim / 10, minDim / 10, minDim - (minDim/10), minDim - (minDim/10)); + bounds.set(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { paint.setColor(getResources().getColor(R.color.colorAccent, context.getTheme())); - } - else { + } else { paint.setColor(getResources().getColor(R.color.colorAccent)); } canvas.drawRoundRect(bounds, minDim / 8, minDim / 8, paint); paint.setColor(Color.parseColor("#FFFFFF")); - paint.setStrokeWidth(minDim/10); + paint.setStrokeWidth(minDim / 10); paint.setStyle(Paint.Style.STROKE); paint.setStrokeJoin(Paint.Join.BEVEL); canvas.drawPath(tick, paint); - } - else { + } else { paint.reset(); paint.setAntiAlias(true); - bounds.set(minDim / 10, minDim / 10, minDim - (minDim/10), minDim - (minDim/10)); + bounds.set(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); paint.setColor(Color.parseColor("#C1C1C1")); canvas.drawRoundRect(bounds, minDim / 8, minDim / 8, paint); - bounds.set(minDim / 5, minDim / 5, minDim - (minDim/5), minDim - (minDim/5)); + bounds.set(minDim / 5, minDim / 5, minDim - (minDim / 5), minDim - (minDim / 5)); paint.setColor(Color.parseColor("#FFFFFF")); canvas.drawRect(bounds, paint); } @@ -95,7 +94,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int height = getMeasuredHeight(); int width = getMeasuredWidth(); minDim = Math.min(width, height); - bounds.set(minDim / 10, minDim / 10, minDim - (minDim/10), minDim - (minDim/10)); + bounds.set(minDim / 10, minDim / 10, minDim - (minDim / 10), minDim - (minDim / 10)); tick.moveTo(minDim / 4, minDim / 2); tick.lineTo(minDim / 2.5f, minDim - (minDim / 3)); diff --git a/sample/src/main/java/com/developer/filepicker/file/FileListAdapter.java b/sample/src/main/java/com/developer/filepicker/file/FileListAdapter.java index 3dedb4a..508824e 100644 --- a/sample/src/main/java/com/developer/filepicker/file/FileListAdapter.java +++ b/sample/src/main/java/com/developer/filepicker/file/FileListAdapter.java @@ -1,13 +1,14 @@ package com.developer.filepicker.file; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + import java.util.ArrayList; class FileListAdapter extends RecyclerView.Adapter { @@ -52,4 +53,4 @@ class FileListViewHolder extends RecyclerView.ViewHolder { path = itemView.findViewById(R.id.path); } } -} +} \ No newline at end of file diff --git a/sample/src/main/java/com/developer/filepicker/file/FilePickerApplication.java b/sample/src/main/java/com/developer/filepicker/file/FilePickerApplication.java index c899365..3c08b2b 100644 --- a/sample/src/main/java/com/developer/filepicker/file/FilePickerApplication.java +++ b/sample/src/main/java/com/developer/filepicker/file/FilePickerApplication.java @@ -1,6 +1,7 @@ package com.developer.filepicker.file; import android.app.Application; + import com.squareup.leakcanary.LeakCanary; public class FilePickerApplication extends Application { @@ -13,4 +14,4 @@ public void onCreate() { } LeakCanary.install(this); } -} +} \ No newline at end of file diff --git a/sample/src/main/java/com/developer/filepicker/file/ListItem.java b/sample/src/main/java/com/developer/filepicker/file/ListItem.java index 733492b..74f3131 100644 --- a/sample/src/main/java/com/developer/filepicker/file/ListItem.java +++ b/sample/src/main/java/com/developer/filepicker/file/ListItem.java @@ -1,8 +1,8 @@ package com.developer.filepicker.file; -public class ListItem { +public class ListItem { - private String name,path; + private String name, path; public String getName() { return name; @@ -19,4 +19,4 @@ public String getPath() { public void setPath(String path) { this.path = path; } -} +} \ No newline at end of file diff --git a/sample/src/main/java/com/developer/filepicker/file/MainActivity.java b/sample/src/main/java/com/developer/filepicker/file/MainActivity.java index 8d81690..d0ddb20 100644 --- a/sample/src/main/java/com/developer/filepicker/file/MainActivity.java +++ b/sample/src/main/java/com/developer/filepicker/file/MainActivity.java @@ -45,46 +45,43 @@ protected void onCreate(Bundle savedInstanceState) { fileList.setNestedScrollingEnabled(false); //Create a DialogProperties object. - final DialogProperties properties=new DialogProperties(); + final DialogProperties properties = new DialogProperties(); //Instantiate FilePickerDialog with Context and DialogProperties. - dialog=new FilePickerDialog(MainActivity.this,properties); + dialog = new FilePickerDialog(MainActivity.this, properties); dialog.setTitle("Select a File"); dialog.setPositiveBtnName("Select"); dialog.setNegativeBtnName("Cancel"); - RadioGroup modeRadio= findViewById(R.id.modeRadio); + RadioGroup modeRadio = findViewById(R.id.modeRadio); modeRadio.check(R.id.singleRadio); modeRadio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(RadioGroup group, int checkedId) { - switch(checkedId) - { case R.id.singleRadio: //Setting selection mode to single selection. - properties.selection_mode = DialogConfigs.SINGLE_MODE; - break; - + switch (checkedId) { + case R.id.singleRadio: //Setting selection mode to single selection. + properties.selection_mode = DialogConfigs.SINGLE_MODE; + break; case R.id.multiRadio: //Setting selection mode to multiple selection. - properties.selection_mode = DialogConfigs.MULTI_MODE; - break; + properties.selection_mode = DialogConfigs.MULTI_MODE; + break; } } }); - RadioGroup typeRadio= findViewById(R.id.typeRadio); + RadioGroup typeRadio = findViewById(R.id.typeRadio); typeRadio.check(R.id.selFile); typeRadio.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { @Override public void onCheckedChanged(RadioGroup group, int checkedId) { - switch(checkedId) - { case R.id.selFile: //Setting selection type to files. - properties.selection_type=DialogConfigs.FILE_SELECT; - break; - + switch (checkedId) { + case R.id.selFile: //Setting selection type to files. + properties.selection_type = DialogConfigs.FILE_SELECT; + break; case R.id.selDir: //Setting selection type to directories. - properties.selection_type=DialogConfigs.DIR_SELECT; - break; - + properties.selection_type = DialogConfigs.DIR_SELECT; + break; case R.id.selfilenddir: //Setting selection type to files and directories. - properties.selection_type=DialogConfigs.FILE_AND_DIR_SELECT; - break; + properties.selection_type = DialogConfigs.FILE_AND_DIR_SELECT; + break; } } }); @@ -98,7 +95,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) { @Override public void onClick(View view) { String fextension = extension.getText().toString(); - if(fextension.length()>0) { + if (fextension.length() > 0) { //Add extensions to be sorted from the EditText input to the array of String. int commas = countCommas(fextension); @@ -118,30 +115,26 @@ public void onClick(View view) { exts[i] = buff.toString(); //Set String Array of extensions. - properties.extensions=exts; - } - else - { //If EditText is empty, Initialise with null reference. - properties.extensions=null; + properties.extensions = exts; + } else { //If EditText is empty, Initialise with null reference. + properties.extensions = null; } - String foffset=root.getText().toString(); - if(foffset.length()>0||!foffset.equals("")) { + String foffset = root.getText().toString(); + if (foffset.length() > 0 || !foffset.equals("")) { //Setting Parent Directory. - properties.root=new File(foffset); - } - else { + properties.root = new File(foffset); + } else { //Setting Parent Directory to Default SDCARD. - properties.root=new File(DialogConfigs.DEFAULT_DIR); + properties.root = new File(DialogConfigs.DEFAULT_DIR); } - String fset=offset.getText().toString(); - if(fset.length()>0||!fset.equals("")) { + String fset = offset.getText().toString(); + if (fset.length() > 0 || !fset.equals("")) { //Setting Offset Directory. - properties.offset=new File(fset); - } - else { + properties.offset = new File(fset); + } else { //Setting Parent Directory to Default SDCARD. - properties.offset=new File(DialogConfigs.DEFAULT_DIR); + properties.offset = new File(DialogConfigs.DEFAULT_DIR); } properties.show_hidden_files = show_hidden_files.isChecked(); @@ -149,7 +142,7 @@ public void onClick(View view) { //Setting Alternative Directory, in case root is not accessible.This will be //used. - properties.error_dir=new File("/mnt"); + properties.error_dir = new File("/mnt"); //Set new properties of dialog. dialog.setProperties(properties); @@ -181,9 +174,9 @@ public void onSelectedFilePaths(String[] files) { int size = listItem.size(); listItem.clear(); mFileListAdapter.notifyItemRangeRemoved(0, size); - for(String path:files) { - File file=new File(path); - ListItem item=new ListItem(); + for (String path : files) { + File file = new File(path); + ListItem item = new ListItem(); item.setName(file.getName()); item.setPath(file.getAbsolutePath()); listItem.add(item); @@ -195,10 +188,8 @@ public void onSelectedFilePaths(String[] files) { private int countCommas(String fextension) { int count = 0; - for(char ch:fextension.toCharArray()) - { if(ch==',') { - count++; - } + for (char ch : fextension.toCharArray()) { + if (ch == ',') count++; } return count; } diff --git a/sample/src/main/java/com/developer/filepicker/file/SettingsActivity.java b/sample/src/main/java/com/developer/filepicker/file/SettingsActivity.java index fdb9c28..cdcb955 100644 --- a/sample/src/main/java/com/developer/filepicker/file/SettingsActivity.java +++ b/sample/src/main/java/com/developer/filepicker/file/SettingsActivity.java @@ -5,12 +5,13 @@ import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; -import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Toast; +import androidx.appcompat.widget.Toolbar; + import com.developer.filepicker.view.FilePickerPreference; public class SettingsActivity extends PreferenceActivity implements Preference.OnPreferenceChangeListener { @@ -20,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.pref_general); - FilePickerPreference fileDialog=(FilePickerPreference)findPreference("directories"); + FilePickerPreference fileDialog = (FilePickerPreference) findPreference("directories"); fileDialog.setOnPreferenceChangeListener(this); } @@ -28,14 +29,14 @@ protected void onCreate(Bundle savedInstanceState) { protected void onPostCreate(Bundle savedInstanceState) { super.onPostCreate(savedInstanceState); Toolbar toolbar; - { LinearLayout root = (LinearLayout) findViewById(android.R.id.list).getParent().getParent().getParent(); + { + LinearLayout root = (LinearLayout) findViewById(android.R.id.list).getParent().getParent().getParent(); toolbar = (Toolbar) LayoutInflater.from(this).inflate(R.layout.toolbar, root, false); root.addView(toolbar, 0); } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary,getTheme())); - } - else { + toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary, getTheme())); + } else { toolbar.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); } toolbar.setNavigationIcon(R.drawable.ic_up_navigation); @@ -51,11 +52,10 @@ public void onClick(View v) { @Override public boolean onPreferenceChange(Preference preference, Object o) { - if(preference.getKey().equals("directories")) - { String value=(String)o; + if (preference.getKey().equals("directories")) { + String value = (String) o; String[] arr = value.split(":"); - for(String path:arr) - Toast.makeText(SettingsActivity.this,path,Toast.LENGTH_SHORT).show(); + for (String path : arr) Toast.makeText(SettingsActivity.this, path, Toast.LENGTH_SHORT).show(); } return false; }