mirror of
https://github.com/SimpleMobileTools/Simple-File-Manager.git
synced 2025-06-05 22:09:15 +02:00
do not replace the root folder with "home"
This commit is contained in:
parent
35ce30804a
commit
82045524c3
@ -101,10 +101,9 @@ public class Breadcrumbs extends LinearLayout implements View.OnClickListener {
|
|||||||
|
|
||||||
public void setInitialBreadcrumb(String fullPath) {
|
public void setInitialBreadcrumb(String fullPath) {
|
||||||
final String basePath = Environment.getExternalStorageDirectory().toString();
|
final String basePath = Environment.getExternalStorageDirectory().toString();
|
||||||
final String tempPath = fullPath.replace(basePath, getContext().getString(R.string.initial_breadcrumb) + "/");
|
|
||||||
removeAllViewsInLayout();
|
removeAllViewsInLayout();
|
||||||
final String[] dirs = tempPath.split("/");
|
final String[] dirs = fullPath.split("/");
|
||||||
String currPath = basePath;
|
String currPath = "/";
|
||||||
for (int i = 0; i < dirs.length; i++) {
|
for (int i = 0; i < dirs.length; i++) {
|
||||||
final String dir = dirs[i];
|
final String dir = dirs[i];
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
|
@ -24,6 +24,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
|
|||||||
@BindView(R.id.breadcrumbs) Breadcrumbs mBreadcrumbs;
|
@BindView(R.id.breadcrumbs) Breadcrumbs mBreadcrumbs;
|
||||||
|
|
||||||
private static final int STORAGE_PERMISSION = 1;
|
private static final int STORAGE_PERMISSION = 1;
|
||||||
|
private static int mRootFoldersCnt;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
@ -52,6 +53,7 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
|
|||||||
final String path = Environment.getExternalStorageDirectory().toString();
|
final String path = Environment.getExternalStorageDirectory().toString();
|
||||||
openPath(path);
|
openPath(path);
|
||||||
mBreadcrumbs.setInitialBreadcrumb(path);
|
mBreadcrumbs.setInitialBreadcrumb(path);
|
||||||
|
mRootFoldersCnt = mBreadcrumbs.getChildCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void openPath(String path) {
|
private void openPath(String path) {
|
||||||
@ -87,10 +89,10 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBackPressed() {
|
public void onBackPressed() {
|
||||||
final int cnt = getSupportFragmentManager().getBackStackEntryCount();
|
final int cnt = mBreadcrumbs.getChildCount() - mRootFoldersCnt;
|
||||||
if (cnt == 1)
|
if (cnt <= 0) {
|
||||||
finish();
|
finish();
|
||||||
else {
|
} else {
|
||||||
mBreadcrumbs.removeBreadcrumb();
|
mBreadcrumbs.removeBreadcrumb();
|
||||||
super.onBackPressed();
|
super.onBackPressed();
|
||||||
}
|
}
|
||||||
@ -118,11 +120,9 @@ public class MainActivity extends SimpleActivity implements ItemsFragment.ItemIn
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void breadcrumbClicked(int id) {
|
public void breadcrumbClicked(int id) {
|
||||||
final int children = mBreadcrumbs.getChildCount() - 1;
|
final FileDirItem item = (FileDirItem) mBreadcrumbs.getChildAt(id).getTag();
|
||||||
final int removeCnt = children - id;
|
final String path = item.getPath();
|
||||||
for (int i = 0; i < removeCnt; i++) {
|
openPath(path);
|
||||||
getSupportFragmentManager().popBackStack();
|
mBreadcrumbs.setInitialBreadcrumb(path);
|
||||||
mBreadcrumbs.removeBreadcrumb();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
<string name="please_select_destination">Bitte wähle ein Ziel</string>
|
<string name="please_select_destination">Bitte wähle ein Ziel</string>
|
||||||
<string name="copy_failed">Konnte die Datei nicht kopieren</string>
|
<string name="copy_failed">Konnte die Datei nicht kopieren</string>
|
||||||
<string name="copying">Kopiere</string>
|
<string name="copying">Kopiere</string>
|
||||||
<string name="initial_breadcrumb">home</string>
|
|
||||||
<string name="ok">OK</string>
|
<string name="ok">OK</string>
|
||||||
<string name="cancel">Abbrechen</string>
|
<string name="cancel">Abbrechen</string>
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
<string name="please_select_destination">Seleziona una destinazione</string>
|
<string name="please_select_destination">Seleziona una destinazione</string>
|
||||||
<string name="copy_failed">Impossibile copiare i file</string>
|
<string name="copy_failed">Impossibile copiare i file</string>
|
||||||
<string name="copying">Copia in corso</string>
|
<string name="copying">Copia in corso</string>
|
||||||
<string name="initial_breadcrumb">home</string>
|
|
||||||
<string name="ok">OK</string>
|
<string name="ok">OK</string>
|
||||||
<string name="cancel">Cancel</string>
|
<string name="cancel">Cancel</string>
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
<string name="please_select_destination">宛先を選択してください</string>
|
<string name="please_select_destination">宛先を選択してください</string>
|
||||||
<string name="copy_failed">ファイルをコピーできませんでした</string>
|
<string name="copy_failed">ファイルをコピーできませんでした</string>
|
||||||
<string name="copying">コピー中</string>
|
<string name="copying">コピー中</string>
|
||||||
<string name="initial_breadcrumb">ホーム</string>
|
|
||||||
<string name="ok">OK</string>
|
<string name="ok">OK</string>
|
||||||
<string name="cancel">Cancel</string>
|
<string name="cancel">Cancel</string>
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
<string name="please_select_destination">Please select a destination</string>
|
<string name="please_select_destination">Please select a destination</string>
|
||||||
<string name="copy_failed">Kunde inte kopiera filen</string>
|
<string name="copy_failed">Kunde inte kopiera filen</string>
|
||||||
<string name="copying">Kopierar</string>
|
<string name="copying">Kopierar</string>
|
||||||
<string name="initial_breadcrumb">home</string>
|
|
||||||
<string name="ok">OK</string>
|
<string name="ok">OK</string>
|
||||||
<string name="cancel">Cancel</string>
|
<string name="cancel">Cancel</string>
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
<string name="please_select_destination">Please select a destination</string>
|
<string name="please_select_destination">Please select a destination</string>
|
||||||
<string name="copy_failed">Could not copy the files</string>
|
<string name="copy_failed">Could not copy the files</string>
|
||||||
<string name="copying">Copying</string>
|
<string name="copying">Copying</string>
|
||||||
<string name="initial_breadcrumb">home</string>
|
|
||||||
<string name="ok">OK</string>
|
<string name="ok">OK</string>
|
||||||
<string name="cancel">Cancel</string>
|
<string name="cancel">Cancel</string>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user