diff --git a/app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt b/app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt index 23fda533b..d5b20d191 100644 --- a/app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt +++ b/app/src/main/java/com/nextcloud/talk/interfaces/SelectionInterface.kt @@ -20,6 +20,7 @@ package com.nextcloud.talk.interfaces +@Deprecated("To be replaced with com.nextcloud.talk.remotefilebrowser.SelectionInterface") interface SelectionInterface { fun toggleBrowserItemSelection(path: String) diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/SelectionInterface.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/SelectionInterface.kt new file mode 100644 index 000000000..0ddfe8ffd --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/SelectionInterface.kt @@ -0,0 +1,27 @@ +/* + * Nextcloud Talk application + * + * @author Mario Danic + * @author Andy Scherzinger + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2017-2018 Mario Danic + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.nextcloud.talk.remotefilebrowser + +interface SelectionInterface { + fun isPathSelected(path: String): Boolean +} diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt index ee5de9120..51bf85811 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt @@ -2,7 +2,9 @@ * Nextcloud Talk application * * @author Andy Scherzinger + * @author Álvaro Brey * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2022 Álvaro Brey * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,7 +40,7 @@ import autodagger.AutoInjector import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.databinding.ActivityRemoteFileBrowserBinding -import com.nextcloud.talk.interfaces.SelectionInterface +import com.nextcloud.talk.remotefilebrowser.SelectionInterface import com.nextcloud.talk.remotefilebrowser.adapters.RemoteFileBrowserItemsAdapter import com.nextcloud.talk.remotefilebrowser.viewmodels.RemoteFileBrowserItemsViewModel import com.nextcloud.talk.ui.dialog.SortingOrderDialogFragment @@ -121,7 +123,7 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe // TODO make mimeTypeSelectionFilter a bundled arg for the activity val mimeTypeSelectionFilter = "image/" - // TODO do not needlesly recreate adapter if it can be reused + // TODO do not needlessly recreate adapter if it can be reused val adapter = RemoteFileBrowserItemsAdapter( showGrid = showGrid, mimeTypeSelectionFilter = mimeTypeSelectionFilter, @@ -240,16 +242,8 @@ class RemoteFileBrowserActivity : AppCompatActivity(), SelectionInterface, Swipe const val REQUEST_CODE_SELECT_AVATAR = 22 } - override fun toggleBrowserItemSelection(path: String) { - // unused, viewmodel gets called directly - } - override fun isPathSelected(path: String): Boolean { // TODO figure out a better way to do this. Narrower interface? return viewModel.isPathSelected(path) } - - override fun shouldOnlySelectOneImageFile(): Boolean { - return true // unused - } } diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsAdapter.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsAdapter.kt index 0af1015ee..2d6020394 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsAdapter.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsAdapter.kt @@ -25,8 +25,8 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.nextcloud.talk.databinding.RvItemBrowserFileBinding -import com.nextcloud.talk.interfaces.SelectionInterface import com.nextcloud.talk.models.database.UserEntity +import com.nextcloud.talk.remotefilebrowser.SelectionInterface import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem class RemoteFileBrowserItemsAdapter( diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt index 61bf4be53..1644b61ef 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsListViewHolder.kt @@ -30,8 +30,8 @@ import com.facebook.drawee.view.SimpleDraweeView import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.databinding.RvItemBrowserFileBinding -import com.nextcloud.talk.interfaces.SelectionInterface import com.nextcloud.talk.models.database.UserEntity +import com.nextcloud.talk.remotefilebrowser.SelectionInterface import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DateUtils.getLocalDateTimeStringFromTimestamp diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt index 4ebc5f7b9..71f343eb9 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/adapters/RemoteFileBrowserItemsViewHolder.kt @@ -25,8 +25,8 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding import com.facebook.drawee.view.SimpleDraweeView -import com.nextcloud.talk.interfaces.SelectionInterface import com.nextcloud.talk.models.database.UserEntity +import com.nextcloud.talk.remotefilebrowser.SelectionInterface import com.nextcloud.talk.remotefilebrowser.model.RemoteFileBrowserItem import com.nextcloud.talk.utils.DrawableUtils diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt index 2b961fff3..ef45577bd 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/viewmodels/RemoteFileBrowserItemsViewModel.kt @@ -2,7 +2,9 @@ * Nextcloud Talk application * * @author Andy Scherzinger - * Copyright (C) 202 Andy Scherzinger + * @author Álvaro Brey + * Copyright (C) 2022 Andy Scherzinger + * Copyright (C) 2022 Álvaro Brey * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by