This repository has been archived by the owner on May 6, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixed for detail item view * Implement the cocktails by tags screen * Implement open tags from list * Fixed detekt issue
- Loading branch information
1 parent
78f741c
commit 9bb8aa0
Showing
33 changed files
with
633 additions
and
263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
shared/src/commonMain/kotlin/org/mixdrinks/data/TagsRepository.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| package org.mixdrinks.data | ||
|
|
||
| import org.mixdrinks.dto.SnapshotDto | ||
| import org.mixdrinks.dto.TagDto | ||
| import org.mixdrinks.dto.TagId | ||
|
|
||
| class TagsRepository( | ||
| private val snapshot: suspend () -> SnapshotDto, | ||
| internal class TagsRepository( | ||
| private val snapshotRepository: SnapshotRepository, | ||
| ) { | ||
|
|
||
| suspend fun getTags(tagId: List<TagId>): List<TagDto> { | ||
| return snapshot().tags.filter { tagDto -> tagId.contains(tagDto.id) } | ||
| return snapshotRepository.get().tags.filter { tagDto -> tagId.contains(tagDto.id) } | ||
| } | ||
| } |
173 changes: 173 additions & 0 deletions
173
shared/src/commonMain/kotlin/org/mixdrinks/ui/ComponentsFactory.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| package org.mixdrinks.ui | ||
|
|
||
| import com.arkivanov.decompose.ComponentContext | ||
| import org.mixdrinks.data.CocktailsProvider | ||
| import org.mixdrinks.data.FutureCocktailSelector | ||
| import org.mixdrinks.data.ItemsType | ||
| import org.mixdrinks.data.TagsRepository | ||
| import org.mixdrinks.domain.CocktailSelector | ||
| import org.mixdrinks.dto.CocktailId | ||
| import org.mixdrinks.dto.FilterId | ||
| import org.mixdrinks.ui.details.DetailsComponent | ||
| import org.mixdrinks.ui.details.FullCocktailRepository | ||
| import org.mixdrinks.ui.details.goods.GoodsRepository | ||
| import org.mixdrinks.ui.filters.main.FilterComponent | ||
| import org.mixdrinks.ui.filters.search.ItemRepository | ||
| import org.mixdrinks.ui.filters.search.SearchItemComponent | ||
| import org.mixdrinks.ui.items.ItemDetailComponent | ||
| import org.mixdrinks.ui.items.ItemGoodsRepository | ||
| import org.mixdrinks.ui.list.CocktailListMapper | ||
| import org.mixdrinks.ui.list.SelectedFilterProvider | ||
| import org.mixdrinks.ui.list.main.ListComponent | ||
| import org.mixdrinks.ui.list.predefine.PreDefineCocktailsComponent | ||
| import org.mixdrinks.ui.list.predefine.PreDefineFilterStorage | ||
| import org.mixdrinks.ui.navigation.Navigator | ||
| import org.mixdrinks.ui.tag.CommonTag | ||
| import org.mixdrinks.ui.tag.CommonTagCocktailsComponent | ||
| import org.mixdrinks.ui.tag.CommonTagNameProvider | ||
|
|
||
| internal class ComponentsFactory( | ||
| private val graph: Graph | ||
| ) { | ||
|
|
||
| fun cocktailListComponent( | ||
| componentContext: ComponentContext, | ||
| navigator: Navigator | ||
| ): ListComponent = | ||
| ListComponent( | ||
| componentContext = componentContext, | ||
| cocktailsProvider = CocktailsProvider( | ||
| graph.snapshotRepository, | ||
| graph.mutableFilterStorage, | ||
| suspend { | ||
| CocktailSelector(graph.mutableFilterStorage.getFilterGroups() | ||
| .map { it.toFilterGroup() }) | ||
| }, | ||
| TagsRepository(graph.snapshotRepository), | ||
| ), | ||
| selectedFilterProvider = SelectedFilterProvider(suspend { graph.snapshotRepository.get() }, | ||
| suspend { graph.mutableFilterStorage }), | ||
| navigator = navigator, | ||
| mutableFilterStorage = graph.mutableFilterStorage, | ||
| cocktailListMapper = CocktailListMapper(), | ||
| ) | ||
|
|
||
| fun cocktailDetailsComponent( | ||
| componentContext: ComponentContext, | ||
| cocktailId: CocktailId, | ||
| navigator: Navigator, | ||
| ): DetailsComponent { | ||
| return DetailsComponent(componentContext, | ||
| FullCocktailRepository(graph.snapshotRepository), | ||
| cocktailId, | ||
| navigator, | ||
| GoodsRepository { graph.snapshotRepository.get() }) | ||
| } | ||
|
|
||
| fun filterScreenComponent( | ||
| componentContext: ComponentContext, | ||
| navigator: Navigator | ||
| ): FilterComponent { | ||
| return FilterComponent( | ||
| componentContext, | ||
| graph.mutableFilterStorage, | ||
| createFutureCocktailSelector(), | ||
| navigator, | ||
| ) | ||
| } | ||
|
|
||
| fun searchItemScreen( | ||
| component: ComponentContext, | ||
| searchItemType: SearchItemComponent.SearchItemType, | ||
| navigator: Navigator, | ||
| ): SearchItemComponent { | ||
| val itemRepository = | ||
| ItemRepository(graph.snapshotRepository, createFutureCocktailSelector()) | ||
| return SearchItemComponent( | ||
| component, | ||
| searchItemType, | ||
| graph.mutableFilterStorage, | ||
| itemRepository, | ||
| navigator, | ||
| ) | ||
| } | ||
|
|
||
| suspend fun commonTagCocktailsScreen( | ||
| component: ComponentContext, | ||
| commonTag: CommonTag, | ||
| navigator: Navigator, | ||
| ): CommonTagCocktailsComponent { | ||
| return CommonTagCocktailsComponent( | ||
| componentContext = component, | ||
| commonTagNameProvider = CommonTagNameProvider( | ||
| snapshotRepository = graph.snapshotRepository, | ||
| ), | ||
| cocktailsProvider = CocktailsProvider( | ||
| snapshotRepository = graph.snapshotRepository, | ||
| filterRepository = PreDefineFilterStorage( | ||
| commonTag.type.filterGroups.id, | ||
| FilterId(commonTag.id) | ||
| ), | ||
| cocktailSelector = { | ||
| CocktailSelector(graph.mutableFilterStorage.getFilterGroups() | ||
| .map { it.toFilterGroup() }) | ||
| }, | ||
| tagsRepository = TagsRepository(graph.snapshotRepository), | ||
| ), | ||
| commonTag = commonTag, | ||
| navigator = navigator, | ||
| commonCocktailListMapper = CocktailListMapper(), | ||
| ) | ||
| } | ||
|
|
||
| fun detailGoodsScreen( | ||
| componentContext: ComponentContext, navigator: Navigator, id: Int, type: String, | ||
| ): ItemDetailComponent { | ||
| return ItemDetailComponent( | ||
| componentContext, | ||
| ItemGoodsRepository(graph.snapshotRepository), | ||
| navigator, | ||
| ItemsType(id, ItemsType.Type.valueOf(type)), | ||
| createPredefinedCocktailsComponent( | ||
| componentContext, | ||
| ItemsType(id, ItemsType.Type.valueOf(type)), | ||
| navigator, | ||
| ), | ||
| ) | ||
| } | ||
|
|
||
| fun createPredefinedCocktailsComponent( | ||
| componentContext: ComponentContext, | ||
| itemsType: ItemsType, | ||
| navigator: Navigator, | ||
| ): PreDefineCocktailsComponent { | ||
| return PreDefineCocktailsComponent( | ||
| componentContext = componentContext, | ||
| cocktailsProvider = CocktailsProvider( | ||
| snapshotRepository = graph.snapshotRepository, | ||
| filterRepository = PreDefineFilterStorage( | ||
| itemsType.type.getFilterGroup().id, | ||
| FilterId(itemsType.id) | ||
| ), | ||
| cocktailSelector = suspend { | ||
| CocktailSelector(graph.mutableFilterStorage.getFilterGroups() | ||
| .map { it.toFilterGroup() }) | ||
| }, | ||
| tagsRepository = TagsRepository(graph.snapshotRepository) | ||
| ), | ||
| navigator = navigator, | ||
| cocktailsMapper = CocktailListMapper(), | ||
| ) | ||
| } | ||
|
|
||
| private fun createFutureCocktailSelector(): FutureCocktailSelector { | ||
| return FutureCocktailSelector( | ||
| snapshot = { graph.snapshotRepository.get() }, | ||
| cocktailSelector = { | ||
| CocktailSelector(graph.mutableFilterStorage.getFilterGroups() | ||
| .map { it.toFilterGroup() }) | ||
| }, | ||
| mutableFilterStorage = { graph.mutableFilterStorage }, | ||
| ) | ||
| } | ||
| } |
Oops, something went wrong.