Implement share monsters on folders and search (#323)

* Implement share monsters on folder preview and insert and search * Implement share monsters on folder list
alexandregpereira · Aug 18, 2024 · f658f9e · f658f9e
1 parent 46a636e
commit f658f9e
Show file tree

Hide file tree

Showing 53 changed files with 498 additions and 235 deletions.
diff --git a/...c/commonMain/kotlin/br/alexandregpereira/hunter/data/database/dao/MonsterFolderDaoImpl.kt b/...c/commonMain/kotlin/br/alexandregpereira/hunter/data/database/dao/MonsterFolderDaoImpl.kt
@@ -58,6 +58,16 @@ internal class MonsterFolderDaoImpl(
         queries.getMonstersFromFolder(folderName).executeAsList().groupByMonsterFolder()
     }
 
+    override suspend fun getMonstersFromFolders(
+        foldersName: List<String>
+    ): List<MonsterEntity> {
+        return withContext(dispatcher) {
+            queries.getMonstersFromFolders(foldersName).executeAsList().map {
+                it.toMonsterEntity()
+            }
+        }
+    }
+
     override suspend fun removeMonsterFromFolder(
         folderName: String,
         monsterIndexes: List<String>
@@ -76,28 +86,32 @@ internal class MonsterFolderDaoImpl(
                 folderName = it.folderName,
                 monsterIndex = it.monsterIndex,
                 createdAt = it.createdAt
-            ) to MonsterEntity(
-                index = it.index,
-                type = it.type,
-                subtype = it.subtype,
-                group = it.subtitle,
-                challengeRating = it.challengeRating.toFloat(),
-                name = it.name,
-                subtitle = it.subtitle,
-                imageUrl = it.imageUrl,
-                backgroundColorLight = it.backgroundColorLight,
-                backgroundColorDark = it.backgroundColorDark,
-                isHorizontalImage = it.isHorizontalImage == 1L,
-                size = it.size,
-                alignment = it.alignment,
-                armorClass = it.armorClass.toInt(),
-                hitPoints = it.hitPoints.toInt(),
-                hitDice = it.hitDice,
-                senses = it.senses,
-                languages = it.languages,
-                sourceName = it.sourceName,
-                status = MonsterEntityStatus.entries[it.isClone.toInt()],
-            )
+            ) to it.toMonsterEntity()
         }.groupBy(keySelector = { it.first }, valueTransform = { it.second })
     }
+
+    private fun MonsterFolderCompleteEntityView.toMonsterEntity(): MonsterEntity {
+        return MonsterEntity(
+            index = index,
+            type = type,
+            subtype = subtype,
+            group = subtitle,
+            challengeRating = challengeRating.toFloat(),
+            name = name,
+            subtitle = subtitle,
+            imageUrl = imageUrl,
+            backgroundColorLight = backgroundColorLight,
+            backgroundColorDark = backgroundColorDark,
+            isHorizontalImage = isHorizontalImage == 1L,
+            size = size,
+            alignment = alignment,
+            armorClass = armorClass.toInt(),
+            hitPoints = hitPoints.toInt(),
+            hitDice = hitDice,
+            senses = senses,
+            languages = languages,
+            sourceName = sourceName,
+            status = MonsterEntityStatus.entries[isClone.toInt()],
+        )
+    }
 }
diff --git a/.../app/data/src/commonMain/sqldelight/br/alexandregpereira/hunter/database/MonsterFolder.sq b/.../app/data/src/commonMain/sqldelight/br/alexandregpereira/hunter/database/MonsterFolder.sq
@@ -19,6 +19,12 @@ WHERE folderName == ?
 ORDER BY createdAt DESC
 ;
 
+getMonstersFromFolders:
+SELECT * FROM MonsterFolderCompleteEntityView
+WHERE folderName IN ?
+ORDER BY createdAt DESC
+;
+
 removeMonsterFromFolder:
 DELETE FROM MonsterFolderEntity
 WHERE folderName == ? AND monsterIndex IN ?

