From 9a2da4c20b518b8a5742bc3516eac94ba1e561ef Mon Sep 17 00:00:00 2001
From: Gimasteev <best.roma7@gmail.com>
Date: Sun, 12 May 2024 12:11:23 +0500
Subject: [PATCH 1/4] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=B8=D1=82=D0=B8,=20=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9=D0=B0=D1=83=D1=82=D1=8B=20=D0=BA=20=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BC=20=D0=B8=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=81=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=90=20=D0=BD=D0=B0=20=D0=B0=D0=BA=D1=82=D0=B8=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D0=B8=20B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 16 +++++--
 app/src/main/AndroidManifest.xml              | 24 ++++++++--
 .../gpb/homework/activities/Activity_A.kt     | 26 +++++++++++
 .../gpb/homework/activities/Activity_B.kt     | 17 +++++++
 .../gpb/homework/activities/Activity_C.kt     | 17 +++++++
 .../gpb/homework/activities/Activity_D.kt     | 20 ++++++++
 app/src/main/res/layout/activity_a.xml        | 22 +++++++++
 app/src/main/res/layout/activity_b.xml        | 20 ++++++++
 app/src/main/res/layout/activity_c.xml        | 46 +++++++++++++++++++
 app/src/main/res/layout/activity_d.xml        | 11 +++++
 build.gradle                                  |  6 +--
 gradle.properties                             |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 13 files changed, 218 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/Activity_D.kt
 create mode 100644 app/src/main/res/layout/activity_a.xml
 create mode 100644 app/src/main/res/layout/activity_b.xml
 create mode 100644 app/src/main/res/layout/activity_c.xml
 create mode 100644 app/src/main/res/layout/activity_d.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3c3711b..a3df66f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 34
 
     defaultConfig {
         applicationId "otus.gpb.homework.activities"
         minSdk 23
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -30,6 +30,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'otus.gpb.homework.activities'
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 detekt {
@@ -49,7 +53,9 @@ tasks.named("detekt").configure {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'androidx.activity:activity:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f318e6c..6a1fd11 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="otus.gpb.homework.activities">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -12,6 +11,25 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Activities"
-        tools:targetApi="31" />
+        tools:targetApi="31">
+        <activity
+            android:name=".Activity_D"
+            android:exported="false" />
+        <activity
+            android:name=".Activity_C"
+            android:exported="false" />
+        <activity
+            android:name=".Activity_B"
+            android:exported="false" />
+        <activity
+            android:name=".Activity_A"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
new file mode 100644
index 0000000..7864f6b
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
@@ -0,0 +1,26 @@
+package otus.gpb.homework.activities
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+
+
+class Activity_A : AppCompatActivity() {
+    @SuppressLint("MissingInflatedId")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_a)
+        val button = findViewById<Button>(R.id.buttonA_to_B)
+        }
+    fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
+        if (view is Button) {
+            // Создаем Intent для открытия другого Activity
+            val intent = Intent(this, Activity_B::class.java)
+            // Начинаем новое Activity
+            startActivity(intent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
new file mode 100644
index 0000000..f4f00bf
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
@@ -0,0 +1,17 @@
+package otus.gpb.homework.activities
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+
+
+class Activity_B : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_b)
+
+    }
+    fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
new file mode 100644
index 0000000..239be15
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
@@ -0,0 +1,17 @@
+package otus.gpb.homework.activities
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+
+
+class Activity_C : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_c)
+
+    }
+    fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_D.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_D.kt
new file mode 100644
index 0000000..af9407b
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_D.kt
@@ -0,0 +1,20 @@
+package otus.gpb.homework.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+
+
+class Activity_D : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_d)
+
+
+    }
+    fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
+
+    }
+}
\ No newline at end of file
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..d26eca0
--- /dev/null
+++ b/app/src/main/res/layout/activity_a.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#f44336"
+    android:onClick="onClickListener"
+    tools:context=".Activity_A">
+
+    <Button
+        android:id="@+id/buttonA_to_B"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="onClickListener"
+        android:text="Open ActivityB"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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..25052af
--- /dev/null
+++ b/app/src/main/res/layout/activity_b.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#4caf50"
+    tools:context=".Activity_B">
+
+    <Button
+        android:id="@+id/buttonB"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Open ActivityC"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_c.xml b/app/src/main/res/layout/activity_c.xml
new file mode 100644
index 0000000..5a84197
--- /dev/null
+++ b/app/src/main/res/layout/activity_c.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#2196f3"
+    tools:context=".Activity_C">
+
+    <Button
+        android:id="@+id/buttonC_to_A"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Open ActivityA"
+        tools:layout_editor_absoluteX="125dp"
+        tools:layout_editor_absoluteY="162dp"
+        tools:ignore="MissingConstraints" />
+
+    <Button
+        android:id="@+id/buttonC_to_D"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Open ActivityD"
+        tools:layout_editor_absoluteX="125dp"
+        tools:layout_editor_absoluteY="271dp"
+        tools:ignore="MissingConstraints" />
+
+    <Button
+        android:id="@+id/buttonC_close_C"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Close ActivityC"
+        tools:layout_editor_absoluteX="122dp"
+        tools:layout_editor_absoluteY="370dp"
+        tools:ignore="MissingConstraints" />
+
+    <Button
+        android:id="@+id/buttonC_close_stack"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Close Stack"
+        tools:layout_editor_absoluteX="137dp"
+        tools:layout_editor_absoluteY="465dp"
+        tools:ignore="MissingConstraints" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_d.xml b/app/src/main/res/layout/activity_d.xml
new file mode 100644
index 0000000..13f7b38
--- /dev/null
+++ b/app/src/main/res/layout/activity_d.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffeb3b"
+    tools:context=".Activity_D">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 07c0e9a..8ec48d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
 }
 
