Skip to content

Commit

Permalink
Extract classes & refactor code usage
Browse files Browse the repository at this point in the history
  • Loading branch information
@hieuwu
hieuwu committed Apr 13, 2024
1 parent 0883fd7 commit b6d2cd3
Show file tree
Hide file tree
Showing 10 changed files with 358 additions and 314 deletions.
78 changes: 54 additions & 24 deletions .../arkbuilders/navigator/presentation/screen/gallery/galleryuplift/GalleryUpliftFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@ import com.google.android.material.chip.Chip
import dev.arkbuilders.arkfilepicker.folders.RootAndFav
import dev.arkbuilders.arklib.ResourceId
import dev.arkbuilders.arklib.data.index.Resource
import dev.arkbuilders.arklib.data.index.ResourceIndex
import dev.arkbuilders.arklib.data.index.ResourceIndexRepo
import dev.arkbuilders.arklib.data.meta.Metadata
import dev.arkbuilders.arklib.data.meta.MetadataProcessorRepo
import dev.arkbuilders.arklib.data.preview.PreviewProcessorRepo
import dev.arkbuilders.arklib.user.score.ScoreStorageRepo
import dev.arkbuilders.arklib.user.tags.Tag
import dev.arkbuilders.arklib.user.tags.TagStorage
import dev.arkbuilders.arklib.user.tags.Tags
import dev.arkbuilders.arklib.user.tags.TagsStorageRepo
import dev.arkbuilders.arklib.utils.extension
Expand All @@ -44,6 +46,7 @@ import dev.arkbuilders.navigator.BuildConfig
import dev.arkbuilders.navigator.R
import dev.arkbuilders.navigator.analytics.gallery.GalleryAnalytics
import dev.arkbuilders.navigator.data.preferences.Preferences
import dev.arkbuilders.navigator.data.stats.StatsStorage
import dev.arkbuilders.navigator.data.stats.StatsStorageRepo
import dev.arkbuilders.navigator.data.utils.LogTags
import dev.arkbuilders.navigator.databinding.FragmentGalleryBinding
Expand All @@ -64,6 +67,7 @@ import dev.arkbuilders.navigator.presentation.utils.makeVisible
import dev.arkbuilders.navigator.presentation.view.DefaultPopup
import dev.arkbuilders.navigator.presentation.view.DepthPageTransformer
import dev.arkbuilders.navigator.presentation.view.StackedToasts
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import timber.log.Timber
import java.nio.file.Path
Expand Down Expand Up @@ -109,16 +113,7 @@ class GalleryUpliftFragment : Fragment() {
lateinit var factory: GalleryUpliftViewModelFactory.Factory
private val viewModel: GalleryUpliftViewModel by viewModels {
factory.create(
selectorNotEdit = false,
// preferences = preferences,
// router = router,
// indexRepo = indexRepo,
// previewStorageRepo = previewStorageRepo,
// metadataStorageRepo = metadataStorageRepo,
// tagsStorageRepo = tagsStorageRepo,
// statsStorageRepo = statsStorageRepo,
// scoreStorageRepo = scoreStorageRepo,
// analytics = analytics
selectorNotEdit = false
)
}

Expand Down Expand Up @@ -146,11 +141,11 @@ class GalleryUpliftFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
Timber.d(LogTags.GALLERY_SCREEN, "view created in GalleryFragment")
App.instance.appComponent.inject(this)
viewModel.apply {
rootAndFav = requireArguments()[ROOT_AND_FAV_KEY] as RootAndFav
viewModel.initialize(
rootAndFav = requireArguments()[ROOT_AND_FAV_KEY] as RootAndFav,
resourcesIds = requireArguments().getParcelableArray(RESOURCES_KEY)!!
.toList() as List<ResourceId>
}
)
super.onViewCreated(view, savedInstanceState)
viewModel.onFirstViewAttach()

Expand Down Expand Up @@ -297,12 +292,16 @@ class GalleryUpliftFragment : Fragment() {
}
launch {
viewModel.notifyCurrentItemChange.collect {
notifyCurrentItemChanged()
if (it) {
notifyCurrentItemChanged()
}
}
}
launch {
viewModel.updatePagerAdapterWithDiff.collect {
updatePagerAdapterWithDiff()
if (it) {
updatePagerAdapterWithDiff()
}
}
}
launch {
Expand All @@ -326,7 +325,9 @@ class GalleryUpliftFragment : Fragment() {
}
launch {
viewModel.notifyResourceScoresChanged.collect {
notifyResourceScoresChanged()
if (it) {
notifyResourceScoresChanged()
}
}
}
launch {
Expand Down Expand Up @@ -363,7 +364,14 @@ class GalleryUpliftFragment : Fragment() {
launch {
viewModel.showEditTagsDialog.collect {
it?.let {
showEditTagsDialog(it)
showEditTagsDialog(
resource = it.resource,
resources = it.resources,
statsStorage = it.statsStorage,
rootAndFav = it.rootAndFav,
index = it.index,
storage = it.storage,
)
}
}
}
Expand All @@ -374,6 +382,23 @@ class GalleryUpliftFragment : Fragment() {
}
}
}
launch {
viewModel.notifyTagsChanged.collect {
if (it) {
notifyTagsChanged()
}
}
}
launch {
viewModel.showProgressWithText.collect {
it?.let {
setProgressVisibility(
isVisible = it.isVisible,
withText = it.text
)
}
}
}
}
}
}
Expand Down Expand Up @@ -544,19 +569,24 @@ class GalleryUpliftFragment : Fragment() {
}
}

fun showEditTagsDialog(
resource: ResourceId
private fun showEditTagsDialog(
resource: ResourceId,
rootAndFav: RootAndFav,
resources: List<ResourceId>,
index: ResourceIndex,
storage: TagStorage,
statsStorage: StatsStorage
) {
Timber.d(
LogTags.GALLERY_SCREEN,
"showing [edit-tags] dialog for resource $resource"
)
val dialog = EditTagsDialogFragment.newInstance(
requireArguments()[ROOT_AND_FAV_KEY] as RootAndFav,
listOf(resource),
viewModel.index,
viewModel.tagsStorage,
viewModel.statsStorage
rootAndFav = rootAndFav,
resources = resources,
index = index,
storage = storage,
statsStorage = statsStorage
)
dialog.show(childFragmentManager, EditTagsDialogFragment.FRAGMENT_TAG)
}
Expand Down
Loading

0 comments on commit b6d2cd3

Please sign in to comment.