File delete implemented

danishjamal104 · danishjamal104 · commit fafb56410b4a · 2021-06-04T07:05:01.000+05:30
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt
@@ -8,6 +8,7 @@ interface CacheDataSource {
 
     suspend fun insertFiles(files: List<File>): Long
     suspend fun getFiles(): List<File>
+    suspend fun deleteFile(fileId: String): Int
     suspend fun insertUrls(urls: List<Url>): Long
     suspend fun getUrls(fileId: String): List<Url>
     suspend fun insertFileMetaData(fileMetaData: FileMetaData, uuid: String)
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt
@@ -32,6 +32,10 @@ constructor(
         return c
     }
 
+    override suspend fun deleteFile(fileId: String): Int {
+        return fileDao.deleteFile(fileId)
+    }
+
     override suspend fun insertUrls(urls: List<Url>): Long {
         val res = urlDao.insertUrls(urlCacheMapper.mapToEntityList(urls))
         return res.size.toLong()
diff --git a/app/src/main/java/com/github/code/gambit/data/local/FileDao.kt b/app/src/main/java/com/github/code/gambit/data/local/FileDao.kt
@@ -17,4 +17,7 @@ interface FileDao {
 
     @Query("SELECT * FROM files WHERE id = :id")
     suspend fun getFile(id: String): List<FileCacheEntity>
+
+    @Query("DELETE FROM files WHERE id = :id")
+    suspend fun deleteFile(id: String): Int
 }
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSource.kt b/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSource.kt
@@ -9,7 +9,7 @@ interface NetworkDataSource {
     suspend fun searchFiles(searchParam: String): List<File>
     suspend fun filterFiles(start: String, end: String): List<File>
     suspend fun uploadFile(file: File): File
-    suspend fun deleteFile(fileId: String): File
+    suspend fun deleteFile(fileId: String): Boolean
 
     suspend fun getUrls(fileId: String): List<Url>
     suspend fun generateUrl(url: Url): Url
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSourceImpl.kt b/app/src/main/java/com/github/code/gambit/data/remote/NetworkDataSourceImpl.kt
@@ -35,8 +35,8 @@ class NetworkDataSourceImpl(
         return fileNetworkMapper.mapFromEntity(fileService.uploadFile(fileNetworkMapper.mapToEntity(file)))
     }
 
-    override suspend fun deleteFile(fileId: String): File {
-        return fileNetworkMapper.mapFromEntity(fileService.deleteFile(fileId))
+    override suspend fun deleteFile(fileId: String): Boolean {
+        return fileService.deleteFile(fileId)
     }
 
     override suspend fun getUrls(fileId: String): List<Url> {
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/ApiService.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/ApiService.kt
@@ -47,7 +47,7 @@ interface ApiService {
     suspend fun uploadFiles(@Path("userId") userId: String, @Body fileNetworkEntity: FileNetworkEntity): Response<FileNetworkEntity>
 
     @DELETE("user/{${AppConstant.API_PATH.USER_ID}}/file/{${AppConstant.API_PATH.FILE_ID}}")
-    suspend fun deleteFile(@Path(AppConstant.API_PATH.USER_ID) userId: String, @Path(AppConstant.API_PATH.FILE_ID) fileId: String): Response<FileNetworkEntity>
+    suspend fun deleteFile(@Path(AppConstant.API_PATH.USER_ID) userId: String, @Path(AppConstant.API_PATH.FILE_ID) fileId: String): Response<String>
 
     @GET("file/{${AppConstant.API_PATH.FILE_ID}}/url")
     suspend fun getUrls(@Path(AppConstant.API_PATH.FILE_ID) fileId: String): ListResponse<UrlNetworkEntity>
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileService.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileService.kt
@@ -8,5 +8,5 @@ interface FileService {
     suspend fun searchFile(searchParam: String): List<FileNetworkEntity>
     suspend fun filterFiles(start: String, end: String): List<FileNetworkEntity>
     suspend fun uploadFile(fileNetworkEntity: FileNetworkEntity): FileNetworkEntity
-    suspend fun deleteFile(fileId: String): FileNetworkEntity
+    suspend fun deleteFile(fileId: String): Boolean
 }
diff --git a/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt b/app/src/main/java/com/github/code/gambit/data/remote/services/file/FileServiceImpl.kt
@@ -40,7 +40,11 @@ class FileServiceImpl(
         return apiService.uploadFiles(userId, fileNetworkEntity).body
     }
 
-    override suspend fun deleteFile(fileId: String): FileNetworkEntity {
-        return apiService.deleteFile(userId, fileId).body
+    override suspend fun deleteFile(fileId: String): Boolean {
+        var id = fileId
+        if (fileId.contains("FILE#")) {
+            id = fileId.split("#")[1]
+        }
+        return apiService.deleteFile(userId, id).statusCode == 200
     }
 }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepository.kt b/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepository.kt
@@ -11,6 +11,7 @@ interface HomeRepository {
     suspend fun getFiles(): Flow<ServiceResult<List<File>>>
     suspend fun searchFile(searchString: String): Flow<ServiceResult<List<File>>>
     suspend fun searchFileByFilter(filter: Filter): Flow<ServiceResult<List<File>>>
+    suspend fun deleteFile(file: File): Flow<ServiceResult<Boolean>>
     suspend fun generateUrl(file: File): Flow<ServiceResult<Url>>
     suspend fun getUrls(fileId: String): Flow<ServiceResult<List<Url>>>
 }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/home/HomeRepositoryImpl.kt
@@ -66,6 +66,28 @@ constructor(
         }
     }
 
+    override suspend fun deleteFile(file: File): Flow<ServiceResult<Boolean>> {
+        return flow {
+            try {
+                val success = networkDataSource.deleteFile(file.id)
+                if (success) {
+                    val dels = cacheDataSource.deleteFile(file.id)
+                    if (dels == 1) {
+                        emit(ServiceResult.Success(true))
+                    } else {
+                        emit(ServiceResult.Success(false))
+                    }
+                } else {
+                    emit(ServiceResult.Success(false))
+                }
+            } catch (internet: NoInternetException) {
+                emit(ServiceResult.Error(internet))
+            } catch (exception: Exception) {
+                emit(ServiceResult.Error(exception))
+            }
+        }
+    }
+
     override suspend fun generateUrl(file: File): Flow<ServiceResult<Url>> {
         val url = Url("", file.id, file.hash, "", true, 50)
         return flow {
diff --git a/app/src/main/java/com/github/code/gambit/ui/BaseAdapter.kt b/app/src/main/java/com/github/code/gambit/ui/BaseAdapter.kt
@@ -93,6 +93,11 @@ abstract class BaseAdapter<T, B : ViewBinding, LS : OnItemClickListener<T>>(priv
         updateCounterText()
     }
 
+    fun remove(item: T) {
+        dataList.remove(item)
+        notifyDataSetChanged()
+    }
+
     /**
      * Sets the counter text view which is used for displaying the live item count
      */
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/FileMetaDataAdapter.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/FileMetaDataAdapter.kt
@@ -42,9 +42,4 @@ class FileMetaDataAdapter(val context: Context) :
         item?.state = state
         notifyDataSetChanged()
     }
-
-    fun remove(item: FileUploadStatus) {
-        getDataList.remove(item)
-        notifyDataSetChanged()
-    }
 }
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt
@@ -1,6 +1,5 @@
 package com.github.code.gambit.ui.activity.main
 
-import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -30,6 +29,7 @@ import com.github.code.gambit.utility.extention.bottomNavHide
 import com.github.code.gambit.utility.extention.bottomNavShow
 import com.github.code.gambit.utility.extention.hide
 import com.github.code.gambit.utility.extention.show
+import com.github.code.gambit.utility.extention.showDefaultMaterialAlert
 import com.github.code.gambit.utility.extention.snackbar
 import com.github.code.gambit.utility.extention.toggleVisibility
 import com.github.code.gambit.utility.sharedpreference.UserManager
@@ -118,16 +118,9 @@ class MainActivity : AppCompatActivity(), BottomNavController {
     private fun setUpRecyclerView() {
         adapter.listener = object : OnItemClickListener<FileUploadStatus> {
             override fun onItemClick(item: FileUploadStatus) {
-                val alertDialog = AlertDialog.Builder(this@MainActivity)
-                    .setTitle("Confirmation")
-                    .setMessage("Are you sure you want to cancel file upload?")
-                    .setPositiveButton("Yes") { _, _ ->
-                        adapter.remove(item)
-                    }
-                    .setNegativeButton("Cancel") { dialog, _ ->
-                        dialog.dismiss()
-                    }.create()
-                alertDialog.show()
+                showDefaultMaterialAlert(
+                    "Confirmation", "Are you sure you want to cancel file upload?"
+                ) { adapter.remove(item) }
             }
 
             override fun onItemLongClick(item: FileUploadStatus) {}
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/FileListAdapter.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/FileListAdapter.kt
@@ -71,7 +71,7 @@ class FileListAdapter :
         }
         binding.createNewUrlButton.setOnClickListener { listener?.onCreateNewUrl(file) }
         binding.root.setOnLongClickListener {
-            listener?.onFileLongClick(file)
+            listener?.onItemLongClick(file)
             true
         }
     }
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/FileUrlClickCallback.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/FileUrlClickCallback.kt
@@ -5,7 +5,6 @@ import com.github.code.gambit.data.model.Url
 import com.github.code.gambit.ui.OnItemClickListener
 
 interface FileUrlClickCallback : OnItemClickListener<File> {
-    fun onFileLongClick(file: File)
     fun onCreateNewUrl(file: File)
     fun onLoadMoreUrl(file: File)
     fun onUrlLongClick(url: Url, file: File)
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeFragment.kt
@@ -31,6 +31,7 @@ import com.github.code.gambit.utility.extention.hideKeyboard
 import com.github.code.gambit.utility.extention.longToast
 import com.github.code.gambit.utility.extention.shortToast
 import com.github.code.gambit.utility.extention.show
+import com.github.code.gambit.utility.extention.showDefaultMaterialAlert
 import com.github.code.gambit.utility.extention.snackbar
 import com.github.code.gambit.utility.sharedpreference.LastEvaluatedKeyManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -171,6 +172,11 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
                     binding.headerSubtitle.text = it.header
                     adapter.addAll(it.files, true)
                 }
+                is HomeState.FileDeleted -> {
+                    requireMainActivity().showSnackBar("${it.file.name} deleted successfully")
+                    adapter.remove(it.file)
+                    binding.linearProgress.hide()
+                }
             }
         }
     }
@@ -385,10 +391,6 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
 
     override fun animateBottomNav(offset: Float) = requireMainActivity().animateBottomNav(offset)
 
-    override fun onFileLongClick(file: File) {
-        Timber.tag("home").i("LongClickFile: ${file.name}")
-    }
-
     override fun onCreateNewUrl(file: File) {
         viewModel.setEvent(HomeEvent.GenerateUrl(file))
         Timber.tag("home").i("CreateNewUrl: ${file.name}, ${file.id}")
@@ -412,6 +414,12 @@ class HomeFragment : Fragment(R.layout.fragment_home), FileUrlClickCallback, Bot
     }
 
     override fun onItemLongClick(item: File) {
-        Timber.tag("home").i("LongClickFile: ${item.name}")
+        Timber.tag("home").i("FileLongClick: ${item.name}")
+        val title = "Confirmation"
+        val message = "Are you sure you want to permanently delete ${item.name}?"
+        activity?.showDefaultMaterialAlert(
+            title,
+            message
+        ) { viewModel.setEvent(HomeEvent.DeleteFile(item)) }
     }
 }
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeViewModel.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/main/HomeViewModel.kt
@@ -46,6 +46,10 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
                     _homeState.postValue(HomeState.Loading())
                     filterFiles(event.filter)
                 }
+                is HomeEvent.DeleteFile -> {
+                    _homeState.postValue(HomeState.Loading())
+                    deleteFile(event.file)
+                }
             }
         }
     }
