|
8 | 8 | import android.view.View; |
9 | 9 | import android.widget.TextView; |
10 | 10 |
|
| 11 | +import com.simplemobiletools.filemanager.Config; |
11 | 12 | import com.simplemobiletools.filemanager.R; |
12 | 13 | import com.simplemobiletools.filemanager.Utils; |
13 | 14 | import com.simplemobiletools.filemanager.models.FileDirItem; |
|
18 | 19 |
|
19 | 20 | public class PropertiesDialog extends DialogFragment { |
20 | 21 | private static FileDirItem mItem; |
| 22 | + private static int mFilesCnt; |
| 23 | + private static boolean mShowHidden; |
21 | 24 |
|
22 | 25 | public static PropertiesDialog newInstance(FileDirItem item) { |
23 | 26 | mItem = item; |
| 27 | + mFilesCnt = 0; |
24 | 28 | return new PropertiesDialog(); |
25 | 29 | } |
26 | 30 |
|
27 | 31 | @Override |
28 | 32 | public Dialog onCreateDialog(Bundle savedInstanceState) { |
| 33 | + mShowHidden = Config.newInstance(getContext()).getShowHidden(); |
29 | 34 | final int title = (mItem.getIsDirectory()) ? R.string.directory_properties : R.string.file_properties; |
30 | 35 |
|
31 | 36 | 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 | + |
32 | 41 | if (mItem.getIsDirectory()) { |
33 | 42 | infoView.findViewById(R.id.properties_files_count_label).setVisibility(View.VISIBLE); |
34 | 43 | 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)); |
36 | 45 | } |
37 | 46 |
|
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 | | - |
42 | 47 | final File file = new File(mItem.getPath()); |
43 | 48 | ((TextView) infoView.findViewById(R.id.properties_last_modified)).setText(formatLastModified(file.lastModified())); |
44 | 49 |
|
@@ -73,6 +78,8 @@ private long directorySize(File dir) { |
73 | 78 | size += directorySize(files[i]); |
74 | 79 | } else { |
75 | 80 | size += files[i].length(); |
| 81 | + if ((!files[i].isHidden() && !dir.isHidden()) || mShowHidden) |
| 82 | + mFilesCnt++; |
76 | 83 | } |
77 | 84 | } |
78 | 85 | return size; |
|
0 commit comments