From 451c2e9f2c35f51df7d09416f045b51375c4d06f Mon Sep 17 00:00:00 2001
From: Adel Khaziakhmetov <adel.khaziakhmetov@shtrafy-gibdd.ru>
Date: Wed, 7 May 2025 13:41:31 +0300
Subject: [PATCH 1/3] homework

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  2 +-
 .../ru/otus/cookbook/CategoryViewHolder.kt    | 15 +++++
 .../ru/otus/cookbook/CookbookAdapter.kt       | 56 +++++++++++++++++++
 .../main/kotlin/ru/otus/cookbook/Listener.kt  |  5 ++
 .../kotlin/ru/otus/cookbook/MainActivity.kt   |  8 +++
 .../ru/otus/cookbook/RecipeViewHolder.kt      | 23 ++++++++
 .../ru/otus/cookbook/ui/CookbookFragment.kt   | 23 +++++++-
 .../cookbook/ui/RecipeDeleteDialogFragment.kt | 33 +++++++++++
 .../ru/otus/cookbook/ui/RecipeFragment.kt     | 33 +++++++++--
 app/src/main/res/anim/slide_in_left.xml       |  7 +++
 app/src/main/res/anim/slide_in_right.xml      |  7 +++
 app/src/main/res/anim/slide_out_left.xml      |  7 +++
 app/src/main/res/anim/slide_out_right.xml     |  7 +++
 app/src/main/res/drawable/divider.xml         |  6 ++
 app/src/main/res/layout/activity_main.xml     | 22 ++------
 app/src/main/res/layout/fragment_cookbook.xml | 10 +++-
 app/src/main/res/layout/fragment_recipe.xml   | 53 ++++++++++++++++++
 .../main/res/layout/vh_recipe_category.xml    | 24 +++++++-
 app/src/main/res/layout/vh_recipe_item.xml    | 33 ++++++++++-
 app/src/main/res/navigation/nav_graph.xml     | 51 +++++++++++++++++
 app/src/main/res/values/strings.xml           |  7 +++
 gradle/libs.versions.toml                     |  2 +
 23 files changed, 405 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/CategoryViewHolder.kt
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/Listener.kt
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/RecipeViewHolder.kt
 create mode 100644 app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
 create mode 100644 app/src/main/res/anim/slide_in_left.xml
 create mode 100644 app/src/main/res/anim/slide_in_right.xml
 create mode 100644 app/src/main/res/anim/slide_out_left.xml
 create mode 100644 app/src/main/res/anim/slide_out_right.xml
 create mode 100644 app/src/main/res/drawable/divider.xml
 create mode 100644 app/src/main/res/navigation/nav_graph.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f3207a6..f8dc461 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.coil)
     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..6e79293 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-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/CategoryViewHolder.kt b/app/src/main/kotlin/ru/otus/cookbook/CategoryViewHolder.kt
