From f8f017661c95257ac79aab65356791ee10a0ac4e Mon Sep 17 00:00:00 2001
From: Ksiana <mari.serovatova@list.ru>
Date: Sat, 4 Nov 2023 14:25:44 +0900
Subject: [PATCH 1/5] errors

---
 app/build.gradle                              |  9 +++-
 app/src/main/AndroidManifest.xml              | 47 ++++++++++++++++++-
 .../gpb/homework/activities/MainActivityA.kt  | 22 +++++++++
 .../gpb/homework/activities/MainActivityB.kt  | 11 +++++
 .../gpb/homework/activities/MainActivityC.kt  | 11 +++++
 .../gpb/homework/activities/MainActivityD.kt  | 11 +++++
 app/src/main/res/layout/activity_main_a.xml   | 22 +++++++++
 app/src/main/res/layout/activity_main_b.xml   | 21 +++++++++
 app/src/main/res/layout/activity_main_c.xml   | 21 +++++++++
 app/src/main/res/layout/activity_main_d.xml   | 10 ++++
 app/src/main/res/values-night/themes.xml      |  5 ++
 app/src/main/res/values/strings.xml           | 42 +++++++++++++++++
 app/src/main/res/values/themes.xml            |  5 ++
 build.gradle                                  |  4 +-
 gradle.properties                             |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 16 files changed, 240 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
 create mode 100644 app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
 create mode 100644 app/src/main/res/layout/activity_main_a.xml
 create mode 100644 app/src/main/res/layout/activity_main_b.xml
 create mode 100644 app/src/main/res/layout/activity_main_c.xml
 create mode 100644 app/src/main/res/layout/activity_main_d.xml

diff --git a/app/build.gradle b/app/build.gradle
index 3c3711b..24c93f7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    compileSdk 32
+    compileSdk 34
 
     defaultConfig {
         applicationId "otus.gpb.homework.activities"
@@ -30,6 +30,10 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'otus.gpb.homework.activities'
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 detekt {
@@ -52,4 +56,7 @@ 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.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f318e6c..00d466e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,9 @@
 <?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">
+    package = "otus.gpb.homework.activities">
+
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -12,6 +14,47 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Activities"
-        tools:targetApi="31" />
+        tools:targetApi="31">
+        <activity
+            android:name=".MainActivityA"
+            android:exported="true"
+            android:launchMode="standard">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".MainActivityD"
+            android:exported="false"
+            android:launchMode="standard">
+
+            <intent-filter>
+                <action android:name="android.intent.action.Main" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".MainActivityC"
+            android:exported="false"
+            android:launchMode="standard">
+
+            <intent-filter>
+                <action android:name="android.intent.action.Main" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".MainActivityB"
+            android:exported="false"
+            android:launchMode="standard">
+
+            <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/MainActivityA.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
new file mode 100644
index 0000000..2eb7aa8
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
@@ -0,0 +1,22 @@
+package otus.gpb.homework.activities
+
+import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+
+class MainActivityA : AppCompatActivity(R.layout.activity_main_a) {
+
+    val button = findViewById<Button>(R.id.button_activity_B)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+//        button.setOnClickListener {
+//            val intent = Intent(this, MainActivityA::class.java)
+//            startActivity(intent)
+//        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
new file mode 100644
index 0000000..971ee53
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
@@ -0,0 +1,11 @@
+package otus.gpb.homework.activities
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class MainActivityB : AppCompatActivity(R.layout.activity_main_b) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main_b)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
new file mode 100644
index 0000000..4f8a861
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
@@ -0,0 +1,11 @@
+package otus.gpb.homework.activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class MainActivityC : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main_c)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
new file mode 100644
index 0000000..50cc9b5
--- /dev/null
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
@@ -0,0 +1,11 @@
+package otus.gpb.homework.activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+class MainActivityD : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main_d)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_a.xml b/app/src/main/res/layout/activity_main_a.xml
new file mode 100644
index 0000000..d466561
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#f44336"
+    tools:context=".MainActivityA">
+
+    <Button
+        android:id="@+id/button_activity_B"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="120dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Open activity B">
+    </Button>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_b.xml b/app/src/main/res/layout/activity_main_b.xml
new file mode 100644
index 0000000..47ad7bc
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_b.xml
@@ -0,0 +1,21 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#4caf50"
+    tools:context=".MainActivityB">
+
+    <Button
+        android:id="@+id/button_activity_C"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="120dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Open activity C">
+    </Button>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_c.xml b/app/src/main/res/layout/activity_main_c.xml
new file mode 100644
index 0000000..ce34ba6
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_c.xml
@@ -0,0 +1,21 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#2196f3"
+    tools:context=".MainActivityC">
+
+    <Button
+        android:id="@+id/button_activity_D"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="120dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Open activity D">
+    </Button>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_d.xml b/app/src/main/res/layout/activity_main_d.xml
new file mode 100644
index 0000000..08bbaab
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_d.xml
@@ -0,0 +1,10 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffeb3b"
+    tools:context=".MainActivityD">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b34635a..b72ce1a 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -13,4 +13,9 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+  <!-- Base application theme. -->
+    <style name="Base.Theme.Activities" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your dark theme here. -->
+        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08ea3c6..d89693b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,45 @@
 <resources>
     <string name="app_name">Activities</string>
