Fix compilation error on sample app

settings.gradle.kts

@@ -19,5 +19,4 @@ rootProject.name = "omh-storage"
 include(":storage-api")
 include(":storage-api-drive-gms")
 include(":storage-api-drive-nongms")
-// Sample app is currently broken. Removed temporally
-//include(":storage-sample")
+include(":storage-sample")

storage-sample/build.gradle.kts

@@ -49,7 +49,9 @@ val ngmsImplementation by configurations
 dependencies {
     implementation(project(":storage-api"))
 
-    ngmsImplementation("com.omh.android:auth-non-gms:1.0-SNAPSHOT")
+    //ngmsImplementation("com.omh.android:auth-non-gms:1.0-SNAPSHOT")
+    // Omh Auth
+    api(Libs.omhAuthLibrary)
     ngmsImplementation(project(":storage-api-drive-nongms"))
 
     implementation(Libs.coreKtx)

storage-sample/src/main/java/com/omh/android/storage/sample/di/SingletonModule.kt

@@ -15,22 +15,26 @@ import dagger.hilt.components.SingletonComponent
 @Module
 @InstallIn(SingletonComponent::class)
 class SingletonModule {
+
     @Provides
     fun providesOmhAuthClient(@ApplicationContext context: Context): OmhAuthClient {
-        return OmhAuthProvider.provideAuthClient(
-            scopes = listOf(
-                "openid",
-                "email",
-                "profile",
-                "https://www.googleapis.com/auth/drive.file"
-            ),
-            clientId = BuildConfig.CLIENT_ID,
-            context = context
-        )
+        return OmhAuthProvider.Builder()
+            .addNonGmsPath(OmhAuthProvider.NGMS_ADDRESS)
+            .build()
+            .provideAuthClient(
+                context = context,
+                scopes = listOf(
+                    "openid",
+                    "email",
+                    "profile",
+                    "https://www.googleapis.com/auth/drive.file"
+                ),
+                clientId = BuildConfig.CLIENT_ID
+            )
     }
 
     @Provides
-    fun providesOmhStorageClient(@ApplicationContext context: Context): OmhStorageClient {
-        return OmhStorageProvider.provideStorageClient(context)
+    fun providesOmhStorageClient(omhAuthClient: OmhAuthClient): OmhStorageClient {
+        return OmhStorageProvider.provideStorageClient(omhAuthClient)
     }
 }

storage-sample/src/main/java/com/omh/android/storage/sample/drive/ActivityFilesAndFolders.kt

@@ -7,13 +7,13 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.omh.android.storage.sample.databinding.ActivityFilesFoldersBinding
-import com.omh.android.storage.sample.drive.adapter.grid.FilesFoldersGridAdapter
+import com.omh.android.storage.sample.drive.adapter.grid.FileGridAdapter
 
 class ActivityFilesAndFolders : AppCompatActivity() {
 
     private lateinit var tvSortByName: TextView
     private lateinit var rvFilesAndFolders: RecyclerView
-    private lateinit var rvGridAdapter: FilesFoldersGridAdapter
+    private lateinit var rvGridAdapter: FileGridAdapter
 
     private val binding: ActivityFilesFoldersBinding by lazy {
         ActivityFilesFoldersBinding.inflate(layoutInflater)
@@ -39,7 +39,7 @@ class ActivityFilesAndFolders : AppCompatActivity() {
         tvSortByName.setOnClickListener {
             // viewModel.sortByName()
         }
-        rvGridAdapter = FilesFoldersGridAdapter()
+        rvGridAdapter = FileGridAdapter()
         rvFilesAndFolders.setHasFixedSize(true)
         rvFilesAndFolders.layoutManager = GridLayoutManager(this, 2)
         rvFilesAndFolders.adapter = rvGridAdapter

storage-sample/src/main/java/com/omh/android/storage/sample/drive/FilesAndFoldersViewModel.kt

@@ -4,28 +4,31 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.omh.android.storage.api.domain.usecase.SortFilesAndFoldersByName
-import com.omh.android.storage.sample.model.UiFileFolderItemData
-import com.omh.android.storage.sample.mapper.fromFilesFoldersListToUi
-import com.omh.android.storage.sample.usecase.KtsGetAllFilesAndFolders
+import com.omh.android.storage.api.domain.model.OmhFile
+import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCase
+import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCaseParams
+import com.omh.android.storage.api.domain.usecase.OmhResult
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class FilesAndFoldersViewModel(
-    private val getAllFilesAndFolders: KtsGetAllFilesAndFolders,
-    private val sortFilesAndFoldersByName: SortFilesAndFoldersByName
+    private val getFilesListWithParentIdUseCase: GetFilesListWithParentIdUseCase
 ) : ViewModel() {
 
-    private val _filesFoldersLiveData = MutableLiveData<List<UiFileFolderItemData>>()
-    val filesFoldersLiveData: LiveData<List<UiFileFolderItemData>> = _filesFoldersLiveData
+    private val _filesFoldersLiveData = MutableLiveData<List<OmhFile>>()
+    val filesFoldersLiveData: LiveData<List<OmhFile>> = _filesFoldersLiveData
     private val _sortByNameAscendingLiveData = MutableLiveData<Boolean>()
     val sortByNameAscendingLiveData: LiveData<Boolean> = _sortByNameAscendingLiveData
 
     fun loadFilesFoldersFromRoot() {
         viewModelScope.launch(Dispatchers.IO) {
-            _filesFoldersLiveData.postValue(
-                fromFilesFoldersListToUi(getAllFilesAndFolders.execute())
-            )
+
+            when (val result = getFilesListWithParentIdUseCase(GetFilesListWithParentIdUseCaseParams())) {
+                is OmhResult.OmhSuccess -> {
+                    _filesFoldersLiveData.postValue(result.data.files)
+                }
+                is OmhResult.OmhError -> {}
+            }
         }
     }
 

storage-sample/src/main/java/com/omh/android/storage/sample/drive/FilesAndFoldersViewModelFactory.kt

@@ -2,20 +2,17 @@ package com.omh.android.storage.sample.drive
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.omh.android.storage.api.domain.usecase.SortFilesAndFoldersByName
-import com.omh.android.storage.sample.usecase.KtsGetAllFilesAndFolders
+import com.omh.android.storage.api.domain.usecase.GetFilesListWithParentIdUseCase
 
 class FilesAndFoldersViewModelFactory(
-    private val getAllFilesAndFolders: KtsGetAllFilesAndFolders,
-    private val sortFilesAndFoldersByName: SortFilesAndFoldersByName
+    private val getFilesListWithParentIdUseCase: GetFilesListWithParentIdUseCase,
 ) : ViewModelProvider.Factory {
 
     @Suppress("UNCHECKED_CAST")
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         return if (modelClass.isAssignableFrom(FilesAndFoldersViewModel::class.java)) {
             FilesAndFoldersViewModel(
-                this.getAllFilesAndFolders,
-                this.sortFilesAndFoldersByName
+                this.getFilesListWithParentIdUseCase
             ) as T
         } else {
             throw IllegalArgumentException("ViewModel Not Found")

storage-sample/src/main/java/com/omh/android/storage/sample/drive/adapter/grid/FileGridAdapter.kt

@@ -0,0 +1,34 @@
+package com.omh.android.storage.sample.drive.adapter.grid
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.omh.android.storage.api.domain.model.OmhFile
+import com.omh.android.storage.sample.databinding.RvItemFilefolderGridBinding
+
+class FileGridAdapter : RecyclerView.Adapter<FileGridViewHolder>() {
+
+    private val files = mutableListOf<OmhFile>()
+
+    override fun getItemCount() = files.size
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int,
+    ): FileGridViewHolder = FileGridViewHolder(
+        RvItemFilefolderGridBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        )
+    )
+
+    override fun onBindViewHolder(holder: FileGridViewHolder, position: Int) {
+        holder.bind(files[position])
+    }
+
+    fun addAll(items: List<OmhFile>) {
+        files.clear()
+        files.addAll(items)
+        notifyDataSetChanged()
+    }
+
+}

storage-sample/src/main/java/com/omh/android/storage/sample/drive/adapter/grid/FileGridViewHolder.kt

@@ -0,0 +1,52 @@
+package com.omh.android.storage.sample.drive.adapter.grid
+
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.omh.android.storage.api.domain.model.OmhFile
+import com.omh.android.storage.api.domain.model.OmhFileType
+import com.omh.android.storage.sample.R
+import com.omh.android.storage.sample.databinding.RvItemFilefolderGridBinding
+
+class FileGridViewHolder(
+    binding: RvItemFilefolderGridBinding
+) : RecyclerView.ViewHolder(binding.root) {
+
+    private val fileIcon: ImageView = binding.ivFileGridItem
+    private val fileName: TextView = binding.tvFileFolderGridItemName
+
+    private fun loadFileImage(url: String) {
+        Glide.with(itemView)
+            .asBitmap()
+            .load(url)
+            .centerCrop()
+            .placeholder(R.mipmap.ic_launcher)
+            .into(fileIcon)
+    }
+
+    fun bind(file: OmhFile) {
+        fileName.text = file.name
+
+        val iconLink = when (file.fileType) {
+            OmhFileType.PDF -> "https://drive-thirdparty.googleusercontent.com/32/type/application/pdf"
+
+            OmhFileType.DOCUMENT,
+            OmhFileType.MICROSOFT_WORD,
+            OmhFileType.OPEN_DOCUMENT_TEXT -> "https://drive-thirdparty.googleusercontent.com/32/type/application/vnd.google-apps.document"
+
+            OmhFileType.SPREADSHEET,
+            OmhFileType.MICROSOFT_EXCEL,
+            OmhFileType.OPEN_DOCUMENT_SPREADSHEET -> "https://drive-thirdparty.googleusercontent.com/32/type/application/vnd.google-apps.spreadsheet"
+
+            OmhFileType.PNG -> "https://drive-thirdparty.googleusercontent.com/32/type/image/png"
+
+            OmhFileType.ZIP -> "https://drive-thirdparty.googleusercontent.com/32/type/application/zip"
+
+            else -> "https://static.thenounproject.com/png/3482632-200.png"
+        }
+
+        loadFileImage(iconLink)
+    }
+
+}