From 4b1167d44cfcc4375883637cf12d4b9dd3159285 Mon Sep 17 00:00:00 2001
From: Sergei Korotaev <zergwsmt@gmail.com>
Date: Thu, 8 May 2025 21:43:15 +0300
Subject: [PATCH 1/2] Initial commit. Tasks: 1,2 & 3.

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  2 +
 .../kotlin/ru/otus/cookbook/MainActivity.kt   |  8 ++
 .../ru/otus/cookbook/ui/CookbookFragment.kt   | 22 ++++-
 .../cookbook/ui/DeleteRecipeDialogFragment.kt | 45 ++++++++++
 .../ru/otus/cookbook/ui/RecipeAdapter.kt      | 86 ++++++++++++++++++
 .../ru/otus/cookbook/ui/RecipeFragment.kt     | 50 +++++++++--
 app/src/main/res/drawable/arrow_back_24px.xml | 11 +++
 app/src/main/res/drawable/circle.xml          |  9 ++
 app/src/main/res/drawable/close_24px.xml      | 10 +++
 app/src/main/res/drawable/delete_24px.xml     | 10 +++
 app/src/main/res/layout/activity_main.xml     | 14 ++-
 app/src/main/res/layout/fragment_cookbook.xml | 40 ++++++++-
 app/src/main/res/layout/fragment_recipe.xml   | 71 ++++++++++++++-
 .../main/res/layout/vh_recipe_category.xml    | 17 +++-
 app/src/main/res/layout/vh_recipe_item.xml    | 64 +++++++++++++-
 app/src/main/res/menu/recipe_app_bar.xml      | 10 +++
 .../main/res/navigation/cookbook_graph.xml    | 49 +++++++++++
 app/src/main/res/values/strings.xml           | 14 +++
 app/src/main/res/values/styles.xml            | 88 +++++++++++++++++++
 gradle/libs.versions.toml                     |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 22 files changed, 600 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
 create mode 100644 app/src/main/res/drawable/arrow_back_24px.xml
 create mode 100644 app/src/main/res/drawable/circle.xml
 create mode 100644 app/src/main/res/drawable/close_24px.xml
 create mode 100644 app/src/main/res/drawable/delete_24px.xml
 create mode 100644 app/src/main/res/menu/recipe_app_bar.xml
 create mode 100644 app/src/main/res/navigation/cookbook_graph.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f3207a6..1b3b0dc 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -48,6 +48,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.github.glide)
     testImplementation(libs.junit)
     testImplementation(libs.kotlin.coroutines.test)
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 063f4d1..682aa63 100644
--- 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
index 6e524b6..36db558 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
@@ -3,6 +3,8 @@ package ru.otus.cookbook
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import ru.otus.cookbook.databinding.ActivityMainBinding
+import androidx.navigation.findNavController
+import androidx.activity.addCallback
 
 class MainActivity : AppCompatActivity() {
 
@@ -12,5 +14,11 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
+
+        onBackPressedDispatcher.addCallback(this) {
+            if (!findNavController(R.id.fragment_container_view).popBackStack()) {
+                finish()
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
index efe6939..411cd77 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
@@ -8,6 +8,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.coroutines.launch
 import ru.otus.cookbook.data.RecipeListItem
 import ru.otus.cookbook.databinding.FragmentCookbookBinding
@@ -29,6 +31,14 @@ class CookbookFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
+
+        binding.withBinding {
+            topToolbar.setOnClickListener {
+                @Suppress("DEPRECATION")
+                requireActivity().onBackPressed()
+            }
+        }
+
         viewLifecycleOwner.lifecycleScope.launch {
             model.recipeList
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
@@ -37,10 +47,18 @@ class CookbookFragment : Fragment() {
     }
 
     private fun setupRecyclerView() = binding.withBinding {
-        // Setup RecyclerView
+        val adapter = RecipeAdapter(requireContext()) { recipeId ->
+            // Handle recipe click, e.g., navigate to RecipeFragment
+            val action = CookbookFragmentDirections.actionToRecipeFragment(recipeId)
+            findNavController().navigate(action)
+        }
+
+        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        recyclerView.adapter = adapter
     }
 
-    private fun onRecipeListUpdated(recipeList: List<RecipeListItem>) {
+    private fun onRecipeListUpdated(recipeList: List<RecipeListItem>) = binding.withBinding {
         // Handle recipe list
+        (recyclerView.adapter as RecipeAdapter).submitList(recipeList)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt
new file mode 100644
index 0000000..f3a37b5
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt
@@ -0,0 +1,45 @@
+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
+
+class DeleteRecipeDialogFragment : DialogFragment() {
+
+    companion object {
+        const val CONFIRMATION_RESULT = "confirmation_result"
+    }
+
+    private val args: DeleteRecipeDialogFragmentArgs by navArgs()
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val recipeTitle = args.recipeTitle
+        return MaterialAlertDialogBuilder(requireContext())
+            .setTitle(getString(R.string.delete))
+            .setMessage(getString(R.string.delete_recipe_message, recipeTitle))
+            .setPositiveButton(R.string.ok) { _, _ ->
+                dismiss()
+                setResult(true)
+            }
+            .setNegativeButton(R.string.cancel
+            ) { _, _ ->
+                dismiss()
+                setResult(false)
+            }
+            .create()
+    }
+
+    private fun setResult(result: Boolean) {
+        val navController = findNavController()
+        navController.previousBackStackEntry?.savedStateHandle?.set(
+            CONFIRMATION_RESULT,
+            result
+        )
+        navController.popBackStack()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
new file mode 100644
index 0000000..2d25777
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
@@ -0,0 +1,86 @@
+package ru.otus.cookbook.ui
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import ru.otus.cookbook.R
+import ru.otus.cookbook.data.RecipeListItem
+import ru.otus.cookbook.databinding.VhRecipeCategoryBinding
+import ru.otus.cookbook.databinding.VhRecipeItemBinding
+
+class RecipeAdapter(private val context: Context, private val onRecipeClick: (Int) -> Unit):
+    ListAdapter<RecipeListItem, RecyclerView.ViewHolder>(RecipeDiffCallback()) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            ITEMTYPE_RECIPE-> {
+                val binding =
+                    VhRecipeItemBinding.inflate(LayoutInflater.from(context), parent, false)
+                RecipeViewHolder(binding)
+            }
+
+            ITEMTYPE_CATEGORY-> {
+                val binding =
+                    VhRecipeCategoryBinding.inflate(LayoutInflater.from(context), parent, false)
+                CategoryViewHolder(binding)
+            }
+
+            else -> throw IllegalArgumentException(context.getString(R.string.unknown_view_type))
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (getItem(position)) {
+            is RecipeListItem.RecipeItem -> ITEMTYPE_RECIPE
+            is RecipeListItem.CategoryItem -> ITEMTYPE_CATEGORY
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (val item = getItem(position)) {
+            is RecipeListItem.RecipeItem -> (holder as RecipeViewHolder).bind(item)
+            is RecipeListItem.CategoryItem -> (holder as CategoryViewHolder).bind(item)
+        }
+    }
+
+    inner class RecipeViewHolder(private val binding: VhRecipeItemBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: RecipeListItem.RecipeItem) {
+            binding.firstLetter.text = item.title.firstOrNull()?.toString() ?: ""
+            binding.title.text = item.title
+            binding.description.text = item.description
+            Glide.with(binding.root.context)
+                .load(item.imageUrl)
+                .centerCrop()
+                .into(binding.image)
+            binding.root.setOnClickListener { onRecipeClick(item.id) }
+        }
+    }
+
+    inner class CategoryViewHolder(private val binding: VhRecipeCategoryBinding) : RecyclerView.ViewHolder(binding.root) {
+        fun bind(item: RecipeListItem.CategoryItem) {
+            binding.categoryName.text = item.name
+        }
+    }
+
+    companion object {
+        const val ITEMTYPE_RECIPE = 1
+        const val ITEMTYPE_CATEGORY = 2
+    }
+}
+
+class RecipeDiffCallback : DiffUtil.ItemCallback<RecipeListItem>() {
+    override fun areItemsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean {
+        return when {
+            oldItem is RecipeListItem.RecipeItem && newItem is RecipeListItem.RecipeItem -> oldItem.id == newItem.id
+            oldItem is RecipeListItem.CategoryItem && newItem is RecipeListItem.CategoryItem -> oldItem.name == newItem.name
+            else -> false
+        }
+    }
+
+    override fun areContentsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean {
+        return oldItem == newItem
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
index e4460c1..e36aaf5 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
@@ -9,14 +9,18 @@ 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
 
 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: RecipeFragmentArgs by navArgs()
+    private val recipeId: Int get() = args.recipeId
     private val binding = FragmentBindingDelegate<FragmentRecipeBinding>(this)
     private val model: RecipeFragmentViewModel by viewModels(
         extrasProducer = {
@@ -38,6 +42,19 @@ class RecipeFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        setupAppBar()
+
+        val navController = findNavController()
+        navController.currentBackStackEntry?.savedStateHandle?.getLiveData<Boolean>(
+            DeleteRecipeDialogFragment.CONFIRMATION_RESULT
+        )?.observe(viewLifecycleOwner) { result->
+            if (result) {
+                model.delete()
+                navController.navigateUp()
+            }
+        }
+
         viewLifecycleOwner.lifecycleScope.launch {
             model.recipe
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
@@ -52,11 +69,32 @@ class RecipeFragment : Fragment() {
         return model.recipe.value.title
     }
 
-    private fun displayRecipe(recipe: Recipe) {
-        // Display the recipe
+    private fun setupAppBar() {
+        binding.withBinding {
+            recipeToolbar.setNavigationOnClickListener {
+                findNavController().navigate(R.id.action_to_cookbook)
+            }
+            recipeToolbar.setOnMenuItemClickListener { menuItem->
+                when (menuItem.itemId) {
+                    R.id.delete -> {
+                        val action = RecipeFragmentDirections.actionToDeleteRecipeDialog(getTitle())
+                        findNavController().navigate(action)
+                        true
+                    }
+
+                    else -> false
+                }
+            }
+        }
     }
 
-    private fun deleteRecipe() {
-        model.delete()
+    private fun displayRecipe(recipe: Recipe) = binding.withBinding {
+        // Display the recipe
+        recipeTitle.text = recipe.title
+        recipeShortDescription.text = recipe.category.name
+        recipeFullDescription.text = recipe.description
+        Glide.with(this@RecipeFragment)
+            .load(recipe.imageUrl)
+            .into(recipeImage)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/arrow_back_24px.xml b/app/src/main/res/drawable/arrow_back_24px.xml
new file mode 100644
index 0000000..0e2e863
--- /dev/null
+++ b/app/src/main/res/drawable/arrow_back_24px.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M313,520L537,744L480,800L160,480L480,160L537,216L313,440L800,440L800,520L313,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml
new file mode 100644
index 0000000..e8ab92e
--- /dev/null
+++ b/app/src/main/res/drawable/circle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/colorPrimaryContainer" />
+
+    <size
+        android:width="40dp"
+        android:height="40dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/close_24px.xml b/app/src/main/res/drawable/close_24px.xml
new file mode 100644
index 0000000..7a0ff35
--- /dev/null
+++ b/app/src/main/res/drawable/close_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/delete_24px.xml b/app/src/main/res/drawable/delete_24px.xml
new file mode 100644
index 0000000..d724c2e
--- /dev/null
+++ b/app/src/main/res/drawable/delete_24px.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86a5d97..bbdeab1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,13 +7,11 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        app:navGraph="@navigation/cookbook_graph" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_cookbook.xml b/app/src/main/res/layout/fragment_cookbook.xml
index 77d9ef6..0c6495d 100644
--- a/app/src/main/res/layout/fragment_cookbook.xml
+++ b/app/src/main/res/layout/fragment_cookbook.xml
@@ -1,6 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        style="@style/AppToolbarStyle"
+        android:id="@+id/topToolbar"
+        app:title="@string/app_name"
+        app:layout_scrollFlags="scroll|enterAlways"
+        app:navigationIcon="@drawable/close_24px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/searchToolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/topToolbar"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        style="@style/SearchBarStyle"
+        android:id="@+id/searchToolbar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.search.SearchBar
+            style="@style/SearchBarStyle"
+            android:id="@+id/search_bar"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+        />
+    </com.google.android.material.appbar.AppBarLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_recipe.xml b/app/src/main/res/layout/fragment_recipe.xml
index 77d9ef6..724cb9e 100644
--- a/app/src/main/res/layout/fragment_recipe.xml
+++ b/app/src/main/res/layout/fragment_recipe.xml
@@ -1,6 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.appbar.MaterialToolbar
+        style="@style/AppToolbarStyle"
+        android:id="@+id/recipeToolbar"
+        app:navigationIcon="@drawable/arrow_back_24px"
+        app:menu="@menu/recipe_app_bar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recipeToolbar">
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/recipe_image_card"
+                    style="@style/RecipeStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <ImageView
+                        android:id="@+id/recipe_image"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:adjustViewBounds="true"
+                        android:contentDescription="@string/recipe_image_desc"
+                        android:scaleType="centerCrop" />
+                </com.google.android.material.card.MaterialCardView>
+
+                <TextView
+                    style="@style/RecipeTitle"
+                    android:id="@+id/recipe_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/title" />
+
+                <TextView
+                    style="@style/RecipeDescription"
+                    android:id="@+id/recipe_short_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/short_desc" />
+
+                <TextView
+                    style="@style/RecipeFullDescription"
+                    android:id="@+id/recipe_full_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/full_desc" />
+
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/vh_recipe_category.xml b/app/src/main/res/layout/vh_recipe_category.xml
index 006fd49..a64ac49 100644
--- a/app/src/main/res/layout/vh_recipe_category.xml
+++ b/app/src/main/res/layout/vh_recipe_category.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="16dp"
+    >
+
+    <TextView
+        style="@style/RecipeCathegoryStyle"
+        android:id="@+id/category_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/vh_recipe_item.xml b/app/src/main/res/layout/vh_recipe_item.xml
index 006fd49..b0f99b4 100644
--- a/app/src/main/res/layout/vh_recipe_item.xml
+++ b/app/src/main/res/layout/vh_recipe_item.xml
@@ -1,6 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    >
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <com.google.android.material.card.MaterialCardView
+        style="@style/RecipeItemCardStyle"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        >
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            >
+
+        <TextView
+            style="@style/RecipeItemAvatarStyle"
+            android:id="@+id/first_letter"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:contentDescription="@string/first_letter"
+            android:text="@string/fl"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            />
+
+        <TextView
+            style="@style/RecipeItemTitleStyle"
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toEndOf="@id/first_letter"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/image"
+            />
+
+            <TextView
+                style="@style/RecipeItemDescStyle"
+                android:id="@+id/description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toStartOf="@id/image"
+                app:layout_constraintStart_toStartOf="@id/title"
+                app:layout_constraintTop_toBottomOf="@+id/title" />
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:contentDescription="@string/recipe_image"
+            android:scaleType="centerCrop"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/recipe_app_bar.xml b/app/src/main/res/menu/recipe_app_bar.xml
new file mode 100644
index 0000000..91be031
--- /dev/null
+++ b/app/src/main/res/menu/recipe_app_bar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/delete"
+        android:icon="@drawable/delete_24px"
+        android:title="@string/delete"
+        app:showAsAction="always"
+        />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/cookbook_graph.xml b/app/src/main/res/navigation/cookbook_graph.xml
new file mode 100644
index 0000000..ac291ed
--- /dev/null
+++ b/app/src/main/res/navigation/cookbook_graph.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cookbook_graph"
+    app:startDestination="@id/cookbookFragment">
+
+    <fragment
+        android:id="@+id/cookbookFragment"
+        android:name="ru.otus.cookbook.ui.CookbookFragment"
+        tools:layout="@layout/fragment_cookbook">
+        <action
+            android:id="@+id/action_to_recipeFragment"
+            app:destination="@id/recipeFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/recipeFragment"
+        android:name="ru.otus.cookbook.ui.RecipeFragment"
+        tools:layout="@layout/fragment_recipe">
+        <argument
+            android:name="recipeId"
+            app:argType="integer" />
+        <action
+            android:id="@+id/action_to_cookbook"
+            app:destination="@id/cookbookFragment"
+            app:enterAnim="@anim/nav_default_enter_anim"
+            app:exitAnim="@anim/nav_default_exit_anim"
+            app:popEnterAnim="@anim/nav_default_pop_enter_anim"
+            app:popExitAnim="@anim/nav_default_pop_exit_anim" />
+        <action
+            android:id="@+id/action_to_deleteRecipeDialog"
+            app:destination="@id/deleteRecipeDialog" />
+    </fragment>
+
+    <dialog
+        android:id="@+id/deleteRecipeDialog"
+        android:name="ru.otus.cookbook.ui.DeleteRecipeDialogFragment"
+        android:label="DeleteRecipeDialogFragment" >
+        <argument
+            android:name="recipeTitle"
+            app:argType="string"/>
+    </dialog>
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8fce1d1..60cc69a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,17 @@
 <resources>
     <string name="app_name">Cookbook</string>
+    <string name="close">Close</string>
+    <string name="search">Search</string>
+    <string name="delete">Delete</string>
+    <string name="unknown_view_type">Unknown view type</string>
+    <string name="recipe_image_desc">Recipe image description</string>
+    <string name="title">Title</string>
+    <string name="short_desc">Short description</string>
+    <string name="full_desc">Full description</string>
+    <string name="fl">A</string>
+    <string name="first_letter">First letter</string>
+    <string name="recipe_image">Recipe image</string>
+    <string name="delete_recipe_message">Are you sure you want to delete %1$s?</string>
+    <string name="cancel">Cancel</string>
+    <string name="ok">OK</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..adc4036
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppToolbarStyle" parent="Widget.Material3.Toolbar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">?attr/actionBarSize</item>
+        <item name="layout_scrollFlags">scroll|enterAlways</item>
+        <item name="android:background">?attr/colorSurfaceContainer</item>
+        <item name="navigationIconTint">?attr/colorOnSurface</item>
+        <item name="titleTextColor">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="SearchBarStyle" parent="Widget.Material3.SearchBar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:background">?attr/colorSurfaceContainer</item>
+        <item name="backgroundTint">?attr/colorSurfaceContainer</item>
+        <item name="navigationIconTint">?attr/colorOnSurfaceVariant</item>
+        <item name="defaultMarginsEnabled">false</item>
+    </style>
+
+    <style name="RecipeItemCardStyle" parent="Widget.Material3.CardView.Outlined">
+        <item name="android:backgroundTint">?attr/colorSurfaceContainer</item>
+        <item name="android:layout_marginHorizontal">16dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="strokeColor">?attr/colorOutlineVariant</item>
+        <item name="cardCornerRadius">12dp</item>
+    </style>
+
+    <style name="RecipeItemAvatarStyle">
+        <item name="android:background">@drawable/circle</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?attr/colorOnPrimaryContainer</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_marginHorizontal">16dp</item>
+    </style>
+
+    <style name="RecipeItemTitleStyle">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:paddingHorizontal">8dp</item>
+        <item name="android:layout_marginTop">16dp</item>
+    </style>
+
+    <style name="RecipeItemDescStyle">
+        <item name="android:textSize">14sp</item>
+        <item name="android:lines">1</item>
+        <item name="android:paddingHorizontal">8dp</item>
+        <item name="android:layout_marginTop">4dp</item>
+    </style>
+
+    <style name="RecipeCathegoryStyle">
+        <item name="android:textSize">28sp</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:layout_marginTop">16dp</item>
+    </style>
+
+    <style name="RecipeStyle" parent="Widget.Material3.CardView.Outlined">
+        <item name="android:layout_margin">16dp</item>
+        <item name="cardCornerRadius">28dp</item>
+    </style>
+
+    <style name="RecipeTitle">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:textSize">32sp</item>
+    </style>
+
+    <style name="RecipeDescription">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:textColor">?attr/colorSecondary</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="RecipeFullDescription">
+        <item name="android:gravity">top</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:textColor">?attr/colorTertiary</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 515d8d1..b5d4836 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.7.3"
+agp = "8.9.2"
 kotlin = "2.1.0"
 coreKtx = "1.15.0"
 fragmentKtx = "1.8.5"
@@ -15,6 +15,7 @@ junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 serialization = "1.7.3"
 datastore = "1.1.1"
+glideVersion = "4.16.0"
 
 
 [libraries]
@@ -37,6 +38,7 @@ androidx-activity = { group = "androidx.activity", name = "activity", version.re
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+github-glide = { module = "com.github.bumptech.glide:glide", version.ref = "glideVersion" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c4701d6..b88a568 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Nov 30 19:52:55 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4f5c2e445db57f63585deb980dd430896108ae60 Mon Sep 17 00:00:00 2001
From: Sergei Korotaev <zergwsmt@gmail.com>
Date: Sat, 10 May 2025 11:24:58 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B7?=
 =?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0=D0=BC=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt     | 13 ++++---------
 gradle/libs.versions.toml                           |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
index 2d25777..1b4ee18 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeAdapter.kt
@@ -16,13 +16,13 @@ class RecipeAdapter(private val context: Context, private val onRecipeClick: (In
     ListAdapter<RecipeListItem, RecyclerView.ViewHolder>(RecipeDiffCallback()) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return when (viewType) {
-            ITEMTYPE_RECIPE-> {
+            R.layout.vh_recipe_item-> {
                 val binding =
                     VhRecipeItemBinding.inflate(LayoutInflater.from(context), parent, false)
                 RecipeViewHolder(binding)
             }
 
-            ITEMTYPE_CATEGORY-> {
+            R.layout.vh_recipe_category-> {
                 val binding =
                     VhRecipeCategoryBinding.inflate(LayoutInflater.from(context), parent, false)
                 CategoryViewHolder(binding)
@@ -34,8 +34,8 @@ class RecipeAdapter(private val context: Context, private val onRecipeClick: (In
 
     override fun getItemViewType(position: Int): Int {
         return when (getItem(position)) {
-            is RecipeListItem.RecipeItem -> ITEMTYPE_RECIPE
-            is RecipeListItem.CategoryItem -> ITEMTYPE_CATEGORY
+            is RecipeListItem.RecipeItem -> R.layout.vh_recipe_item
+            is RecipeListItem.CategoryItem -> R.layout.vh_recipe_category
         }
     }
 
@@ -64,11 +64,6 @@ class RecipeAdapter(private val context: Context, private val onRecipeClick: (In
             binding.categoryName.text = item.name
         }
     }
-
-    companion object {
-        const val ITEMTYPE_RECIPE = 1
-        const val ITEMTYPE_CATEGORY = 2
-    }
 }
 
 class RecipeDiffCallback : DiffUtil.ItemCallback<RecipeListItem>() {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b5d4836..d12c941 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.9.2"
+agp = "8.10.0"
 kotlin = "2.1.0"
 coreKtx = "1.15.0"
 fragmentKtx = "1.8.5"