diff --git a/gradle.properties b/gradle.properties
index cd0519b..022338b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a577dba..fb9e5b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Aug 27 13:57:30 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 709181af6f4abfe6f1abc793d7a1206c1f8cc16a Mon Sep 17 00:00:00 2001
From: Gimasteev <166092452+Gimasteev@users.noreply.github.com>
Date: Sun, 12 May 2024 13:56:01 +0500
Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=D1=8B=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=B6=D0=B4=D1=83=20=D0=B2=D1=81=D0=B5=D0=BC=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BD=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gpb/homework/activities/Activity_A.kt     |  3 +-
 .../gpb/homework/activities/Activity_B.kt     | 13 ++++++--
 .../gpb/homework/activities/Activity_C.kt     | 15 +++++++--
 app/src/main/res/layout/activity_a.xml        |  2 +-
 app/src/main/res/layout/activity_b.xml        |  6 ++--
 app/src/main/res/layout/activity_c.xml        | 31 +++++++++++++------
 app/src/main/res/layout/activity_d.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 gradle.properties                             |  2 ++
 9 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
index 7864f6b..579c98e 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
@@ -3,17 +3,18 @@ package otus.gpb.homework.activities
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 
 class Activity_A : AppCompatActivity() {
-    @SuppressLint("MissingInflatedId")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_a)
         val button = findViewById<Button>(R.id.buttonA_to_B)
+        Log.d("Debug", "onCreateA")
         }
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
index f4f00bf..2d2e794 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
@@ -1,7 +1,10 @@
 package otus.gpb.homework.activities
 
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 
@@ -9,9 +12,15 @@ class Activity_B : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_b)
-
+        val button = findViewById<Button>(R.id.buttonB_to_C)
+        Log.d("Debug", "onCreateB")
     }
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
-
+        if (view is Button) {
+            // Создаем Intent для открытия другого Activity
+            val intent = Intent(this, Activity_C::class.java)
+            // Начинаем новое Activity
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
index 239be15..e1a69b4 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
@@ -1,7 +1,10 @@
 package otus.gpb.homework.activities
 
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.view.View
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 
@@ -9,9 +12,17 @@ class Activity_C : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_c)
-
+        val button = findViewById<Button>(R.id.buttonC_to_A)
+        Log.d("Debug", "onCreateC")
     }
-    fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
 
