From b82febf82adfabed0594137003b8bc78c9ad9727 Mon Sep 17 00:00:00 2001
From: moreoronce <nsy.bati@gmail.com>
Date: Mon, 7 Oct 2024 09:00:14 +0800
Subject: [PATCH] Refactor and Optimize Layouts and Resources

- Updated activity_main.xml for better layout alignment and consistent use of Material Design components.
- Added ids to LinearLayouts for easier reference and manipulation.
- Enhanced styles in styles.xml to unify the UI appearance across the app.
- Adjusted themes in themes.xml to incorporate the latest Material Components.
- Revised colors.xml and strings.xml to include new color schemes and text resources.
- Updated backup_rules.xml and various drawable resources for consistency and clarity.
---
 .gitignore                                    |  16 ++-
 .idea/deploymentTargetSelector.xml            |  18 ---
 app/build.gradle.kts                          |   1 +
 .../com/example/lobchat/WebViewActivity.kt    |  12 ++
 app/src/main/res/layout/activity_main.xml     | 136 ++++++++----------
 5 files changed, 86 insertions(+), 97 deletions(-)
 delete mode 100644 .idea/deploymentTargetSelector.xml

diff --git a/.gitignore b/.gitignore
index aa724b7..49463a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+/wrapper
+/daemon
+/cache
+/native
+/jdks
+/android
+/.tmp
+/kotlin-profile
+
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
deleted file mode 100644
index fcc5e40..0000000
--- a/.idea/deploymentTargetSelector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="Unnamed">
-        <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-05T10:05:39.736702200Z">
-          <Target type="DEFAULT_BOOT">
-            <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Archol\.android\avd\Pixel_5_API_28.avd" />
-            </handle>
-          </Target>
-        </DropdownSelection>
-        <DialogSelection />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b750540..8716c94 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -65,6 +65,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.constraintlayout)
+    implementation("androidx.activity:activity-ktx:1.9.2")
     implementation(libs.material)
 
     testImplementation(libs.junit)
diff --git a/app/src/main/java/com/example/lobchat/WebViewActivity.kt b/app/src/main/java/com/example/lobchat/WebViewActivity.kt
index e64dd06..a282aa1 100644
--- a/app/src/main/java/com/example/lobchat/WebViewActivity.kt
+++ b/app/src/main/java/com/example/lobchat/WebViewActivity.kt
@@ -49,6 +49,18 @@ class WebViewActivity : AppCompatActivity() {
         }
     }
 
+    // 增加处理Android返回键逻辑
+    override fun onBackPressed() {
+        if (webView.canGoBack()) {
+            // 如果WebView能够返回上一页
+            webView.goBack()
+        } else {
+            // 否则调用super以处理默认的后退行为
+            super.onBackPressed()
+        }
+    }
+
+
     private fun setupWebView() {
         val webSettings: WebSettings = webView.settings
         webSettings.javaScriptEnabled = true
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ee2b36b..0006c88 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,91 +1,81 @@
 <FrameLayout
     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"
-    tools:context=".MainActivity">
+    android:layout_height="match_parent">
 
-    <!-- URL 输入部分，包括 Logo、URL 输入框和提交按钮 -->
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/urlInputLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/logo_3d"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_marginTop="84dp"
-            android:layout_marginEnd="8dp"
-            android:contentDescription="@string/logo_3d_description"
-            android:src="@drawable/logo_3d"
-            app:layout_constraintEnd_toStartOf="@+id/appLogo"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/appLogo"
-            android:layout_width="200dp"
-            android:layout_height="100dp"
-            android:contentDescription="@string/logo_3d_description"
-            android:src="@drawable/logo"
-            app:layout_constraintBottom_toBottomOf="@+id/logo_3d"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/logo_3d" />
-
-        <EditText
-            android:id="@+id/urlInput"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:layout_marginTop="16dp"
-            android:autofillHints="url"
-            android:background="@drawable/search_box_background"
-            android:hint="@string/enter_your_server_url"
-            android:inputType="textUri"
-            android:padding="12dp"
-            android:textColor="@color/cyan_dark_0"
-            android:textColorHint="@color/gray_dark_8"
-            android:textSize="14sp"
-            android:lineSpacingExtra="1.571dp"
-            android:paddingTop="6dp"
-            android:paddingBottom="6dp"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/appLogo" />
-
-        <!-- 提交按钮 -->
-        <Button
-            android:id="@+id/loadUrlButton"
+        <!-- 包含两个ImageView的容器 -->
+        <LinearLayout
+            android:id="@+id/logoPos"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/button_rounded_background"
+            android:orientation="horizontal"
             android:gravity="center"
-            android:lineSpacingExtra="1.57dp"
-            android:paddingLeft="15dp"
-            android:paddingTop="6dp"
-            android:paddingRight="15dp"
-            android:paddingBottom="6dp"
-            android:text="@string/send"
-            android:textAllCaps="false"
-            android:textColor="@android:color/white"
-            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="84dp">
+
+            <ImageView
+                android:id="@+id/logo_3d"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:contentDescription="@string/logo_3d_description"
+                android:src="@drawable/logo_3d" />
+
+            <ImageView
+                android:id="@+id/appLogo"
+                android:layout_width="200dp"
+                android:layout_height="80dp"
+                android:contentDescription="@string/app_logo"
+                android:src="@drawable/logo" />
+
+        </LinearLayout>
+
+        <!-- 输入框和按钮 -->
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/urlInput" />
+            app:layout_constraintTop_toBottomOf="@id/logoPos"
+            android:layout_marginTop="20dp"
+            app:layout_constraintWidth_percent="0.8">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/urlInput"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/enter_your_server_url"
+                    android:inputType="textUri"
+                    android:textColor="@color/cyan_dark_0"
+                    android:textColorHint="@color/gray_dark_8"
+                    android:textSize="14sp" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/loadUrlButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:backgroundTint="@color/gray_dark_0"
+                android:text="@string/send"
+                android:textColor="@android:color/white"
+                android:textAllCaps="false"
+                app:cornerRadius="4dp" />
+
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!-- WebView 控件 -->
-    <WebView
-        android:id="@+id/webView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="gone"/>
-
 </FrameLayout>