Skip to content

Commit bb371a3

Browse files
committed
convert FileDirItem to kotlin
1 parent de71cef commit bb371a3

File tree

6 files changed

+26
-66
lines changed

6 files changed

+26
-66
lines changed

app/src/main/java/com/simplemobiletools/filemanager/adapters/ItemsAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
4949
final FileDirItem item = mItems.get(position);
5050
viewHolder.name.setText(item.getName());
5151

52-
if (item.getIsDirectory()) {
52+
if (item.isDirectory()) {
5353
viewHolder.icon.setImageBitmap(mDirectoryBmp);
5454
viewHolder.details.setText(getChildrenCnt(item));
5555
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ public static PropertiesDialog newInstance(FileDirItem item) {
3131
@Override
3232
public Dialog onCreateDialog(Bundle savedInstanceState) {
3333
mShowHidden = Config.newInstance(getContext()).getShowHidden();
34-
final int title = (mItem.getIsDirectory()) ? R.string.directory_properties : R.string.file_properties;
34+
final int title = (mItem.isDirectory()) ? R.string.directory_properties : R.string.file_properties;
3535

3636
final View infoView = getActivity().getLayoutInflater().inflate(R.layout.item_properties, null);
3737
((TextView) infoView.findViewById(R.id.properties_name)).setText(mItem.getName());
3838
((TextView) infoView.findViewById(R.id.properties_path)).setText(mItem.getPath());
3939
((TextView) infoView.findViewById(R.id.properties_size)).setText(getItemSize());
4040

41-
if (mItem.getIsDirectory()) {
41+
if (mItem.isDirectory()) {
4242
infoView.findViewById(R.id.properties_files_count_label).setVisibility(View.VISIBLE);
4343
infoView.findViewById(R.id.properties_files_count).setVisibility(View.VISIBLE);
4444
((TextView) infoView.findViewById(R.id.properties_files_count)).setText(String.valueOf(mFilesCnt));
@@ -56,7 +56,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
5656
}
5757

5858
private String getItemSize() {
59-
if (mItem.getIsDirectory()) {
59+
if (mItem.isDirectory()) {
6060
return Utils.formatSize(directorySize(new File(mItem.getPath())));
6161
}
6262

app/src/main/java/com/simplemobiletools/filemanager/dialogs/SelectFolderDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SelectFolderDialog : DialogFragment() {
5353
return
5454
}
5555

56-
items = items.sortedWith(compareBy({ !it.isDirectory }, { it.name.toLowerCase() }))
56+
items = items.sortedWith(compareBy({ !it.isDirectory }, { it.name }))
5757

5858
val adapter = ItemsAdapter(context, items)
5959
dialog.directory_picker_list.adapter = adapter

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public boolean accept(File file) {
173173
@Override
174174
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
175175
final FileDirItem item = mItems.get(position);
176-
if (item.getIsDirectory()) {
176+
if (item.isDirectory()) {
177177
if (mListener != null)
178178
mListener.itemClicked(item);
179179
} else {
@@ -389,7 +389,7 @@ private void displayRenameDialog() {
389389
final EditText itemName = (EditText) renameView.findViewById(R.id.item_name);
390390
itemName.setText(item.getName());
391391

392-
final int title = (item.getIsDirectory()) ? R.string.rename_directory : R.string.rename_file;
392+
final int title = (item.isDirectory()) ? R.string.rename_directory : R.string.rename_file;
393393
final AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
394394
builder.setTitle(getResources().getString(title));
395395
builder.setView(renameView);

app/src/main/java/com/simplemobiletools/filemanager/models/FileDirItem.java

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.simplemobiletools.filemanager.models
2+
3+
class FileDirItem(val path: String, val name: String, val isDirectory: Boolean, val children: Int, val size: Long) :
4+
Comparable<FileDirItem> {
5+
6+
override fun compareTo(other: FileDirItem): Int {
7+
if (isDirectory && !other.isDirectory) {
8+
return -1
9+
} else if (!isDirectory && other.isDirectory) {
10+
return 1
11+
}
12+
13+
return name.compareTo(other.name)
14+
}
15+
16+
override fun toString(): String {
17+
return "FileDirItem{name=$name, isDirectory=$isDirectory, path=$path, children=$children, size=$size}"
18+
}
19+
}

0 commit comments

Comments
 (0)