Remove unused code

This commit is contained in:
MM20 2022-01-17 00:18:53 +01:00
parent d85da0361d
commit 974988f65d
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
4 changed files with 14 additions and 48 deletions

View File

@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.*
interface FileRepository {
fun search(query: String): Flow<List<File>>
suspend fun deleteFile(file: File)
fun deleteFile(file: File)
}
internal class FileRepositoryImpl(
@ -89,34 +89,13 @@ internal class FileRepositoryImpl(
}
}
}
/*hiddenItems.collectLatest { hiddenItems ->
val files = mutableListOf<File>()
val localFiles = withContext(Dispatchers.IO) {
LocalFile.search(context, query).sorted().filter { !hiddenItems.contains(it.key) }
}
files.addAll(localFiles)
send(localFiles)
val cloudFiles = withContext(Dispatchers.IO) {
delay(300)
listOf(
async { OneDriveFile.search(context, query) },
async { GDriveFile.search(context, query) },
async { NextcloudFile.search(context, query, nextcloudClient) },
async { OwncloudFile.search(context, query, owncloudClient) }
).awaitAll().flatten()
}
yield()
files.addAll(cloudFiles.filter { !hiddenItems.contains(it.key) })
send(files)
}*/
}
override suspend fun deleteFile(file: File) {
if (file.isDeletable) {
file.delete(context)
override fun deleteFile(file: File) {
scope.launch {
if (file.isDeletable) {
file.delete(context)
}
}
}
}

View File

@ -1,16 +0,0 @@
package de.mm20.launcher2.files
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import de.mm20.launcher2.search.data.File
import kotlinx.coroutines.launch
class FilesViewModel(
private val filesRepository: FileRepository
): ViewModel() {
fun deleteFile(file: File) {
viewModelScope.launch {
filesRepository.deleteFile(file)
}
}
}

View File

@ -6,5 +6,4 @@ import org.koin.dsl.module
val filesModule = module {
single<FileRepository> { FileRepositoryImpl(androidContext(), get(), get()) }
viewModel { FilesViewModel(get()) }
}

View File

@ -10,7 +10,7 @@ import androidx.lifecycle.repeatOnLifecycle
import androidx.transition.Scene
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import de.mm20.launcher2.badges.BadgeRepository
import de.mm20.launcher2.files.FilesViewModel
import de.mm20.launcher2.files.FileRepository
import de.mm20.launcher2.icons.IconRepository
import de.mm20.launcher2.ktx.dp
import de.mm20.launcher2.ktx.lifecycleOwner
@ -23,8 +23,8 @@ import de.mm20.launcher2.ui.legacy.view.*
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.component.KoinComponent
import org.koin.core.component.get
import org.koin.core.component.inject
import java.text.DecimalFormat
@ -125,9 +125,8 @@ class FileDetailRepresentation : Representation, KoinComponent {
)
)
.setPositiveButton(android.R.string.ok) { dialog, _ ->
val fileViewModel: FilesViewModel by (context as AppCompatActivity).viewModel()
dialog.dismiss()
fileViewModel.deleteFile(file)
deleteFile(file)
}
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
dialog.dismiss()
@ -135,6 +134,11 @@ class FileDetailRepresentation : Representation, KoinComponent {
.show()
}
private fun deleteFile(file: File) {
val fileRepository: FileRepository = get()
fileRepository.deleteFile(file)
}
private fun share(context: Context, fileDetail: File) {
val shareIntent = Intent(Intent.ACTION_SEND)
shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)