fix: 完善聊天界面功能面板

完善聊天界面功能面板
2024-10-29 22:35:49 +08:00 · 2024-10-29 22:35:49 +08:00 · e6094e9a33
commit e6094e9a33
parent 4ac75337ec
31 changed files with 332 additions and 106 deletions
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -69,6 +69,9 @@ dependencies {
    implementation(libs.kotlinx.coroutines.core)
    implementation(libs.kotlinx.coroutines.android)

+    implementation(libs.shapeview)
+    implementation(libs.shapedrawable)
+
 //    implementation(libs.therouter)
 //    ksp(libs.therouter.ksp)
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -20,26 +20,4 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile

-# TheRouter
-# need add for Fragment page route
-# -keep public class * extends android.app.Fragment
-# -keep public class * extends androidx.fragment.app.Fragment
-# -keep public class * extends android.support.v4.app.Fragment
-
-keep class androidx.annotation.Keep
-keep @androidx.annotation.Keep class * {*;}
-keepclassmembers class * {
-    @androidx.annotation.Keep *;
-}
-keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
-}
-keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
-}
-keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
-}
-keepclasseswithmembers class * {
-    @com.therouter.router.Autowired <fields>;
-}
+-keep class com.hjq.shape.** {*;}
--- a/app/src/androidTest/java/com/kaixed/kchat/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/kaixed/kchat/ExampleInstrumentedTest.kt
@ -1,26 +1,17 @@
-package com.kaixed.kchat;
+package com.kaixed.kchat

-import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith

-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
    @Test
-    public void useAppContext() {
+    fun useAppContext() {
        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.kaixed.kchat", appContext.getPackageName());
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        Assert.assertEquals("com.kaixed.kchat", appContext.packageName)
    }
-}
+}
--- a/app/src/main/java/com/kaixed/kchat/model/FunctionItem.kt
+++ b/app/src/main/java/com/kaixed/kchat/model/FunctionItem.kt
@ -0,0 +1,10 @@
+package com.kaixed.kchat.model
+
+/**
+ * @Author: kaixed
+ * @Date: 2024/10/29 13:02
+ */
+data class FunctionItem(
+    val itemName: String,
+    val iconResId: Int
+)
--- a/app/src/main/java/com/kaixed/kchat/ui/activity/ApproveContactRequestActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/ApproveContactRequestActivity.kt
@ -32,7 +32,7 @@ class ApproveContactRequestActivity : BaseActivity() {
        val nickname = intent.getStringExtra("nickname")
        val message = intent.getStringExtra("message")
        binding.etRemark.setText(nickname)
-        binding.tvMessage.text = "“$message”"
+        binding.tvMessage.text = "$message"
    }

    private fun setOnClickListener() {
--- a/app/src/main/java/com/kaixed/kchat/ui/activity/ApproveDetailActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/ApproveDetailActivity.kt
@ -1,8 +1,10 @@
 package com.kaixed.kchat.ui.activity

 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
+import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import com.kaixed.kchat.databinding.ActivityApproveDetailBinding
@ -14,15 +16,15 @@ class ApproveDetailActivity : AppCompatActivity() {

    private var request: FriendRequestItem? = null

+    @RequiresApi(Build.VERSION_CODES.TIRAMISU)
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        enableEdgeToEdge()
        binding = ActivityApproveDetailBinding.inflate(layoutInflater)
        setContentView(binding.root)

-        request = intent.getParcelableExtra("request") as? FriendRequestItem
+        request = intent.getParcelableExtra("request", FriendRequestItem::class.java)

-        setContent()
        setOnClick()
    }

@ -44,10 +46,12 @@ class ApproveDetailActivity : AppCompatActivity() {
        }

        binding.rlGotoVerify.setOnClickListener {
-            startActivity(Intent(this, ApproveContactRequestActivity::class.java).apply {
-                putExtra("nickname", request?.nickname)
-                putExtra("message", request?.message)
-            })
+            startActivity(
+                Intent(this, ApproveContactRequestActivity::class.java).apply {
+                    putExtra("nickname", request?.nickname)
+                    putExtra("message", request?.message)
+                }
+            )
        }
    }
