Remove code that was reintroduced during merge with upstream. Fix Lists route.

amethyst/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -56,7 +56,6 @@ class User(
     var latestMetadata: MetadataEvent? = null
     var latestMetadataRelay: NormalizedRelayUrl? = null
     var latestContactList: ContactListEvent? = null
-    var latestBookmarkList: BookmarkListEvent? = null
     var followSetNotes: Set<AddressableNote> = setOf()
         private set
 
@@ -354,55 +353,6 @@ class UserFlowSet(
     val statuses = UserBundledRefresherFlow(u)
     val followSets = UserBundledRefresherFlow(u)
 
-    fun isInUse(): Boolean =
-        metadata.stateFlow.subscriptionCount.value > 0 ||
-            relays.stateFlow.subscriptionCount.value > 0 ||
-            follows.stateFlow.subscriptionCount.value > 0 ||
-            followSets.stateFlow.subscriptionCount.value > 0
-
-    fun destroy() {
-        metadata.destroy()
-        relays.destroy()
-        follows.destroy()
-        followSets.destroy()
-    }
-}
-
-@Stable
-class UserLiveSet(
-    u: User,
-) {
-    val innerMetadata = UserBundledRefresherLiveData(u)
-
-    // UI Observers line up here.
-    val innerFollows = UserBundledRefresherLiveData(u)
-    val innerFollowers = UserBundledRefresherLiveData(u)
-    val innerReports = UserBundledRefresherLiveData(u)
-    val innerMessages = UserBundledRefresherLiveData(u)
-    val innerRelays = UserBundledRefresherLiveData(u)
-    val innerRelayInfo = UserBundledRefresherLiveData(u)
-    val innerZaps = UserBundledRefresherLiveData(u)
-    val innerBookmarks = UserBundledRefresherLiveData(u)
-    val innerStatuses = UserBundledRefresherLiveData(u)
-
-    // UI Observers line up here.
-    val metadata = innerMetadata.map { it }
-    val follows = innerFollows.map { it }
-    val followers = innerFollowers.map { it }
-    val reports = innerReports.map { it }
-    val messages = innerMessages.map { it }
-    val relays = innerRelays.map { it }
-    val relayInfo = innerRelayInfo.map { it }
-    val zaps = innerZaps.map { it }
-    val bookmarks = innerBookmarks.map { it }
-    val statuses = innerStatuses.map { it }
-
-    val profilePictureChanges = innerMetadata.map { it.user.profilePicture() }.distinctUntilChanged()
-
-    val nip05Changes = innerMetadata.map { it.user.nip05() }.distinctUntilChanged()
-
-    val userMetadataInfo = innerMetadata.map { it.user.info }.distinctUntilChanged()
-
     fun isInUse(): Boolean =
         metadata.hasObservers() ||
             relays.hasObservers() ||
@@ -411,7 +361,8 @@ class UserLiveSet(
             reports.hasObservers() ||
             relayInfo.hasObservers() ||
             zaps.hasObservers() ||
-            statuses.hasObservers()
+            statuses.hasObservers() ||
+            followSets.hasObservers()
 }
 
 @Immutable

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/drawer/DrawerContent.kt

@@ -75,6 +75,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.TextLinkStyles
@@ -437,7 +438,7 @@ fun ListContent(
 
         NavigationRow(
             title = R.string.my_lists,
-            icon = R.drawable.format_list_bulleted_type,
+            icon = ImageVector.vectorResource(R.drawable.format_list_bulleted_type),
             tint = MaterialTheme.colorScheme.onBackground,
             nav = nav,
             route = Route.Lists,

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/routes/Routes.kt

@@ -52,12 +52,7 @@ sealed class Route {
 
     @Serializable object UserSettings : Route()
 
-    object Lists :
-        Route(
-            route = "Lists",
-            icon = R.drawable.format_list_bulleted_type,
-            contentDescriptor = R.string.my_lists,
-        )
+    @Serializable object Lists : Route()
 
     @Serializable object EditProfile : Route()