optimize code

Author: leavesCZY

.github/workflows/android.yml

@@ -42,7 +42,7 @@ jobs:
           body: "create by workflows"
           allowUpdates: true
           artifactErrorsFailBuild: true
-          generateReleaseNotes: true
+          generateReleaseNotes: false
           token: ${{ secrets.ACTION_TOKEN }}
           tag: ${{ steps.currentTime.outputs.time }}
           name: v${{ steps.currentTime.outputs.time }}

.gitignore

@@ -1,15 +1,8 @@
-/local.properties
 /.idea/
 /app/release/
 /build
-/captures
+/local.properties
 *.iml
-.gradle
-.DS_Store
-.externalNativeBuild
-.cxx
-.idea
 *.apk
-*.json
-local.properties
-build
+.gradle
+.DS_Store

README.md

@@ -2,32 +2,35 @@
 
 Jetpack Compose 最佳实践，用 Jetpack Compose 写一个 IM APP
 
-关联的文章：
+相关联的文章：
 
 - [学不动也要学，用 Jetpack Compose 写一个 IM APP（一）](https://juejin.cn/post/6991429231821684773)
 - [学不动也要学，用 Jetpack Compose 写一个 IM APP（二）](https://juejin.cn/post/7028397244894330917)
 
 Apk 下载：[releases](https://github.com/leavesCZY/compose_chat/releases)
 
-由于腾讯云 IM SDK 免费版最多只能注册一百个账号，如果已经发现注册不了的话，可以使用以下几个账号进行登录
+腾讯云 IM SDK 的免费版本最多只能注册一百个账号，目前数量已经超限了，开发者可以使用以下几个账号进行登录
 
-- Android
-- Google
-- Apple
 - Jetpack
 - Compose
 - Chat
-- Flutter
 - Java
 - Kotlin
 - Dart
+- Android
+- Apple
+- Google
+- Flutter
 - Admin
 - Hello
+- Good
+- Nice
 - Test
 
-![](https://user-images.githubusercontent.com/30774063/221415412-57eb8da5-e85c-4409-9a0f-37df11f71a70.gif)
+![](https://github.com/leavesCZY/compose_chat/assets/30774063/fbb36fb3-52b8-4719-b783-ec7f0c5b2d92)
 
-Compose Chat 也使用到了我的另外两个开源库
+compose_chat 也使用到了我另外的两个开源库
 
-- 一个用 Jetpack Compose 实现的 Android 图片/视频 选择框架：[Matisse](https://github.com/leavesCZY/Matisse)
-- 一个适用于 Android 的字节码插桩库：[Trace](https://github.com/leavesCZY/Trace)
+- 一个用 Jetpack Compose 实现的 Android 图片/视频
+  选择框架：[Matisse](https://github.com/leavesCZY/Matisse)
+- 一个 Android 字节码插桩库：[Trace](https://github.com/leavesCZY/Trace)

app/build.gradle.kts

@@ -1,21 +1,24 @@
+plugins {
+    alias(libs.plugins.chat.android.application)
+    alias(libs.plugins.chat.android.compose)
+    alias(libs.plugins.chat.kotlin.parcelize)
+    alias(libs.plugins.chat.leavesczy.trace)
+}
+
 android {
     namespace = "github.leavesczy.compose_chat"
 }
 
 dependencies {
     implementation(project(":base"))
     implementation(project(":proxy"))
-    implementationTest()
-    implementationCompose()
-    implementationCoil()
-    implementation(Dependencies.Accompanist.uiController)
-    implementation(Dependencies.Components.appcompat)
-    implementation(Dependencies.Components.exifinterface)
-    implementation(Dependencies.Components.coroutines)
-    implementation(Dependencies.Components.matisse)
-}
-
-composeClickTrace {
-    onClickClass = "github.leavesczy.compose_chat.extend.ComposeOnClick"
-    onClickWhiteList = "notCheck"
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    implementation(libs.androidx.exifinterface)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.leavesczy.matisse)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.gif)
+    implementation(libs.coil.network.okhttp)
 }

app/proguard-rules.pro

@@ -20,6 +20,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
+-optimizationpasses 10
 -packageobfuscationdictionary dictionary.txt
 -classobfuscationdictionary dictionary.txt
 -obfuscationdictionary dictionary.txt

app/src/androidTest/java/github/leavesczy/compose_chat/ExampleInstrumentedTest.kt

@@ -17,8 +17,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals(
-            "github.leavesczy.compose_chat", appContext.packageName
-        )
+        assertEquals("github.leavesczy.compose_chat", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -5,7 +5,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission
+        android:name="android.permission.READ_MEDIA_IMAGES"
+        tools:ignore="SelectedPhotoAccess" />
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
@@ -15,19 +17,22 @@
 
     <application
         android:name=".MainApplication"
+        android:allowBackup="false"
+        android:fullBackupContent="false"
         android:icon="@drawable/icon_logo"
         android:label="@string/app_name"
         android:roundIcon="@drawable/icon_logo_round"
         android:supportsRtl="false"
         android:theme="@style/Theme.ComposeChat"
+        tools:ignore="DataExtractionRules"
         tools:replace="android:supportsRtl">
         <activity
             android:name=".ui.login.LoginActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity">
+            tools:ignore="DiscouragedApi,LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -41,42 +46,42 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".ui.chat.GroupProfileActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".ui.friend.FriendProfileActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".ui.profile.ProfileUpdateActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".ui.chat.ChatActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
         <activity
             android:name=".ui.preview.PreviewImageActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation|uiMode"
             android:exported="false"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="DiscouragedApi,LockedOrientationActivity" />
     </application>
 
 </manifest>

app/src/main/java/github/leavesczy/compose_chat/MainApplication.kt

@@ -4,9 +4,9 @@ import android.app.Application
 import github.leavesczy.compose_chat.provider.AccountProvider
 import github.leavesczy.compose_chat.provider.AppThemeProvider
 import github.leavesczy.compose_chat.provider.ContextProvider
-import github.leavesczy.compose_chat.provider.ImageLoaderProvider
 import github.leavesczy.compose_chat.provider.ToastProvider
 import github.leavesczy.compose_chat.ui.logic.ComposeChat
+import github.leavesczy.compose_chat.utils.CoilUtils
 
 /**
  * @Author: leavesCZY
@@ -19,9 +19,9 @@ class MainApplication : Application() {
         super.onCreate()
         ContextProvider.init(application = this)
         ToastProvider.init(application = this)
+        CoilUtils.init(application = this)
         AppThemeProvider.init(application = this)
         AccountProvider.init(application = this)
-        ImageLoaderProvider.init(application = this)
         ComposeChat.accountProvider.init(application = this)
     }
 

app/src/main/java/github/leavesczy/compose_chat/WorkflowsTrigger.kt

@@ -0,0 +1,12 @@
+package github.leavesczy.compose_chat
+
+/**
+ * @Author: leavesCZY
+ * @Desc:
+ * @Github：https://github.com/leavesCZY
+ */
+object WorkflowsTrigger {
+
+    val trigger = 1
+
+}

app/src/main/java/github/leavesczy/compose_chat/extend/ComposeOnClick.kt

@@ -11,7 +11,7 @@ class ComposeOnClick(private val onClick: () -> Unit) : Function0<Unit> {
 
     companion object {
 
-        private const val MIN_DURATION = 300L
+        private const val MIN_DURATION = 250L
 
         private var lastClickTime = 0L
 

app/src/main/java/github/leavesczy/compose_chat/extend/ModifierExtends.kt

@@ -2,9 +2,9 @@ package github.leavesczy.compose_chat.extend
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.draw.drawWithContent
 import androidx.compose.ui.graphics.Color
 
@@ -18,10 +18,14 @@ fun Modifier.scrim(color: Color): Modifier = drawWithContent {
     drawRect(color = color)
 }
 
-fun Modifier.clickableNoRipple(onClick: () -> Unit): Modifier = composed {
-    clickable(
-        onClick = onClick,
-        interactionSource = remember { MutableInteractionSource() },
-        indication = null
+@Composable
+fun Modifier.clickableNoRipple(onClick: () -> Unit): Modifier {
+    return then(
+        other = Modifier.clickable(
+            onClickLabel = null,
+            indication = null,
+            interactionSource = remember { MutableInteractionSource() },
+            onClick = onClick
+        )
     )
 }

app/src/main/java/github/leavesczy/compose_chat/ui/MainActivity.kt

@@ -4,11 +4,14 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
-import github.leavesczy.compose_chat.base.model.ServerState
+import github.leavesczy.compose_chat.base.models.ServerState
 import github.leavesczy.compose_chat.provider.AccountProvider
 import github.leavesczy.compose_chat.ui.base.BaseActivity
+import github.leavesczy.compose_chat.ui.conversation.logic.ConversationViewModel
+import github.leavesczy.compose_chat.ui.friendship.logic.FriendshipViewModel
 import github.leavesczy.compose_chat.ui.logic.MainViewModel
 import github.leavesczy.compose_chat.ui.login.LoginActivity
+import github.leavesczy.compose_chat.ui.person.logic.PersonProfileViewModel
 import kotlinx.coroutines.launch
 
 /**
@@ -20,10 +23,21 @@ class MainActivity : BaseActivity() {
 
     private val mainViewModel by viewModels<MainViewModel>()
 
+    private val conversationViewModel by viewModels<ConversationViewModel>()
+
+    private val friendshipViewModel by viewModels<FriendshipViewModel>()
+
+    private val personProfileViewModel by viewModels<PersonProfileViewModel>()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            MainPage(mainViewModel = mainViewModel)
+            MainPage(
+                mainViewModel = mainViewModel,
+                conversationViewModel = conversationViewModel,
+                friendshipViewModel = friendshipViewModel,
+                personProfileViewModel = personProfileViewModel
+            )
         }
         initEvent()
     }