-}
+}
--- a/app/src/main/java/com/kaixed/kchat/ui/activity/ChatActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/ChatActivity.kt
@ -23,10 +23,12 @@ import androidx.core.widget.addTextChangedListener
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.kaixed.kchat.R
 import com.kaixed.kchat.data.objectbox.ObjectBox.get
 import com.kaixed.kchat.data.objectbox.entity.Messages
 import com.kaixed.kchat.data.objectbox.entity.Messages_
 import com.kaixed.kchat.databinding.ActivityChatBinding
+import com.kaixed.kchat.model.FunctionItem
 import com.kaixed.kchat.service.WebSocketService
 import com.kaixed.kchat.service.WebSocketService.LocalBinder
 import com.kaixed.kchat.ui.adapter.ChatAdapter
@ -327,17 +329,28 @@ class ChatActivity : BaseActivity(), OnItemClickListener {
        val gridLayoutManager = GridLayoutManager(this, 7)
        binding.rvEmoji.layoutManager = gridLayoutManager

-        val strings1: MutableList<String> = ArrayList()
-        strings1.add("相册")
-        strings1.add("拍摄")
-        strings1.add("位置")
-        strings1.add("名片")
-        strings1.add("红包")
-        strings1.add("转账")
-        strings1.add("文件")
-        strings1.add("我的收藏")
+        val map: MutableMap<String, Int> = mutableMapOf()

-        val functionPanelAdapter = FunctionPanelAdapter(strings1, this)
+        map["相册"] = R.drawable.ic_filled_picture
+        map["拍摄"] = R.drawable.ic_filled_camera
+        map["位置"] = R.drawable.ic_filled_location
+        map["名片"] = R.drawable.ic_filled_personal
+        map["转账"] = R.drawable.ic_filled_transfer
+        map["文件"] = R.drawable.ic_folder_filled
+        map["语音输入"] = R.drawable.ic_filled_voiceinput
+        map["我的收藏"] = R.drawable.ic_filled_favorites
+
+        val functionItems = mutableListOf<FunctionItem>()
+        for (i in map.keys) {
+            functionItems.add(
+                FunctionItem(
+                    i,
+                    map[i]!!
+                )
+            )
+        }
+
+        val functionPanelAdapter = FunctionPanelAdapter(functionItems, this)
        binding.gvFunctionPanel.adapter = functionPanelAdapter
    }

--- a/app/src/main/java/com/kaixed/kchat/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/MainActivity.kt
@ -85,6 +85,7 @@ class MainActivity : AppCompatActivity(), OnChatListItemClickListener {
            startActivity(intent)
        }
    }
+
    private fun flipImage(v: View) {
        val flipAnimation = if (isFlipped) {
            ObjectAnimator.ofFloat(v, "rotationX", 180f, 0f)
--- a/app/src/main/java/com/kaixed/kchat/ui/activity/ProfileActivity.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/activity/ProfileActivity.kt
@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.kaixed.kchat.databinding.ActivityProfileBinding
+import com.kaixed.kchat.ui.widget.MyBottomSheetFragment


 class ProfileActivity : AppCompatActivity() {
@ -20,18 +21,8 @@ class ProfileActivity : AppCompatActivity() {
        }

        binding.rlSetting.setOnClickListener {
-//            val intent = Intent(this, SettingActivity::class.java)
-//            startActivity(intent)
-//            supportFragmentManager
-//                .beginTransaction()
-//                .replace(
-//                    binding.fragmentContainer.id,
-//                    SettingsFragment()
-//                ) // fragment_container 是你的布局中的容器ID
-//                .commit()
-//            binding.clProfile.visibility = View.GONE
-//            binding.llSettingItems.visibility = View.GONE
-
+            val bottomSheetFragment = MyBottomSheetFragment()
+            bottomSheetFragment.show(supportFragmentManager, bottomSheetFragment.tag)
        }
    }
-}
+}
--- a/app/src/main/java/com/kaixed/kchat/ui/adapter/FunctionPanelAdapter.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/adapter/FunctionPanelAdapter.kt
@ -6,17 +6,18 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.BaseAdapter
 import com.kaixed.kchat.databinding.FunctionGridItemBinding
