-
Notifications
You must be signed in to change notification settings - Fork 22
Д.З. по теме Navigation Component #15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Gbdr73
wants to merge
1
commit into
Android-Developer-Basic:master
Choose a base branch
from
Gbdr73:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
app/src/main/kotlin/ru/otus/cookbook/ui/DeleteRecipeDialogFragment.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package ru.otus.cookbook.ui | ||
|
|
||
| import android.app.Dialog | ||
| import android.os.Bundle | ||
| import androidx.fragment.app.DialogFragment | ||
| import androidx.navigation.fragment.navArgs | ||
| import com.google.android.material.dialog.MaterialAlertDialogBuilder | ||
| import ru.otus.cookbook.R | ||
| import androidx.navigation.fragment.findNavController | ||
| import kotlin.getValue | ||
|
|
||
| class DeleteRecipeDialogFragment: DialogFragment() { | ||
|
|
||
| private val args by navArgs<DeleteRecipeDialogFragmentArgs>() | ||
|
|
||
| override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | ||
| val recipeTitle = args.recipeTitle | ||
| return MaterialAlertDialogBuilder(requireContext()) | ||
| .setTitle(getString(R.string.delete)) | ||
| .setMessage(getString(R.string.are_you_sure_want_to_delete, recipeTitle)) | ||
| .setPositiveButton(getString(R.string.ok)) { _, _ -> | ||
| dismiss() | ||
| setResult(true) | ||
| } | ||
| .setNegativeButton(getString(R.string.cancel)) { _, _ -> | ||
| dismiss() | ||
| setResult(false) | ||
| } | ||
| .create() | ||
| } | ||
|
|
||
| private fun setResult(result: Boolean) { | ||
| val navController = findNavController() | ||
| navController.previousBackStackEntry?.savedStateHandle?.set( | ||
| DIALOG_RESULT_KEY, | ||
| result | ||
| ) | ||
| } | ||
|
|
||
| companion object { | ||
| const val DIALOG_RESULT_KEY = "delete" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
app/src/main/kotlin/ru/otus/cookbook/ui/RecipeCategoryViewHolder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package ru.otus.cookbook.ui | ||
|
|
||
| import androidx.recyclerview.widget.RecyclerView.ViewHolder | ||
| import ru.otus.cookbook.databinding.VhRecipeCategoryBinding | ||
|
|
||
| class RecipeCategoryViewHolder(val binding: VhRecipeCategoryBinding): ViewHolder(binding.root) { | ||
| } |
20 changes: 20 additions & 0 deletions
20
app/src/main/kotlin/ru/otus/cookbook/ui/RecipeDiffCallback.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package ru.otus.cookbook.ui | ||
|
|
||
| import androidx.recyclerview.widget.DiffUtil | ||
| import ru.otus.cookbook.data.RecipeListItem | ||
|
|
||
| class RecipeDiffCallback: DiffUtil.ItemCallback<RecipeListItem>() { | ||
| override fun areItemsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean { | ||
| return when{ | ||
| oldItem is RecipeListItem.CategoryItem && newItem is RecipeListItem.CategoryItem -> | ||
| oldItem.name == newItem.name | ||
| oldItem is RecipeListItem.RecipeItem && newItem is RecipeListItem.RecipeItem -> | ||
| oldItem.id == newItem.id | ||
| else -> false | ||
| } | ||
| } | ||
|
|
||
| override fun areContentsTheSame(oldItem: RecipeListItem, newItem: RecipeListItem): Boolean { | ||
| return oldItem == newItem | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/src/main/kotlin/ru/otus/cookbook/ui/RecipeItemViewHolder.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package ru.otus.cookbook.ui | ||
|
|
||
| import androidx.recyclerview.widget.RecyclerView | ||
| import ru.otus.cookbook.databinding.VhRecipeItemBinding | ||
|
|
||
| class RecipeItemViewHolder(val binding: VhRecipeItemBinding): RecyclerView.ViewHolder(binding.root) { | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package ru.otus.cookbook.ui | ||
|
|
||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.ListAdapter | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import com.bumptech.glide.Glide | ||
| import ru.otus.cookbook.data.RecipeListItem | ||
| import ru.otus.cookbook.databinding.VhRecipeCategoryBinding | ||
| import ru.otus.cookbook.databinding.VhRecipeItemBinding | ||
|
|
||
| class RecipesAdapter(val onRecipeClick: (Int) -> Unit): | ||
| ListAdapter<RecipeListItem, RecyclerView.ViewHolder>(RecipeDiffCallback()) { | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { | ||
| val inflater = LayoutInflater.from(parent.context) | ||
|
|
||
| return when(viewType){ | ||
| VIEW_TYPE_CATEGORY -> { | ||
| val binding = VhRecipeCategoryBinding.inflate(inflater, parent, false) | ||
| RecipeCategoryViewHolder(binding) | ||
| } | ||
| VIEW_TYPE_RECIPE -> { | ||
| val binding = VhRecipeItemBinding.inflate(inflater, parent, false) | ||
| RecipeItemViewHolder(binding) | ||
| } | ||
| else -> throw RuntimeException("RuntimeException") | ||
| } | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { | ||
| val item = getItem(position) | ||
| when(holder){ | ||
| is RecipeCategoryViewHolder -> { | ||
| val category = item as RecipeListItem.CategoryItem | ||
| holder.binding.textViewCategory.text = category.category.name | ||
| } | ||
| is RecipeItemViewHolder -> { | ||
| val recipeItem = item as RecipeListItem.RecipeItem | ||
| with(holder){ | ||
| binding.textBackground.text = recipeItem.title.first().toString() | ||
| binding.title.text = recipeItem.title | ||
| binding.description.text = recipeItem.description | ||
| Glide.with(binding.root.context) | ||
| .load(recipeItem.imageUrl) | ||
| .centerCrop() | ||
| .into(binding.imageViewRecipe) | ||
| binding.root.setOnClickListener { onRecipeClick(item.id) } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun getItemViewType(position: Int): Int { | ||
| return when (getItem(position)) { | ||
| is RecipeListItem.CategoryItem -> VIEW_TYPE_CATEGORY | ||
| is RecipeListItem.RecipeItem -> VIEW_TYPE_RECIPE | ||
| } | ||
| } | ||
|
|
||
| companion object{ | ||
| private const val VIEW_TYPE_CATEGORY = 1 | ||
| private const val VIEW_TYPE_RECIPE = 2 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16"> | ||
| <path android:pathData="M3.825,9L9.425,14.6L8,16L0,8L8,0L9.425,1.4L3.825,7H16V9H3.825Z" android:fillColor="#1D1B20"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="14dp" android:height="14dp" android:viewportWidth="14" android:viewportHeight="14"> | ||
| <path android:pathData="M1.4,14L0,12.6L5.6,7L0,1.4L1.4,0L7,5.6L12.6,0L14,1.4L8.4,7L14,12.6L12.6,14L7,8.4L1.4,14Z" android:fillColor="#1D1B20"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> | ||
| <corners android:radius="20dp"/> | ||
| </shape> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="18dp" android:viewportWidth="16" android:viewportHeight="18"> | ||
| <path android:pathData="M3,18C2.45,18 1.979,17.804 1.587,17.413C1.196,17.021 1,16.55 1,16V3H0V1H5V0H11V1H16V3H15V16C15,16.55 14.804,17.021 14.413,17.413C14.021,17.804 13.55,18 13,18H3ZM13,3H3V16H13V3ZM5,14H7V5H5V14ZM9,14H11V5H9V14Z" android:fillColor="#49454F"/> | ||
| </vector> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <LinearLayout 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" | ||
| android:orientation="vertical" | ||
| 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> | ||
| <androidx.fragment.app.FragmentContainerView | ||
| android:id="@+id/main_container" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:name="androidx.navigation.fragment.NavHostFragment" | ||
| app:navGraph="@navigation/nav_graph" | ||
| app:defaultNavHost="true"/> | ||
| </LinearLayout> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,27 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| <LinearLayout 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:tools="http://schemas.android.com/tools" | ||
| android:orientation="vertical" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| <com.google.android.material.appbar.MaterialToolbar | ||
| style="@style/MyToolbarStyle" | ||
| android:id="@+id/toolbar" | ||
| app:navigationIcon="@drawable/close" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| /> | ||
|
|
||
| <androidx.recyclerview.widget.RecyclerView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:fillViewport="true" | ||
| android:id="@+id/recyclerViewCategory" | ||
| app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" | ||
| android:orientation="vertical" | ||
| tools:listitem="@layout/vh_recipe_category"/> | ||
|
|
||
| </LinearLayout> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Интересно, что получается использование Handler.post здесь избыточно, так как observer уже выполняется в юай потоке. Можно напрямую вызвать navController.navigateUp() без обертки в handler