fenix/Simple-File-Manager
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-File-Manager.git synced 2025-06-05 22:09:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not replace the root folder with "home"

Browse Source
This commit is contained in:
tibbi
2016-09-05 20:03:43 +02:00
parent 35ce30804a
commit 82045524c3
7 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/simplemobiletools/filemanager/Breadcrumbs.java
View File

@@ -101,10 +101,9 @@ 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, getContext().getString(R.string.initial_breadcrumb) + "/");
removeAllViewsInLayout();
final String[] dirs = tempPath.split("/");
String currPath = basePath;
final String[] dirs = fullPath.split("/");
String currPath = "/";
for (int i = 0; i < dirs.length; i++) {
final String dir = dirs[i];
if (i > 0) {

18
app/src/main/java/com/simplemobiletools/filemanager/activities/MainActivity.java
View File

@@ -24,6 +24,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
@BindView(R.id.breadcrumbs) Breadcrumbs mBreadcrumbs;
private static final int STORAGE_PERMISSION = 1;
private static int mRootFoldersCnt;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +53,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
final String path = Environment.getExternalStorageDirectory().toString();
openPath(path);
mBreadcrumbs.setInitialBreadcrumb(path);
mRootFoldersCnt = mBreadcrumbs.getChildCount();
}
private void openPath(String path) {
@@ -87,10 +89,10 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
@Override
public void onBackPressed() {
final int cnt = getSupportFragmentManager().getBackStackEntryCount();
if (cnt == 1)
final int cnt = mBreadcrumbs.getChildCount() - mRootFoldersCnt;
if (cnt <= 0) {
finish();
else {
} else {
mBreadcrumbs.removeBreadcrumb();
super.onBackPressed();
}
@@ -118,11 +120,9 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
@Override
public void breadcrumbClicked(int id) {
final int children = mBreadcrumbs.getChildCount() - 1;
final int removeCnt = children - id;
for (int i = 0; i < removeCnt; i++) {
getSupportFragmentManager().popBackStack();
mBreadcrumbs.removeBreadcrumb();
}
final FileDirItem item = (FileDirItem) mBreadcrumbs.getChildAt(id).getTag();
final String path = item.getPath();
openPath(path);
mBreadcrumbs.setInitialBreadcrumb(path);
}
}

1
app/src/main/res/values-de/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="please_select_destination">Bitte wähle ein Ziel</string>
<string name="copy_failed">Konnte die Datei nicht kopieren</string>
<string name="copying">Kopiere</string>
<string name="initial_breadcrumb">home</string>
<string name="ok">OK</string>
<string name="cancel">Abbrechen</string>

1
app/src/main/res/values-it/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="please_select_destination">Seleziona una destinazione</string>
<string name="copy_failed">Impossibile copiare i file</string>
<string name="copying">Copia in corso</string>
<string name="initial_breadcrumb">home</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>

1
app/src/main/res/values-ja/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="please_select_destination">宛先を選択してください</string>
<string name="copy_failed">ファイルをコピーできませんでした</string>
<string name="copying">コピー中</string>
<string name="initial_breadcrumb">ホーム</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>

1
app/src/main/res/values-sv/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="please_select_destination">Please select a destination</string>
<string name="copy_failed">Kunde inte kopiera filen</string>
<string name="copying">Kopierar</string>
<string name="initial_breadcrumb">home</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>

1
app/src/main/res/values/strings.xml
View File

@@ -29,7 +29,6 @@
<string name="please_select_destination">Please select a destination</string>
<string name="copy_failed">Could not copy the files</string>
<string name="copying">Copying</string>
<string name="initial_breadcrumb">home</string>
<string name="ok">OK</string>
<string name="cancel">Cancel</string>