Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo app: don't start the main activity again, just finish the current one #604

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Demo app: don't start the main activity again, just finish the current one #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63b3f6c
just finish the current activity instead of starting the main activit…
magda-woj Sep 18, 2024
7371807
unused imports
magda-woj Sep 18, 2024
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
5 changes: 0 additions & 5 deletions demo-app/src/main/java/io/opentelemetry/android/demo/about/AboutActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package io.opentelemetry.android.demo.about

import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.bottomnavigation.BottomNavigationView
import io.opentelemetry.android.demo.MainActivity
import io.opentelemetry.android.demo.R

class AboutActivity : AppCompatActivity() {
Expand All @@ -25,9 +23,6 @@ class AboutActivity : AppCompatActivity() {
bottomNavigationView.setOnItemSelectedListener { item ->
when (item.itemId) {
R.id.navigation_exit -> {
val intent = Intent(this, MainActivity::class.java)
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
startActivity(intent)
finish()
true
}
Expand Down
4 changes: 0 additions & 4 deletions demo-app/src/main/java/io/opentelemetry/android/demo/shop/ui/AstronomyShopActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.android.demo.shop.ui

import android.app.Activity
import android.content.Intent
import android.os.Bundle
import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -23,7 +22,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import io.opentelemetry.android.demo.MainActivity
import io.opentelemetry.android.demo.shop.clients.ProductCatalogClient
import io.opentelemetry.android.demo.theme.DemoAppTheme
import io.opentelemetry.android.demo.shop.ui.cart.CartScreen
Expand Down Expand Up @@ -66,8 +64,6 @@ fun AstronomyShopScreen() {
}
},
onExitClicked = {
val intent = Intent(context, MainActivity::class.java)
context.startActivity(intent)
(context as? Activity)?.finish()
}
)
Expand Down