Delete file (sample app)

storage-api-drive-nongms/src/main/java/com/omh/android/storage/api/drive/nongms/data/GoogleStorageApiService.kt

@@ -3,6 +3,7 @@ package com.omh.android.storage.api.drive.nongms.data
 import com.omh.android.storage.api.drive.nongms.data.source.body.CreateFileRequestBody
 import com.omh.android.storage.api.drive.nongms.data.source.response.FileListRemoteResponse
 import com.omh.android.storage.api.drive.nongms.data.source.response.FileRemoteResponse
+import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -44,5 +45,5 @@ internal interface GoogleStorageApiService {
     @DELETE("$FILES_PARTICLE/{$FILE_ID}")
     fun deleteFile(
         @Path(FILE_ID) fileId: String
-    ): Call<Nothing>
+    ): Call<ResponseBody>
 }

storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileAdapter.kt

@@ -80,6 +80,8 @@ class FileAdapter(
     interface GridItemListener {
 
         fun onFileClicked(file: OmhFile)
+
+        fun onDeleteClicked(file: OmhFile)
     }
 
     abstract class FileViewHolder(binding: View) : RecyclerView.ViewHolder(binding) {
@@ -99,6 +101,7 @@ class FileAdapter(
                 fileName.text = file.name
                 loadFileIcon(context, iconLink, fileIcon)
                 root.setOnClickListener { listener.onFileClicked(file) }
+                buttonDelete.setOnClickListener { listener.onDeleteClicked(file) }
             }
         }
     }
@@ -115,6 +118,7 @@ class FileAdapter(
                 fileName.text = file.name
                 loadFileIcon(context, iconLink, fileIcon)
                 root.setOnClickListener { listener.onFileClicked(file) }
+                buttonDelete.setOnClickListener { listener.onDeleteClicked(file) }
             }
         }
     }

storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerActivity.kt

@@ -125,6 +125,10 @@ class FileViewerActivity :
         dispatchEvent(FileViewerViewEvent.FileClicked(file))
     }
 
+    override fun onDeleteClicked(file: OmhFile) {
+        dispatchEvent(FileViewerViewEvent.DeleteFile(file))
+    }
+
     private fun buildFinishState() = finish().also { finishAffinity() }
 
     private fun showCreateFileDialog() {

storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewEvent.kt

@@ -34,4 +34,9 @@ sealed class FileViewerViewEvent : ViewEvent {
 
         override fun getEventName() = "FileViewerViewEvent.CreateFile"
     }
+
+    class DeleteFile(val file: OmhFile) : FileViewerViewEvent() {
+
+        override fun getEventName() = "FileViewerViewEvent.CreateFile"
+    }
 }

storage-sample/src/main/java/com/omh/android/storage/sample/presentation/file_viewer/FileViewerViewModel.kt

@@ -1,9 +1,13 @@
 package com.omh.android.storage.sample.presentation.file_viewer
 
 import com.omh.android.storage.api.OmhStorageClient
+import com.omh.android.storage.api.domain.model.OmhFile
 import com.omh.android.storage.api.domain.model.OmhFileType
 import com.omh.android.storage.api.domain.usecase.CreateFileUseCase
 import com.omh.android.storage.api.domain.usecase.CreateFileUseCaseParams
+import com.omh.android.storage.api.domain.usecase.DeleteFileUseCase
+import com.omh.android.storage.api.domain.usecase.DeleteFileUseCaseParams
+import com.omh.android.storage.api.domain.usecase.DeleteFileUseCaseResult
 import com.omh.android.storage.api.domain.usecase.GetFilesListUseCase
 import com.omh.android.storage.api.domain.usecase.GetFilesListUseCaseParams
 import com.omh.android.storage.api.domain.usecase.OmhResult
