Skip to content
Open

done #20

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.activity)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.recyclerview)
implementation(libs.glide)
annotationProcessor(libs.compiler)
testImplementation(libs.junit)
testImplementation(libs.kotlin.coroutines.test)
}
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET"/>

<application
android:allowBackup="true"
android:name=".App"
Expand Down
48 changes: 36 additions & 12 deletions app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,67 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.flowWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import kotlinx.coroutines.launch
import ru.otus.cookbook.data.RecipeListItem
import ru.otus.cookbook.databinding.FragmentCookbookBinding

class CookbookFragment : Fragment() {

private val binding = FragmentBindingDelegate<FragmentCookbookBinding>(this)
private val model: CookbookFragmentViewModel by viewModels { CookbookFragmentViewModel.Factory }
private val viewModel: CookbookFragmentViewModel by viewModels { CookbookFragmentViewModel.Factory }
private val recipesAdapter = RecipesAdapter(::openRecipe)

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View = binding.bind(
container,
FragmentCookbookBinding::inflate
)
): View = binding.bind(container, FragmentCookbookBinding::inflate)

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setupRecyclerView()

setupToolbar()
setupRecycler()
observeRecipes()
}

private fun setupToolbar() {
val activity = activity as? AppCompatActivity ?: return

binding.withBinding {
activity.setSupportActionBar(toolbar)
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
}
}

private fun setupRecycler() {
binding.withBinding {
categoryRecyclerView.adapter = recipesAdapter
}
}

private fun observeRecipes() {
viewLifecycleOwner.lifecycleScope.launch {
model.recipeList
viewModel.recipeList
.flowWithLifecycle(viewLifecycleOwner.lifecycle)
.collect(::onRecipeListUpdated)
.collect(::updateRecipes)
}
}

