Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
namespace 'otus.gpb.homework.activities'
buildFeatures {
Expand Down
24 changes: 23 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,28 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Activities"
tools:targetApi="31" />
tools:targetApi="31">

<activity
android:name=".ActivityD"
android:exported="false"
android:taskAffinity="tasks2"/>
<activity
android:name=".ActivityC"
android:exported="false"
android:taskAffinity="tasks2"/>
<activity
android:name=".ActivityB"
android:exported="false"
android:taskAffinity="tasks2"/>

<activity android:name=".ActivityA" android:exported="true" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>

</manifest>
40 changes: 40 additions & 0 deletions app/src/main/java/otus/gpb/homework/activities/ActivityA.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package otus.gpb.homework.activities

import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.ViewGroup
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat

class ActivityA : AppCompatActivity(), BaseComponentsI {

override lateinit var buttonOpenView: Button
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_a)
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
}

getSupportActionBar()?.setTitle("Activity A")

buttonOpenView = findViewById<ViewGroup>(R.id.base).findViewById(R.id.button)
buttonOpenView.text = resources.getStringArray(R.array.open_buttons)[1] // Open Activity B
buttonOpenView.setOnClickListener {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mahonin-ms, тут надо еще подумать.
Задание:

По клику на кнопку “Open ActivityB” запустите ActivityB в отдельном стеке

А у вас и режим запуска стандартный и affinity нету - откроется в том же стеке

startActivity( Intent(this, ActivityB::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
}
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
Log.d("ActivityA", "get ActivityA and call callback onNewIntent")
}

}
32 changes: 32 additions & 0 deletions app/src/main/java/otus/gpb/homework/activities/ActivityB.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package otus.gpb.homework.activities

import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat

class ActivityB : AppCompatActivity(), BaseComponentsI {
override lateinit var buttonOpenView: Button
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_b)
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
}

getSupportActionBar()?.setTitle("Activity B")

buttonOpenView = findViewById<ViewGroup>(R.id.base).findViewById(R.id.button)
buttonOpenView.text = resources.getStringArray(R.array.open_buttons)[2] // Open Activity C
buttonOpenView.setOnClickListener {
startActivity( Intent(this, ActivityC::class.java))
}
}
}
51 changes: 51 additions & 0 deletions app/src/main/java/otus/gpb/homework/activities/ActivityC.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package otus.gpb.homework.activities

import android.content.Intent
import android.os.Bundle
import android.view.ViewGroup
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat

class ActivityC : AppCompatActivity() {
private lateinit var btn1:Button // Open A
private lateinit var btn2:Button // Open D
private lateinit var btn3:Button // Close C
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_c)
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
}

getSupportActionBar()?.setTitle("Activity C")

btn1 = findViewById<ViewGroup>(R.id.base_1).findViewById(R.id.button)
btn1.text = resources.getStringArray(R.array.open_buttons)[0] // Open Activity A
btn1.setOnClickListener {
val intent = Intent(this, ActivityA::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
startActivity(intent)
}

btn2 = findViewById<ViewGroup>(R.id.base_2).findViewById(R.id.button)
btn2.text = resources.getStringArray(R.array.open_buttons)[3] // Open Activity D
btn2.setOnClickListener {
val intent = Intent(this, ActivityD::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
startActivity(intent)
}

btn3 = findViewById<ViewGroup>(R.id.base_3).findViewById(R.id.button)
btn3.text = resources.getStringArray(R.array.close_buttons)[0] // Close Activity C
btn3.setOnClickListener { finish() }

}
}
33 changes: 33 additions & 0 deletions app/src/main/java/otus/gpb/homework/activities/ActivityD.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package otus.gpb.homework.activities

import android.os.Bundle
import android.view.ViewGroup
import android.widget.Button
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat

class ActivityD : AppCompatActivity(), BaseComponentsI {
override lateinit var buttonOpenView: Button
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContentView(R.layout.activity_d)
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
}

getSupportActionBar()?.setTitle("Activity D")

buttonOpenView = findViewById<ViewGroup>(R.id.base).findViewById(R.id.button)
buttonOpenView.text = resources.getStringArray(R.array.close_buttons)[1] // Close Stack
buttonOpenView.setOnClickListener {
finishAffinity()
}
}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package otus.gpb.homework.activities

import android.widget.Button


interface BaseComponentsI {
val buttonOpenView: Button
}
16 changes: 16 additions & 0 deletions app/src/main/res/layout/activity_a.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ActivityA"
android:background="#f44336">

<include layout="@layout/base"
android:id="@+id/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />


</LinearLayout >
15 changes: 15 additions & 0 deletions app/src/main/res/layout/activity_b.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ActivityB"
android:background="#4caf50">

<include layout="@layout/base"
android:id="@+id/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</LinearLayout>
29 changes: 29 additions & 0 deletions app/src/main/res/layout/activity_c.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ActivityC"
android:background="#2196f3">

<include
android:id="@+id/base_1"
layout="@layout/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<include
android:id="@+id/base_2"
layout="@layout/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<include
android:id="@+id/base_3"
layout="@layout/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</LinearLayout>
15 changes: 15 additions & 0 deletions app/src/main/res/layout/activity_d.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ActivityD"
android:background="#ffeb3b">

<include layout="@layout/base"
android:id="@+id/base"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

</LinearLayout>
16 changes: 16 additions & 0 deletions app/src/main/res/layout/base.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">


<Button
android:id="@+id/button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Button"
android:layout_marginTop="128dp" >
</Button>

</LinearLayout>
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<resources>
<string name="app_name">Activities</string>
<string-array name="open_buttons">
<item>Open Activity A</item>
<item>Open Activity B</item>
<item>Open Activity C</item>
<item>Open Activity D</item>
</string-array>
<string-array name="close_buttons">
<item>Close Activity C</item>
<item>Close Stack</item>
</string-array>
</resources>
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Sat Aug 27 13:57:30 MSK 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME