@@ -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 ();
0 commit comments