From 6c32be024154b5ae92699a48fd5d2b9b941d4328 Mon Sep 17 00:00:00 2001 From: xenia Date: Sat, 6 Dec 2025 20:41:52 +0300 Subject: [PATCH 1/3] TASK 0 --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 6 +++++ .../otus/gpb/homework/fragments/Activity1.kt | 26 +++++++++++++++++++ .../otus/gpb/homework/fragments/Activity2.kt | 26 +++++++++++++++++++ .../otus/gpb/homework/fragments/FragmentA.kt | 18 +++++++++++++ .../otus/gpb/homework/fragments/FragmentB.kt | 19 ++++++++++++++ .../gpb/homework/fragments/MainActivity.kt | 15 +++++++++++ app/src/main/res/layout/activity_1.xml | 15 +++++++++++ app/src/main/res/layout/activity_2.xml | 15 +++++++++++ app/src/main/res/layout/activity_main.xml | 18 ++++++++++--- app/src/main/res/layout/fragment_a.xml | 14 ++++++++++ app/src/main/res/layout/fragment_b.xml | 14 ++++++++++ app/src/main/res/values/strings.xml | 5 ++++ 13 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/otus/gpb/homework/fragments/Activity1.kt create mode 100644 app/src/main/java/otus/gpb/homework/fragments/Activity2.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/FragmentB.kt create mode 100644 app/src/main/res/layout/activity_1.xml create mode 100644 app/src/main/res/layout/activity_2.xml create mode 100644 app/src/main/res/layout/fragment_a.xml create mode 100644 app/src/main/res/layout/fragment_b.xml diff --git a/app/build.gradle b/app/build.gradle index c5cf1b8..70ba3b5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,6 +42,7 @@ dependencies { 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.8.0' 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..ca775ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,12 @@ android:supportsRtl="true" android:theme="@style/Theme.Fragments" tools:targetApi="31"> + + diff --git a/app/src/main/java/otus/gpb/homework/fragments/Activity1.kt b/app/src/main/java/otus/gpb/homework/fragments/Activity1.kt new file mode 100644 index 0000000..ee0ad65 --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/Activity1.kt @@ -0,0 +1,26 @@ +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 Activity1 : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_1) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + + supportFragmentManager.beginTransaction() + .replace(R.id.fragment_a, FragmentA()) + .setReorderingAllowed(true) + .commit() + } +} \ No newline at end of file diff --git a/app/src/main/java/otus/gpb/homework/fragments/Activity2.kt b/app/src/main/java/otus/gpb/homework/fragments/Activity2.kt new file mode 100644 index 0000000..05167ec --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/Activity2.kt @@ -0,0 +1,26 @@ +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 Activity2 : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_2) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + + supportFragmentManager.beginTransaction() + .replace(R.id.fragment_b, FragmentB()) + .setReorderingAllowed(true) + .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..ad0fa0f --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentA.kt @@ -0,0 +1,18 @@ +package otus.gpb.homework.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +class FragmentA : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_a, container, false) + } +} \ No newline at end of file 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..fbd69e0 --- /dev/null +++ b/app/src/main/java/otus/gpb/homework/fragments/FragmentB.kt @@ -0,0 +1,19 @@ +package otus.gpb.homework.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + + +class FragmentB : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_b, container, false) + } +} \ No newline at end of file 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..276421b 100644 --- a/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt +++ b/app/src/main/java/otus/gpb/homework/fragments/MainActivity.kt @@ -1,6 +1,8 @@ package otus.gpb.homework.fragments +import android.content.Intent import android.os.Bundle +import android.widget.Button import androidx.appcompat.app.AppCompatActivity class MainActivity : AppCompatActivity() { @@ -8,5 +10,18 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + val button1 = findViewById