feat(DMCategories): add option to hide category if empty

Author: zt64

plugin/DMCategories/build.gradle.kts

@@ -1,8 +1,11 @@
-version = "1.1.2"
+version = "1.2.0"
 description = "Adds the ability to create categories for DMs, which will come first in the list"
 
 aliucord.changelog.set(
     """
+    # 1.2.0
+    * Added option to hide categories if they have no channels
+
     # 1.1.1
     * Fixed a major bug which caused categories to disappear
    

plugin/DMCategories/src/main/kotlin/DMCategories.kt

@@ -41,6 +41,7 @@ class DMCategories : Plugin() {
 
     private val SettingsAPI.showSelected: Boolean by settings.delegate(true)
     private val SettingsAPI.showUnread: Boolean by settings.delegate(false)
+    private val SettingsAPI.hideEmpty: Boolean by settings.delegate(false)
 
     init {
         settingsTab = SettingsTab(PluginSettings::class.java, SettingsTab.Type.BOTTOM_SHEET).withArgs(settings)
@@ -131,24 +132,24 @@ class DMCategories : Plugin() {
         }
 
         @OptIn(ExperimentalStdlibApi::class)
-        patcher.before<WidgetChannelsList>(
-            "configureUI",
-            WidgetChannelListModel::class.java
-        ) { (_, model: WidgetChannelListModel) ->
+        patcher.before<WidgetChannelsList>("configureUI", WidgetChannelListModel::class.java) { (_, model: WidgetChannelListModel) ->
+            // Only run if this is the DMs tab
             if (model.selectedGuild != null) return@before
 
             // I hate this but it works
             if (categories.none { (userId) -> userId == Util.getCurrentId() }) return@before
 
             val privateChannels = model.items.filterIsInstance<ChannelListItemPrivate>()
-            val items = buildList(1000) {
+            val items = buildList(100) {
                 categories.forEach { category ->
-                    add(ChannelListItemDMCategory(category))
-
                     val channels = privateChannels.filter { channel ->
                         channel.channel.id in category.channelIds
                     }
 
+                    if (settings.hideEmpty && channels.isEmpty()) return@forEach
+
+                    add(ChannelListItemDMCategory(category))
+
                     model.items.removeAll(channels)
 
                     addAll(

plugin/DMCategories/src/main/kotlin/dmcategories/PluginSettings.kt

@@ -12,6 +12,7 @@ import com.lytefast.flexinput.R
 class PluginSettings(private val settings: SettingsAPI) : BottomSheet() {
     private var SettingsAPI.showSelected: Boolean by settings.delegate(true)
     private var SettingsAPI.showUnread: Boolean by settings.delegate(false)
+    private var SettingsAPI.hideEmpty: Boolean by settings.delegate(false)
 
     override fun onViewCreated(view: View, bundle: Bundle?) {
         super.onViewCreated(view, bundle)
@@ -45,5 +46,15 @@ class PluginSettings(private val settings: SettingsAPI) : BottomSheet() {
                     setOnCheckedListener { settings.showUnread = it }
                 }
         )
+        addView(
+            Util.createSwitch(
+                ctx,
+                "Hide if empty",
+                "Whether categories should be hidden if they have no channels"
+            ).apply {
+                isChecked = settings.hideEmpty
+                setOnCheckedListener { settings.hideEmpty = it }
+            }
+        )
     }
 }