From d3567b0b956518ffbeb755c4559817b5f8e67de8 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 12 Oct 2016 23:39:32 +0200 Subject: [PATCH] rename setInitialBreadcrumb to setBreadcrumb --- .../filemanager/activities/MainActivity.java | 2 +- .../filepicker/dialogs/SelectFolderDialog.kt | 4 ++-- .../com/simplemobiletools/filepicker/views/Breadcrumbs.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java index e39c662d..87bd61f1 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java @@ -78,7 +78,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn } private void openPath(String path) { - mBreadcrumbs.setInitialBreadcrumb(path, mConfig.getShowFullPath()); + mBreadcrumbs.setBreadcrumb(path, mConfig.getShowFullPath()); final Bundle bundle = new Bundle(); bundle.putString(Constants.PATH, path); diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt index 2cbe5fef..152cfcdd 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/dialogs/SelectFolderDialog.kt @@ -18,13 +18,13 @@ import java.util.* import kotlin.comparisons.compareBy class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener { - val SELECT_FOLDER_PATH = "path" companion object { lateinit var mPath: String var mFirstUpdate: Boolean = true var mShowHidden: Boolean = false var mShowFullPath: Boolean = false + val SELECT_FOLDER_PATH = "path" fun newInstance(path: String, showHidden: Boolean, showFullPath: Boolean): SelectFolderDialog { mPath = path @@ -64,7 +64,7 @@ class SelectFolderDialog : DialogFragment(), Breadcrumbs.BreadcrumbsListener { val adapter = ItemsAdapter(context, items) dialog.directory_picker_list.adapter = adapter - dialog.directory_picker_breadcrumbs.setInitialBreadcrumb(mPath, mShowFullPath) + dialog.directory_picker_breadcrumbs.setBreadcrumb(mPath, mShowFullPath) dialog.directory_picker_list.setOnItemClickListener { adapterView, view, position, id -> val item = items[position] if (item.isDirectory) { diff --git a/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt b/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt index 093f1e6c..ce107b2b 100644 --- a/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt +++ b/library/src/main/kotlin/com/simplemobiletools/filepicker/views/Breadcrumbs.kt @@ -96,7 +96,7 @@ class Breadcrumbs(context: Context, attrs: AttributeSet) : LinearLayout(context, setMeasuredDimension(parentWidth, calculatedHeight) } - fun setInitialBreadcrumb(fullPath: String, showFullPath: Boolean) { + fun setBreadcrumb(fullPath: String, showFullPath: Boolean) { val basePath = Environment.getExternalStorageDirectory().toString() var tempPath = fullPath var currPath = basePath