From 66a4a5c3aa78869a3c51e79f2a6a610c99016c24 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 16 四月 2025 08:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/res/layout/activity_setting.xml | 2 +-
app/src/main/java/com/example/firstapp/activity/AboutCompanyActivity.kt | 13 +++++++++++++
app/src/main/res/layout/activity_about_company.xml | 1 +
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/activity/AboutCompanyActivity.kt b/app/src/main/java/com/example/firstapp/activity/AboutCompanyActivity.kt
index 1553514..1205e1f 100644
--- a/app/src/main/java/com/example/firstapp/activity/AboutCompanyActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/AboutCompanyActivity.kt
@@ -3,6 +3,7 @@
import android.content.Intent
import android.net.Uri
import android.os.Bundle
+import android.view.MenuItem
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
@@ -51,4 +52,16 @@
}
}
+
+ override fun onOptionsItemSelected(item: MenuItem): Boolean {
+ return when (item.itemId) {
+ android.R.id.home -> {
+ // 处理返回按钮的点击事件
+ onBackPressed()
+ true
+ }
+ else -> super.onOptionsItemSelected(item)
+ }
+ }
+
}
diff --git a/app/src/main/res/layout/activity_about_company.xml b/app/src/main/res/layout/activity_about_company.xml
index 1414bd7..853f61f 100644
--- a/app/src/main/res/layout/activity_about_company.xml
+++ b/app/src/main/res/layout/activity_about_company.xml
@@ -39,6 +39,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
android:gravity="center"
tools:ignore="MissingConstraints">
<ImageView
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 47e1c7d..b66c6ac 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -41,7 +41,7 @@
android:gravity="center"
android:orientation="vertical"
android:background="#F9F9F9"
- android:layout_marginTop="1dp"
+ android:layout_marginTop="10dp"
>
<TextView
--
Gitblit v1.9.3