+import com.kaixed.kchat.model.FunctionItem

 /**
 * @Author: kaixed
 * @Date: 2024/10/27 18:29
 */
 class FunctionPanelAdapter(
-    private val strings: List<String>?,
+    private val items: List<FunctionItem>,
    private val context: Context
 ) :
    BaseAdapter() {
-    override fun getCount(): Int = strings?.size ?: 0
+    override fun getCount(): Int = items.size
    override fun getItem(position: Int): Any? {
        return null
    }
@ -39,8 +40,8 @@ class FunctionPanelAdapter(
            // convertView 不为空时，直接复用已有的 View
            binding = convertView.tag as FunctionGridItemBinding
        }
-        binding.tvItemName.text = strings?.get(position)
-
+        binding.tvItemName.text = items[position].itemName
+        binding.ivItem.setImageResource(items[position].iconResId)
        return convertView
    }
 }
--- a/app/src/main/java/com/kaixed/kchat/ui/adapter/MessageListAdapter.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/adapter/MessageListAdapter.kt
@ -34,7 +34,6 @@ class MessageListAdapter(private val items: MutableList<FriendRequestItem>, val
    override fun getItemCount(): Int = items.size

    override fun onBindViewHolder(holder: MyViewHolder, position: Int) {
-
        holder.binding.root.setOnClickListener {
            val intent = Intent(context, ApproveDetailActivity::class.java)
            intent.putExtra("request", items[position])
@ -42,11 +41,13 @@ class MessageListAdapter(private val items: MutableList<FriendRequestItem>, val
        }

        holder.binding.tvAdd.setOnClickListener {
-            context.startActivity(Intent(context, ApproveContactRequestActivity::class.java).apply {
-                putExtra("nickname", items[position].nickname)
-                putExtra("contactId", items[position].username)
-                putExtra("message", items[position].message)
-            })
+            context.startActivity(
+                Intent(context, ApproveContactRequestActivity::class.java).apply {
+                    putExtra("nickname", items[position].nickname)
+                    putExtra("contactId", items[position].username)
+                    putExtra("message", items[position].message)
+                }
+            )
        }

        holder.binding.top.visibility = if (position == 0) View.GONE else View.VISIBLE
@ -56,7 +57,5 @@ class MessageListAdapter(private val items: MutableList<FriendRequestItem>, val
        Glide.with(context).load(items[position].avatarUrl).into(holder.binding.ifvAvatar)
        holder.binding.tvMessage.text = items[position].message
        holder.binding.tvNickname.text = items[position].nickname
-
    }
-
-}
+}
--- a/app/src/main/java/com/kaixed/kchat/ui/widget/MyBottomSheetFragment.kt
+++ b/app/src/main/java/com/kaixed/kchat/ui/widget/MyBottomSheetFragment.kt
@ -0,0 +1,71 @@
+package com.kaixed.kchat.ui.widget
+
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.kaixed.kchat.R
+import com.kaixed.kchat.databinding.BottomSheetLayoutBinding
+import com.kaixed.kchat.ui.activity.LoginActivity
+import com.kaixed.kchat.utils.Constants.MMKV_USER_SESSION
+import com.tencent.mmkv.MMKV
+
+/**
+ * @Author: kaixed
+ * @Date: 2024/10/29 13:45
+ */
+class MyBottomSheetFragment : BottomSheetDialogFragment() {
+
+    private var _binding: BottomSheetLayoutBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = BottomSheetLayoutBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NORMAL, R.style.MyBottomSheetDialogStyle)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.tvQuitAccount.setOnClickListener {
+            val mmkv = MMKV.mmkvWithID(MMKV_USER_SESSION)
+            mmkv.clearAll()
+            activity?.finish()
+
+            activity?.startActivity(
+                Intent(
+                    activity,
+                    LoginActivity::class.java
+                ).apply {
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                }
+            )
+        }
+
+        binding.tvCancel.setOnClickListener {
+            dismiss()
+        }
+
+        binding.tvQuitApp.setOnClickListener {
+            activity?.finishAffinity()
+        }
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
--- a/app/src/main/res/drawable/bac_chat_function_panel.xml
+++ b/app/src/main/res/drawable/bac_chat_function_panel.xml
@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">

-    <corners android:radius="10dp" />
+    <corners android:radius="14dp" />

    <solid android:color="@color/white" />

--- a/app/src/main/res/drawable/ic_filled_camera.xml
+++ b/app/src/main/res/drawable/ic_filled_camera.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.732,4C14.9,4 15.056,4.084 15.148,4.223L17,7h4C21.552,7 22,7.448 22,8V19C22,19.552 21.552,20 21,20H3C2.448,20 2,19.552 2,19V8C2,7.448 2.448,7 3,7H7L8.852,4.223C8.944,4.084 9.1,4 9.268,4H14.732zM12,16.5C13.933,16.5 15.5,14.933 15.5,13 15.5,11.067 13.933,9.5 12,9.5 10.067,9.5 8.5,11.067 8.5,13 8.5,14.933 10.067,16.5 12,16.5z"
+      android:strokeWidth="1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_favorites.xml
+++ b/app/src/main/res/drawable/ic_filled_favorites.xml
@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.653,6.771 L12,11.189 4.348,6.771C4.348,6.771 9.064,4.073 11.195,2.855 11.639,2.6 12.361,2.601 12.806,2.855 14.879,4.04 19.653,6.771 19.653,6.771zM20.39,7.962C20.39,7.962 20.39,13.397 20.4,15.887 20.4,16.391 20.039,17.005 19.595,17.259 17.386,18.522 12.7,21.193 12.7,21.193L12.7,12.401L20.39,7.962zM11.3,21.193C11.3,21.193 6.659,18.505 4.406,17.259 3.961,17.005 3.6,16.386 3.6,15.887 3.6,13.311 3.61,7.961 3.61,7.961L11.3,12.401v8.792z"
+      android:fillColor="#000"
+      android:fillAlpha="0.9"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_location.xml
+++ b/app/src/main/res/drawable/ic_filled_location.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M33.785,66.403C33.785,66.403 12,48.055 12,30 12,16.745 22.745,6 36,6 49.255,6 60,16.745 60,30c0,18.055 -21.774,36.393 -21.774,36.393C37.001,67.518 35.008,67.506 33.785,66.403zM36,40.5C41.799,40.5 46.5,35.799 46.5,30 46.5,24.201 41.799,19.5 36,19.5 30.201,19.5 25.5,24.201 25.5,30 25.5,35.799 30.201,40.5 36,40.5z"
+      android:strokeWidth="1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_personal.xml
+++ b/app/src/main/res/drawable/ic_filled_personal.xml
@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M16.6,7c0,2.5 -2,4.6 -4.6,4.6c-2.5,0 -4.6,-2 -4.6,-4.6c0,-2.5 2,-4.6 4.6,-4.6C14.5,2.4 16.6,4.4 16.6,7z"
+      android:fillType="evenOdd"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,21.6c8.6,0 9.6,0 9.6,-2.9c0,-2.5 -4.8,-5.6 -9.6,-5.6c-4.8,0 -9.6,3.1 -9.6,5.6C2.4,21.6 3.4,21.6 12,21.6z"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_picture.xml
+++ b/app/src/main/res/drawable/ic_filled_picture.xml
@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M8.975,12H63.025C64.634,12 66,13.443 66,15.224V56.776C66,58.563 64.668,60 63.025,60H8.975C7.366,60 6,58.557 6,56.776V15.224C6,13.436 7.332,12 8.975,12zM60,41.044 L54.766,36.285C53.42,35.077 51.214,35.053 49.827,36.232L42.981,42.055 29.552,30.255C28.214,29.08 25.985,29.026 24.598,30.148L12,40.336V18H60V41.044z"
+      android:fillColor="#000"
+      android:fillAlpha="0.9"
+      android:fillType="evenOdd"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_transfer.xml
+++ b/app/src/main/res/drawable/ic_filled_transfer.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M61.016,40.5c0.828,0 1.5,0.672 1.5,1.5C62.516,42.47 62.296,42.913 61.921,43.197L43.562,57.077C43.033,57.477 42.281,57.372 41.881,56.843 41.647,56.534 41.577,56.131 41.693,55.761L44.597,46.5L10.5,46.5v-6L61.016,40.5zM30.116,15.157C30.35,15.466 30.42,15.869 30.304,16.239L27.4,25.5L61.5,25.5v6L10.981,31.5C10.152,31.5 9.481,30.828 9.481,30 9.481,29.53 9.701,29.087 10.076,28.803L28.435,14.923C28.964,14.523 29.716,14.628 30.116,15.157z"
+      android:strokeWidth="1"
+      android:fillColor="#000"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_filled_voiceinput.xml
+++ b/app/src/main/res/drawable/ic_filled_voiceinput.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M25.433,5.171C27.978,6.64 28.85,9.894 27.381,12.439L22.939,20.132C21.47,22.677 18.216,23.549 15.671,22.08 13.126,20.61 12.254,17.356 13.723,14.811L18.164,7.118C19.634,4.573 22.888,3.701 25.433,5.171zM14.452,26.319L13.338,28.248L11.495,27.184L12.609,25.255C8.726,22.402 7.53,17.023 9.995,12.754L11.715,9.776L13.558,10.84L11.859,13.782C9.802,17.345 11.023,21.901 14.586,23.959 18.149,26.016 22.705,24.795 24.762,21.232L26.461,18.289L28.304,19.354L26.585,22.332C24.12,26.601 18.864,28.255 14.452,26.319zM10.952,28.123L12.796,29.188L11.233,30.369C11.089,30.478 10.883,30.45 10.774,30.305 10.723,30.237 10.7,30.152 10.711,30.067L10.952,28.123z"
+      android:strokeWidth="1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/drawable/ic_folder_filled.xml
+++ b/app/src/main/res/drawable/ic_folder_filled.xml
@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,4L8.75,4L10.625,5.5L21,5.5C21.552,5.5 22,5.948 22,6.5L22,19C22,19.552 21.552,20 21,20L3,20C2.448,20 2,19.552 2,19L2,5C2,4.448 2.448,4 3,4zM3.5,9L3.5,10.5h17L20.5,9L3.5,9z"
+      android:strokeWidth="1"
+      android:fillColor="#000"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="@color/gray"
+    android:background="#F7F7F7"
    android:fitsSystemWindows="true"
    android:orientation="vertical">

@ -161,7 +161,6 @@
            android:id="@+id/gv_function_panel"
            android:layout_width="0dp"
            android:layout_height="250dp"
-            android:background="@color/gray"
            android:numColumns="4"
            android:visibility="invisible"
            app:layout_constraintBottom_toBottomOf="parent"
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -83,6 +83,7 @@
        android:layout_marginStart="35dp"
        android:background="@null"
        android:hint="请填写密码"
+        android:inputType="textPassword"
        android:textCursorDrawable="@drawable/cursor"
        app:layout_constraintBottom_toTopOf="@id/view2"
        app:layout_constraintEnd_toEndOf="parent"
--- a/app/src/main/res/layout/bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/bottom_sheet_layout.xml
@ -0,0 +1,42 @@
+<com.hjq.shape.layout.ShapeLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/gray"
+    android:orientation="vertical"
+    app:shape_radiusInTopLeft="16dp"
+    app:shape_radiusInTopRight="16dp"
+    app:shape_type="rectangle">
+
+    <com.hjq.shape.view.ShapeTextView
+        android:id="@+id/tv_quit_account"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:gravity="center_horizontal|center_vertical"
+        android:text="退出登录"
+        android:textColor="@color/black"
+        app:shape_radiusInTopLeft="16dp"
+        app:shape_radiusInTopRight="16dp"
+        app:shape_solidColor="@color/white"
+        app:shape_type="rectangle" />
+
+    <TextView
+        android:id="@+id/tv_quit_app"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginTop="1dp"
+        android:background="@color/white"
+        android:gravity="center_horizontal|center_vertical"
+        android:text="关闭应用"
+        android:textColor="@color/black" />
+
+    <TextView
+        android:id="@+id/tv_cancel"
+        android:layout_width="match_parent"
+        android:layout_height="55dp"
+        android:layout_marginTop="8dp"
+        android:background="@color/white"
+        android:gravity="center_horizontal|center_vertical"
+        android:text="取消"
+        android:textColor="@color/black" />
+</com.hjq.shape.layout.ShapeLinearLayout>
--- a/app/src/main/res/layout/function_grid_item.xml
+++ b/app/src/main/res/layout/function_grid_item.xml
@ -6,7 +6,7 @@
    android:padding="20dp">

    <ImageView
-        android:id="@+id/iv_item"
+        android:id="@+id/iv_bg"
        android:layout_width="55dp"
        android:layout_height="55dp"
        android:background="@drawable/bac_chat_function_panel"
@ -14,15 +14,25 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent" />

+    <ImageView
+        android:id="@+id/iv_item"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        app:layout_constraintBottom_toBottomOf="@id/iv_bg"
+        app:layout_constraintEnd_toEndOf="@id/iv_bg"
+        app:layout_constraintStart_toStartOf="@id/iv_bg"
+        app:layout_constraintTop_toTopOf="@id/iv_bg" />
+
    <TextView
        android:id="@+id/tv_item_name"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="5dp"
        android:text="哈哈"
+        android:textColor="#6F6F6F"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/iv_item"
-        app:layout_constraintStart_toStartOf="@id/iv_item"
-        app:layout_constraintTop_toBottomOf="@id/iv_item" />
+        app:layout_constraintEnd_toEndOf="@id/iv_bg"
+        app:layout_constraintStart_toStartOf="@id/iv_bg"
+        app:layout_constraintTop_toBottomOf="@id/iv_bg" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -8,4 +8,12 @@
    <style name="RemoveYellowBg" parent="Theme.AppCompat.Light.NoActionBar">
        <item name="android:autofilledHighlight">@android:color/transparent</item>
    </style>
+
+    <style name="MyBottomSheetDialogStyle" parent="Theme.Material3.Light.BottomSheetDialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
 </resources>
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@ -5,7 +5,7 @@
 -->
 <data-extraction-rules>
    <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <!--
        <include .../>
        <exclude .../>
        -->
--- a/app/src/test/java/com/kaixed/kchat/ExampleUnitTest.kt
+++ b/app/src/test/java/com/kaixed/kchat/ExampleUnitTest.kt
@ -1,17 +1,16 @@
-package com.kaixed.kchat;
+package com.kaixed.kchat

-import org.junit.Test;
-
-import static org.junit.Assert.*;
+import org.junit.Assert
+import org.junit.Test

 /**
 * Example local unit test, which will execute on the development machine (host).
 *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ * @see [Testing documentation](http://d.android.com/tools/testing)
 */
-public class ExampleUnitTest {
+class ExampleUnitTest {
    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
+    fun addition_isCorrect() {
+        Assert.assertEquals(4, (2 + 2).toLong())
    }
-}
+}
--- a/gradle.properties
+++ b/gradle.properties
@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+android.enableJetifier = true
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -16,6 +16,8 @@ constraintlayout = "2.1.4"
 mmkv = "1.3.9"
 okhttp = "4.12.0"
 preference = "1.2.1"
+shapedrawable = "3.2"
+shapeview = "9.2"
 therouter = "1.2.2"
 window = "1.3.0"
 #noinspection GradleDependency
@ -27,6 +29,8 @@ objectbox = "4.0.2"
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesCore" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" }
+shapedrawable = { module = "com.github.getActivity:ShapeDrawable", version.ref = "shapedrawable" }
+shapeview = { module = "com.github.getActivity:ShapeView", version.ref = "shapeview" }
 therouter-ksp = { module = "cn.therouter:apt", version.ref = "therouter" }
 objectbox-android-objectbrowser = { group = "io.objectbox", name = "objectbox-android-objectbrowser", version.ref = "objectbox" }
 objectbox-android = { group = "io.objectbox", name = "objectbox-android", version.ref = "objectbox" }
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -16,6 +16,9 @@ dependencyResolutionManagement {
    repositories {
        google()
        mavenCentral()
+        maven {
+            url = uri("https://jitpack.io")
+        }
    }
 }