Android-Developer-Basic · Alinsk1 · Jun 20, 2025
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.annotationProcessor
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -44,6 +46,8 @@ dependencies {
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.navigation.fragment)
+    implementation("com.github.bumptech.glide:glide:4.16.0")
+    annotationProcessor("com.github.bumptech.glide:compiler:4.16.0")
     implementation(libs.androidx.navigation.ui)
     implementation(libs.material)
     implementation(libs.androidx.activity)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -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"

diff --git a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
@@ -2,6 +2,10 @@ package ru.otus.cookbook
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.navigation.NavController
+import androidx.navigation.findNavController
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupWithNavController
 import ru.otus.cookbook.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {

diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
@@ -4,10 +4,12 @@ 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
@@ -16,6 +18,7 @@ class CookbookFragment : Fragment() {
 
     private val binding = FragmentBindingDelegate<FragmentCookbookBinding>(this)
     private val model: CookbookFragmentViewModel by viewModels { CookbookFragmentViewModel.Factory }
+    private val adapter = RecipesAdapter({ launchRecipeFragment(it) })
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -28,6 +31,7 @@ class CookbookFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setupAppBar()
         setupRecyclerView()
         viewLifecycleOwner.lifecycleScope.launch {
             model.recipeList
@@ -36,11 +40,25 @@ class CookbookFragment : Fragment() {
         }
     }
 
+    private fun setupAppBar() {
+        binding.withBinding {
+            (activity as? AppCompatActivity)?.setSupportActionBar(toolbar)
+            (activity as? AppCompatActivity)?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+            toolbar.setNavigationOnClickListener {
+                findNavController().navigateUp()
+            }
+        }
+    }
+
+    private fun launchRecipeFragment(recipeId: Int) {
+        findNavController().navigate(CookbookFragmentDirections.actionCookbookFragmentToRecipeFragment(recipeId))
+    }
+
     private fun setupRecyclerView() = binding.withBinding {
-        // Setup RecyclerView
+        recyclerViewCategory.adapter = adapter
     }
 
     private fun onRecipeListUpdated(recipeList: List<RecipeListItem>) {
-        // Handle recipe list
+        adapter.submitList(recipeList)
     }
 }
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt
@@ -0,0 +1,45 @@
+package ru.otus.cookbook.ui
+
+import android.app.AlertDialog
+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 com.google.android.material.dialog.MaterialDialogs
+import ru.otus.cookbook.R
+import kotlin.getValue
+
+class DeleteRecipeDialogFragment: DialogFragment() {
+
+    private val args by navArgs<DeleteRecipeDialogFragmentArgs>()
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val recipeTitle = args.recipeTitle
+        return MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.delete))
+            .setMessage(getString(R.string.are_you_sure_want_to_delete, recipeTitle))
+            .setPositiveButton(getString(R.string.ok)) { _, _ ->
+                dismiss()
+                setResult(true)
+            }
+            .setNegativeButton(getString(R.string.cancel)) { _, _ ->
+                dismiss()
+                setResult(false)
+            }
+            .create()
+    }
+
+    private fun setResult(result: Boolean) {
+        val navController = findNavController()
+        navController.previousBackStackEntry?.savedStateHandle?.set(
+            DIALOG_RESULT_KEY,
+            result
+        )
+    }
+
+    companion object {
+        const val DIALOG_RESULT_KEY = "delete"
+    }
+}
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeCategoryViewHolder.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeCategoryViewHolder.kt
@@ -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) {
+}
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDiffCallback.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDiffCallback.kt
@@ -0,0 +1,21 @@
+package ru.otus.cookbook.ui
+
+import androidx.recyclerview.widget.DiffUtil
+import ru.otus.cookbook.data.RecipeListItem
+
+class RecipeDiffCallback: DiffUtil.ItemCallback<RecipeListItem>() {
+
+    override fun areItemsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean {
+        return when {
+            oldItem is RecipeListItem.CategoryItem && newItem is RecipeListItem.CategoryItem ->
+                oldItem.name == newItem.name
+            oldItem is RecipeListItem.RecipeItem && newItem is RecipeListItem.RecipeItem ->
+                oldItem.id == newItem.id
+            else -> false
+        }
+    }
+
+    override fun areContentsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean {
+        return oldItem == newItem
+    }
+}
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
@@ -1,21 +1,32 @@
 package ru.otus.cookbook.ui
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
 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.fragment.findNavController
+import androidx.navigation.fragment.navArgs
+import com.bumptech.glide.Glide
 import kotlinx.coroutines.launch
+import ru.otus.cookbook.R
 import ru.otus.cookbook.data.Recipe
 import ru.otus.cookbook.databinding.FragmentRecipeBinding
+import ru.otus.cookbook.ui.RecipeFragmentArgs
 
 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: Int get() = args.recipeId
