Remove unused code
This commit is contained in:
parent
d85da0361d
commit
974988f65d
@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.*
|
|||||||
|
|
||||||
interface FileRepository {
|
interface FileRepository {
|
||||||
fun search(query: String): Flow<List<File>>
|
fun search(query: String): Flow<List<File>>
|
||||||
suspend fun deleteFile(file: File)
|
fun deleteFile(file: File)
|
||||||
}
|
}
|
||||||
|
|
||||||
internal class FileRepositoryImpl(
|
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) {
|
override fun deleteFile(file: File) {
|
||||||
if (file.isDeletable) {
|
scope.launch {
|
||||||
file.delete(context)
|
if (file.isDeletable) {
|
||||||
|
file.delete(context)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -6,5 +6,4 @@ import org.koin.dsl.module
|
|||||||
|
|
||||||
val filesModule = module {
|
val filesModule = module {
|
||||||
single<FileRepository> { FileRepositoryImpl(androidContext(), get(), get()) }
|
single<FileRepository> { FileRepositoryImpl(androidContext(), get(), get()) }
|
||||||
viewModel { FilesViewModel(get()) }
|
|
||||||
}
|
}
|
||||||
@ -10,7 +10,7 @@ import androidx.lifecycle.repeatOnLifecycle
|
|||||||
import androidx.transition.Scene
|
import androidx.transition.Scene
|
||||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import de.mm20.launcher2.badges.BadgeRepository
|
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.icons.IconRepository
|
||||||
import de.mm20.launcher2.ktx.dp
|
import de.mm20.launcher2.ktx.dp
|
||||||
import de.mm20.launcher2.ktx.lifecycleOwner
|
import de.mm20.launcher2.ktx.lifecycleOwner
|
||||||
@ -23,8 +23,8 @@ import de.mm20.launcher2.ui.legacy.view.*
|
|||||||
import kotlinx.coroutines.Job
|
import kotlinx.coroutines.Job
|
||||||
import kotlinx.coroutines.flow.collectLatest
|
import kotlinx.coroutines.flow.collectLatest
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.koin.androidx.viewmodel.ext.android.viewModel
|
|
||||||
import org.koin.core.component.KoinComponent
|
import org.koin.core.component.KoinComponent
|
||||||
|
import org.koin.core.component.get
|
||||||
import org.koin.core.component.inject
|
import org.koin.core.component.inject
|
||||||
import java.text.DecimalFormat
|
import java.text.DecimalFormat
|
||||||
|
|
||||||
@ -125,9 +125,8 @@ class FileDetailRepresentation : Representation, KoinComponent {
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
.setPositiveButton(android.R.string.ok) { dialog, _ ->
|
.setPositiveButton(android.R.string.ok) { dialog, _ ->
|
||||||
val fileViewModel: FilesViewModel by (context as AppCompatActivity).viewModel()
|
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
fileViewModel.deleteFile(file)
|
deleteFile(file)
|
||||||
}
|
}
|
||||||
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
|
.setNegativeButton(android.R.string.cancel) { dialog, _ ->
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
@ -135,6 +134,11 @@ class FileDetailRepresentation : Representation, KoinComponent {
|
|||||||
.show()
|
.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun deleteFile(file: File) {
|
||||||
|
val fileRepository: FileRepository = get()
|
||||||
|
fileRepository.deleteFile(file)
|
||||||
|
}
|
||||||
|
|
||||||
private fun share(context: Context, fileDetail: File) {
|
private fun share(context: Context, fileDetail: File) {
|
||||||
val shareIntent = Intent(Intent.ACTION_SEND)
|
val shareIntent = Intent(Intent.ACTION_SEND)
|
||||||
shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user