fix(CompactMode): support new feature backports from core (#117)

* chore(deps): lock to kt1 aliucord core

* fix(CompactMode): support avatar decorations

* fix(CompactMode): support polls

* refactor(deps): use different version ref names

Author: cillynder

gradle/libs.versions.toml

@@ -1,6 +1,7 @@
 [versions]
 discord = "aliucord-SNAPSHOT"
-aliucord = "main-SNAPSHOT"
+aliucord-core = "2.4.0"
+aliucord-gradle = "753ad25"
 #noinspection GradleDependency
 kotlin = "1.5.21"
 android = "7.4.2"
@@ -10,10 +11,10 @@ ktlint = "0.50.0"
 
 [libraries]
 discord = { module = "com.discord:discord", version.ref = "discord" }
-aliucord = { module = "com.aliucord:Aliucord", version.ref = "aliucord" }
+aliucord = { module = "com.aliucord:Aliucord", version.ref = "aliucord-core" }
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "android" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-aliucord = { id = "com.aliucord.gradle", version.ref = "aliucord" }
+aliucord = { id = "com.aliucord.gradle", version.ref = "aliucord-gradle" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintPlugin" }

plugin/CompactMode/src/main/kotlin/CompactMode.kt

@@ -56,6 +56,21 @@ class CompactMode : Plugin() {
         val usernameViewId = getResId("chat_list_adapter_item_text_name", "id")
         val loadingTextId = getResId("chat_list_adapter_item_text_loading", "id")
 
+        val avatarDecorationId = try {
+            Class.forName("com.aliucord.coreplugins.decorations.avatar.AvatarDecoratorKt")
+                .getDeclaredField("decoId")
+                .also { it.isAccessible = true }
+                .get(null) as Int
+        } catch (_: Throwable) {
+            null
+        }
+
+        val pollsClass = try {
+            Class.forName("com.aliucord.coreplugins.polls.chatview.WidgetChatListAdapterItemPoll")
+        } catch (_: Throwable) {
+            null
+        }
+
         patcher.after<WidgetChatListItem>(
             "onConfigure",
             Int::class.java,
@@ -73,6 +88,13 @@ class CompactMode : Plugin() {
                 }
             }
 
+            if (pollsClass?.isInstance(this) == true) {
+                itemView.run {
+                    setPadding(contentMargin, paddingTop, paddingRight, paddingBottom)
+                }
+                return@after
+            }
+
             val layoutParams = when (this) {
                 is WidgetChatListAdapterItemInvite,
                 is WidgetChatListAdapterItemStageInvite,
@@ -101,13 +123,28 @@ class CompactMode : Plugin() {
             when (itemView.id) {
                 // Regular message
                 messageRootId -> {
+                    val avatarDecoration = avatarDecorationId?.let { itemView.findViewById<View?>(it) }
+                    val decoEnabled = avatarDecoration != null
+
                     itemView
                         .findViewById<View>(loadingTextId)
                         .layoutParams<MarginLayoutParams>()
                         .marginStart = 0
 
                     val headerView = itemView.findViewById<ConstraintLayout>(headerLayoutId)
 
+                    // Reverts avatar decorator's top padding on header, so the avatar gets centred properly
+                    if (decoEnabled) {
+                        headerView.run {
+                            setPadding(
+                                paddingLeft,
+                                paddingTop - 6.dp,
+                                paddingRight,
+                                paddingBottom
+                            )
+                        }
+                    }
+
                     itemView.findViewById<Guideline>(guidelineId).setGuidelineBegin(contentMargin)
                     itemView.setPadding(0, settings.messagePadding.dp, 0, 0)
 
@@ -116,13 +153,26 @@ class CompactMode : Plugin() {
                     }
                     if (settings.hideAvatar) {
                         avatarView!!.visibility = View.GONE
+                        avatarDecoration?.visibility = View.GONE
 
                         headerView.layoutParams<ConstraintLayout.LayoutParams>().marginStart = contentMargin
 
                         return@after
                     }
 
-                    2.dp.let { dp -> avatarView!!.setPadding(dp, dp, dp, dp) }
+                    2.dp.let { dp ->
+                        val decoOffset = if (decoEnabled) {
+                            // Adds offset for decorations
+                            dp + (settings.avatarScale.dp / 11)
+                        } else {
+                            dp
+                        }
+                        avatarView!!.setPadding(decoOffset, decoOffset, dp, dp)
+                        avatarDecoration?.layoutParams<MarginLayoutParams>()?.apply {
+                            topMargin = dp
+                            leftMargin = dp
+                        }
+                    }
 
                     val constraintLayout = itemView as ConstraintLayout
                     val constraintSet = ConstraintSet().apply {
@@ -134,6 +184,11 @@ class CompactMode : Plugin() {
                             settings.avatarScale.dp.let { dp ->
                                 constrainWidth(id, dp)
                                 constrainHeight(id, dp)
+                                avatarDecorationId?.let { decoId ->
+                                    val decoSize = dp * 12 / 11 - 4.dp
+                                    constrainWidth(decoId, decoSize)
+                                    constrainHeight(decoId, decoSize)
+                                }
                             }
 
                             setMargin(id, ConstraintSet.START, settings.headerMargin.dp)