+
 
     private val binding = FragmentBindingDelegate<FragmentRecipeBinding>(this)
     private val model: RecipeFragmentViewModel by viewModels(
@@ -38,13 +49,31 @@ class RecipeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding.withBinding {
+            (activity as? AppCompatActivity)?.setSupportActionBar(toolbar)
+            (activity as? AppCompatActivity)?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        }
+        setupAppBar()
+        observeLiveData()
         viewLifecycleOwner.lifecycleScope.launch {
             model.recipe
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
                 .collect(::displayRecipe)
         }
     }
 
+    fun observeLiveData(){
+        val navController = findNavController()
+        navController.currentBackStackEntry?.savedStateHandle?.getLiveData<Boolean>(
+            DeleteRecipeDialogFragment.DIALOG_RESULT_KEY
+        )?.observe(viewLifecycleOwner) {
+            if (it) {
+                deleteRecipe()
+                navController.navigateUp()
+            }
+        }
+    }
+
     /**
      * Use to get recipe title and pass to confirmation dialog
      */
@@ -53,7 +82,32 @@ class RecipeFragment : Fragment() {
     }
 
     private fun displayRecipe(recipe: Recipe) {
-        // Display the recipe
+        binding.withBinding {
+            textViewTittle.text = recipe.title
+            textViewDescription.text = recipe.description
+            textViewRecipe.text = recipe.steps.mapIndexed { index, step ->  "${index + 1}. $step"}
+                .joinToString("\n")
+            Glide.with(root)
+                .load(recipe.imageUrl)
+                .centerCrop()
+                .into(imageViewRecipe)
+        }
+    }
+
+    private fun setupAppBar() {
+        binding.withBinding {
+            (activity as? AppCompatActivity)?.supportActionBar?.title = getTitle()
+            toolbar.setNavigationOnClickListener {
+                findNavController().navigateUp()
+            }
+            imageViewDelete.setOnClickListener {
+                findNavController().navigate(
+                            RecipeFragmentDirections.actionRecipeFragmentToDeleteRecipeDialogFragment(
+                                getTitle()
+                            )
+                        )
+            }
+        }
     }
 
     private fun deleteRecipe() {

diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeItemViewHolder.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeItemViewHolder.kt
@@ -0,0 +1,7 @@
+package ru.otus.cookbook.ui
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import ru.otus.cookbook.databinding.VhRecipeItemBinding
+
+class RecipeItemViewHolder(val binding: VhRecipeItemBinding): ViewHolder(binding.root) {
+}
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipesAdapter.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipesAdapter.kt
@@ -0,0 +1,64 @@
+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>(RecipeDiffCallback()){
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return when(viewType) {
+            VIEW_TYPE_RECIPE -> {
+                val binding = VhRecipeItemBinding.inflate(inflater, parent, false)
+                RecipeItemViewHolder(binding)
+            }
+            VIEW_TYPE_CATEGORY -> {
+                val binding = VhRecipeCategoryBinding.inflate(inflater, parent, false)
+                RecipeCategoryViewHolder(binding)
+            }
+            else -> throw RuntimeException("RuntimeException")
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val item = getItem(position)
+        when(holder){
+            is RecipeCategoryViewHolder -> {
+                val category = item as RecipeListItem.CategoryItem
+                holder.binding.textViewCategory.text = category.category.name
+            }
+            is RecipeItemViewHolder -> {
+                val recipe = item as RecipeListItem.RecipeItem
+                with(holder){
+                    binding.textViewAvatar.text = recipe.title.first().toString()
+                    binding.textViewTittle.text = recipe.title
+                    binding.textViewDescription.text = recipe.description
+                    Glide.with(binding.root.context)
+                        .load(recipe.imageUrl)
+                        .centerCrop()
+                        .into(binding.imageViewRecipe)
+                    binding.root.setOnClickListener { onRecipeClick(item.id) }
+                }
+            }
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (getItem(position)) {
+            is RecipeListItem.CategoryItem -> VIEW_TYPE_CATEGORY
+            is RecipeListItem.RecipeItem -> VIEW_TYPE_RECIPE
+        }
+    }
+
+    companion object {
+        private const val VIEW_TYPE_RECIPE = 100
+        private const val VIEW_TYPE_CATEGORY = 101
+    }
+}
diff --git a/app/src/main/res/drawable/arrow_left.xml b/app/src/main/res/drawable/arrow_left.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M20,11V13H8L13.5,18.5L12.08,19.92L4.16,12L12.08,4.08L13.5,5.5L8,11H20Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/border_gray.xml b/app/src/main/res/drawable/border_gray.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="10dp"/>
+    <solid android:color="@color/white"/>
+    <stroke android:width="1dp"
+        android:color="@color/border_gray"/>
+</shape>
diff --git a/app/src/main/res/drawable/close.xml b/app/src/main/res/drawable/close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/oval_purple.xml b/app/src/main/res/drawable/oval_purple.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/oval"/>
+</shape>
diff --git a/app/src/main/res/drawable/shape_image_view.xml b/app/src/main/res/drawable/shape_image_view.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:bottomRightRadius="10dp"
+        android:topRightRadius="10dp"/>
+</shape>
diff --git a/app/src/main/res/drawable/shape_image_view_recipe.xml b/app/src/main/res/drawable/shape_image_view_recipe.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="20dp"/>
+</shape>