From fdf372719c6caac5126fa67a7e356359e71c93ce Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Thu, 18 Sep 2025 13:26:04 +0200
Subject: [PATCH] Replace with interface delegation using "by" in the class
 header Replace abstract class with an interface

---
 .../ui/navigation/navs/ObservableNav.kt       | 19 +++---------
 .../chats/rooms/twopane/TwoPaneNav.kt         | 31 ++-----------------
 .../loggedIn/notifications/CardFeedState.kt   | 16 +++++-----
 3 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt
index 03bfae269c..458ea14f01 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/navs/ObservableNav.kt
@@ -20,27 +20,16 @@
  */
 package com.vitorpamplona.amethyst.ui.navigation.navs
 
-import androidx.compose.material3.DrawerState
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.reflect.KClass
 
 class ObservableNav(
-    val sourceNav: INav,
+    private val sourceNav: INav,
     override val navigationScope: CoroutineScope,
     val onBeforeNavigate: () -> Unit,
-) : INav {
-    override val drawerState: DrawerState = sourceNav.drawerState
-
-    override fun closeDrawer() {
-        sourceNav.closeDrawer()
-    }
-
-    override fun openDrawer() {
-        sourceNav.openDrawer()
-    }
-
+) : INav by sourceNav {
     override fun nav(route: Route) {
         navigationScope.launch {
             onBeforeNavigate()
@@ -71,11 +60,11 @@ class ObservableNav(
 
     override fun <T : Route> popUpTo(
         route: Route,
-        upToClass: KClass<T>,
+        klass: KClass<T>,
     ) {
         navigationScope.launch {
             onBeforeNavigate()
         }
-        sourceNav.popUpTo(route, upToClass)
+        sourceNav.popUpTo(route, klass)
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt
index e0a3c12dae..5c83da672d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/rooms/twopane/TwoPaneNav.kt
@@ -20,20 +20,16 @@
  */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.rooms.twopane
 
-import androidx.compose.material3.DrawerState
 import androidx.compose.runtime.mutableStateOf
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import kotlin.reflect.KClass
 
 class TwoPaneNav(
-    val nav: INav,
+    private val nav: INav,
     override val navigationScope: CoroutineScope,
-) : INav {
-    override val drawerState: DrawerState = nav.drawerState
-
+) : INav by nav {
     val innerNav = mutableStateOf<Route?>(null)
 
     override fun nav(route: Route) {
@@ -56,27 +52,4 @@ class TwoPaneNav(
             }
         }
     }
-
-    override fun newStack(route: Route) {
-        nav.newStack(route)
-    }
-
-    override fun popBack() {
-        nav.popBack()
-    }
-
-    override fun <T : Route> popUpTo(
-        route: Route,
-        klass: KClass<T>,
-    ) {
-        nav.popUpTo<T>(route, klass)
-    }
-
-    override fun closeDrawer() {
-        nav.closeDrawer()
-    }
-
-    override fun openDrawer() {
-        nav.openDrawer()
-    }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedState.kt
index 7baa1fee90..2e9322086b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedState.kt
@@ -33,16 +33,16 @@ import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @Immutable
-abstract class Card {
-    abstract fun createdAt(): Long
+interface Card {
+    fun createdAt(): Long
 
-    abstract fun id(): String
+    fun id(): String
 }
 
 @Immutable
 class BadgeCard(
     val note: Note,
-) : Card() {
+) : Card {
     override fun createdAt(): Long = note.createdAt() ?: 0L
 
     override fun id() = note.idHex
@@ -51,7 +51,7 @@ class BadgeCard(
 @Immutable
 class NoteCard(
     val note: Note,
-) : Card() {
+) : Card {
     override fun createdAt(): Long = note.createdAt() ?: 0L
 
     override fun id() = note.idHex
@@ -61,7 +61,7 @@ class NoteCard(
 class ZapUserSetCard(
     val user: User,
     val zapEvents: ImmutableList<CombinedZap>,
-) : Card() {
+) : Card {
     val createdAt = zapEvents.maxOfOrNull { it.createdAt() ?: 0L } ?: 0L
 
     override fun createdAt(): Long = createdAt
@@ -75,7 +75,7 @@ class MultiSetCard(
     val boostEvents: ImmutableList<Note>,
     val likeEvents: ImmutableList<Note>,
     val zapEvents: ImmutableList<CombinedZap>,
-) : Card() {
+) : Card {
     val maxCreatedAt =
         maxOf(
             zapEvents.maxOfOrNull { it.createdAt() ?: 0L } ?: 0L,
@@ -108,7 +108,7 @@ class MultiSetCard(
 @Immutable
 class MessageSetCard(
     val note: Note,
-) : Card() {
+) : Card {
     override fun createdAt(): Long = note.createdAt() ?: 0L
 
     override fun id() = note.idHex