@@ -42,7 +46,8 @@ class FileViewerViewModel @Inject constructor(
             is FileViewerViewEvent.SwapLayoutManager -> swapLayoutManagerEvent()
             is FileViewerViewEvent.FileClicked -> fileClickedEvent(event)
             FileViewerViewEvent.BackPressed -> backPressedEvent()
-            is FileViewerViewEvent.CreateFile -> createFile(event)
+            is FileViewerViewEvent.CreateFile -> createFileEvent(event)
+            is FileViewerViewEvent.DeleteFile -> deleteFileEvent(event)
         }
     }
 
@@ -97,7 +102,7 @@ class FileViewerViewModel @Inject constructor(
         }
     }
 
-    private suspend fun createFile(event: FileViewerViewEvent.CreateFile) {
+    private suspend fun createFileEvent(event: FileViewerViewEvent.CreateFile) {
         setState(FileViewerViewState.Loading)
         val parentId = parentIdStack.peek()
 
@@ -117,4 +122,37 @@ class FileViewerViewModel @Inject constructor(
             }
         }
     }
+
+    private suspend fun deleteFileEvent(event: FileViewerViewEvent.DeleteFile) {
+        setState(FileViewerViewState.Loading)
+
+        val file = event.file
+
+        val deleteFileUseCase: DeleteFileUseCase = omhStorageClient.deleteFile()
+
+        when (val result = deleteFileUseCase(DeleteFileUseCaseParams(file.id))) {
+            is OmhResult.OmhSuccess -> {
+                handleDeleteSuccess(result, file)
+            }
+
+            is OmhResult.OmhError -> {
+                toastMessage.postValue("ERROR: ${file.name} was NOT deleted")
+            }
+        }
+
+        refreshFileListEvent()
+    }
+
+    private fun handleDeleteSuccess(
+        result: OmhResult.OmhSuccess<DeleteFileUseCaseResult>,
+        file: OmhFile
+    ) {
+        val toastText = if (result.data.isSuccess) {
+            "${file.name} was successfully deleted"
+        } else {
+            "${file.name} was NOT deleted"
+        }
+
+        toastMessage.postValue(toastText)
+    }
 }

storage-sample/src/main/res/layout/file_grid_adapter.xml

@@ -1,36 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="160dp"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
+    android:layout_marginStart="10dp"
+    android:layout_marginBottom="10dp"
+    android:background="@drawable/rounded_for_grid"
+    android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:background="@drawable/rounded_for_grid">
-
-        <ImageView
-            android:id="@+id/fileIcon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            tools:ignore="ContentDescription"
-            tools:scaleType="centerCrop"
-            tools:srcCompat="@mipmap/ic_launcher" />
+    <ImageView
+        android:id="@+id/buttonDelete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="5dp"
+        android:src="@android:drawable/ic_menu_delete"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/black" />
 
-    </FrameLayout>
+    <ImageView
+        android:id="@+id/fileIcon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonDelete"
+        tools:ignore="ContentDescription"
+        tools:scaleType="centerCrop"
+        tools:srcCompat="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/fileName"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="10dp"
         android:ellipsize="end"
         android:maxLines="1"
         android:textSize="17sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fileIcon"
         tools:text="File Name" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

storage-sample/src/main/res/layout/file_linear_adapter.xml

@@ -20,12 +20,25 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
+        android:ellipsize="end"
+        android:maxLines="1"
         app:layout_constraintBottom_toBottomOf="@+id/fileIcon"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/buttonDelete"
         app:layout_constraintStart_toEndOf="@+id/fileIcon"
         app:layout_constraintTop_toTopOf="@+id/fileIcon"
         tools:text="File Name" />
 
+    <ImageView
+        android:id="@+id/buttonDelete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="5dp"
+        android:src="@android:drawable/ic_menu_delete"
+        app:layout_constraintBottom_toBottomOf="@+id/fileName"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/fileName"
+        app:tint="@color/black" />
+
     <View
         android:id="@+id/line"
         android:layout_width="match_parent"