@@ -61,6 +65,15 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
         }
     }
 
+    private suspend fun deleteFile(file: File) {
+        homeRepository.deleteFile(file).collect {
+            when (it) {
+                is ServiceResult.Error -> postError(it.exception)
+                is ServiceResult.Success -> _homeState.postValue(HomeState.FileDeleted(file))
+            }
+        }
+    }
+
     private suspend fun filterFiles(filter: Filter) {
         homeRepository.searchFileByFilter(filter).collect {
             when (it) {
@@ -112,6 +125,7 @@ constructor(private val homeRepository: HomeRepository) : ViewModel() {
 sealed class HomeEvent {
     object GetFiles : HomeEvent()
     data class FilterFiles(val filter: Filter) : HomeEvent()
+    data class DeleteFile(val file: File) : HomeEvent()
     data class GetUrls(val file: File) : HomeEvent()
     data class GenerateUrl(val file: File) : HomeEvent()
     data class SearchFile(val searchString: String) : HomeEvent()
@@ -121,6 +135,7 @@ sealed class HomeState {
     object LoadingUrl : HomeState()
     data class Loading(val isSearchResultLoading: Boolean = false) : HomeState()
     data class FilesLoaded(val files: List<File>, val isSearchResult: Boolean = false) : HomeState()
+    data class FileDeleted(val file: File) : HomeState()
     data class FilterResult(val files: List<File>, val header: String) : HomeState()
     data class UrlsLoaded(val urls: List<Url>) : HomeState()
     data class UrlGenerated(val url: Url) : HomeState()
diff --git a/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponentImpl.kt b/app/src/main/java/com/github/code/gambit/ui/fragment/home/searchcomponent/FileSearchComponentImpl.kt
@@ -65,8 +65,6 @@ class FileSearchComponentImpl(
         return fileSearchRequest
     }
 
-    override fun onFileLongClick(file: File) = fileSearchRequest.postValue("")
-
     override fun onCreateNewUrl(file: File) = fileSearchRequest.postValue("")
 
     override fun onLoadMoreUrl(file: File) = fileSearchRequest.postValue("")
diff --git a/app/src/main/java/com/github/code/gambit/utility/extention/view.kt b/app/src/main/java/com/github/code/gambit/utility/extention/view.kt
@@ -1,6 +1,7 @@
 package com.github.code.gambit.utility.extention
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
@@ -16,6 +17,7 @@ import androidx.core.content.ContextCompat.getSystemService
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import com.github.code.gambit.R
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputLayout
 
@@ -142,3 +144,16 @@ fun Fragment.copyToClipboard(text: String) {
     clipboard?.setPrimaryClip(clip)
     shortToast("Url copied")
 }
+
+fun Context.showDefaultAlert(title: String, message: String, positiveButtonPress: () -> Unit) {
+    AlertDialog.Builder(this)
+        .setTitle(title).setMessage(message)
+        .setPositiveButton("Yes") { _, _ -> positiveButtonPress() }
+        .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }.create().show()
+}
+
+fun Context.showDefaultMaterialAlert(title: String, message: String, positiveButtonPress: () -> Unit) {
+    MaterialAlertDialogBuilder(this)
+        .setTitle(title).setMessage(message).setPositiveButton("Yes") { _, _ -> positiveButtonPress() }
+        .setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }.create().show()
+}
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Theme.VTransfer" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
@@ -11,6 +11,8 @@
         <item name="colorSecondaryVariant">@color/secondaryVariant</item>
         <item name="colorOnSecondary">@color/onSecondary</item>
 
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog</item>
+
         <item name="android:windowBackground">@color/primary</item>
     </style>
 
@@ -168,4 +170,16 @@
         <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
     </style>
 
+    <style name="Widget.App.Button" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">@color/secondary</item>
+        <item name="android:textStyle">bold</item>
+        <item name="shapeAppearance">@style/ShapeAppearance.App.SmallComponent</item>
+    </style>
+
+    <style name="ThemeOverlay.App.MaterialAlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.App.Button</item>
+        <item name="buttonBarNegativeButtonStyle">@style/Widget.App.Button</item>
+    </style>
+
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,7 @@ interface FileDao {`
`17`	`17`
`18`	`18`	`@Query("SELECT * FROM files WHERE id = :id")`
`19`	`19`	`suspend fun getFile(id: String): List<FileCacheEntity>`
	`20`	`+`
	`21`	`+ @Query("DELETE FROM files WHERE id = :id")`
	`22`	`+ suspend fun deleteFile(id: String): Int`
`20`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ class NetworkDataSourceImpl(`
`35`	`35`	`return fileNetworkMapper.mapFromEntity(fileService.uploadFile(fileNetworkMapper.mapToEntity(file)))`
`36`	`36`	`}`
`37`	`37`
`38`		`- override suspend fun deleteFile(fileId: String): File {`
`39`		`- return fileNetworkMapper.mapFromEntity(fileService.deleteFile(fileId))`
	`38`	`+ override suspend fun deleteFile(fileId: String): Boolean {`
	`39`	`+ return fileService.deleteFile(fileId)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`override suspend fun getUrls(fileId: String): List<Url> {`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ interface FileService {`
`8`	`8`	`suspend fun searchFile(searchParam: String): List<FileNetworkEntity>`
`9`	`9`	`suspend fun filterFiles(start: String, end: String): List<FileNetworkEntity>`
`10`	`10`	`suspend fun uploadFile(fileNetworkEntity: FileNetworkEntity): FileNetworkEntity`
`11`		`- suspend fun deleteFile(fileId: String): FileNetworkEntity`
	`11`	`+ suspend fun deleteFile(fileId: String): Boolean`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,11 @@ class FileServiceImpl(`
`40`	`40`	`return apiService.uploadFiles(userId, fileNetworkEntity).body`
`41`	`41`	`}`
`42`	`42`
`43`		`- override suspend fun deleteFile(fileId: String): FileNetworkEntity {`
`44`		`- return apiService.deleteFile(userId, fileId).body`
	`43`	`+ override suspend fun deleteFile(fileId: String): Boolean {`
	`44`	`+ var id = fileId`
	`45`	`+ if (fileId.contains("FILE#")) {`
	`46`	`+ id = fileId.split("#")[1]`
	`47`	`+ }`
	`48`	`+ return apiService.deleteFile(userId, id).statusCode == 200`
`45`	`49`	`}`
`46`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ interface HomeRepository {`
`11`	`11`	`suspend fun getFiles(): Flow<ServiceResult<List<File>>>`
`12`	`12`	`suspend fun searchFile(searchString: String): Flow<ServiceResult<List<File>>>`
`13`	`13`	`suspend fun searchFileByFilter(filter: Filter): Flow<ServiceResult<List<File>>>`
	`14`	`+ suspend fun deleteFile(file: File): Flow<ServiceResult<Boolean>>`
`14`	`15`	`suspend fun generateUrl(file: File): Flow<ServiceResult<Url>>`
`15`	`16`	`suspend fun getUrls(fileId: String): Flow<ServiceResult<List<Url>>>`
`16`	`17`	`}`