Skip to content

Commit 483b433

Browse files
committed
show full path at breadcrumbs if set so
1 parent 899255f commit 483b433

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void tryInitFileManager() {
7373
private void initRootFileManager() {
7474
final String path = Environment.getExternalStorageDirectory().toString();
7575
openPath(path);
76-
mBreadcrumbs.setInitialBreadcrumb(path);
76+
mBreadcrumbs.setInitialBreadcrumb(path, mConfig.getShowFullPath());
7777
mRootFoldersCnt = mBreadcrumbs.getChildCount();
7878
}
7979

@@ -143,7 +143,7 @@ public void itemClicked(FileDirItem item) {
143143
public void breadcrumbClicked(int id) {
144144
final FileDirItem item = (FileDirItem) mBreadcrumbs.getChildAt(id).getTag();
145145
final String path = item.getPath();
146-
mBreadcrumbs.setInitialBreadcrumb(path);
146+
mBreadcrumbs.setInitialBreadcrumb(path, mConfig.getShowFullPath());
147147
openPath(path);
148148
}
149149
}

app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,8 @@ private void notifyDeletion(int cnt) {
549549
@Override
550550
public void onClick(final View view) {
551551
final boolean showHiddenItems = Config.newInstance(getContext()).getShowHidden();
552-
SelectFolderDialog dialog = SelectFolderDialog.Companion.newInstance(mCopyDestinationPath, showHiddenItems);
552+
final boolean showFullPath = Config.newInstance(getContext()).getShowFullPath();
553+
SelectFolderDialog dialog = SelectFolderDialog.Companion.newInstance(mCopyDestinationPath, showHiddenItems, showFullPath);
553554
dialog.setTargetFragment(ItemsFragment.this, SELECT_FOLDER_REQUEST);
554555
dialog.show(getFragmentManager(), "selectFolder");
555556
}

library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener {
2525
lateinit var mPath: String
2626
var mFirstUpdate: Boolean = true
2727
var mShowHidden: Boolean = false
28+
var mShowFullPath: Boolean = false
2829

29-
fun newInstance(path: String, showHidden: Boolean): SelectFolderDialog {
30+
fun newInstance(path: String, showHidden: Boolean, showFullPath: Boolean): SelectFolderDialog {
3031
mPath = path
3132
mFirstUpdate = true
3233
mShowHidden = showHidden
34+
mShowFullPath = showFullPath
3335
return SelectFolderDialog()
3436
}
3537
}
@@ -61,7 +63,7 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener {
6163

6264
val adapter = ItemsAdapter(context, items)
6365
dialog.directory_picker_list.adapter = adapter
64-
dialog.directory_picker_breadcrumbs.setInitialBreadcrumb(mPath)
66+
dialog.directory_picker_breadcrumbs.setInitialBreadcrumb(mPath, mShowFullPath)
6567
dialog.directory_picker_list.setOnItemClickListener { adapterView, view, position, id ->
6668
val item = items[position]
6769
if (item.isDirectory) {

library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context,
9696
setMeasuredDimension(parentWidth, calculatedHeight)
9797
}
9898

99-
fun setInitialBreadcrumb(fullPath: String) {
100-
val showFullPath = false//Config.newInstance(context).showFullPath
99+
fun setInitialBreadcrumb(fullPath: String, showFullPath: Boolean) {
101100
val basePath = Environment.getExternalStorageDirectory().toString()
102101
var tempPath = fullPath
103102
var currPath = basePath

0 commit comments

Comments
 (0)