+    fun onClickListener(view: View) { // создаем функцию и указываем переменную view типа View (!)
+        if (view is Button) {
+            // Создаем Intent для открытия другого Activity
+            val intent = Intent(this, Activity_A::class.java)
+            // Начинаем новое Activity
+            startActivity(intent)
+        }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_a.xml b/app/src/main/res/layout/activity_a.xml
index d26eca0..e208951 100644
--- a/app/src/main/res/layout/activity_a.xml
+++ b/app/src/main/res/layout/activity_a.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:id="@+id/layoutActivityA"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#f44336"
diff --git a/app/src/main/res/layout/activity_b.xml b/app/src/main/res/layout/activity_b.xml
index 25052af..81412c9 100644
--- a/app/src/main/res/layout/activity_b.xml
+++ b/app/src/main/res/layout/activity_b.xml
@@ -2,16 +2,18 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:id="@+id/layoutActivityB"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#4caf50"
+    android:onClick="onClickListener"
     tools:context=".Activity_B">
 
     <Button
-        android:id="@+id/buttonB"
+        android:id="@+id/buttonB_to_C"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:onClick="onClickListener"
         android:text="Open ActivityC"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_c.xml b/app/src/main/res/layout/activity_c.xml
index 5a84197..9fb03b3 100644
--- a/app/src/main/res/layout/activity_c.xml
+++ b/app/src/main/res/layout/activity_c.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:id="@+id/layoutActivityB"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#2196f3"
@@ -12,35 +12,48 @@
         android:id="@+id/buttonC_to_A"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="184dp"
+        android:onClick="onClickListener"
         android:text="Open ActivityA"
-        tools:layout_editor_absoluteX="125dp"
-        tools:layout_editor_absoluteY="162dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints" />
 
     <Button
         android:id="@+id/buttonC_to_D"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="292dp"
         android:text="Open ActivityD"
-        tools:layout_editor_absoluteX="125dp"
-        tools:layout_editor_absoluteY="271dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints" />
 
     <Button
         android:id="@+id/buttonC_close_C"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="388dp"
         android:text="Close ActivityC"
-        tools:layout_editor_absoluteX="122dp"
-        tools:layout_editor_absoluteY="370dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.483"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints" />
 
     <Button
         android:id="@+id/buttonC_close_stack"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="492dp"
         android:text="Close Stack"
-        tools:layout_editor_absoluteX="137dp"
-        tools:layout_editor_absoluteY="465dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="MissingConstraints" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_d.xml b/app/src/main/res/layout/activity_d.xml
index 13f7b38..b9c7415 100644
--- a/app/src/main/res/layout/activity_d.xml
+++ b/app/src/main/res/layout/activity_d.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout 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/buttonB_to_C"
+    android:id="@+id/layoutActivityB"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ffeb3b"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08ea3c6..000adfd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Activities</string>
+    <string name="app_name">Roman_Activities</string>
 </resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 022338b..e4ea60e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,6 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
\ No newline at end of file

From c67ccf594befb70c564c6e35bf39292009ea5fd5 Mon Sep 17 00:00:00 2001
From: Gimasteev <166092452+Gimasteev@users.noreply.github.com>
Date: Sun, 19 May 2024 12:36:12 +0500
Subject: [PATCH 3/4] Finish

---
 .../gpb/homework/activities/Activity_A.kt     | 19 +++++++++++++
 .../gpb/homework/activities/Activity_B.kt     |  6 ++++
 .../gpb/homework/activities/Activity_C.kt     | 28 ++++++++++++++++++-
 app/src/main/res/layout/activity_c.xml        |  5 +++-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
index 579c98e..adb3f50 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
@@ -16,12 +16,31 @@ class Activity_A : AppCompatActivity() {
         val button = findViewById<Button>(R.id.buttonA_to_B)
         Log.d("Debug", "onCreateA")
         }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("Debug", "onDestroyA")
+    }
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
             // Создаем Intent для открытия другого Activity
             val intent = Intent(this, Activity_B::class.java)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
             // Начинаем новое Activity
             startActivity(intent)
         }
