From a0d81bc52449d47e58b8175bbf6c73dbfe52179e Mon Sep 17 00:00:00 2001 From: Adel Khaziakhmetov Date: Wed, 30 Apr 2025 16:19:41 +0300 Subject: [PATCH 1/2] commit 1 --- app/build.gradle | 11 +++- app/src/main/AndroidManifest.xml | 3 + .../otus/gpb/homework/fragments/ActivityB.kt | 20 +++++++ .../otus/gpb/homework/fragments/FragmentA.kt | 56 +++++++++++++++++++ .../otus/gpb/homework/fragments/FragmentAA.kt | 45 +++++++++++++++ .../otus/gpb/homework/fragments/FragmentAB.kt | 36 ++++++++++++ .../otus/gpb/homework/fragments/FragmentB.kt | 50 +++++++++++++++++ .../otus/gpb/homework/fragments/FragmentBA.kt | 51 +++++++++++++++++ .../otus/gpb/homework/fragments/FragmentBB.kt | 43 ++++++++++++++ .../gpb/homework/fragments/MainActivity.kt | 16 +++++- app/src/main/res/layout-land/fragment_b.xml | 22 ++++++++ app/src/main/res/layout/activity_b.xml | 15 +++++ app/src/main/res/layout/activity_main.xml | 36 ++++++++---- app/src/main/res/layout/fragment_a.xml | 27 +++++++++ app/src/main/res/layout/fragment_a_a.xml | 24 ++++++++ app/src/main/res/layout/fragment_a_b.xml | 8 +++ app/src/main/res/layout/fragment_b.xml | 11 ++++ app/src/main/res/layout/fragment_b_a.xml | 19 +++++++ app/src/main/res/layout/fragment_b_b.xml | 19 +++++++ app/src/main/res/values-land/bools.xml | 4 ++ app/src/main/res/values/bools.xml | 4 ++ app/src/main/res/values/strings.xml | 6 ++ 22 files changed, 512 insertions(+), 14 deletions(-) create mode 100644 app/src/main/java/otus/gpb/homework/fragments/ActivityB.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentAA.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentAB.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentB.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentBA.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/FragmentBB.kt create mode 100644 app/src/main/res/layout-land/fragment_b.xml create mode 100644 app/src/main/res/layout/activity_b.xml create mode 100644 app/src/main/res/layout/fragment_a.xml create mode 100644 app/src/main/res/layout/fragment_a_a.xml create mode 100644 app/src/main/res/layout/fragment_a_b.xml create mode 100644 app/src/main/res/layout/fragment_b.xml create mode 100644 app/src/main/res/layout/fragment_b_a.xml create mode 100644 app/src/main/res/layout/fragment_b_b.xml create mode 100644 app/src/main/res/values-land/bools.xml create mode 100644 app/src/main/res/values/bools.xml diff --git a/app/build.gradle b/app/build.gradle index c5cf1b8..5c39681 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,13 +8,13 @@ kotlin { } android { - compileSdk 34 + compileSdk 35 namespace "otus.gpb.homework.fragments" defaultConfig { applicationId "otus.gpb.homework.fragments" minSdk 26 - targetSdk 34 + targetSdk 35 versionCode 1 versionName "1.0" @@ -34,14 +34,19 @@ android { kotlinOptions { jvmTarget = '17' } + + buildFeatures { + viewBinding = true + } } dependencies { - + implementation 'androidx.fragment:fragment-ktx:1.6.2' implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.appcompat:appcompat:1.5.1' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.activity:activity:1.10.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9604b34..2c68ce3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.Fragments" tools:targetApi="31"> + diff --git a/app/src/main/java/otus/gpb/homework/fragments/ActivityB.kt b/app/src/main/java/otus/gpb/homework/fragments/ActivityB.kt new file mode 100644 index 0000000..954f66c --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/ActivityB.kt @@ -0,0 +1,20 @@ +package otus.gpb.homework.fragments + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class ActivityB : AppCompatActivity() { + private val isPortrait: Boolean get() = resources.getBoolean(R.bool.isPortrait) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_b) + + supportFragmentManager.beginTransaction() + .replace(R.id.container_fragment_b, FragmentB.newInstance()) + .commit() + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt new file mode 100644 index 0000000..6cbeb28 --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt @@ -0,0 +1,56 @@ +package otus.gpb.homework.fragments + +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.activity.OnBackPressedCallback + +class FragmentA : Fragment() { + override fun onAttach(context: Context) { + super.onAttach(context) + + val callback = object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + if (childFragmentManager.backStackEntryCount > 0) { + childFragmentManager.popBackStack() + } else { + isEnabled = false + @Suppress("DEPRECATION") + requireActivity().onBackPressed() + } + } + } + + requireActivity().onBackPressedDispatcher.addCallback(callback) + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.fragment_a, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + view.setBackgroundColor(Color.WHITE) + + view.findViewById