private fun setupRecyclerView() = binding.withBinding {
// Setup RecyclerView
private fun openRecipe(recipeId: Int) {
findNavController().navigate(
CookbookFragmentDirections.actionCookbookFragmentToRecipeFragment(recipeId)
)
}

private fun onRecipeListUpdated(recipeList: List<RecipeListItem>) {
// Handle recipe list
private fun updateRecipes(recipeList: List<RecipeListItem>) {
recipesAdapter.submitList(recipeList)
}
}
43 changes: 43 additions & 0 deletions app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialog.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package ru.otus.cookbook.ui

import android.app.Dialog
import android.os.Bundle
import androidx.fragment.app.DialogFragment
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import ru.otus.cookbook.R
import kotlin.getValue

class DeleteRecipeDialog: DialogFragment() {

private val recipeArg by navArgs<DeleteRecipeDialogArgs>()

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val recipeTitle = recipeArg.recipeTitle
return MaterialAlertDialogBuilder(requireContext())
.setTitle(getString(R.string.Delete))
.setMessage(getString(R.string.Choice, recipeTitle))
.setPositiveButton(getString(R.string.Ok)) { _, _ ->
dismiss()
setDialogResult(true)
}
.setNegativeButton(getString(R.string.Cancel)) { _, _ ->
dismiss()
setDialogResult(false)
}
.create()
}

private fun setDialogResult(result: Boolean) {
val navController = findNavController()
navController.previousBackStackEntry?.savedStateHandle?.set(
DIALOG_RESULT,
result
)
}

companion object {
const val DIALOG_RESULT = "dialogRes"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ru.otus.cookbook.ui

import androidx.recyclerview.widget.RecyclerView.ViewHolder
import ru.otus.cookbook.databinding.VhRecipeCategoryBinding

class RecipeCategoryViewHolder(val binding: VhRecipeCategoryBinding): ViewHolder(binding.root) {
}
26 changes: 26 additions & 0 deletions app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDiffUtil.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package ru.otus.cookbook.ui

import androidx.recyclerview.widget.DiffUtil
import ru.otus.cookbook.data.RecipeListItem

class RecipeDiffUtil: DiffUtil.ItemCallback<RecipeListItem>() {

override fun areItemsTheSame( firstItem: RecipeListItem, secondItem: RecipeListItem ): Boolean {

return when{
firstItem is RecipeListItem.CategoryItem && secondItem is RecipeListItem.CategoryItem ->
firstItem.name == secondItem.name
firstItem is RecipeListItem.RecipeItem && secondItem is RecipeListItem.RecipeItem ->
firstItem.id == secondItem.id
else -> false
}

}

override fun areContentsTheSame(firsttem: RecipeListItem, secondItem: RecipeListItem): Boolean {

return firsttem == secondItem

}

}
86 changes: 71 additions & 15 deletions app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,29 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.flowWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.viewmodel.MutableCreationExtras
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.bumptech.glide.Glide
import kotlinx.coroutines.launch
import ru.otus.cookbook.data.Recipe
import ru.otus.cookbook.databinding.FragmentRecipeBinding

class RecipeFragment : Fragment() {

private val recipeId: Int get() = TODO("Use Safe Args to get the recipe ID: https://developer.android.com/guide/navigation/use-graph/pass-data#Safe-args")
private val args by navArgs<RecipeFragmentArgs>()
private val recipeId get() = args.recipeId

private val binding = FragmentBindingDelegate<FragmentRecipeBinding>(this)
private val model: RecipeFragmentViewModel by viewModels(
private lateinit var navController: NavController

private val viewModel: RecipeFragmentViewModel by viewModels(
extrasProducer = {
MutableCreationExtras(defaultViewModelCreationExtras).apply {
set(RecipeFragmentViewModel.RECIPE_ID_KEY, recipeId)
Expand All @@ -31,32 +39,80 @@ class RecipeFragment : Fragment() {
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View = binding.bind(
container,
FragmentRecipeBinding::inflate
)
): View = binding.bind(container, FragmentRecipeBinding::inflate)

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

navController = findNavController()

setupToolbar()
setupActions()
observeDeleteResult()
observeRecipe()
}

private fun setupToolbar() {
val activity = activity as? AppCompatActivity ?: return

binding.withBinding {
activity.setSupportActionBar(toolbar)
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
activity.supportActionBar?.title = getTitle()
toolbar.setNavigationOnClickListener { navController.navigateUp() }
}
}

private fun setupActions() {
binding.withBinding {
refuseBin.setOnClickListener {
navController.navigate(
RecipeFragmentDirections.actionRecipeFragmentToDeleteRecipeDialogFragment(
getTitle()
)
)
}
}
}

private fun observeDeleteResult() {
navController.currentBackStackEntry
?.savedStateHandle
?.getLiveData<Boolean>(DeleteRecipeDialog.DIALOG_RESULT)
?.observe(viewLifecycleOwner) { result ->
if (result) {
deleteRecipe()
navController.navigateUp()
}
}
}

private fun observeRecipe() {
viewLifecycleOwner.lifecycleScope.launch {
model.recipe
viewModel.recipe
.flowWithLifecycle(viewLifecycleOwner.lifecycle)
.collect(::displayRecipe)
}
}

/**
* Use to get recipe title and pass to confirmation dialog
*/
private fun getTitle(): String {
return model.recipe.value.title
}
private fun getTitle(): String = viewModel.recipe.value.title

private fun displayRecipe(recipe: Recipe) {
// Display the recipe
binding.withBinding {
recipeTitle.text = recipe.title
recipeDescription.text = recipe.description
recipeDetail.text = recipe.steps
.mapIndexed { index, step -> "${index + 1}. $step" }
.joinToString("\n")

Glide.with(root)
.load(recipe.imageUrl)
.centerCrop()
.into(recipeImage)
}
}

private fun deleteRecipe() {
model.delete()
viewModel.delete()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ru.otus.cookbook.ui

import androidx.recyclerview.widget.RecyclerView
import ru.otus.cookbook.databinding.VhRecipeItemBinding

class RecipeItemViewHolder(val binding: VhRecipeItemBinding): RecyclerView.ViewHolder(binding.root) {
}
65 changes: 65 additions & 0 deletions app/src/main/kotlin/ru/otus/cookbook/ui/RecipesAdapter.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package ru.otus.cookbook.ui

import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide
import ru.otus.cookbook.data.RecipeListItem
import ru.otus.cookbook.databinding.VhRecipeCategoryBinding
import ru.otus.cookbook.databinding.VhRecipeItemBinding

class RecipesAdapter(val onRecipeClick: (Int) -> Unit):ListAdapter<RecipeListItem, RecyclerView.ViewHolder>(RecipeDiffUtil()) {

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
val inflater = LayoutInflater.from(parent.context)

return when(viewType){
VIEW_CATEGORY -> {
val binding = VhRecipeCategoryBinding.inflate(inflater, parent, false)
RecipeCategoryViewHolder(binding)
}
VIEW_RECIPE -> {
val binding = VhRecipeItemBinding.inflate(inflater, parent, false)
RecipeItemViewHolder(binding)
}
else -> throw IllegalArgumentException("View type is not supported")
}
}

override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
val listItem = getItem(position)
when(holder){
is RecipeCategoryViewHolder -> {
val category = listItem as RecipeListItem.CategoryItem
holder.binding.categoryTextView.text = category.category.name
}
is RecipeItemViewHolder -> {
val recipeItem = listItem as RecipeListItem.RecipeItem
with(holder){
binding.textBackground.text = recipeItem.title.first().toString()
binding.itemTitle.text = recipeItem.title
binding.description.text = recipeItem.description
Glide.with(binding.root.context)
.load(recipeItem.imageUrl)
.centerCrop()
.into(binding.imageViewRecipe)
binding.root.setOnClickListener { onRecipeClick( listItem.id ) }
}
}
}
}

override fun getItemViewType(position: Int): Int {
return when (getItem(position)) {
is RecipeListItem.CategoryItem -> VIEW_CATEGORY
is RecipeListItem.RecipeItem -> VIEW_RECIPE
}
}

companion object{
private const val VIEW_CATEGORY = 1
private const val VIEW_RECIPE = 2
}

}
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/arrow_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:pathData="M3.825,9L9.425,14.6L8,16L0,8L8,0L9.425,1.4L3.825,7H16V9H3.825Z"
android:fillColor="#1D1B20"/>
</vector>
Loading