+    <!-- Strings used for fragments for navigation -->
+    <string name="first_fragment_label">First Fragment</string>
+    <string name="second_fragment_label">Second Fragment</string>
+    <string name="next">Next</string>
+    <string name="previous">Previous</string>
+
+    <string name="lorem_ipsum">
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam in scelerisque sem. Mauris
+        volutpat, dolor id interdum ullamcorper, risus dolor egestas lectus, sit amet mattis purus
+        dui nec risus. Maecenas non sodales nisi, vel dictum dolor. Class aptent taciti sociosqu ad
+        litora torquent per conubia nostra, per inceptos himenaeos. Suspendisse blandit eleifend
+        diam, vel rutrum tellus vulputate quis. Aliquam eget libero aliquet, imperdiet nisl a,
+        ornare ex. Sed rhoncus est ut libero porta lobortis. Fusce in dictum tellus.\n\n
+        Suspendisse interdum ornare ante. Aliquam nec cursus lorem. Morbi id magna felis. Vivamus
+        egestas, est a condimentum egestas, turpis nisl iaculis ipsum, in dictum tellus dolor sed
+        neque. Morbi tellus erat, dapibus ut sem a, iaculis tincidunt dui. Interdum et malesuada
+        fames ac ante ipsum primis in faucibus. Curabitur et eros porttitor, ultricies urna vitae,
+        molestie nibh. Phasellus at commodo eros, non aliquet metus. Sed maximus nisl nec dolor
+        bibendum, vel congue leo egestas.\n\n
+        Sed interdum tortor nibh, in sagittis risus mollis quis. Curabitur mi odio, condimentum sit
+        amet auctor at, mollis non turpis. Nullam pretium libero vestibulum, finibus orci vel,
+        molestie quam. Fusce blandit tincidunt nulla, quis sollicitudin libero facilisis et. Integer
+        interdum nunc ligula, et fermentum metus hendrerit id. Vestibulum lectus felis, dictum at
+        lacinia sit amet, tristique id quam. Cras eu consequat dui. Suspendisse sodales nunc ligula,
+        in lobortis sem porta sed. Integer id ultrices magna, in luctus elit. Sed a pellentesque
+        est.\n\n
+        Aenean nunc velit, lacinia sed dolor sed, ultrices viverra nulla. Etiam a venenatis nibh.
+        Morbi laoreet, tortor sed facilisis varius, nibh orci rhoncus nulla, id elementum leo dui
+        non lorem. Nam mollis ipsum quis auctor varius. Quisque elementum eu libero sed commodo. In
+        eros nisl, imperdiet vel imperdiet et, scelerisque a mauris. Pellentesque varius ex nunc,
+        quis imperdiet eros placerat ac. Duis finibus orci et est auctor tincidunt. Sed non viverra
+        ipsum. Nunc quis augue egestas, cursus lorem at, molestie sem. Morbi a consectetur ipsum, a
+        placerat diam. Etiam vulputate dignissim convallis. Integer faucibus mauris sit amet finibus
+        convallis.\n\n
+        Phasellus in aliquet mi. Pellentesque habitant morbi tristique senectus et netus et
+        malesuada fames ac turpis egestas. In volutpat arcu ut felis sagittis, in finibus massa
+        gravida. Pellentesque id tellus orci. Integer dictum, lorem sed efficitur ullamcorper,
+        libero justo consectetur ipsum, in mollis nisl ex sed nisl. Donec maximus ullamcorper
+        sodales. Praesent bibendum rhoncus tellus nec feugiat. In a ornare nulla. Donec rhoncus
+        libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
+        vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
+    </string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4948543..9be4467 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -13,4 +13,9 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+  <!-- Base application theme. -->
+    <style name="Base.Theme.Activities" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+    </style>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 07c0e9a..27e536f 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 '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' 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..fcb8cae 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.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From eafa4fb4c7476bd3d9916a513291622ff51f89cf Mon Sep 17 00:00:00 2001
From: Ksiana <mari.serovatova@list.ru>
Date: Sat, 4 Nov 2023 17:19:44 +0900
Subject: [PATCH 2/5] hw1

