diff --git a/app/build.gradle b/app/build.gradle
index c5cf1b8..6320ea9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,13 +8,13 @@ kotlin {
}
android {
- compileSdk 34
+ compileSdk 36
namespace "otus.gpb.homework.fragments"
defaultConfig {
applicationId "otus.gpb.homework.fragments"
minSdk 26
- targetSdk 34
+ targetSdk 36
versionCode 1
versionName "1.0"
@@ -27,6 +27,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ buildFeatures {
+ viewBinding = true
+ }
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
@@ -45,4 +48,5 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ implementation 'androidx.activity:activity:1.10.1'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9604b34..c7be1f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,6 +21,12 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/fragments/ActivityA.kt b/app/src/main/java/otus/gpb/homework/fragments/ActivityA.kt
new file mode 100644
index 0000000..bc5e8bb
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/ActivityA.kt
@@ -0,0 +1,32 @@
+package otus.gpb.homework.fragments
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+
+class ActivityA : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
+ setContentView(R.layout.activity_a)
+ ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.containerA)) { v, insets ->
+ val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+ insets
+ }
+ if (savedInstanceState == null) {
+ supportFragmentManager.beginTransaction()
+ .replace(R.id.containerA, FragmentA.newInstance())
+ .commit()
+ }
+ }
+ companion object {
+ fun newIntent(context: Context): Intent {
+ return Intent(context, ActivityA::class.java)
+ }
+ }
+}
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..39b8cba
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/ActivityB.kt
@@ -0,0 +1,33 @@
+package otus.gpb.homework.fragments
+
+import android.content.Context
+import android.content.Intent
+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() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ enableEdgeToEdge()
+ setContentView(R.layout.activity_b)
+ ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.container_b)) { v, insets ->
+ val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+ v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+ insets
+ }
+ if (savedInstanceState == null){
+ supportFragmentManager.beginTransaction()
+ .replace(R.id.container_b, FragmentB.newInstance())
+ .commit()
+ }
+ }
+
+ companion object {
+ fun newIntent(context: Context): Intent {
+ return Intent(context, ActivityB::class.java)
+ }
+ }
+}
\ 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..aef7e19
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt
@@ -0,0 +1,55 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentABinding
+
+class FragmentA : Fragment() {
+
+ private var _binding: FragmentABinding? = null
+ private val binding: FragmentABinding
+ get() = _binding ?: throw RuntimeException("FragmentABinding == null")
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentABinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object : OnBackPressedCallback(true){
+ override fun handleOnBackPressed() {
+ if (childFragmentManager.backStackEntryCount <= 0){
+ requireActivity().finish()
+ } else {
+ childFragmentManager.popBackStack()
+ }
+ }
+ })
+ binding.buttonFragmentAA.setOnClickListener(){
+ childFragmentManager.popBackStack()
+ childFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentA, FragmentAA.newInstance(ColorGenerator.generateColor()))
+ .addToBackStack(null)
+ .commit()
+ }
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+
+ companion object {
+ fun newInstance(): FragmentA{
+ return FragmentA()
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentAA.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentAA.kt
new file mode 100644
index 0000000..5667b6f
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentAA.kt
@@ -0,0 +1,55 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentAABinding
+
+class FragmentAA : Fragment() {
+ private var _binding: FragmentAABinding? = null
+ private val binding: FragmentAABinding
+ get() = _binding ?: throw RuntimeException("FragmentAABinding == null")
+ private var colorInt: Int? = 0
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ colorInt = arguments?.getInt(COLOR)
+ }
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentAABinding.inflate(inflater, container, false)
+ return binding.root
+ }
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding.buttonFragmentAB.setOnClickListener(){
+ parentFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentA, FragmentAB.newInstance(ColorGenerator.generateColor()))
+ .addToBackStack(null)
+ .commit()
+ }
+ colorInt?.let {
+ binding.layoutFragmentAA.setBackgroundColor(it)
+ }
+ }
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+ companion object {
+
+ private const val COLOR = "color"
+
+ fun newInstance(color: Int): FragmentAA {
+ return FragmentAA().apply {
+ arguments = Bundle().apply {
+ putInt(COLOR, color)
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentAB.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentAB.kt
new file mode 100644
index 0000000..7825edb
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentAB.kt
@@ -0,0 +1,47 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentABBinding
+
+class FragmentAB : Fragment() {
+ private var _binding: FragmentABBinding? = null
+ private val binding: FragmentABBinding
+ get() = _binding ?: throw RuntimeException("FragmentAABinding == null")
+ private var colorInt: Int? = 0
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ colorInt = arguments?.getInt(COLOR)
+ }
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentABBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ colorInt?.let {
+ binding.layoutFragmentAB.setBackgroundColor(it)
+ }
+ }
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+ companion object {
+ private const val COLOR = "color"
+ fun newInstance(color: Int): FragmentAB {
+ return FragmentAB().apply {
+ arguments = Bundle().apply {
+ putInt(COLOR, color)
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentB.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentB.kt
new file mode 100644
index 0000000..7ab38f1
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentB.kt
@@ -0,0 +1,52 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentBBinding
+
+class FragmentB : Fragment() {
+
+ private var _binding: FragmentBBinding? = null
+ private val binding: FragmentBBinding
+ get() = _binding ?: throw RuntimeException("FragmentAABinding == null")
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentBBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ if (binding.containerFragmentB == null) {
+ childFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentBA, FragmentBA.newInstance())
+ .commit()
+ childFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentBB, FragmentBB.newInstance())
+ .commit()
+ } else {
+ childFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentB, FragmentBA.newInstance())
+ .addToBackStack(null)
+ .commit()
+ }
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+
+ companion object {
+
+ fun newInstance(): FragmentB{
+ return FragmentB()
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentBA.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentBA.kt
new file mode 100644
index 0000000..3948803
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentBA.kt
@@ -0,0 +1,51 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentBABinding
+
+class FragmentBA : Fragment() {
+
+ private var _binding: FragmentBABinding? = null
+ private val binding: FragmentBABinding
+ get() = _binding ?: throw RuntimeException("FragmentAABinding == null")
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentBABinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ parentFragmentManager.setFragmentResultListener(FragmentBB.KEY_BB, this){ key, bundle ->
+ val color = bundle.getInt(FragmentBB.BK_COLOR)
+ binding.layoutFragmentBA.setBackgroundColor(color)
+ }
+ if(binding.buttonFragmentBB != null){
+ binding.buttonFragmentBB?.setOnClickListener(){
+ parentFragmentManager.beginTransaction()
+ .replace(R.id.containerFragmentB, FragmentBB.newInstance())
+ .addToBackStack(null)
+ .commit()
+ }
+ }
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+
+ companion object {
+
+ fun newInstance(): FragmentBA{
+ return FragmentBA()
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/FragmentBB.kt b/app/src/main/java/otus/gpb/homework/fragments/FragmentBB.kt
new file mode 100644
index 0000000..1fdc93e
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentBB.kt
@@ -0,0 +1,47 @@
+package otus.gpb.homework.fragments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import otus.gpb.homework.fragments.databinding.FragmentBBBinding
+
+class FragmentBB : Fragment() {
+ private var _binding: FragmentBBBinding? = null
+ private val binding: FragmentBBBinding
+ get() = _binding ?: throw RuntimeException("FragmentAABinding == null")
+
+ override fun onCreateView(
+ inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View {
+ _binding = FragmentBBBinding.inflate(inflater, container, false)
+ return binding.root
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ binding.buttonSendColor.setOnClickListener(){
+ parentFragmentManager.popBackStack()
+ parentFragmentManager.setFragmentResult(
+ KEY_BB,
+ bundleOf(BK_COLOR to ColorGenerator.generateColor())
+ )
+ }
+ }
+
+ override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }
+
+ companion object {
+ val KEY_BB = "request_key_bb"
+ val BK_COLOR = "color"
+ fun newInstance(): FragmentBB{
+ return FragmentBB()
+ }
+ }
+}
diff --git a/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt b/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt
index 5e89c44..b4620fc 100644
--- a/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt
+++ b/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt
@@ -2,11 +2,23 @@ package otus.gpb.homework.fragments
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
+import otus.gpb.homework.fragments.databinding.ActivityMainBinding
class MainActivity : AppCompatActivity() {
+ private lateinit var binding : ActivityMainBinding
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main)
+ binding = ActivityMainBinding.inflate(layoutInflater)
+ setContentView(binding.root)
+ binding.activityA.setOnClickListener(){
+ val intent = ActivityA.newIntent(this)
+ startActivity(intent)
+ }
+ binding.activityB.setOnClickListener(){
+ val intent = ActivityB.newIntent(this)
+ startActivity(intent)
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_b.xml b/app/src/main/res/layout-land/fragment_b.xml
new file mode 100644
index 0000000..1c573bc
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_b.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_b_a.xml b/app/src/main/res/layout-land/fragment_b_a.xml
new file mode 100644
index 0000000..05801c9
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_b_a.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_a.xml b/app/src/main/res/layout/activity_a.xml
new file mode 100644
index 0000000..721f0f6
--- /dev/null
+++ b/app/src/main/res/layout/activity_a.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_b.xml b/app/src/main/res/layout/activity_b.xml
new file mode 100644
index 0000000..2ba8529
--- /dev/null
+++ b/app/src/main/res/layout/activity_b.xml
@@ -0,0 +1,8 @@
+
+
\ 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 17eab17..4563d05 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,29 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
-
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.5" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_a.xml b/app/src/main/res/layout/fragment_a.xml
new file mode 100644
index 0000000..1f7fac6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_a.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_a_a.xml b/app/src/main/res/layout/fragment_a_a.xml
new file mode 100644
index 0000000..b261b2c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_a_a.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_a_b.xml b/app/src/main/res/layout/fragment_a_b.xml
new file mode 100644
index 0000000..510dac0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_a_b.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_b.xml b/app/src/main/res/layout/fragment_b.xml
new file mode 100644
index 0000000..bfbce1b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_b.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_b_a.xml b/app/src/main/res/layout/fragment_b_a.xml
new file mode 100644
index 0000000..f0706ee
--- /dev/null
+++ b/app/src/main/res/layout/fragment_b_a.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_b_b.xml b/app/src/main/res/layout/fragment_b_b.xml
new file mode 100644
index 0000000..d87b2d1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_b_b.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34277aa..69e7f01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
Fragments
+
+ Hello blank fragment
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index bd20018..598d925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '8.7.2' apply false
- id 'com.android.library' version '8.7.2' apply false
+ id 'com.android.application' version '8.12.3' apply false
+ id 'com.android.library' version '8.12.3' apply false
id 'org.jetbrains.kotlin.android' version '2.0.21' apply false
}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1f1d072..f464719 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Tue Nov 05 08:41:56 CET 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists