Skip to content

Commit 3b9c697

Browse files
committed
display an empty properties dialog on info click
1 parent 1be4ccb commit 3b9c697

File tree

8 files changed

+55
-17
lines changed

8 files changed

+55
-17
lines changed

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

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
313313
MenuItem menuItem = menu.findItem(R.id.cab_rename);
314314
menuItem.setVisible(mSelectedItemsCnt == 1);
315315

316-
menuItem = menu.findItem(R.id.cab_info);
316+
menuItem = menu.findItem(R.id.cab_properties);
317317
menuItem.setVisible(mSelectedItemsCnt == 1);
318318

319319
return true;
@@ -325,8 +325,8 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
325325
case R.id.cab_rename:
326326
displayRenameDialog();
327327
break;
328-
case R.id.cab_info:
329-
displayInfoDialog();
328+
case R.id.cab_properties:
329+
displayPropertiesDialog();
330330
break;
331331
case R.id.cab_share:
332332
shareFiles();
@@ -369,24 +369,33 @@ private void shareFiles() {
369369
startActivity(Intent.createChooser(sendIntent, shareTitle));
370370
}
371371

372-
private void displayInfoDialog() {
372+
private void displayPropertiesDialog() {
373+
final FileDirItem item = getSelectedItem();
374+
if (item == null)
375+
return;
376+
377+
final int title = (item.getIsDirectory()) ? R.string.directory_properties : R.string.file_properties;
373378

379+
final View infoView = getActivity().getLayoutInflater().inflate(R.layout.item_info, null);
380+
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
381+
builder.setTitle(getResources().getString(title));
382+
builder.setView(infoView);
383+
builder.setPositiveButton(R.string.ok, null);
384+
builder.create().show();
374385
}
375386

376387
private void displayRenameDialog() {
377-
final List<Integer> itemIndexes = getSelectedItemIndexes();
378-
if (itemIndexes.isEmpty())
388+
final FileDirItem item = getSelectedItem();
389+
if (item == null)
379390
return;
380391

381-
final int itemIndex = itemIndexes.get(0);
382-
final FileDirItem item = mItems.get(itemIndex);
383392
final View renameView = getActivity().getLayoutInflater().inflate(R.layout.rename_item, null);
384393
final EditText itemName = (EditText) renameView.findViewById(R.id.item_name);
385394
itemName.setText(item.getName());
386395

387-
final int renameString = (item.getIsDirectory()) ? R.string.rename_directory : R.string.rename_file;
396+
final int title = (item.getIsDirectory()) ? R.string.rename_directory : R.string.rename_file;
388397
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
389-
builder.setTitle(getResources().getString(renameString));
398+
builder.setTitle(getResources().getString(title));
390399
builder.setView(renameView);
391400
builder.setPositiveButton(R.string.ok, null);
392401
builder.setNegativeButton(R.string.cancel, null);
@@ -487,6 +496,15 @@ public void onDismiss(DialogInterface dialog) {
487496
});
488497
}
489498