---
 app/build.gradle                              | 12 ++++-----
 app/src/main/AndroidManifest.xml              | 26 +++++-------------
 .../gpb/homework/activities/MainActivityA.kt  | 18 ++++++-------
 .../gpb/homework/activities/MainActivityB.kt  | 26 ++++++++++++++++++
 .../gpb/homework/activities/MainActivityC.kt  | 27 ++++++++++++++++++-
 .../gpb/homework/activities/MainActivityD.kt  | 14 +++++++++-
 app/src/main/res/layout/activity_main_a.xml   |  6 ++---
 app/src/main/res/layout/activity_main_b.xml   | 19 ++++++++++---
 app/src/main/res/layout/activity_main_c.xml   | 19 ++++++++++---
 app/src/main/res/layout/activity_main_d.xml   | 13 +++++++++
 build.gradle                                  |  2 +-
 11 files changed, 134 insertions(+), 48 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 24c93f7..b872653 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         applicationId "otus.gpb.homework.activities"
         minSdk 23
-        targetSdk 32
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
@@ -53,10 +53,10 @@ 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.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.4'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00d466e..ad2c511 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,45 +15,33 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Activities"
         tools:targetApi="31">
+
         <activity
             android:name=".MainActivityA"
             android:exported="true"
-            android:launchMode="standard">
+            android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".MainActivityD"
             android:exported="false"
             android:launchMode="standard">
-
-            <intent-filter>
-                <action android:name="android.intent.action.Main" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
+
         <activity
             android:name=".MainActivityC"
             android:exported="false"
-            android:launchMode="standard">
-
-            <intent-filter>
-                <action android:name="android.intent.action.Main" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:launchMode="singleTask">
         </activity>
+
         <activity
             android:name=".MainActivityB"
             android:exported="false"
-            android:launchMode="standard">
-
-            <intent-filter>
-                <action android:name="android.intent.action.Main" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+            android:launchMode="singleTask">
         </activity>
     </application>
 
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
index 2eb7aa8..9e07b6b 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
@@ -1,22 +1,20 @@
 package otus.gpb.homework.activities
 
+import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityA : AppCompatActivity(R.layout.activity_main_a) {
 
-    val button = findViewById<Button>(R.id.button_activity_B)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-    }
-
-    override fun onStart() {
-        super.onStart()
-
-//        button.setOnClickListener {
-//            val intent = Intent(this, MainActivityA::class.java)
-//            startActivity(intent)
-//        }
+        val button = findViewById<Button>(R.id.button_activity_B)
+        button.setOnClickListener {
+            val intent = Intent(this, MainActivityB::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+            startActivity(intent)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
index 971ee53..ef487f8 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
@@ -1,11 +1,37 @@
 package otus.gpb.homework.activities
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityB : AppCompatActivity(R.layout.activity_main_b) {
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_b)
     }
+
+    override fun onStart() {
+        super.onStart()
+
+        val button = findViewById<Button>(R.id.button_activity_C)
+        val button2 = findViewById<Button>(R.id.button_activity_AB)
+
+        button.setOnClickListener {
+            val intent = Intent(this, MainActivityC::class.java)
+            startActivity(intent)
+        }
+        button2.setOnClickListener {
+            val intent = Intent(this, MainActivityA::class.java)
+            startActivity(intent)
+        }
+    }
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
index 4f8a861..a7ec74e 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
@@ -1,11 +1,36 @@
 package otus.gpb.homework.activities
 
-import androidx.appcompat.app.AppCompatActivity
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityC : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_c)
     }
+
+    override fun onStart() {
+        super.onStart()
+
+        val button = findViewById<Button>(R.id.button_activity_D)
+        val button2 = findViewById<Button>(R.id.button_close_activity_C)
+
+        button.setOnClickListener {
+            val intent = Intent(this, MainActivityD::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+            startActivity(intent)
+        }
+
+
+        button2.setOnClickListener {
+            val intent = Intent(this,MainActivityB::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+            }
+
+            startActivity(intent)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
index 50cc9b5..eff13ee 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
@@ -1,11 +1,23 @@
 package otus.gpb.homework.activities
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityD : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_d)
     }
+
+    override fun onStart() {
+        super.onStart()
+
+        val button = findViewById<Button>(R.id.button_clear_D)
+
+        button.setOnClickListener {
+            finishAffinity()
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_a.xml b/app/src/main/res/layout/activity_main_a.xml
index d466561..05e16dd 100644
--- a/app/src/main/res/layout/activity_main_a.xml
+++ b/app/src/main/res/layout/activity_main_a.xml
@@ -12,11 +12,11 @@
         android:id="@+id/button_activity_B"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="120dp"
+        android:layout_marginBottom="284dp"
+        android:text="Open activity B"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="Open activity B">
+        app:layout_constraintStart_toStartOf="parent">
     </Button>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_b.xml b/app/src/main/res/layout/activity_main_b.xml
index 47ad7bc..71ec474 100644
--- a/app/src/main/res/layout/activity_main_b.xml
+++ b/app/src/main/res/layout/activity_main_b.xml
@@ -11,11 +11,22 @@
         android:id="@+id/button_activity_C"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="120dp"
+        android:layout_marginBottom="252dp"
+        android:text="Open activity C"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="Open activity C">
-    </Button>
+        app:layout_constraintHorizontal_bias="0.496"
+        app:layout_constraintStart_toStartOf="parent"></Button>
+
+    <Button
+        android:id="@+id/button_activity_AB"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="100dp"
+        android:text="Open activity A"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
+        app:layout_constraintStart_toStartOf="parent"></Button>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_c.xml b/app/src/main/res/layout/activity_main_c.xml
index ce34ba6..2baeaea 100644
--- a/app/src/main/res/layout/activity_main_c.xml
+++ b/app/src/main/res/layout/activity_main_c.xml
@@ -11,11 +11,24 @@
         android:id="@+id/button_activity_D"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="120dp"
+        android:layout_marginBottom="260dp"
+        android:text="Open activity D"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:text="Open activity D">
+        app:layout_constraintStart_toStartOf="parent">
+
+    </Button>
+
+    <Button
+        android:id="@+id/button_close_activity_C"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="128dp"
+        android:text="Close activity C"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
     </Button>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_d.xml b/app/src/main/res/layout/activity_main_d.xml
index 08bbaab..0abc98a 100644
--- a/app/src/main/res/layout/activity_main_d.xml
+++ b/app/src/main/res/layout/activity_main_d.xml
@@ -7,4 +7,17 @@
     android:background="#ffeb3b"
     tools:context=".MainActivityD">
 
+    <Button
+        android:id="@+id/button_clear_D"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:layout_marginBottom="148dp"
+        android:text="Close Stack"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+    </Button>
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 27e536f..c4334c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '8.1.2' apply false
     id 'com.android.library' version '8.1.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
 }
 

From 519c352cd4ab0763d9992b0a123294a15bdfb4ac Mon Sep 17 00:00:00 2001
From: Ksiana <mari.serovatova@list.ru>
Date: Sun, 5 Nov 2023 21:49:16 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad2c511..4fedc61 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         <activity
             android:name=".MainActivityA"
             android:exported="true"
-            android:launchMode="singleInstance">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

From 0b47ce599a68366c8f9e3017691800087d27f385 Mon Sep 17 00:00:00 2001
From: Ksiana <mari.serovatova@list.ru>
Date: Mon, 6 Nov 2023 21:24:56 +0900
Subject: [PATCH 4/5] check

---
 app/src/main/AndroidManifest.xml              | 10 +++--
 .../gpb/homework/activities/MainActivityA.kt  | 10 ++++-
 .../gpb/homework/activities/MainActivityB.kt  | 11 ------
 .../gpb/homework/activities/MainActivityC.kt  | 30 ++++++++-------
 .../gpb/homework/activities/MainActivityD.kt  | 12 ------
 app/src/main/res/layout/activity_main_a.xml   |  4 +-
 app/src/main/res/layout/activity_main_b.xml   | 19 ++--------
 app/src/main/res/layout/activity_main_c.xml   | 38 +++++++++++++++----
 app/src/main/res/layout/activity_main_d.xml   | 13 -------
 app/src/main/res/values/strings.xml           |  6 +++
 10 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4fedc61..39beee5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,22 +27,24 @@
         </activity>
 
         <activity
-            android:name=".MainActivityD"
+            android:name=".MainActivityB"
             android:exported="false"
-            android:launchMode="standard">
+            android:launchMode="singleTop">
         </activity>
 
         <activity
             android:name=".MainActivityC"
             android:exported="false"
-            android:launchMode="singleTask">
+            android:launchMode="singleTop">
         </activity>
 
         <activity
-            android:name=".MainActivityB"
+            android:name=".MainActivityD"
             android:exported="false"
             android:launchMode="singleTask">
         </activity>
+
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
index 9e07b6b..cfde982 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
@@ -2,9 +2,12 @@ package otus.gpb.homework.activities
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
+private const val TAG = "onNewIntent"
+
 class MainActivityA : AppCompatActivity(R.layout.activity_main_a) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -12,9 +15,14 @@ class MainActivityA : AppCompatActivity(R.layout.activity_main_a) {
         val button = findViewById<Button>(R.id.button_activity_B)
         button.setOnClickListener {
             val intent = Intent(this, MainActivityB::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK
             }
             startActivity(intent)
         }
     }
+
+    override fun onNewIntent(intent: Intent?) {
+        Log.d(TAG,"call newIntent activity A")
+        super.onNewIntent(intent)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
index ef487f8..183b957 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityB.kt
@@ -11,27 +11,16 @@ class MainActivityB : AppCompatActivity(R.layout.activity_main_b) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_b)
-    }
-
-    override fun onStart() {
-        super.onStart()
 
         val button = findViewById<Button>(R.id.button_activity_C)
-        val button2 = findViewById<Button>(R.id.button_activity_AB)
 
         button.setOnClickListener {
             val intent = Intent(this, MainActivityC::class.java)
             startActivity(intent)
         }
-        button2.setOnClickListener {
-            val intent = Intent(this, MainActivityA::class.java)
-            startActivity(intent)
-        }
     }
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
-
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
index a7ec74e..7dac067 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
@@ -6,31 +6,33 @@ import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityC : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_c)
-    }
-
-    override fun onStart() {
-        super.onStart()
 
-        val button = findViewById<Button>(R.id.button_activity_D)
-        val button2 = findViewById<Button>(R.id.button_close_activity_C)
+        val button = findViewById<Button>(R.id.button_open_activity_A_from_C)
+        val button2 = findViewById<Button>(R.id.button_open_activity_D_from_C)
+        val button3 = findViewById<Button>(R.id.button_close_activity_C_from_C)
+        val button4 = findViewById<Button>(R.id.button_close_Stacks)
 
         button.setOnClickListener {
-            val intent = Intent(this, MainActivityD::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
-            }
+            val intent = Intent(this, MainActivityA::class.java)
             startActivity(intent)
         }
 
-
         button2.setOnClickListener {
-            val intent = Intent(this,MainActivityB::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
-            }
-
+            val intent = Intent(this, MainActivityD::class.java)
             startActivity(intent)
         }
+
+        button3.setOnClickListener {
+            finish()
+        }
+
+        button4.setOnClickListener {
+            finishAffinity()
+        }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
index eff13ee..8b07347 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityD.kt
@@ -1,7 +1,6 @@
 package otus.gpb.homework.activities
 
 import android.os.Bundle
-import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivityD : AppCompatActivity() {
@@ -9,15 +8,4 @@ class MainActivityD : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main_d)
     }
-
-    override fun onStart() {
-        super.onStart()
-
-        val button = findViewById<Button>(R.id.button_clear_D)
-
-        button.setOnClickListener {
-            finishAffinity()
-        }
-
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_a.xml b/app/src/main/res/layout/activity_main_a.xml
index 05e16dd..94ac4fa 100644
--- a/app/src/main/res/layout/activity_main_a.xml
+++ b/app/src/main/res/layout/activity_main_a.xml
@@ -12,8 +12,8 @@
         android:id="@+id/button_activity_B"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="284dp"
-        android:text="Open activity B"
+        android:layout_marginBottom="50dp"
+        android:text="@string/open_activity_b"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
diff --git a/app/src/main/res/layout/activity_main_b.xml b/app/src/main/res/layout/activity_main_b.xml
index 71ec474..c3f5a8b 100644
--- a/app/src/main/res/layout/activity_main_b.xml
+++ b/app/src/main/res/layout/activity_main_b.xml
@@ -11,22 +11,11 @@
         android:id="@+id/button_activity_C"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="252dp"
-        android:text="Open activity C"
+        android:layout_marginBottom="50dp"
+        android:text="@string/open_activity_c"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.496"
-        app:layout_constraintStart_toStartOf="parent"></Button>
-
-    <Button
-        android:id="@+id/button_activity_AB"
-        android:layout_width="250dp"
-        android:layout_height="70dp"
-        android:layout_marginBottom="100dp"
-        android:text="Open activity A"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.496"
-        app:layout_constraintStart_toStartOf="parent"></Button>
+        app:layout_constraintStart_toStartOf="parent">
+    </Button>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_c.xml b/app/src/main/res/layout/activity_main_c.xml
index 2baeaea..6dd2b55 100644
--- a/app/src/main/res/layout/activity_main_c.xml
+++ b/app/src/main/res/layout/activity_main_c.xml
@@ -8,23 +8,47 @@
     tools:context=".MainActivityC">
 
     <Button
-        android:id="@+id/button_activity_D"
+        android:id="@+id/button_open_activity_A_from_C"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="260dp"
-        android:text="Open activity D"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="@string/open_activity_a"
+        android:layout_margin="50dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_open_activity_D_from_C"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+    </Button>
+
+    <Button
+        android:id="@+id/button_open_activity_D_from_C"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:text="@string/open_activity_d"
+        android:layout_margin="50dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_close_activity_C_from_C"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+    </Button>
+
+    <Button
+        android:id="@+id/button_close_activity_C_from_C"
+        android:layout_width="250dp"
+        android:layout_height="70dp"
+        android:text="@string/close_activity_c"
+        android:layout_margin="50dp"
+        app:layout_constraintBottom_toTopOf="@+id/button_close_Stacks"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
     </Button>
 
     <Button
-        android:id="@+id/button_close_activity_C"
+        android:id="@+id/button_close_Stacks"
         android:layout_width="250dp"
         android:layout_height="70dp"
-        android:layout_marginBottom="128dp"
-        android:text="Close activity C"
+        android:layout_marginBottom="50dp"
+        android:text="@string/close_stack"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
diff --git a/app/src/main/res/layout/activity_main_d.xml b/app/src/main/res/layout/activity_main_d.xml
index 0abc98a..08bbaab 100644
--- a/app/src/main/res/layout/activity_main_d.xml
+++ b/app/src/main/res/layout/activity_main_d.xml
@@ -7,17 +7,4 @@
     android:background="#ffeb3b"
     tools:context=".MainActivityD">
 
-    <Button
-        android:id="@+id/button_clear_D"
-        android:layout_width="250dp"
-        android:layout_height="70dp"
-        android:layout_marginBottom="148dp"
-        android:text="Close Stack"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-    </Button>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d89693b..9276a5b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,4 +42,10 @@
         libero vel nunc consequat, quis tincidunt nisl eleifend. Cras bibendum enim a justo luctus
         vestibulum. Fusce dictum libero quis erat maximus, vitae volutpat diam dignissim.
     </string>
+    <string name="open_activity_b">Open activity B</string>
+    <string name="open_activity_c">Open activity C</string>
+    <string name="open_activity_a">Open activity A</string>
+    <string name="open_activity_d">Open activity D</string>
+    <string name="close_activity_c">Close activity C</string>
+    <string name="close_stack">Close Stack</string>
 </resources>
\ No newline at end of file

From 6b17206688bbccc0d391f43cfa54489a8a658da7 Mon Sep 17 00:00:00 2001
From: Ksiana <mari.serovatova@list.ru>
Date: Mon, 6 Nov 2023 21:48:18 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE:=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=90,=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D0=B5=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                      | 11 ++++-------
 .../otus/gpb/homework/activities/MainActivityA.kt     |  2 +-
 .../otus/gpb/homework/activities/MainActivityC.kt     |  4 +++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 39beee5..8f9b200 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         <activity
             android:name=".MainActivityA"
             android:exported="true"
-            android:launchMode="singleTop">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -28,20 +28,17 @@
 
         <activity
             android:name=".MainActivityB"
-            android:exported="false"
-            android:launchMode="singleTop">
+            android:exported="false">
         </activity>
 
         <activity
             android:name=".MainActivityC"
-            android:exported="false"
-            android:launchMode="singleTop">
+            android:exported="false">
         </activity>
 
         <activity
             android:name=".MainActivityD"
-            android:exported="false"
-            android:launchMode="singleTask">
+            android:exported="false">
         </activity>
 
 
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
index cfde982..ad2ceec 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityA.kt
@@ -15,7 +15,7 @@ class MainActivityA : AppCompatActivity(R.layout.activity_main_a) {
         val button = findViewById<Button>(R.id.button_activity_B)
         button.setOnClickListener {
             val intent = Intent(this, MainActivityB::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                flags = Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
             }
             startActivity(intent)
         }
diff --git a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
index 7dac067..abc6970 100644
--- a/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
+++ b/app/src/main/java/otus/gpb/homework/activities/MainActivityC.kt
@@ -22,7 +22,9 @@ class MainActivityC : AppCompatActivity() {
         }
 
         button2.setOnClickListener {
-            val intent = Intent(this, MainActivityD::class.java)
+            val intent = Intent(this, MainActivityD::class.java).apply {
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            }
             startActivity(intent)
         }