formatools · michaem · May 3, 2023 · May 3, 2023
diff --git a/.gitignore b/.gitignore
@@ -4,12 +4,10 @@
 build
 /captures
 **/.idea/*
-!.idea/codeStyles
 !.idea/dictionaries
 !.idea/fileTemplates
 !.idea/file.template.settings.xml
 !.idea/inspectionProfiles
-!.idea/vcs.xml
 *.iml
 .externalNativeBuild
 .cxx
diff --git a/application/binary/build.gradle.kts b/application/binary/build.gradle.kts
@@ -15,7 +15,6 @@ androidBinary(
         target(":feature:characters:list:databinding"),
         target(":feature:characters:detail:api"),
         target(":feature:characters:detail:impl"),
-        target(":feature:characters:detail:databinding"),
         target(":feature:characters:favorite:api"),
         target(":feature:characters:favorite:impl"),
         target(":feature:characters:favorite:databinding"),

diff --git a/application/common/extensions/android-util/build.gradle.kts b/application/common/extensions/android-util/build.gradle.kts
@@ -12,5 +12,7 @@ androidUtil(
         androidx.paging,
         google.material,
         io.coil
+    ) + deps(
+        target(":common:placeholder:res")
     )
 )
diff --git a/.../src/main/java/com/stepango/blockme/common/extensions/android/util/ImageViewExtensions.kt b/.../src/main/java/com/stepango/blockme/common/extensions/android/util/ImageViewExtensions.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023 forma.tools
+ *
+ * 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 com.stepango.blockme.common.extensions.android.util
+
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.widget.ImageView
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import coil.load
+import kotlin.random.Random
+
+fun ImageView.loadImage(url: String?, @DrawableRes placeholderId: Int? = null) {
+    load(url) {
+        crossfade(true)
+        placeholder(placeholderId?.let {
+            ContextCompat.getDrawable(context, it)
+        } ?: run {
+            val placeholdersColors = resources.getStringArray(R.array.placeholders)
+            val placeholderColor = placeholdersColors[Random.nextInt(placeholdersColors.size)]
+            ColorDrawable(Color.parseColor(placeholderColor))
+        })
+    }
+}
diff --git a/application/feature/characters/detail/api/src/main/empty.kt b/application/feature/characters/detail/api/src/main/empty.kt
diff --git a/...presentation/ICharacterDetailViewModel.kt → ...presentation/ICharacterDetailViewModel.kt b/...presentation/ICharacterDetailViewModel.kt → ...presentation/ICharacterDetailViewModel.kt
@@ -1,13 +1,7 @@
-package com.stepango.blockme.feature.characters.detail.impl.presentation
-
-import androidx.lifecycle.LiveData
-import com.stepango.blockme.feature.characters.core.api.domain.model.ICharacter
+package com.stepango.blockme.feature.characters.detail.api.presentation
 
 interface ICharacterDetailViewModel {
 
-    val data: LiveData<ICharacter>
-    val state: LiveData<ICharacterDetailViewState>
-
     fun loadCharacterDetail(characterId: Long)
 
     fun addCharacterToFavorite()

diff --git a/application/feature/characters/detail/databinding/build.gradle.kts b/application/feature/characters/detail/databinding/build.gradle.kts
diff --git a/...n/feature/characters/detail/databinding/src/main/res/layout/fragment_character_detail.xml b/...n/feature/characters/detail/databinding/src/main/res/layout/fragment_character_detail.xml
diff --git a/...ature/characters/detail/databinding/src/main/res/layout/view_character_detail_content.xml b/...ature/characters/detail/databinding/src/main/res/layout/view_character_detail_content.xml
diff --git a/application/feature/characters/detail/impl/build.gradle.kts b/application/feature/characters/detail/impl/build.gradle.kts
@@ -12,13 +12,13 @@ impl(
         google.material,
         google.dagger,
         jakewharton.timber,
-        kotlinx.coroutines_core
-
+        kotlinx.coroutines_core,
+        viewbinding.viewpropertydelegate
     ) + deps(
         target(":feature:characters:core:api"),
         target(":feature:characters:favorite:api"),
         target(":feature:characters:detail:api"),
-        target(":feature:characters:detail:databinding"),
+        target(":feature:characters:detail:viewbinding"),
 
         target(":core:di:library"),
         target(":core:theme:android-util"),
@@ -28,7 +28,6 @@ impl(
 
         target(":common:util"),
         target(":common:extensions:android-util"),
-        target(":common:extensions:databinding-adapter"),
         target(":common:progressbar:databinding")
     )
 )
diff --git a/.../stepango/blockme/feature/characters/detail/impl/presentation/CharacterDetailViewModel.kt b/.../stepango/blockme/feature/characters/detail/impl/presentation/CharacterDetailViewModel.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 vmadalin.com
+ * Copyright 2019 forma.tools
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.stepango.blockme.feature.characters.core.api.domain.model.ICharacter
 import com.stepango.blockme.feature.characters.core.api.domain.repository.MarvelRepository
+import com.stepango.blockme.feature.characters.detail.api.presentation.ICharacterDetailViewModel
+import com.stepango.blockme.feature.characters.detail.api.presentation.ICharacterDetailViewState
 import com.stepango.blockme.feature.characters.favorite.api.domain.usecase.IGetCharacterFavoriteUseCase
 import com.stepango.blockme.feature.characters.favorite.api.domain.usecase.ISetCharacterFavoriteUseCase
 import kotlinx.coroutines.launch
@@ -34,11 +36,11 @@ class CharacterDetailViewModel @Inject constructor(
 ) : ViewModel(), ICharacterDetailViewModel {
 
     private val _data = MutableLiveData<ICharacter>()
-    override val data: LiveData<ICharacter>
+    val data: LiveData<ICharacter>
         get() = _data
 
     private val _state = MutableLiveData<ICharacterDetailViewState>()
-    override val state: LiveData<ICharacterDetailViewState>
+    val state: LiveData<ICharacterDetailViewState>
         get() = _state
 
     override fun loadCharacterDetail(characterId: Long) {<
10000
/span>

diff --git a/.../stepango/blockme/feature/characters/detail/impl/presentation/CharacterDetailViewState.kt b/.../stepango/blockme/feature/characters/detail/impl/presentation/CharacterDetailViewState.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 vmadalin.com
+ * Copyright 2019 forma.tools
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package com.stepango.blockme.feature.characters.detail.impl.presentation
 
 import com.stepango.blockme.core.mvvm.library.ui.BaseViewState
+import com.stepango.blockme.feature.characters.detail.api.presentation.ICharacterDetailViewState
 
 sealed class CharacterDetailViewState : BaseViewState, ICharacterDetailViewState {
 

diff --git a/...in/java/com/stepango/blockme/feature/characters/detail/impl/ui/CharacterDetailFragment.kt b/...in/java/com/stepango/blockme/feature/characters/detail/impl/ui/CharacterDetailFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 vmadalin.com
+ * Copyright 2019 forma.tools
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,28 +18,32 @@ package com.stepango.blockme.feature.characters.detail.impl.ui
 
 import android.os.Bundle
 import android.view.View
+import androidx.core.view.isVisible
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
+import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
+import com.stepango.blockme.common.extensions.android.util.loadImage
 import com.stepango.blockme.common.extensions.android.util.observe
 import com.stepango.blockme.common.progressbar.databinding.ProgressBarDialog
-import com.stepango.blockme.core.mvvm.library.ui.BaseFragment
+import com.stepango.blockme.core.mvvm.library.ui.BaseViewBindingFragment
 import com.stepango.blockme.core.mvvm.library.viewModels
 import com.stepango.blockme.feature.characters.core.api.di.CharactersCoreFeatureProvider
-import com.stepango.blockme.feature.characters.detail.databinding.databinding.FragmentCharacterDetailBinding
+import com.stepango.blockme.feature.characters.core.api.domain.model.ICharacter
+import com.stepango.blockme.feature.characters.detail.api.presentation.ICharacterDetailViewState
+import com.stepango.blockme.feature.characters.detail.viewbinding.databinding.FragmentCharacterDetailBinding
 import com.stepango.blockme.feature.characters.detail.impl.R
 import com.stepango.blockme.feature.characters.detail.impl.di.DaggerCharacterDetailComponent
 import com.stepango.blockme.feature.characters.detail.impl.presentation.CharacterDetailViewModel
 import com.stepango.blockme.feature.characters.detail.impl.presentation.CharacterDetailViewState
-import com.stepango.blockme.feature.characters.detail.impl.presentation.ICharacterDetailViewState
 import com.stepango.blockme.feature.characters.favorite.api.di.CharacterFavoriteFeatureProvider
 
-class CharacterDetailFragment :
-    BaseFragment<FragmentCharacterDetailBinding>(
-        layoutId = R.layout.fragment_character_detail
-    ) {
+class CharacterDetailFragment : BaseViewBindingFragment(
+    layoutId = R.layout.fragment_character_detail
+) {
 
     private val viewModel: CharacterDetailViewModel by viewModels()
+    private val viewBinding: FragmentCharacterDetailBinding by viewBinding(FragmentCharacterDetailBinding::bind)
 
     private val args: CharacterDetailFragmentArgs by navArgs()
 
@@ -48,7 +52,9 @@ class CharacterDetailFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         progressDialog = ProgressBarDialog(requireCompatActivity())
+        setupViews()
 
+        observe(viewModel.data, ::onViewDataChange)
         observe(viewModel.state, ::onViewStateChange)
         viewModel.loadCharacterDetail(args.characterId)
     }
@@ -63,11 +69,24 @@ class CharacterDetailFragment :
             .inject(this)
     }
 
-    override fun onInitDataBinding() {
-        viewBinding.viewModel = viewModel
+    private fun setupViews() {
+        viewBinding.toolbar.setNavigationOnClickListener {
+            viewModel.dismissCharacterDetail()
+        }
+        viewBinding.addFavoriteButton.setOnClickListener {
+            viewModel.addCharacterToFavorite()
+        }
+    }
+
+    private fun onViewDataChange(viewData: ICharacter) {
+        viewBinding.collapsingToolbar.title = viewData.name
+        viewBinding.characterImage.loadImage(viewData.imageUrl)
+        viewBinding.includeDetailBody.characterName.text = viewData.name
+        viewBinding.includeDetailBody.characterDescription.text = viewData.description
     }
 
     private fun onViewStateChange(viewState: ICharacterDetailViewState) {
+        viewBinding.addFavoriteButton.isVisible = viewState.isAddToFavorite()
         when (viewState) {
             is CharacterDetailViewState.Loading ->
                 progressDialog.show(R.string.character_detail_dialog_loading_text)

diff --git a/.../characters/detail/databinding/.gitignore → .../characters/detail/viewbinding/.gitignore b/.../characters/detail/databinding/.gitignore → .../characters/detail/viewbinding/.gitignore
diff --git a/application/feature/characters/detail/viewbinding/build.gradle.kts b/application/feature/characters/detail/viewbinding/build.gradle.kts
@@ -0,0 +1,10 @@
+viewBinding(
+    packageName = "com.stepango.blockme.feature.characters.detail.viewbinding",
+    dependencies = deps(
+        google.material,
+        androidx.constraintlayout,
+    ) + deps(
+        target(":feature:characters:detail:res"),
+        target(":core:theme:res"),
+    )
+)