+
     }
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+    }
+    override fun onRestart() {
+        super.onRestart()
+        Log.d("Debug", "onRestart")
+        val intent = Intent(this, Activity_A::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
+        startActivity(intent)
+        Log.d("Debug", "onNewIntent")
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
index 2d2e794..f7880c4 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
@@ -15,8 +15,14 @@ class Activity_B : AppCompatActivity() {
         val button = findViewById<Button>(R.id.buttonB_to_C)
         Log.d("Debug", "onCreateB")
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("Debug", "onDestroyB")
+    }
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
+            Log.d("Debug", "openB")
             // Создаем Intent для открытия другого Activity
             val intent = Intent(this, Activity_C::class.java)
             // Начинаем новое Activity
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
index e1a69b4..44c2a50 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
@@ -16,7 +16,15 @@ class Activity_C : AppCompatActivity() {
         Log.d("Debug", "onCreateC")
     }
 
-    fun onClickListener(view: View) { // создаем функцию и указываем переменную view типа View (!)
+    override fun onResume() {
+        super.onResume()
+        Log.d("Debug", "onResumeC")
+    }
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("Debug", "onDestroyC")
+    }
+    fun onClickListenerOpenAfromC(view: View) { // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
             // Создаем Intent для открытия другого Activity
             val intent = Intent(this, Activity_A::class.java)
@@ -25,4 +33,22 @@ class Activity_C : AppCompatActivity() {
         }
     }
 
+    fun onClickListenerOpenDfromC(view: View){
+        val intent = Intent(this, Activity_D::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+    }
+
+    fun onClickListenerCloseCAndStack(view: View){
+        val intent = Intent(this, Activity_B::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        startActivity(intent)
+    }
+
+    fun onClickListenerCloseStackAndGoA(view: View){
+        val intent = Intent(this, Activity_A::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_c.xml b/app/src/main/res/layout/activity_c.xml
index 9fb03b3..fb60022 100644
--- a/app/src/main/res/layout/activity_c.xml
+++ b/app/src/main/res/layout/activity_c.xml
@@ -13,7 +13,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="184dp"
-        android:onClick="onClickListener"
+        android:onClick="onClickListenerOpenAfromC"
         android:text="Open ActivityA"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -26,6 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="292dp"
+        android:onClick="onClickListenerOpenDfromC"
         android:text="Open ActivityD"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
@@ -38,6 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="388dp"
+        android:onClick="onClickListenerCloseCAndStack"
         android:text="Close ActivityC"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.483"
@@ -50,6 +52,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="492dp"
+        android:onClick="onClickListenerCloseStackAndGoA"
         android:text="Close Stack"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"

From f01390a14bf8dcb592c1dc534b0306b7fdea595e Mon Sep 17 00:00:00 2001
From: Gimasteev <166092452+Gimasteev@users.noreply.github.com>
Date: Sat, 25 May 2024 14:50:51 +0500
Subject: [PATCH 4/4] =?UTF-8?q?=D0=A1=D0=BF=D0=B0=D1=81=D0=B8=D0=B1=D0=BE?=
 =?UTF-8?q?=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B5=20=D0=B7=D0=B0=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B8.=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D1=81=D0=B5=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D0=B5=D1=82?=
 =?UTF-8?q?=D1=8B.=20=D0=92=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D1=8B=20=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BB=D0=B8=D1=81=D1=8C=20=D0=BF=D0=BE=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8E=202.4=20=D0=B8=202.5?=
 =?UTF-8?q?.=20=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB,=20=D0=BD=D0=BE=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=BE=D0=BD=D1=8F=D0=BB=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D1=80=D0=B5=D0=B5=20=D0=B2=D0=B8=D1=81=D0=B8?=
 =?UTF-8?q?=D1=82=20=D1=82=D0=B0=D1=81=D0=BA,=20=D1=85=D0=BE=D1=82=D1=8F?=
 =?UTF-8?q?=20=D1=8F=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BE=D1=87?=
 =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D1=83.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  4 ++-
 .../gpb/homework/activities/Activity_A.kt     | 31 +++++++++----------
 .../gpb/homework/activities/Activity_B.kt     |  2 +-
 .../gpb/homework/activities/Activity_C.kt     | 17 ++++++----
 app/src/main/res/layout/activity_c.xml        |  2 +-
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6a1fd11..7defa71 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,12 +18,14 @@
         <activity
             android:name=".Activity_C"
             android:exported="false" />
+
         <activity
             android:name=".Activity_B"
             android:exported="false" />
         <activity
             android:name=".Activity_A"
-            android:exported="true">
+            android:exported="true"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
index adb3f50..ab4a712 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_A.kt
@@ -17,30 +17,29 @@ class Activity_A : AppCompatActivity() {
         Log.d("Debug", "onCreateA")
         }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        Log.d("Debug", "onDestroyA")
-    }
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
             // Создаем Intent для открытия другого Activity
             val intent = Intent(this, Activity_B::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            // Задание 2.1: Создаем FLAG_ACTIVITY_NEW_TASK для singleTop и добавляем флаг FLAG_ACTIVITY_MULTIPLE_TASK для открытия в новом таске
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK
             // Начинаем новое Activity
             startActivity(intent)
         }
 
     }
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-    }
-    override fun onRestart() {
-        super.onRestart()
-        Log.d("Debug", "onRestart")
-        val intent = Intent(this, Activity_A::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
-        startActivity(intent)
-        Log.d("Debug", "onNewIntent")
-    }
+//    override fun onNewIntent(intent: Intent?) {
+//        super.onNewIntent(intent)
+//    }
+//    override fun onRestart() {
+//        super.onRestart()
+//        Log.d("Debug", "onRestart")
+//        val intent = Intent(this, Activity_A::class.java)
+//        intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
+//        startActivity(intent)
+//        Log.d("Debug", "onNewIntent")
+//    }
+
+
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
index f7880c4..35530e2 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_B.kt
@@ -23,7 +23,7 @@ class Activity_B : AppCompatActivity() {
     fun onClickListener(view: View){ // создаем функцию и указываем переменную view типа View (!)
         if (view is Button) {
             Log.d("Debug", "openB")
-            // Создаем Intent для открытия другого Activity
+            // // Задание 2.2: Создаем Intent для открытия другого Activity
             val intent = Intent(this, Activity_C::class.java)
             // Начинаем новое Activity
             startActivity(intent)
diff --git a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
index 44c2a50..d4fd3d2 100644
--- a/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/Activity_C.kt
@@ -35,20 +35,25 @@ class Activity_C : AppCompatActivity() {
 
     fun onClickListenerOpenDfromC(view: View){
         val intent = Intent(this, Activity_D::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TASK
+        // Задание 2.4: Создаю новый активти и чищу весь стек. Вроде как сделано задание. Нажимаю назад и закрывается текущий таск, НО потом открываю трей и вижу, что оно есть))))
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or  Intent.FLAG_ACTIVITY_CLEAR_TASK
         startActivity(intent)
     }
 
-    fun onClickListenerCloseCAndStack(view: View){
+    fun onClickListenerCloseCAndGoBack(view: View){
         val intent = Intent(this, Activity_B::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
-        startActivity(intent)
+        // Задание 2.5: Финиширую активити С
+        finish()
+        //intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        //startActivity(intent)
     }
 
     fun onClickListenerCloseStackAndGoA(view: View){
         val intent = Intent(this, Activity_A::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-        startActivity(intent)
+        // Задание 2.5: Финиширую через функцию finishAffinity(), но опять-таки вижу в трее что висит активити С
+        finishAffinity()
+        //intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        //startActivity(intent)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_c.xml b/app/src/main/res/layout/activity_c.xml
index fb60022..de32f37 100644
--- a/app/src/main/res/layout/activity_c.xml
+++ b/app/src/main/res/layout/activity_c.xml
@@ -39,7 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="388dp"
-        android:onClick="onClickListenerCloseCAndStack"
+        android:onClick="onClickListenerCloseCAndGoBack"
         android:text="Close ActivityC"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.483"