499+
private FileDirItem getSelectedItem() {
500+
final List<Integer> itemIndexes = getSelectedItemIndexes();
501+
if (itemIndexes.isEmpty())
502+
return null;
503+
504+
final int itemIndex = itemIndexes.get(0);
505+
return mItems.get(itemIndex);
506+
}
507+
490508
private List<Integer> getSelectedItemIndexes() {
491509
final List<Integer> selectedItems = new ArrayList<>();
492510
final SparseBooleanArray items = mListView.getCheckedItemPositions();
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
android:id="@+id/dialog_holder"
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:orientation="vertical"
8+
android:padding="@dimen/activity_margin">
9+
10+
</LinearLayout>

app/src/main/res/menu/cab.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
44
<item
5-
android:id="@+id/cab_info"
5+
android:id="@+id/cab_properties"
66
android:icon="@mipmap/info"
7-
android:title="@string/info"
7+
android:title="@string/properties"
88
app:showAsAction="ifRoom"/>
99
<item
1010
android:id="@+id/cab_rename"

app/src/main/res/values-de/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<string name="delete">Löschen</string>
1616
<string name="undo">Rückgängig</string>
1717
<string name="rename">Umbenennen</string>
18-
<string name="info">Info</string>
18+
<string name="properties">Properties</string>
1919
<string name="copy">Kopieren</string>
2020
<string name="copy_move">Copy/Move</string>
2121
<string name="share">Teilen</string>
@@ -34,6 +34,8 @@
3434
<string name="initial_breadcrumb">home</string>
3535
<string name="ok">OK</string>
3636
<string name="cancel">Abbrechen</string>
37+
<string name="file_properties">File properties</string>
38+
<string name="directory_properties">Directory properties</string>
3739

3840
<plurals name="items_deleted">
3941
<item quantity="one">1 Datei/Ordner gelöscht</item>

app/src/main/res/values-it/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<string name="delete">Elimina</string>
1616
<string name="undo">Annulla</string>
1717
<string name="rename">Rinomina</string>
18-
<string name="info">Info</string>
18+
<string name="properties">Properties</string>
1919
<string name="copy">Copia</string>
2020
<string name="copy_move">Copy/Move</string>
2121
<string name="share">Condividi</string>
@@ -34,6 +34,8 @@
3434
<string name="initial_breadcrumb">home</string>
3535
<string name="ok">OK</string>
3636
<string name="cancel">Cancel</string>
37+
<string name="file_properties">File properties</string>
38+
<string name="directory_properties">Directory properties</string>
3739

3840
<plurals name="items_deleted">
3941
<item quantity="one">1 elemento eliminato</item>

app/src/main/res/values-ja/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<string name="delete">削除</string>
1616
<string name="undo">元に戻す</string>
1717
<string name="rename">名前を変更</string>
18-
<string name="info">Info</string>
18+
<string name="properties">Properties</string>
1919
<string name="copy">コピー</string>
2020
<string name="copy_move">Copy/Move</string>
2121
<string name="share">Dela</string>
@@ -34,6 +34,8 @@
3434
<string name="initial_breadcrumb">ホーム</string>
3535
<string name="ok">OK</string>
3636
<string name="cancel">Cancel</string>
37+
<string name="file_properties">File properties</string>
38+
<string name="directory_properties">Directory properties</string>
3739

3840
<plurals name="items_deleted">
3941
<item quantity="one">1 アイテムを削除しました</item>

app/src/main/res/values-sv/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<string name="delete">Ta bort</string>
1616
<string name="undo">Ångra</string>
1717
<string name="rename">Döp om</string>
18-
<string name="info">Info</string>
18+
<string name="properties">Properties</string>
1919
<string name="copy">Kopiera</string>
2020
<string name="copy_move">Copy/Move</string>
2121
<string name="share">Dela</string>
@@ -34,6 +34,8 @@
3434
<string name="initial_breadcrumb">home</string>
3535
<string name="ok">OK</string>
3636
<string name="cancel">Cancel</string>
37+
<string name="file_properties">File properties</string>
38+
<string name="directory_properties">Directory properties</string>
3739

3840
<plurals name="items_deleted">
3941
<item quantity="one">1 objekt borttagen</item>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<string name="delete">Delete</string>
1616
<string name="undo">Undo</string>
1717
<string name="rename">Rename</string>
18-
<string name="info">Info</string>
18+
<string name="properties">Properties</string>
1919
<string name="copy">Copy</string>
2020
<string name="copy_move">Copy/Move</string>
2121
<string name="share">Share</string>
@@ -34,6 +34,8 @@
3434
<string name="initial_breadcrumb">home</string>
3535
<string name="ok">OK</string>
3636
<string name="cancel">Cancel</string>
37+
<string name="file_properties">File properties</string>
38+
<string name="directory_properties">Directory properties</string>
3739

3840
<plurals name="items_deleted">
3941
<item quantity="one">1 item deleted</item>

0 commit comments

Comments
 (0)