new file mode 100644
index 0000000..c08d3f4
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/CategoryViewHolder.kt
@@ -0,0 +1,15 @@
+package ru.otus.cookbook
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.cookbook.data.RecipeListItem
+
+class CategoryViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
+
+    private val name: TextView by lazy { view.findViewById(R.id.textView) }
+
+    fun bind(item: RecipeListItem.CategoryItem) {
+        name.text = item.name
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt b/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
new file mode 100644
index 0000000..e1a4b88
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
@@ -0,0 +1,56 @@
+package ru.otus.cookbook
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.cookbook.data.RecipeListItem
+
+class CookbookAdapter(private val listener: Listener): RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private var list = listOf<RecipeListItem>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            ViewTypes.CATEGORY.id -> {
+                val view = LayoutInflater.from(parent.context).inflate(R.layout.vh_recipe_category, parent, false)
+                CategoryViewHolder(view)
+            }
+            ViewTypes.RECIPE.id -> {
+                val view = LayoutInflater.from(parent.context).inflate(R.layout.vh_recipe_item, parent, false)
+                RecipeViewHolder(view, listener)
+            }
+            else -> throw IllegalArgumentException("Not found view type for chat adapter")
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        val item = list.getOrNull(position) ?: return
+        when (item) {
+            is RecipeListItem.CategoryItem -> {
+                (holder as? CategoryViewHolder)?.bind(item)
+            }
+            is RecipeListItem.RecipeItem -> {
+                (holder as? RecipeViewHolder)?.bind(item)
+            }
+        }
+    }
+
+    override fun getItemCount(): Int = list.size
+
+    override fun getItemViewType(position: Int): Int {
+        return when (list[position]) {
+            is RecipeListItem.CategoryItem -> ViewTypes.CATEGORY.id
+            is RecipeListItem.RecipeItem -> ViewTypes.RECIPE.id
+            else -> -1
+        }
+    }
+
+    fun setItems(items: List<RecipeListItem>) {
+        list = items
+        notifyDataSetChanged()
+    }
+
+    enum class ViewTypes(val id: Int) {
+        CATEGORY(R.layout.vh_recipe_category),
+        RECIPE(R.layout.vh_recipe_item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/Listener.kt b/app/src/main/kotlin/ru/otus/cookbook/Listener.kt
new file mode 100644
index 0000000..74c1cf9
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/Listener.kt
@@ -0,0 +1,5 @@
+package ru.otus.cookbook
+
+interface Listener {
+    fun onItemClicked(id: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
index 6e524b6..099533a 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
@@ -1,7 +1,9 @@
 package ru.otus.cookbook
 
 import android.os.Bundle
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
+import androidx.navigation.findNavController
 import ru.otus.cookbook.databinding.ActivityMainBinding
 
 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/RecipeViewHolder.kt b/app/src/main/kotlin/ru/otus/cookbook/RecipeViewHolder.kt
new file mode 100644
index 0000000..d6bd619
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/RecipeViewHolder.kt
@@ -0,0 +1,23 @@
+package ru.otus.cookbook
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.cookbook.data.RecipeListItem
+
+class RecipeViewHolder(
+    private val view: View,
+    private val listener: Listener): RecyclerView.ViewHolder(view) {
+
+        private val twName: TextView by lazy { view.findViewById(R.id.tw_name) }
+    private val twDescription: TextView by lazy { view.findViewById(R.id.tw_description) }
+
+    fun bind(item: RecipeListItem.RecipeItem) {
+        twName.text = item.title
+        twDescription.text = item.description
+
+        view.setOnClickListener {
+            listener.onItemClicked(item.id)
+        }
+    }
+}
\ 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..7311301 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
@@ -8,14 +8,23 @@ 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.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.coroutines.launch
+import ru.otus.cookbook.CategoryViewHolder
+import ru.otus.cookbook.CookbookAdapter
+import ru.otus.cookbook.Listener
+import ru.otus.cookbook.RecipeViewHolder
 import ru.otus.cookbook.data.RecipeListItem
 import ru.otus.cookbook.databinding.FragmentCookbookBinding
 
-class CookbookFragment : Fragment() {
+class CookbookFragment : Fragment(), Listener {
 
     private val binding = FragmentBindingDelegate<FragmentCookbookBinding>(this)
     private val model: CookbookFragmentViewModel by viewModels { CookbookFragmentViewModel.Factory }
+    private val cookbookAdapter = CookbookAdapter(this@CookbookFragment)
+
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -37,10 +46,18 @@ class CookbookFragment : Fragment() {
     }
 
     private fun setupRecyclerView() = binding.withBinding {
-        // Setup RecyclerView
+        val dividerItemDecoration = DividerItemDecoration(context, LinearLayoutManager.VERTICAL)
+        recyclerView.addItemDecoration(dividerItemDecoration)
+        recyclerView.adapter = cookbookAdapter
     }
 
     private fun onRecipeListUpdated(recipeList: List<RecipeListItem>) {
-        // Handle recipe list
+        cookbookAdapter.setItems(recipeList)
+    }
+
+    override fun onItemClicked(id: Int) {
+        findNavController().navigate(CookbookFragmentDirections.actionCookbookToRecipe(
+            recipeID = id
+        ))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
new file mode 100644
index 0000000..257ee85
--- /dev/null
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
@@ -0,0 +1,33 @@
+package ru.otus.cookbook.ui
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.navigation.fragment.findNavController
+import ru.otus.cookbook.R
+
+class RecipeDeleteDialogFragment : DialogFragment() {
+    private val title get() = RecipeDeleteDialogFragmentArgs.fromBundle(requireArguments()).title
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
+        requireContext().let {
+            AlertDialog.Builder(it)
+                .setTitle(title)
+                .setMessage(R.string.rdf_message)
+                .setPositiveButton(R.string.rdf_ok) { dialog, button ->
+                    findNavController().previousBackStackEntry?.savedStateHandle?.set(RESULT, 1)
+                }
+                .setNegativeButton(R.string.rdf_no) { dialog, button ->
+                    findNavController().previousBackStackEntry?.savedStateHandle?.set(RESULT, 0)
+                }
+                .setNeutralButton(R.string.rdf_cancel) { dialog, button ->
+                    dialog.dismiss()
+                }
+                .create()
+        }
+
+    companion object {
+        const val RESULT = "result"
+    }
+}
\ 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..20f2f7d 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
@@ -9,13 +9,15 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewmodel.MutableCreationExtras
+import androidx.navigation.fragment.findNavController
 import kotlinx.coroutines.launch
 import ru.otus.cookbook.data.Recipe
 import ru.otus.cookbook.databinding.FragmentRecipeBinding
+import coil.load
+import ru.otus.cookbook.R
 
 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 recipeId: Int get() = RecipeFragmentArgs.fromBundle(requireArguments()).recipeID
 
     private val binding = FragmentBindingDelegate<FragmentRecipeBinding>(this)
     private val model: RecipeFragmentViewModel by viewModels(
@@ -26,6 +28,7 @@ class RecipeFragment : Fragment() {
         },
         factoryProducer = { RecipeFragmentViewModel.Factory }
     )
+    private val navigationController by lazy { findNavController() }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -43,20 +46,38 @@ class RecipeFragment : Fragment() {
                 .flowWithLifecycle(viewLifecycleOwner.lifecycle)
                 .collect(::displayRecipe)
         }
+
+        displayRecipe(model.recipe.value)
+
+        navigationController.currentBackStackEntry?.savedStateHandle?.getLiveData<Int>(
+            RecipeDeleteDialogFragment.RESULT)
+            ?.observe(viewLifecycleOwner) {
+                if (it == 1) {
+                    deleteRecipe()
+                }
+            }
     }
 
-    /**
-     * Use to get recipe title and pass to confirmation dialog
-     */
     private fun getTitle(): String {
         return model.recipe.value.title
     }
 
     private fun displayRecipe(recipe: Recipe) {
-        // Display the recipe
+        binding.withBinding {
+            twName.text = recipe.title
+            twDescription.text = recipe.description
+            imageView.load(recipe.imageUrl) {
+                crossfade(true)
+            }
+            button.setOnClickListener {
+                navigationController.navigate(RecipeFragmentDirections.actionRecipeToDialog(
+                    getTitle()))
+            }
+        }
     }
 
     private fun deleteRecipe() {
         model.delete()
+        findNavController().popBackStack(R.id.fragment_cookbook, false)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml
new file mode 100644
index 0000000..2640a8d
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_left.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="-100%"
+        android:toXDelta="0%"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
new file mode 100644
index 0000000..e2022e6
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="100%"
+        android:toXDelta="0%"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
new file mode 100644
index 0000000..a5c9daa
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="-100%"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
new file mode 100644
index 0000000..5f0e616
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="300"
+        android:fromXDelta="0%"
+        android:toXDelta="100%"/>
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml
new file mode 100644
index 0000000..44e6f26
--- /dev/null
+++ b/app/src/main/res/drawable/divider.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">
+    <size android:height="1dp" />
+    <solid android:color="@android:color/darker_gray" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86a5d97..e7a74fa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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/main"
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container_view"
+    android:name="androidx.navigation.fragment.NavHostFragment"
     android:layout_width="match_parent"
     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.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:navGraph="@navigation/nav_graph"
+    />
\ 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..2a80697 100644
--- a/app/src/main/res/layout/fragment_cookbook.xml
+++ b/app/src/main/res/layout/fragment_cookbook.xml
@@ -1,6 +1,14 @@
 <?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.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:divider="@drawable/divider"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </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..ab821a0 100644
--- a/app/src/main/res/layout/fragment_recipe.xml
+++ b/app/src/main/res/layout/fragment_recipe.xml
@@ -1,6 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <Button
+        android:id="@+id/button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/rf_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView"/>
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:scaleType="centerCrop"
+        app:layout_constraintWidth_percent="0.3"
+        app:layout_constraintDimensionRatio="H,1:1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:drawable/alert_dark_frame" />
+
+    <TextView
+        android:id="@+id/tw_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:textAlignment="textStart"
+        android:textSize="22sp"
+        android:fontFamily="sans-serif-black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tw_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:textAlignment="textStart"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toBottomOf="@+id/tw_name" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/vh_recipe_category.xml b/app/src/main/res/layout/vh_recipe_category.xml
index 006fd49..06f0233 100644
--- a/app/src/main/res/layout/vh_recipe_category.xml
+++ b/app/src/main/res/layout/vh_recipe_category.xml
@@ -1,6 +1,26 @@
 <?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/black">
 
+    <TextView
+        android:id="@+id/textView"
+        android:textColor="@color/white"
+        android:textSize="22sp"
+        android:fontFamily="sans-serif-black"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:text=""
+        android:textAlignment="textStart"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="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..36bbef8 100644
--- a/app/src/main/res/layout/vh_recipe_item.xml
+++ b/app/src/main/res/layout/vh_recipe_item.xml
@@ -1,6 +1,37 @@
 <?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <TextView
+        android:id="@+id/tw_name"
+        android:textSize="18sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:textAlignment="textStart"
+        android:text=""
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tw_description"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:textAlignment="textStart"
+        android:text=""
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tw_name" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..44faf5d
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,51 @@
+<?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"
+    android:id="@+id/nav_graph.xml"
+    app:startDestination="@id/fragment_cookbook">
+
+    <fragment
+        android:id="@+id/fragment_cookbook"
+        android:name="ru.otus.cookbook.ui.CookbookFragment"
+        android:label="listFragment"
+        >
+
+        <action
+            android:id="@+id/action_cookbook_to_recipe"
+            app:destination="@id/fragment_recipe"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right"
+            />
+    </fragment>
+
+    <fragment
+        android:id="@+id/fragment_recipe"
+        android:name="ru.otus.cookbook.ui.RecipeFragment"
+        android:label="recipeFragment"
+        >
+
+        <argument
+            android:name="recipeID"
+            app:argType="integer"
+            />
+
+        <action
+            android:id="@+id/action_recipe_to_dialog"
+            app:destination="@id/fragment_recipe_delete_dialog"
+            />
+    </fragment>
+
+    <dialog
+        android:id="@+id/fragment_recipe_delete_dialog"
+        android:name="ru.otus.cookbook.ui.RecipeDeleteDialogFragment"
+        android:label="recipeDeleteDialogFragment"
+        >
+
+        <argument
+            android:name="title"
+            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..db844c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,10 @@
 <resources>
     <string name="app_name">Cookbook</string>
+    <string name="rf_button">Удалить рецепт</string>
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="rdf_message">Вы действительно хотите удалить рецепт?</string>
+    <string name="rdf_ok">Да</string>
+    <string name="rdf_no">Нет</string>
+    <string name="rdf_cancel">Отмена</string>
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 515d8d1..614e736 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 agp = "8.7.3"
+coil = "2.5.0"
 kotlin = "2.1.0"
 coreKtx = "1.15.0"
 fragmentKtx = "1.8.5"
@@ -18,6 +19,7 @@ datastore = "1.1.1"
 
 
 [libraries]
+coil = { module = "io.coil-kt:coil", version.ref = "coil" }
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }

From 432fb7d17e37aa104990789ef53f8404bd347c55 Mon Sep 17 00:00:00 2001
From: Adel Khaziakhmetov <adel.khaziakhmetov@shtrafy-gibdd.ru>
Date: Wed, 7 May 2025 13:45:01 +0300
Subject: [PATCH 2/3] homework

---
 app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt     | 1 -
 app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt | 2 --
 app/src/main/res/layout/fragment_recipe.xml                 | 2 +-
 app/src/main/res/layout/vh_recipe_category.xml              | 1 -
 app/src/main/res/values/strings.xml                         | 1 +
 gradle/libs.versions.toml                                   | 2 --
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt b/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
index e1a4b88..98f426c 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/CookbookAdapter.kt
@@ -40,7 +40,6 @@ class CookbookAdapter(private val listener: Listener): RecyclerView.Adapter<Recy
         return when (list[position]) {
             is RecipeListItem.CategoryItem -> ViewTypes.CATEGORY.id
             is RecipeListItem.RecipeItem -> ViewTypes.RECIPE.id
-            else -> -1
         }
     }
 
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 7311301..7a480d5 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
@@ -12,10 +12,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.coroutines.launch
-import ru.otus.cookbook.CategoryViewHolder
 import ru.otus.cookbook.CookbookAdapter
 import ru.otus.cookbook.Listener
-import ru.otus.cookbook.RecipeViewHolder
 import ru.otus.cookbook.data.RecipeListItem
 import ru.otus.cookbook.databinding.FragmentCookbookBinding
 
diff --git a/app/src/main/res/layout/fragment_recipe.xml b/app/src/main/res/layout/fragment_recipe.xml
index ab821a0..467f003 100644
--- a/app/src/main/res/layout/fragment_recipe.xml
+++ b/app/src/main/res/layout/fragment_recipe.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -18,6 +17,7 @@
         app:layout_constraintTop_toBottomOf="@+id/imageView"/>
 
     <ImageView
+        android:contentDescription="@string/im_contentDescription"
         android:id="@+id/imageView"
         android:layout_width="0dp"
         android:layout_height="0dp"
diff --git a/app/src/main/res/layout/vh_recipe_category.xml b/app/src/main/res/layout/vh_recipe_category.xml
index 06f0233..4daa56b 100644
--- a/app/src/main/res/layout/vh_recipe_category.xml
+++ b/app/src/main/res/layout/vh_recipe_category.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/black">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db844c0..74c4516 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,4 +7,5 @@
     <string name="rdf_ok">Да</string>
     <string name="rdf_no">Нет</string>
     <string name="rdf_cancel">Отмена</string>
+    <string name="im_contentDescription">Картинка</string>
 </resources>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 614e736..76db4b0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -37,8 +37,6 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 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" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

From 38916eeb62466e9f148d7b07b95bd2811d397329 Mon Sep 17 00:00:00 2001
From: Adel Khaziakhmetov <adel.khaziakhmetov@shtrafy-gibdd.ru>
Date: Tue, 13 May 2025 16:53:40 +0300
Subject: [PATCH 3/3] fix layout

---
 .../kotlin/ru/otus/cookbook/MainActivity.kt   | 31 +++++++++++++++
 .../ru/otus/cookbook/ui/CookbookFragment.kt   |  2 +
 .../cookbook/ui/RecipeDeleteDialogFragment.kt | 13 +++----
 .../ru/otus/cookbook/ui/RecipeFragment.kt     | 23 +++++++++--
 .../main/res/drawable/dialog_background.xml   |  5 +++
 app/src/main/res/drawable/rounded_corners.xml |  5 +++
 app/src/main/res/drawable/trailing_icon.xml   | 13 +++++++
 app/src/main/res/layout/activity_main.xml     | 39 ++++++++++++++++---
 app/src/main/res/layout/fragment_cookbook.xml |  3 +-
 app/src/main/res/layout/fragment_recipe.xml   | 31 ++++++---------
 .../main/res/layout/vh_recipe_category.xml    |  5 +--
 app/src/main/res/navigation/nav_graph.xml     |  3 +-
 app/src/main/res/values/strings.xml           | 13 +++----
 app/src/main/res/values/styles.xml            | 25 ++++++++++++
 app/src/main/res/values/themes.xml            | 11 +++++-
 15 files changed, 170 insertions(+), 52 deletions(-)
 create mode 100644 app/src/main/res/drawable/dialog_background.xml
 create mode 100644 app/src/main/res/drawable/rounded_corners.xml
 create mode 100644 app/src/main/res/drawable/trailing_icon.xml
 create mode 100644 app/src/main/res/values/styles.xml

diff --git a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
index 099533a..9d064a6 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/MainActivity.kt
@@ -1,24 +1,55 @@
 package ru.otus.cookbook
 
 import android.os.Bundle
+import android.view.Menu
+import android.widget.ImageButton
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.ui.AppBarConfiguration
+import androidx.navigation.ui.setupActionBarWithNavController
+import com.google.android.material.appbar.MaterialToolbar
 import ru.otus.cookbook.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
 
+    val fragmentsWithButton = setOf(
+        R.id.fragment_recipe,
+    )
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
+        val toolbar = findViewById<MaterialToolbar>(R.id.topAppBar)
+        setSupportActionBar(toolbar)
+
+        val navHostFragment = supportFragmentManager
+            .findFragmentById(R.id.fragment_container_view) as NavHostFragment
+        val navController = navHostFragment.navController
+
+        val appBarConfiguration = AppBarConfiguration(navController.graph)
+        setupActionBarWithNavController(navController, appBarConfiguration)
+
         onBackPressedDispatcher.addCallback(this) {
             if (!findNavController(R.id.fragment_container_view).popBackStack()) {
                 finish()
             }
         }
+
+        navController.addOnDestinationChangedListener { _, destination, _ ->
+            val shouldShow = fragmentsWithButton.contains(destination.id)
+            toolbar.findViewById<ImageButton>(R.id.deleteButton)?.visibility =
+                if (shouldShow) ImageButton.VISIBLE else ImageButton.GONE
+        }
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        val navController = findNavController(R.id.fragment_container_view)
+        return navController.navigateUp() || super.onSupportNavigateUp()
     }
 }
\ 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 7a480d5..3b9f2c7 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/CookbookFragment.kt
@@ -11,9 +11,11 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.appbar.MaterialToolbar
 import kotlinx.coroutines.launch
 import ru.otus.cookbook.CookbookAdapter
 import ru.otus.cookbook.Listener
+import ru.otus.cookbook.R
 import ru.otus.cookbook.data.RecipeListItem
 import ru.otus.cookbook.databinding.FragmentCookbookBinding
 
diff --git a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
index 257ee85..b0e7e85 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDeleteDialogFragment.kt
@@ -12,16 +12,13 @@ class RecipeDeleteDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
         requireContext().let {
-            AlertDialog.Builder(it)
-                .setTitle(title)
-                .setMessage(R.string.rdf_message)
-                .setPositiveButton(R.string.rdf_ok) { dialog, button ->
+            AlertDialog.Builder(it, R.style.RoundedDialog)
+                .setTitle(R.string.rdf_title)
+                .setMessage(getString(R.string.rdf_message, title))
+                .setPositiveButton(R.string.rdf_ok) { _, _ ->
                     findNavController().previousBackStackEntry?.savedStateHandle?.set(RESULT, 1)
                 }
-                .setNegativeButton(R.string.rdf_no) { dialog, button ->
-                    findNavController().previousBackStackEntry?.savedStateHandle?.set(RESULT, 0)
-                }
-                .setNeutralButton(R.string.rdf_cancel) { dialog, button ->
+                .setNeutralButton(R.string.rdf_cancel) { dialog, _ ->
                     dialog.dismiss()
                 }
                 .create()
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 20f2f7d..61a05ee 100644
--- a/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
+++ b/app/src/main/kotlin/ru/otus/cookbook/ui/RecipeFragment.kt
@@ -2,8 +2,12 @@ package ru.otus.cookbook.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageButton
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
@@ -14,6 +18,7 @@ import kotlinx.coroutines.launch
 import ru.otus.cookbook.data.Recipe
 import ru.otus.cookbook.databinding.FragmentRecipeBinding
 import coil.load
+import com.google.android.material.appbar.MaterialToolbar
 import ru.otus.cookbook.R
 
 class RecipeFragment : Fragment() {
@@ -29,6 +34,13 @@ class RecipeFragment : Fragment() {
         factoryProducer = { RecipeFragmentViewModel.Factory }
     )
     private val navigationController by lazy { findNavController() }
+    private val toolbar by lazy { activity?.findViewById<MaterialToolbar>(R.id.topAppBar) }
+    private val deleteButton by lazy { toolbar?.findViewById<ImageButton>(R.id.deleteButton) }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -56,6 +68,13 @@ class RecipeFragment : Fragment() {
                     deleteRecipe()
                 }
             }
+
+
+        toolbar?.title = getTitle()
+        deleteButton?.setOnClickListener {
+            navigationController.navigate(RecipeFragmentDirections.actionRecipeToDialog(
+                getTitle()))
+        }
     }
 
     private fun getTitle(): String {
@@ -69,10 +88,6 @@ class RecipeFragment : Fragment() {
             imageView.load(recipe.imageUrl) {
                 crossfade(true)
             }
-            button.setOnClickListener {
-                navigationController.navigate(RecipeFragmentDirections.actionRecipeToDialog(
-                    getTitle()))
-            }
         }
     }
 
diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml
new file mode 100644
index 0000000..412c55b
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/design_default_color_background"/>
+    <corners android:radius="28dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_corners.xml b/app/src/main/res/drawable/rounded_corners.xml
new file mode 100644
index 0000000..c90dc07
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_corners.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="16dp"/>
+    <solid android:color="@android:color/transparent"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/trailing_icon.xml b/app/src/main/res/drawable/trailing_icon.xml
new file mode 100644
index 0000000..42848c8
--- /dev/null
+++ b/app/src/main/res/drawable/trailing_icon.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <group>
+    <clip-path
+        android:pathData="M24,4L24,4A20,20 0,0 1,44 24L44,24A20,20 0,0 1,24 44L24,44A20,20 0,0 1,4 24L4,24A20,20 0,0 1,24 4z"/>
+    <path
+        android:pathData="M19,33C18.45,33 17.979,32.804 17.587,32.412C17.196,32.021 17,31.55 17,31V18H16V16H21V15H27V16H32V18H31V31C31,31.55 30.804,32.021 30.413,32.412C30.021,32.804 29.55,33 29,33H19ZM29,18H19V31H29V18ZM21,29H23V20H21V29ZM25,29H27V20H25V29Z"
+        android:fillColor="#49454F"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e7a74fa..5e12186 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,9 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container_view"
-    android:name="androidx.navigation.fragment.NavHostFragment"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:navGraph="@navigation/nav_graph"
-    />
\ No newline at end of file
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/topAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"
+        app:titleTextColor="@color/white"
+        app:navigationIconTint="@color/white">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/deleteButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:src="@drawable/trailing_icon"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:contentDescription="@string/rf_button"
+            app:tint="@color/white" />
+
+    </com.google.android.material.appbar.MaterialToolbar>
+
+    <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fragment_container_view"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:navGraph="@navigation/nav_graph"
+        />
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/fragment_cookbook.xml b/app/src/main/res/layout/fragment_cookbook.xml
index 2a80697..d0170af 100644
--- a/app/src/main/res/layout/fragment_cookbook.xml
+++ b/app/src/main/res/layout/fragment_cookbook.xml
@@ -9,6 +9,7 @@
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:divider="@drawable/divider"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        />
 
 </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 467f003..3d65d58 100644
--- a/app/src/main/res/layout/fragment_recipe.xml
+++ b/app/src/main/res/layout/fragment_recipe.xml
@@ -1,29 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/rf_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView"/>
-
     <ImageView
         android:contentDescription="@string/im_contentDescription"
         android:id="@+id/imageView"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginTop="16dp"
         android:scaleType="centerCrop"
+        android:background="@drawable/rounded_corners"
         app:layout_constraintWidth_percent="0.3"
         app:layout_constraintDimensionRatio="H,1:1"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,28 +23,28 @@
 
     <TextView
         android:id="@+id/tw_name"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
+        android:fontFamily="sans-serif-black"
         android:textAlignment="textStart"
         android:textSize="22sp"
-        android:fontFamily="sans-serif-black"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
     <TextView
         android:id="@+id/tw_description"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:textAlignment="textStart"
         android:textSize="14sp"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/imageView"
         app:layout_constraintTop_toBottomOf="@+id/tw_name" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/vh_recipe_category.xml b/app/src/main/res/layout/vh_recipe_category.xml
index 4daa56b..0bdedc4 100644
--- a/app/src/main/res/layout/vh_recipe_category.xml
+++ b/app/src/main/res/layout/vh_recipe_category.xml
@@ -3,13 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/black">
+    android:background="@color/white">
 
     <TextView
         android:id="@+id/textView"
-        android:textColor="@color/white"
+        android:textColor="@color/black"
         android:textSize="22sp"
-        android:fontFamily="sans-serif-black"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 44faf5d..9933c13 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
     <fragment
         android:id="@+id/fragment_cookbook"
         android:name="ru.otus.cookbook.ui.CookbookFragment"
-        android:label="listFragment"
+        android:label="Cookbook"
         >
 
         <action
@@ -23,7 +23,6 @@
     <fragment
         android:id="@+id/fragment_recipe"
         android:name="ru.otus.cookbook.ui.RecipeFragment"
-        android:label="recipeFragment"
         >
 
         <argument
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74c4516..b571605 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,10 @@
 <resources>
     <string name="app_name">Cookbook</string>
-    <string name="rf_button">Удалить рецепт</string>
-    <!-- TODO: Remove or change this placeholder text -->
+    <string name="rf_button">Delete</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="rdf_message">Вы действительно хотите удалить рецепт?</string>
-    <string name="rdf_ok">Да</string>
-    <string name="rdf_no">Нет</string>
-    <string name="rdf_cancel">Отмена</string>
-    <string name="im_contentDescription">Картинка</string>
+    <string name="rdf_title">Delete</string>
+    <string name="rdf_message">Are you sure you want to delete %1$s?</string>
+    <string name="rdf_ok">Yes</string>
+    <string name="rdf_cancel">Cancel</string>
+    <string name="im_contentDescription">Image</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..5f0ee17
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="RoundedDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:windowBackground">@drawable/dialog_background</item>
+        <item name="android:windowMinWidthMajor">90%</item>
+        <item name="android:windowMinWidthMinor">90%</item>
+        <item name="materialButtonOutlinedStyle">@style/MyButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/MyPositiveButton</item>
+        <item name="buttonBarNeutralButtonStyle">@style/MyNeutralButton</item>
+    </style>
+
+    <style name="MyButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/black</item>
+        <item name="backgroundTint">@color/white</item>
+    </style>
+
+    <style name="MyPositiveButton" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <style name="MyNeutralButton" parent="Widget.Material3.Button.TextButton.Dialog">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 47d6575..94ea169 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,16 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.Theme.Cookbook" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+
     </style>
 
     <style name="Theme.Cookbook" parent="Base.Theme.Cookbook" />
+
+    <style name="MyToolbarStyle" parent="Widget.MaterialComponents.Toolbar">
+        <item name="navigationIconTint">@color/white</item>
+    </style>
+
+    <style name="MyActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
+        <item name="colorControlNormal">@color/white</item>
+    </style>
 </resources>
\ No newline at end of file