Skip to content

Commit 38f73c8

Browse files
committed
display subfiles count of directories
1 parent 0fe69a1 commit 38f73c8

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

app/src/main/java/com/simplemobiletools/filemanager/dialogs/PropertiesDialog.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.view.View;
99
import android.widget.TextView;
1010

11+
import com.simplemobiletools.filemanager.Config;
1112
import com.simplemobiletools.filemanager.R;
1213
import com.simplemobiletools.filemanager.Utils;
1314
import com.simplemobiletools.filemanager.models.FileDirItem;
@@ -18,27 +19,31 @@
1819

1920
public class PropertiesDialog extends DialogFragment {
2021
private static FileDirItem mItem;
22+
private static int mFilesCnt;
23+
private static boolean mShowHidden;
2124

2225
public static PropertiesDialog newInstance(FileDirItem item) {
2326
mItem = item;
27+
mFilesCnt = 0;
2428
return new PropertiesDialog();
2529
}
2630

2731
@Override
2832
public Dialog onCreateDialog(Bundle savedInstanceState) {
33+
mShowHidden = Config.newInstance(getContext()).getShowHidden();
2934
final int title = (mItem.getIsDirectory()) ? R.string.directory_properties : R.string.file_properties;
3035

3136
final View infoView = getActivity().getLayoutInflater().inflate(R.layout.item_properties, null);
37+
((TextView) infoView.findViewById(R.id.properties_name)).setText(mItem.getName());
38+
((TextView) infoView.findViewById(R.id.properties_path)).setText(mItem.getPath());
39+
((TextView) infoView.findViewById(R.id.properties_size)).setText(getItemSize());
40+
3241
if (mItem.getIsDirectory()) {
3342
infoView.findViewById(R.id.properties_files_count_label).setVisibility(View.VISIBLE);
3443
infoView.findViewById(R.id.properties_files_count).setVisibility(View.VISIBLE);
35-
((TextView) infoView.findViewById(R.id.properties_files_count)).setText(String.valueOf(mItem.getChildren()));
44+
((TextView) infoView.findViewById(R.id.properties_files_count)).setText(String.valueOf(mFilesCnt));
3645
}
3746

38-
((TextView) infoView.findViewById(R.id.properties_name)).setText(mItem.getName());
39-
((TextView) infoView.findViewById(R.id.properties_path)).setText(mItem.getPath());
40-
((TextView) infoView.findViewById(R.id.properties_size)).setText(getItemSize());
41-
4247
final File file = new File(mItem.getPath());
4348
((TextView) infoView.findViewById(R.id.properties_last_modified)).setText(formatLastModified(file.lastModified()));
4449

@@ -73,6 +78,8 @@ private long directorySize(File dir) {
7378
size += directorySize(files[i]);
7479
} else {
7580
size += files[i].length();
81+
if ((!files[i].isHidden() && !dir.isHidden()) || mShowHidden)
82+
mFilesCnt++;
7683
}
7784
}
7885
return size;

0 commit comments

Comments
 (0)