From 3fcdeab70236bade9db9e617fb049f725fd74882 Mon Sep 17 00:00:00 2001 From: xfy Date: Tue, 16 Jun 2026 16:26:14 +0800 Subject: [PATCH] feat: navigate to DogParkActivity from AboutActivity --- .../main/kotlin/plus/rua/project/AboutActivity.kt | 4 +++- .../main/kotlin/plus/rua/project/BaseActivity.kt | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/plus/rua/project/AboutActivity.kt b/app/src/main/kotlin/plus/rua/project/AboutActivity.kt index e53fc7c..ce0ea3a 100644 --- a/app/src/main/kotlin/plus/rua/project/AboutActivity.kt +++ b/app/src/main/kotlin/plus/rua/project/AboutActivity.kt @@ -17,7 +17,9 @@ class AboutActivity : BaseActivity() { onNavigateToLicenses = { startActivityWithSlide(Intent(this, LicensesActivity::class.java)) }, - onNavigateToDogPark = {} + onNavigateToDogPark = { + startActivityWithFade(Intent(this, DogParkActivity::class.java)) + } ) } } diff --git a/app/src/main/kotlin/plus/rua/project/BaseActivity.kt b/app/src/main/kotlin/plus/rua/project/BaseActivity.kt index b55df0f..828fabb 100644 --- a/app/src/main/kotlin/plus/rua/project/BaseActivity.kt +++ b/app/src/main/kotlin/plus/rua/project/BaseActivity.kt @@ -57,4 +57,19 @@ abstract class BaseActivity : ComponentActivity() { overridePendingTransition(enterAnim, exitAnim) } } + + /** + * 带 fade 进入动画的 startActivity。 + */ + protected fun startActivityWithFade( + intent: android.content.Intent, + @AnimRes enterAnim: Int = R.anim.fade_in, + @AnimRes exitAnim: Int = R.anim.fade_out + ) { + startActivity(intent) + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { + @Suppress("DEPRECATION") // API 34+ 使用 overrideActivityTransition,低版本仍用 overridePendingTransition 实现 fade 转场 + overridePendingTransition(enterAnim, exitAnim) + } + } }