From ac63b454d132b7330aead93a0bdf55306f439013 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:07:21 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D1=8B?= =?UTF-8?q?=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D1=8B=D0=B5=20=D1=84?= =?UTF-8?q?=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++++ app/src/main/res/layout/activity_root.xml | 14 +++++++++++--- app/src/main/res/layout/fragment_favorites.xml | 7 +++++++ app/src/main/res/layout/fragment_filter.xml | 7 +++++++ app/src/main/res/layout/fragment_search.xml | 7 +++++++ app/src/main/res/layout/fragment_team.xml | 7 +++++++ .../main/res/navigation/main_navigation_graph.xml | 6 ++++++ gradle/libs.versions.toml | 3 +++ 8 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/layout/fragment_favorites.xml create mode 100644 app/src/main/res/layout/fragment_filter.xml create mode 100644 app/src/main/res/layout/fragment_search.xml create mode 100644 app/src/main/res/layout/fragment_team.xml create mode 100644 app/src/main/res/navigation/main_navigation_graph.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c0e251eff8e..d17b1548256 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,4 +55,8 @@ dependencies { androidTestImplementation(libs.uiTests.junitExt) androidTestImplementation(libs.uiTests.espressoCore) // endregion + + // Navigation Component libraries + implementation(libs.navigation.fragment.ktx) + implementation(libs.navigation.ui.ktx) } diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index ea46b92d7b9..a8c59d315e7 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -1,10 +1,18 @@ + android:orientation="vertical"> + + - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_favorites.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_filter.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_search.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml new file mode 100644 index 00000000000..fbdd146ffc5 --- /dev/null +++ b/app/src/main/res/layout/fragment_team.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/navigation/main_navigation_graph.xml b/app/src/main/res/navigation/main_navigation_graph.xml new file mode 100644 index 00000000000..6b1faef4bfd --- /dev/null +++ b/app/src/main/res/navigation/main_navigation_graph.xml @@ -0,0 +1,6 @@ + + + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4518ee4f7a7..8f4272a0d15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ java = "VERSION_1_8" # Build constants minSdk = "26" compileSdk = "34" +navigationFragmentKtx = "2.7.7" targetSdk = "33" # Detekt @@ -14,6 +15,8 @@ detektTwitterComposeRules ="0.0.26" [libraries] # Detekt +navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" } +navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" } staticAnalysis-detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } staticAnalysis-detektCli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = "detekt" } staticAnalysis-detektApi = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" } From 76374f6ff4f4a6cf75c44695d2ed7702a311a5f7 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:07:24 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D1=84?= =?UTF-8?q?=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавлен фрагмент "Вакансия" экрана описания вакансии --- app/build.gradle.kts | 1 + .../diploma/ui/fragment/FavouritesFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/FilterFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/SearchFragment.kt | 20 +++++++++++++++++++ .../diploma/ui/fragment/TeamFragment.kt | 19 ++++++++++++++++++ .../diploma/ui/fragment/VacancyFragment.kt | 19 ++++++++++++++++++ app/src/main/res/layout/activity_root.xml | 4 +++- ..._favorites.xml => fragment_favourites.xml} | 0 app/src/main/res/layout/fragment_vacancy.xml | 6 ++++++ .../res/navigation/main_navigation_graph.xml | 4 ++-- 10 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt create mode 100644 app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt rename app/src/main/res/layout/{fragment_favorites.xml => fragment_favourites.xml} (100%) create mode 100644 app/src/main/res/layout/fragment_vacancy.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d17b1548256..30b7ab52e12 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -59,4 +59,5 @@ dependencies { // Navigation Component libraries implementation(libs.navigation.fragment.ktx) implementation(libs.navigation.ui.ktx) + } diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt new file mode 100644 index 00000000000..b2cdd8aa50e --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class FavouritesFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_favourites, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt new file mode 100644 index 00000000000..444026afe9c --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class FilterFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_filter, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt new file mode 100644 index 00000000000..608b786ae1b --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt @@ -0,0 +1,20 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class SearchFragment : Fragment(){ + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_search, container, false) + } + +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt new file mode 100644 index 00000000000..fc69c039b44 --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class TeamFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_team, container, false) + } +} diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt new file mode 100644 index 00000000000..0f4f5ecc360 --- /dev/null +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt @@ -0,0 +1,19 @@ +package ru.practicum.android.diploma.ui.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import ru.practicum.android.diploma.R + +class VacancyFragment: Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_vacancy, container, false) + } +} diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index a8c59d315e7..4c0b47f5544 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -1,6 +1,7 @@ @@ -12,7 +13,8 @@ android:layout_height="0dp" android:layout_weight="1" app:defaultNavHost="true" - app:navGraph="@navigation/main_navigation_graph" /> + app:navGraph="@navigation/main_navigation_graph" + tools:ignore="MissingConstraints" /> + + + diff --git a/app/src/main/res/navigation/main_navigation_graph.xml b/app/src/main/res/navigation/main_navigation_graph.xml index 6b1faef4bfd..9e494838cd7 100644 --- a/app/src/main/res/navigation/main_navigation_graph.xml +++ b/app/src/main/res/navigation/main_navigation_graph.xml @@ -1,6 +1,6 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/main_navigation_graph"> From 6109e952c0e0ac89cd58cbe9972700f57ad5cbe3 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:35:23 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=9D=D0=B0=20=D0=B2=D1=81=D0=B5=20=D1=84?= =?UTF-8?q?=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD=D1=82=D1=8B=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20TextView=20=D1=81=20?= =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC=20=D1=87?= =?UTF-8?q?=D1=82=D0=BE=20=D0=B7=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FavouritesFragment.kt | 2 +- .../{fragment => fragments}/FilterFragment.kt | 2 +- .../{fragment => fragments}/SearchFragment.kt | 2 +- .../{fragment => fragments}/TeamFragment.kt | 2 +- .../VacancyFragment.kt | 2 +- app/src/main/res/layout/activity_root.xml | 10 +--------- .../main/res/layout/fragment_favourites.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_filter.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_search.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_team.xml | 14 +++++++++++++- app/src/main/res/layout/fragment_vacancy.xml | 19 ++++++++++++++++--- 11 files changed, 74 insertions(+), 21 deletions(-) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/FavouritesFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/FilterFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/SearchFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/TeamFragment.kt (90%) rename app/src/main/java/ru/practicum/android/diploma/ui/{fragment => fragments}/VacancyFragment.kt (90%) diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt index b2cdd8aa50e..1a608757169 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FavouritesFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FavouritesFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt index 444026afe9c..3725b765859 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/FilterFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt index 608b786ae1b..1097201c5e3 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/SearchFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/SearchFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt index fc69c039b44..d990fd772bc 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/TeamFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/TeamFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt similarity index 90% rename from app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt rename to app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt index 0f4f5ecc360..ce0dcfa2eae 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragment/VacancyFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/VacancyFragment.kt @@ -1,4 +1,4 @@ -package ru.practicum.android.diploma.ui.fragment +package ru.practicum.android.diploma.ui.fragments import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/res/layout/activity_root.xml b/app/src/main/res/layout/activity_root.xml index 4c0b47f5544..c8cda858f00 100644 --- a/app/src/main/res/layout/activity_root.xml +++ b/app/src/main/res/layout/activity_root.xml @@ -16,14 +16,6 @@ app:navGraph="@navigation/main_navigation_graph" tools:ignore="MissingConstraints" /> - + diff --git a/app/src/main/res/layout/fragment_favourites.xml b/app/src/main/res/layout/fragment_favourites.xml index fbdd146ffc5..fd84f6f218f 100644 --- a/app/src/main/res/layout/fragment_favourites.xml +++ b/app/src/main/res/layout/fragment_favourites.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.FavouritesFragment"> + + diff --git a/app/src/main/res/layout/fragment_filter.xml b/app/src/main/res/layout/fragment_filter.xml index fbdd146ffc5..48b477282e3 100644 --- a/app/src/main/res/layout/fragment_filter.xml +++ b/app/src/main/res/layout/fragment_filter.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.FilterFragment"> + + diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index fbdd146ffc5..e025558e681 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.SearchFragment"> + + diff --git a/app/src/main/res/layout/fragment_team.xml b/app/src/main/res/layout/fragment_team.xml index fbdd146ffc5..7fa02b68368 100644 --- a/app/src/main/res/layout/fragment_team.xml +++ b/app/src/main/res/layout/fragment_team.xml @@ -1,7 +1,19 @@ + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.TeamFragment"> + + diff --git a/app/src/main/res/layout/fragment_vacancy.xml b/app/src/main/res/layout/fragment_vacancy.xml index 13544084861..c0d0b7432d2 100644 --- a/app/src/main/res/layout/fragment_vacancy.xml +++ b/app/src/main/res/layout/fragment_vacancy.xml @@ -1,6 +1,19 @@ - + android:layout_height="match_parent" + android:gravity="center" + tools:context=".ui.fragments.TeamFragment"> - + + + From 1de463b34e09a9492d65e4ee775d7efe6e413626 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:56:50 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=97=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B3=D1=80=D0=B0=D1=84=20=D0=BD=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=B3=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Исправлена ошибка в layout vacancy_fragment --- app/src/main/res/layout/fragment_vacancy.xml | 2 +- .../res/navigation/main_navigation_graph.xml | 39 ++++++++++++++++++- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/fragment_vacancy.xml b/app/src/main/res/layout/fragment_vacancy.xml index c0d0b7432d2..96baba93ac7 100644 --- a/app/src/main/res/layout/fragment_vacancy.xml +++ b/app/src/main/res/layout/fragment_vacancy.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - tools:context=".ui.fragments.TeamFragment"> + tools:context=".ui.fragments.VacancyFragment"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/main_navigation_graph" + app:startDestination="@id/main_screen"> + + + + + + + + + From c9261789b60066fcc12b3c67db3649e59e1f7fd6 Mon Sep 17 00:00:00 2001 From: Andrei <116720914+AnShok@users.noreply.github.com> Date: Fri, 2 Aug 2024 13:40:26 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D0=B0=20=D1=81=20=D1=8D?= =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20=D1=84?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=B8=20=D0=B2?= =?UTF-8?q?=D0=B0=D0=BA=D0=B0=D0=BD=D1=81=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../android/diploma/ui/fragments/FilterFragment.kt | 10 ++++++++++ .../android/diploma/ui/fragments/SearchFragment.kt | 14 ++++++++++++++ .../diploma/ui/fragments/VacancyFragment.kt | 10 ++++++++++ app/src/main/res/layout/fragment_filter.xml | 6 ++++++ app/src/main/res/layout/fragment_search.xml | 12 ++++++++++++ app/src/main/res/layout/fragment_vacancy.xml | 5 +++++ 6 files changed, 57 insertions(+) diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt index 3725b765859..7361b2163ea 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/fragments/FilterFragment.kt @@ -4,7 +4,9 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.Button import androidx.fragment.app.Fragment +import androidx.navigation.fragment.findNavController import ru.practicum.android.diploma.R class FilterFragment: Fragment() { @@ -16,4 +18,12 @@ class FilterFragment: Fragment() { ): View { return inflater.inflate(R.layout.fragment_filter, container, false) } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + view.findViewById