diff --git a/...in/kotlin/br/alexandregpereira/hunter/domain/folder/AddMonsterToTemporaryFolderUseCase.kt b/...in/kotlin/br/alexandregpereira/hunter/domain/folder/AddMonsterToTemporaryFolderUseCase.kt
@@ -23,10 +23,10 @@ class AddMonsterToTemporaryFolderUseCase(
     private val addMonstersToFolder: AddMonstersToFolderUseCase,
 ) {
 
-    operator fun invoke(index: String): Flow<Unit> {
+    operator fun invoke(indexes: List<String>): Flow<Unit> {
         return addMonstersToFolder(
             folderName = TEMPORARY_FOLDER_NAME,
-            indexes = listOf(index)
+            indexes = indexes
         )
     }
 }
diff --git a/...ommonMain/kotlin/br/alexandregpereira/hunter/domain/folder/GetMonstersByFoldersUseCase.kt b/...ommonMain/kotlin/br/alexandregpereira/hunter/domain/folder/GetMonstersByFoldersUseCase.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 Alexandre Gomes Pereira
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package br.alexandregpereira.hunter.domain.folder
+
+import br.alexandregpereira.hunter.domain.folder.model.MonsterPreviewFolder
+import kotlinx.coroutines.flow.Flow
+
+class GetMonstersByFolders(
+    private val monsterFolderRepository: MonsterFolderRepository
+) {
+
+    operator fun invoke(foldersName: List<String>): Flow<List<MonsterPreviewFolder>> {
+        return monsterFolderRepository.getMonstersFromFolders(
+            foldersName = foldersName
+        )
+    }
+}
diff --git a/...rc/commonMain/kotlin/br/alexandregpereira/hunter/domain/folder/MonsterFolderRepository.kt b/...rc/commonMain/kotlin/br/alexandregpereira/hunter/domain/folder/MonsterFolderRepository.kt
@@ -17,6 +17,7 @@
 package br.alexandregpereira.hunter.domain.folder
 
 import br.alexandregpereira.hunter.domain.folder.model.MonsterFolder
+import br.alexandregpereira.hunter.domain.folder.model.MonsterPreviewFolder
 import kotlinx.coroutines.flow.Flow
 
 interface MonsterFolderRepository {
@@ -25,5 +26,6 @@ interface MonsterFolderRepository {
     fun removeMonsters(folderName: String, indexes: List<String>): Flow<Unit>
     fun getMonsterFolders(): Flow<List<MonsterFolder>>
     fun getMonstersFromFolder(folderName: String): Flow<MonsterFolder?>
+    fun getMonstersFromFolders(foldersName: List<String>): Flow<List<MonsterPreviewFolder>>
     fun removeMonsterFolders(folderNames: List<String>): Flow<Unit>
 }
diff --git a/...r/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/folder/di/DomainModule.kt b/...r/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/folder/di/DomainModule.kt
@@ -22,6 +22,7 @@ import br.alexandregpereira.hunter.domain.folder.ClearTemporaryFolderUseCase
 import br.alexandregpereira.hunter.domain.folder.GetFolderMonsterPreviewsByIdsUseCase
 import br.alexandregpereira.hunter.domain.folder.GetMonsterFoldersUseCase
 import br.alexandregpereira.hunter.domain.folder.GetMonstersByFolderUseCase
+import br.alexandregpereira.hunter.domain.folder.GetMonstersByFolders
 import br.alexandregpereira.hunter.domain.folder.GetMonstersByTemporaryFolderUseCase
 import br.alexandregpereira.hunter.domain.folder.RemoveMonsterFoldersUseCase
 import br.alexandregpereira.hunter.domain.folder.RemoveMonstersFromTemporaryFolderUseCase
@@ -37,4 +38,5 @@ val monsterFolderDomainModule = module {
     factory { GetMonstersByTemporaryFolderUseCase(get()) }
     factory { RemoveMonsterFoldersUseCase(get()) }
     factory { RemoveMonstersFromTemporaryFolderUseCase(get()) }
+    factory { GetMonstersByFolders(get()) }
 }
diff --git a/...monMain/kotlin/br/alexandregpereira/hunter/data/monster/folder/DefaultFolderRepository.kt b/...monMain/kotlin/br/alexandregpereira/hunter/data/monster/folder/DefaultFolderRepository.kt
@@ -40,6 +40,11 @@ internal class DefaultFolderRepository(
         return monsterFolderLocalDataSource.getMonstersFromFolder(folderName).map { it?.asDomain() }
     }
 
+    override fun getMonstersFromFolders(foldersName: List<String>): Flow<List<MonsterPreviewFolder>> {
+        return monsterFolderLocalDataSource.getMonstersFromFolders(foldersName)
+            .map { it.asDomainMonsterPreviewFolderEntity() }
+    }
+
     override fun removeMonsters(folderName: String, indexes: List<String>): Flow<Unit> {
         return monsterFolderLocalDataSource.removeMonsters(folderName, monsterIndexes = indexes)
     }

diff --git a/...alexandregpereira/hunter/data/monster/folder/local/DefaultMonsterFolderLocalDataSource.kt b/...alexandregpereira/hunter/data/monster/folder/local/DefaultMonsterFolderLocalDataSource.kt
@@ -85,4 +85,8 @@ internal class DefaultMonsterFolderLocalDataSource(
     override fun removeMonsterFolders(folderNames: List<String>): Flow<Unit> = flow {
         emit(monsterFolderDao.removeMonsterFolders(folderNames))
     }
+
+    override fun getMonstersFromFolders(foldersName: List<String>): Flow<List<MonsterEntity>> = flow {
+        emit(monsterFolderDao.getMonstersFromFolders(foldersName))
+    }
 }
diff --git a/...lin/br/alexandregpereira/hunter/data/monster/folder/local/MonsterFolderLocalDataSource.kt b/...lin/br/alexandregpereira/hunter/data/monster/folder/local/MonsterFolderLocalDataSource.kt
@@ -28,4 +28,5 @@ internal interface MonsterFolderLocalDataSource {
     fun getMonstersFromFolder(folderName: String): Flow<MonsterFolderCompleteEntity?>
     fun getFolderMonsterPreviewsByIds(monsterIndexes: List<String>): Flow<List<MonsterEntity>>
     fun removeMonsterFolders(folderNames: List<String>): Flow<Unit>
+    fun getMonstersFromFolders(foldersName: List<String>): Flow<List<MonsterEntity>>
 }
diff --git a/...Main/kotlin/br/alexandregpereira/hunter/data/monster/folder/local/dao/MonsterFolderDao.kt b/...Main/kotlin/br/alexandregpereira/hunter/data/monster/folder/local/dao/MonsterFolderDao.kt
@@ -30,4 +30,6 @@ interface MonsterFolderDao {
     suspend fun removeMonsterFromFolder(folderName: String, monsterIndexes: List<String>)
 
     suspend fun removeMonsterFolders(folderNames: List<String>)
+
+    suspend fun getMonstersFromFolders(foldersName: List<String>): List<MonsterEntity>
 }
diff --git a/...se/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertFeature.kt b/...se/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertFeature.kt
@@ -35,6 +35,7 @@ fun FolderInsertFeature(
         onFolderSelected = stateHolder::onFolderNameFieldChange,
         onLongClick = stateHolder::onRemoveMonster,
         onSave = stateHolder::onSave,
-        onClose = stateHolder::onClose
+        onClose = stateHolder::onClose,
+        onShare = stateHolder::onShare,
     )
 }
diff --git a/.../src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/ui/FolderInsertScreen.kt b/.../src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/ui/FolderInsertScreen.kt
@@ -38,38 +38,49 @@ internal fun FolderInsertScreen(
     onLongClick: (String) -> Unit = {},
     onSave: () -> Unit = {},
     onClose: () -> Unit = {},
+    onShare: () -> Unit = {},
+) = BottomSheet(
+    opened = state.isOpen,
+    contentPadding = contentPadding,
+    topSpaceHeight = 0.dp,
+    onClose = onClose
 ) {
-    BottomSheet(opened = state.isOpen, contentPadding = contentPadding, onClose = onClose) {
-        ScreenHeader(
-            title = state.strings.addToFolder,
-            modifier = Modifier.padding(16.dp)
-        )
+    ScreenHeader(
+        title = state.strings.addToFolder,
+        modifier = Modifier.padding(16.dp)
+    )
 
-        MonsterPreviewRow(
-            monsters = state.monsterPreviews,
-            onLongClick = onLongClick,
-            modifier = Modifier.padding(top = 8.dp)
-        )
+    MonsterPreviewRow(
+        monsters = state.monsterPreviews,
+        onLongClick = onLongClick,
+        modifier = Modifier.padding(top = 8.dp)
+    )
 
-        AppTextField(
-            text = state.folderName,
-            label = state.strings.folderNameLabel,
-            modifier = Modifier.padding(vertical = 16.dp, horizontal = 16.dp),
-            onValueChange = onFolderNameFieldChange
-        )
+    AppTextField(
+        text = state.folderName,
+        label = state.strings.folderNameLabel,
+        modifier = Modifier.padding(vertical = 16.dp, horizontal = 16.dp),
+        onValueChange = onFolderNameFieldChange
+    )
 
-        MonsterFolderGrid(
-            folders = state.folders,
-            onFolderSelected = onFolderSelected,
-            modifier = Modifier.padding(bottom = 16.dp)
-        )
+    MonsterFolderGrid(
+        folders = state.folders,
+        onFolderSelected = onFolderSelected,
+        modifier = Modifier.padding(bottom = 16.dp)
+    )
 
-        AppButton(
-            text = state.strings.save,
-            modifier = Modifier.padding(16.dp),
-            onClick = onSave
-        )
-    }
+    AppButton(
+        text = state.strings.share,
+        modifier = Modifier.padding(top = 16.dp, bottom = 8.dp).padding(horizontal = 16.dp),
+        isPrimary = false,
+        onClick = onShare
+    )
+
+    AppButton(
+        text = state.strings.save,
+        modifier = Modifier.padding(bottom = 16.dp, top = 8.dp).padding(horizontal = 16.dp),
+        onClick = onSave
+    )
 }
 
 @Preview

diff --git a/feature/folder-insert/state-holder/build.gradle.kts b/feature/folder-insert/state-holder/build.gradle.kts
@@ -9,6 +9,7 @@ multiplatform {
         api(project(":core:state-holder"))
         api(project(":domain:monster-folder:core"))
         implementation(project(":feature:folder-insert:event"))
+        implementation(project(":feature:share-content:event"))
         implementation(libs.kotlin.coroutines.core)
         implementation(libs.koin.core)
     }

diff --git a/.../src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertAnalytics.kt b/.../src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertAnalytics.kt
@@ -55,4 +55,10 @@ internal class FolderInsertAnalytics(
             )
         )
     }
