Skip to content

Commit c6e2077

Browse files
Merge pull request #17459 from nextcloud/convert-local-file-list-fragment-to-kt-2
Convert LocalFileListFragment to Kotlin
2 parents ca9013d + d4e7e96 commit c6e2077

8 files changed

Lines changed: 316 additions & 441 deletions

File tree

app/src/main/java/com/nextcloud/client/di/ComponentsModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
import com.owncloud.android.ui.fragment.GalleryFragment;
109109
import com.owncloud.android.ui.fragment.GalleryFragmentBottomSheetDialog;
110110
import com.owncloud.android.ui.fragment.GroupfolderListFragment;
111-
import com.owncloud.android.ui.fragment.LocalFileListFragment;
111+
import com.owncloud.android.ui.fragment.localfilelist.LocalFileListFragment;
112112
import com.owncloud.android.ui.fragment.OCFileListBottomSheetDialog;
113113
import com.owncloud.android.ui.fragment.OCFileListFragment;
114114
import com.owncloud.android.ui.fragment.SharedListFragment;

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
import com.owncloud.android.ui.dialog.LocalStoragePathPickerDialogFragment;
5050
import com.owncloud.android.ui.dialog.SortingOrderDialogFragment;
5151
import com.owncloud.android.ui.fragment.ExtendedListFragment;
52-
import com.owncloud.android.ui.fragment.LocalFileListFragment;
52+
import com.owncloud.android.ui.fragment.localfilelist.LocalFileListFragment;
53+
import com.owncloud.android.ui.fragment.localfilelist.LocalFileListListener;
5354
import com.owncloud.android.utils.FileSortOrder;
5455
import com.owncloud.android.utils.FileUtil;
5556
import com.owncloud.android.utils.PermissionUtil;
@@ -70,14 +71,13 @@
7071
import androidx.fragment.app.FragmentManager;
7172
import androidx.fragment.app.FragmentTransaction;
7273
import kotlin.Unit;
73-
import kotlin.jvm.functions.Function1;
7474

7575
import static com.owncloud.android.ui.activity.FileActivity.EXTRA_USER;
7676

7777
/**
7878
* Displays local files and let the user choose what of them wants to upload to the current Nextcloud account.
7979
*/
80-
public class UploadFilesActivity extends DrawerActivity implements LocalFileListFragment.ContainerActivity,
80+
public class UploadFilesActivity extends DrawerActivity implements LocalFileListListener,
8181
OnClickListener, ConfirmationDialogFragmentListener, SortingOrderDialogFragment.OnSortingOrderListener,
8282
CheckAvailableSpaceTask.CheckAvailableSpaceListener, StoragePathAdapter.StoragePathAdapterListener, Injectable {
8383

app/src/main/java/com/owncloud/android/ui/adapter/localFileList/LocalFileListAdapter.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,19 @@ class LocalFileListAdapter(
9999

100100
fun isCheckedFile(file: File): Boolean = checkedFiles.contains(file)
101101

102+
fun onItemCheckboxClicked(file: File) {
103+
if (isCheckedFile(file)) {
104+
removeCheckedFile(file)
105+
} else {
106+
addCheckedFile(file)
107+
}
108+
109+
val position = getItemPosition(file)
110+
if (position != RecyclerView.NO_POSITION) {
111+
notifyItemChanged(position)
112+
}
113+
}
114+
102115
fun addCheckedFile(file: File) {
103116
checkedFiles.add(file)
104117
}

0 commit comments

Comments
 (0)