diff --git a/app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java b/app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java index f41f9c78..aa05fd60 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java @@ -2,6 +2,7 @@ package com.simplemobiletools.filemanager; import android.content.Context; import android.graphics.Point; +import android.os.Environment; import android.util.AttributeSet; import android.view.Display; import android.view.LayoutInflater; @@ -99,16 +100,21 @@ public class Breadcrumbs extends LinearLayout implements View.OnClickListener { } public void setInitialBreadcrumb(String fullPath) { + final String basePath = Environment.getExternalStorageDirectory().toString(); + final String tempPath = fullPath.replace(basePath, "home/"); removeAllViewsInLayout(); - final String[] dirs = fullPath.split("/"); - String currPath = ""; + final String[] dirs = tempPath.split("/"); + String currPath = basePath; for (int i = 0; i < dirs.length; i++) { final String dir = dirs[i]; - currPath += dir + "/"; + if (i > 0) { + currPath += dir + "/"; + } + if (dir.isEmpty()) continue; - final FileDirItem item = new FileDirItem(currPath, dir, true, 0, 0); + final FileDirItem item = new FileDirItem(i > 0 ? currPath : basePath, dir, true, 0, 0); addBreadcrumb(item, i > 1); } } diff --git a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java index e0e50c52..f071553d 100644 --- a/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java +++ b/app/src/main/java/com/simplemobiletools/filemanager/fragments/ItemsFragment.java @@ -385,7 +385,7 @@ public class ItemsFragment extends android.support.v4.app.Fragment final View copyView = getActivity().getLayoutInflater().inflate(R.layout.copy_item, null); final TextView source = (TextView) copyView.findViewById(R.id.source); - source.setText(mPath); + source.setText(mPath + "/"); final TextView destination = (TextView) copyView.findViewById(R.id.destination); destination.setOnClickListener(destinationPicker); @@ -526,7 +526,10 @@ public class ItemsFragment extends android.support.v4.app.Fragment alertDialog.setOnDismissListener(new DialogInterface.OnDismissListener() { @Override public void onDismiss(DialogInterface dialog) { - mCopyDestinationPath = ((TextView) destinationView).getText().toString().trim(); + final String destText = ((TextView) destinationView).getText().toString().trim(); + if (!destText.equals(getString(R.string.select_destination))) { + mCopyDestinationPath = destText; + } } }); diff --git a/app/src/main/res/layout/copy_item.xml b/app/src/main/res/layout/copy_item.xml index 5fcca674..4faaf242 100644 --- a/app/src/main/res/layout/copy_item.xml +++ b/app/src/main/res/layout/copy_item.xml @@ -1,12 +1,13 @@ - + - + - diff --git a/app/src/main/res/layout/directory_picker.xml b/app/src/main/res/layout/directory_picker.xml index c881a643..a1385ad3 100644 --- a/app/src/main/res/layout/directory_picker.xml +++ b/app/src/main/res/layout/directory_picker.xml @@ -16,7 +16,6 @@ android:id="@+id/directory_picker_list" xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/directory_picker_breadcrumbs"/> + android:layout_height="wrap_content"/> diff --git a/app/src/main/res/layout/items_fragment.xml b/app/src/main/res/layout/items_fragment.xml index b27373c6..dce29add 100644 --- a/app/src/main/res/layout/items_fragment.xml +++ b/app/src/main/res/layout/items_fragment.xml @@ -17,6 +17,7 @@ android:choiceMode="multipleChoiceModal" android:clipToPadding="false" android:paddingLeft="@dimen/activity_margin"/> + + diff --git a/app/src/main/res/layout/rename_item.xml b/app/src/main/res/layout/rename_item.xml index 2efc527e..cdd4bdd6 100644 --- a/app/src/main/res/layout/rename_item.xml +++ b/app/src/main/res/layout/rename_item.xml @@ -1,10 +1,11 @@ - +