+
+    fun trackShared() {
+        analytics.track(
+            eventName = "Folder Insert - shared",
+        )
+    }
 }
diff --git a/...rc/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertStateHolder.kt b/...rc/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertStateHolder.kt
@@ -16,6 +16,8 @@
 
 package br.alexandregpereira.hunter.folder.insert
 
+import br.alexadregpereira.hunter.shareContent.event.ShareContentEvent
+import br.alexadregpereira.hunter.shareContent.event.ShareContentEventDispatcher
 import br.alexandregpereira.hunter.domain.folder.AddMonstersToFolderUseCase
 import br.alexandregpereira.hunter.domain.folder.GetFolderMonsterPreviewsByIdsUseCase
 import br.alexandregpereira.hunter.domain.folder.GetMonsterFoldersUseCase
@@ -40,6 +42,7 @@ class FolderInsertStateHolder internal constructor(
     private val dispatcher: CoroutineDispatcher,
     private val analytics: FolderInsertAnalytics,
     private val appLocalization: AppLocalization,
+    private val shareContentEventDispatcher: ShareContentEventDispatcher,
 ) : UiModel<FolderInsertState>(FolderInsertState()) {
 
     private val strings: FolderInsertStrings
@@ -93,6 +96,14 @@ class FolderInsertStateHolder internal constructor(
         setState { copy(isOpen = false) }
     }
 
+    fun onShare() {
+        analytics.trackShared()
+        onClose()
+        shareContentEventDispatcher.dispatchEvent(
+            ShareContentEvent.Export.OnStart(state.value.monsterIndexes)
+        )
+    }
+
     private fun load(monsterIndexes: List<String>, folderName: String = "") {
         setState {
             copy(

diff --git a/...er/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertStrings.kt b/...er/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/FolderInsertStrings.kt
@@ -6,24 +6,28 @@ interface FolderInsertStrings {
     val addToFolder: String
     val folderNameLabel: String
     val save: String
+    val share: String
 }
 
 internal data class FolderInsertEnStrings(
     override val addToFolder: String = "Add to folder",
     override val folderNameLabel: String = "Folder name",
     override val save: String = "Save",
+    override val share: String = "Share",
 ) : FolderInsertStrings
 
 internal data class FolderInsertPtStrings(
     override val addToFolder: String = "Adicionar à pasta",
     override val folderNameLabel: String = "Nome da pasta",
     override val save: String = "Salvar",
+    override val share: String = "Compartilhar",
 ) : FolderInsertStrings
 
 internal data class FolderInsertEmptyStrings(
     override val addToFolder: String = "",
     override val folderNameLabel: String = "",
     override val save: String = "",
+    override val share: String = "",
 ) : FolderInsertStrings
 
 internal fun getFolderInsertStrings(lang: Language): FolderInsertStrings {

diff --git a/...state-holder/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/di/Module.kt b/...state-holder/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/insert/di/Module.kt
@@ -37,6 +37,7 @@ val folderInsertModule = module {
             dispatcher = get(),
             analytics = FolderInsertAnalytics(get()),
             appLocalization = get(),
+            shareContentEventDispatcher = get(),
         )
     }
 }
diff --git a/...ompose/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/list/FolderListFeature.kt b/...ompose/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/list/FolderListFeature.kt
@@ -40,6 +40,7 @@ fun FolderListFeature(
         onCLick = viewModel::onItemClick,
         onLongCLick = viewModel::onItemSelect,
         onItemSelectionClose = viewModel::onItemSelectionClose,
-        onItemSelectionDeleteClick = viewModel::onItemSelectionDeleteClick
+        onItemSelectionDeleteClick = viewModel::onItemSelectionDeleteClick,
+        onItemSelectionAddToPreviewClick = viewModel::onItemSelectionAddToPreviewClick,
     )
 }
diff --git a/...pose/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/list/ui/FolderListScreen.kt b/...pose/src/commonMain/kotlin/br/alexandregpereira/hunter/folder/list/ui/FolderListScreen.kt
@@ -30,7 +30,8 @@ internal fun FolderListScreen(
     onCLick: (String) -> Unit = {},
     onLongCLick: (String) -> Unit = {},
     onItemSelectionClose: () -> Unit = {},
-    onItemSelectionDeleteClick: () -> Unit = {}
+    onItemSelectionDeleteClick: () -> Unit = {},
+    onItemSelectionAddToPreviewClick: () -> Unit = {},
 ) {
     Box(Modifier.fillMaxSize()) {
         FolderCardGrid(
@@ -44,9 +45,11 @@ internal fun FolderListScreen(
         ItemSelection(
             itemSelectionText = state.strings.itemSelected(state.itemSelectionCount),
             deleteText = state.strings.delete,
+            addToPreviewText = state.strings.addToPreview,
             contentBottomPadding = contentPadding.calculateBottomPadding(),
             onClose = onItemSelectionClose,
             onDeleteClick = onItemSelectionDeleteClick,
+            onAddToPreviewClick = onItemSelectionAddToPreviewClick,
             isOpen = state.isItemSelectionOpen,
         )
     }