fixup! refactor: Avatar function

change design

app/build.gradle.kts

@@ -105,5 +105,4 @@ dependencies {
     implementation(libs.splitties.base)           // Syntax sugar
     implementation(libs.jsoup)                    // HTML parser
     implementation(libs.iconsax.compose)          // Material icons
-    implementation(libs.unifiedpush.connector)    // UnifiedPush / ntfy notifications
 }

app/src/main/AndroidManifest.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Created by sweetbread
-  ~ Copyright (c) 2026. All rights reserved.
+  ~ Copyright (c) 2025. All rights reserved.
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
@@ -35,14 +34,6 @@
             android:name=".ui.activity.Login"
             android:exported="false"
             android:theme="@style/Theme.PixelDragon" />
-
-        <service
-            android:name=".push.PixelDragonUnifiedPushService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="org.unifiedpush.android.connector.PUSH_EVENT" />
-            </intent-filter>
-        </service>
     </application>
 
 </manifest>

app/src/main/java/ru/risdeveau/pixeldragon/push/MatrixUnifiedPushManager.kt

@@ -1,128 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.push
-
-import android.content.Context
-import android.os.Build
-import de.connect2x.trixnity.client.MatrixClient
-import de.connect2x.trixnity.clientserverapi.model.push.PusherData
-import de.connect2x.trixnity.clientserverapi.model.push.SetPushers
-import ru.risdeveau.pixeldragon.client
-import java.util.Locale
-
-const val PIXELDRAGON_UNIFIED_PUSH_APP_ID = "ru.risdeveau.pixeldragon.unifiedpush"
-
-object MatrixUnifiedPushManager {
-    suspend fun reconcileRegisteredPusher(context: Context): Result<Boolean> {
-        val state = UnifiedPushSettingsStore.read(context)
-        if (!state.enabled || state.endpoint.isNullOrBlank()) {
-            return Result.success(false)
-        }
-        return registerMatrixPusher(context)
-    }
-
-    suspend fun registerMatrixPusher(context: Context): Result<Boolean> {
-        return runCatching {
-            val state = UnifiedPushSettingsStore.read(context)
-            val endpoint = state.endpoint?.takeIf { it.isNotBlank() }
-                ?: error("UnifiedPush endpoint is not available yet")
-            val gatewayUrl = state.gatewayUrl?.takeIf { it.isNotBlank() }
-                ?: error("ntfy Matrix gateway URL is not configured")
-            val matrixClient = client ?: error("Matrix client is not ready")
-
-            matrixClient.registerNtfyPusher(
-                endpoint = endpoint,
-                gatewayUrl = gatewayUrl,
-            )
-            UnifiedPushSettingsStore.setMatrixPusherStatus(context, registered = true)
-            true
-        }.onFailure { throwable ->
-            UnifiedPushSettingsStore.setMatrixPusherStatus(
-                context = context,
-                registered = false,
-                error = throwable.toPushError(),
-            )
-        }
-    }
-
-    suspend fun unregisterMatrixPusher(context: Context): Result<Boolean> {
-        return runCatching {
-            val endpoint = UnifiedPushSettingsStore.read(context).endpoint
-                ?: return@runCatching false
-            val matrixClient = client ?: error("Matrix client is not ready")
-
-            matrixClient.api.push.setPushers(
-                SetPushers.Request.Remove(
-                    appId = PIXELDRAGON_UNIFIED_PUSH_APP_ID,
-                    pushkey = endpoint,
-                )
-            ).getOrThrow()
-            UnifiedPushSettingsStore.setMatrixPusherStatus(context, registered = false)
-            true
-        }.onFailure { throwable ->
-            UnifiedPushSettingsStore.setMatrixPusherStatus(
-                context = context,
-                registered = false,
-                error = throwable.toPushError(),
-            )
-        }
-    }
-
-    suspend fun refreshMatrixPusherStatus(context: Context): Result<Boolean> {
-        return runCatching {
-            val endpoint = UnifiedPushSettingsStore.read(context).endpoint
-                ?: return@runCatching false
-            val matrixClient = client ?: error("Matrix client is not ready")
-            val isRegistered = matrixClient.api.push.getPushers()
-                .getOrThrow()
-                .devices
-                .any { pusher ->
-                    pusher.appId == PIXELDRAGON_UNIFIED_PUSH_APP_ID && pusher.pushkey == endpoint
-                }
-            UnifiedPushSettingsStore.setMatrixPusherStatus(context, registered = isRegistered)
-            isRegistered
-        }.onFailure { throwable ->
-            UnifiedPushSettingsStore.setMatrixPusherStatus(
-                context = context,
-                registered = false,
-                error = throwable.toPushError(),
-            )
-        }
-    }
-}
-
-private suspend fun MatrixClient.registerNtfyPusher(
-    endpoint: String,
-    gatewayUrl: String,
-) {
-    api.push.setPushers(
-        SetPushers.Request.Set(
-            appId = PIXELDRAGON_UNIFIED_PUSH_APP_ID,
-            pushkey = endpoint,
-            kind = "http",
-            appDisplayName = "PixelDragon",
-            deviceDisplayName = deviceDisplayName(),
-            lang = Locale.getDefault().toLanguageTag(),
-            data = PusherData(
-                url = gatewayUrl,
-                format = "event_id_only",
-            ),
-            append = true,
-        )
-    ).getOrThrow()
-}
-
-private fun MatrixClient.deviceDisplayName(): String {
-    return listOfNotNull(
-        Build.MANUFACTURER.takeIf { it.isNotBlank() },
-        Build.MODEL.takeIf { it.isNotBlank() },
-        deviceId?.takeIf { it.isNotBlank() },
-    ).joinToString(" ").ifBlank { "Android" }
-}
-
-fun Throwable.toPushError(): String {
-    return message?.takeIf { it.isNotBlank() } ?: this::class.simpleName ?: "Unknown error"
-}

app/src/main/java/ru/risdeveau/pixeldragon/push/PixelDragonNotifier.kt

@@ -1,74 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.push
-
-import android.Manifest
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.core.content.ContextCompat
-import ru.risdeveau.pixeldragon.R
-import ru.risdeveau.pixeldragon.ui.activity.MainActivity
-
-private const val MATRIX_CHANNEL_ID = "matrix_messages"
-private const val MATRIX_NOTIFICATION_ID = 1001
-
-object PixelDragonNotifier {
-    fun showWakeUpNotification(context: Context) {
-        val appContext = context.applicationContext
-        if (!appContext.canPostNotifications()) return
-
-        ensureChannel(appContext)
-
-        val intent = Intent(appContext, MainActivity::class.java).apply {
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        }
-        val pendingIntent = PendingIntent.getActivity(
-            appContext,
-            0,
-            intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
-        )
-
-        val notification = NotificationCompat.Builder(appContext, MATRIX_CHANNEL_ID)
-            .setSmallIcon(R.drawable.ic_launcher_foreground)
-            .setContentTitle("New Matrix activity")
-            .setContentText("Open PixelDragon to sync and decrypt the latest messages.")
-            .setContentIntent(pendingIntent)
-            .setAutoCancel(true)
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .build()
-
-        NotificationManagerCompat.from(appContext).notify(MATRIX_NOTIFICATION_ID, notification)
-    }
-
-    private fun ensureChannel(context: Context) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
-        val notificationManager = context.getSystemService(NotificationManager::class.java)
-        val channel = NotificationChannel(
-            MATRIX_CHANNEL_ID,
-            "Matrix messages",
-            NotificationManager.IMPORTANCE_DEFAULT,
-        ).apply {
-            description = "Wake-up notifications from ntfy / UnifiedPush."
-        }
-        notificationManager.createNotificationChannel(channel)
-    }
-}
-
-fun Context.canPostNotifications(): Boolean {
-    return Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU ||
-            ContextCompat.checkSelfPermission(
-                this,
-                Manifest.permission.POST_NOTIFICATIONS,
-            ) == PackageManager.PERMISSION_GRANTED
-}

app/src/main/java/ru/risdeveau/pixeldragon/push/PixelDragonUnifiedPushService.kt

@@ -1,64 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.push
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.launch
-import org.unifiedpush.android.connector.FailedReason
-import org.unifiedpush.android.connector.PushService
-import org.unifiedpush.android.connector.data.PushEndpoint
-import org.unifiedpush.android.connector.data.PushMessage
-import ru.risdeveau.pixeldragon.client
-
-class PixelDragonUnifiedPushService : PushService() {
-    private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
-
-    override fun onNewEndpoint(endpoint: PushEndpoint, instance: String) {
-        UnifiedPushSettingsStore.setEndpoint(applicationContext, endpoint.url)
-        UnifiedPushSettingsStore.setLastError(applicationContext, null)
-
-        serviceScope.launch {
-            MatrixUnifiedPushManager.registerMatrixPusher(applicationContext)
-        }
-    }
-
-    override fun onMessage(message: PushMessage, instance: String) {
-        UnifiedPushSettingsStore.recordPush(applicationContext)
-
-        serviceScope.launch {
-            runCatching {
-                client?.startSync()
-            }
-            PixelDragonNotifier.showWakeUpNotification(applicationContext)
-        }
-    }
-
-    override fun onRegistrationFailed(reason: FailedReason, instance: String) {
-        UnifiedPushSettingsStore.setLastError(applicationContext, reason.name)
-    }
-
-    override fun onTempUnavailable(instance: String) {
-        UnifiedPushSettingsStore.setLastError(
-            context = applicationContext,
-            error = "Distributor backend is temporarily unavailable",
-        )
-    }
-
-    override fun onUnregistered(instance: String) {
-        serviceScope.launch {
-            MatrixUnifiedPushManager.unregisterMatrixPusher(applicationContext)
-            UnifiedPushSettingsStore.clear(applicationContext)
-        }
-    }
-
-    override fun onDestroy() {
-        serviceScope.cancel()
-        super.onDestroy()
-    }
-}

app/src/main/java/ru/risdeveau/pixeldragon/push/UnifiedPushSettingsStore.kt

@@ -1,137 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.push
-
-import android.content.Context
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-
-private const val PREFS_NAME = "unified_push_settings"
-private const val KEY_ENABLED = "enabled"
-private const val KEY_ENDPOINT = "endpoint"
-private const val KEY_GATEWAY_OVERRIDE = "gateway_override"
-private const val KEY_LAST_ERROR = "last_error"
-private const val KEY_LAST_PUSH_TS = "last_push_ts"
-private const val KEY_MATRIX_PUSHER_REGISTERED = "matrix_pusher_registered"
-private const val KEY_MATRIX_PUSHER_TS = "matrix_pusher_ts"
-private const val KEY_MATRIX_ERROR = "matrix_error"
-
-data class UnifiedPushSettingsState(
-    val enabled: Boolean = false,
-    val endpoint: String? = null,
-    val gatewayUrlOverride: String? = null,
-    val lastError: String? = null,
-    val lastPushAt: Long? = null,
-    val matrixPusherRegistered: Boolean = false,
-    val matrixPusherUpdatedAt: Long? = null,
-    val matrixError: String? = null,
-) {
-    val gatewayUrl: String?
-        get() = gatewayUrlOverride?.takeIf { it.isNotBlank() }
-            ?: endpoint?.toNtfyMatrixGatewayUrl()
-}
-
-object UnifiedPushSettingsStore {
-    private val state = MutableStateFlow(UnifiedPushSettingsState())
-
-    fun observe(context: Context): StateFlow<UnifiedPushSettingsState> {
-        refresh(context)
-        return state.asStateFlow()
-    }
-
-    fun refresh(context: Context) {
-        state.value = read(context)
-    }
-
-    fun setEnabled(context: Context, enabled: Boolean) {
-        edit(context) { putBoolean(KEY_ENABLED, enabled) }
-    }
-
-    fun setEndpoint(context: Context, endpoint: String?) {
-        edit(context) {
-            putNullableString(KEY_ENDPOINT, endpoint)
-            putBoolean(KEY_ENABLED, endpoint != null)
-        }
-    }
-
-    fun setGatewayOverride(context: Context, gatewayUrl: String?) {
-        edit(context) { putNullableString(KEY_GATEWAY_OVERRIDE, gatewayUrl?.trim()?.takeIf { it.isNotBlank() }) }
-    }
-
-    fun setLastError(context: Context, error: String?) {
-        edit(context) { putNullableString(KEY_LAST_ERROR, error) }
-    }
-
-    fun recordPush(context: Context) {
-        edit(context) {
-            putLong(KEY_LAST_PUSH_TS, System.currentTimeMillis())
-            remove(KEY_LAST_ERROR)
-        }
-    }
-
-    fun setMatrixPusherStatus(
-        context: Context,
-        registered: Boolean,
-        error: String? = null,
-    ) {
-        edit(context) {
-            putBoolean(KEY_MATRIX_PUSHER_REGISTERED, registered)
-            if (registered) {
-                putLong(KEY_MATRIX_PUSHER_TS, System.currentTimeMillis())
-                remove(KEY_MATRIX_ERROR)
-            } else {
-                remove(KEY_MATRIX_PUSHER_TS)
-                putNullableString(KEY_MATRIX_ERROR, error)
-            }
-        }
-    }
-
-    fun clear(context: Context) {
-        prefs(context).edit().clear().apply()
-        refresh(context)
-    }
-
-    fun read(context: Context): UnifiedPushSettingsState {
-        val prefs = prefs(context)
-        return UnifiedPushSettingsState(
-            enabled = prefs.getBoolean(KEY_ENABLED, false),
-            endpoint = prefs.getString(KEY_ENDPOINT, null),
-            gatewayUrlOverride = prefs.getString(KEY_GATEWAY_OVERRIDE, null),
-            lastError = prefs.getString(KEY_LAST_ERROR, null),
-            lastPushAt = prefs.getLongOrNull(KEY_LAST_PUSH_TS),
-            matrixPusherRegistered = prefs.getBoolean(KEY_MATRIX_PUSHER_REGISTERED, false),
-            matrixPusherUpdatedAt = prefs.getLongOrNull(KEY_MATRIX_PUSHER_TS),
-            matrixError = prefs.getString(KEY_MATRIX_ERROR, null),
-        )
-    }
-
-    private fun edit(context: Context, block: android.content.SharedPreferences.Editor.() -> Unit) {
-        prefs(context).edit().apply(block).apply()
-        refresh(context)
-    }
-
-    private fun prefs(context: Context) =
-        context.applicationContext.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
-}
-
-private fun android.content.SharedPreferences.getLongOrNull(key: String): Long? {
-    return if (contains(key)) getLong(key, 0L) else null
-}
-
-private fun android.content.SharedPreferences.Editor.putNullableString(
-    key: String,
-    value: String?,
-) {
-    if (value == null) remove(key) else putString(key, value)
-}
-
-fun String.toNtfyMatrixGatewayUrl(): String? {
-    val uri = android.net.Uri.parse(this)
-    val scheme = uri.scheme ?: return null
-    val authority = uri.authority ?: return null
-    return "$scheme://$authority/_matrix/push/v1/notify"
-}

app/src/main/java/ru/risdeveau/pixeldragon/ui/activity/MainActivity.kt

@@ -23,7 +23,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -48,7 +47,6 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.navigation
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import de.connect2x.trixnity.client.CryptoDriverModule
@@ -70,21 +68,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import ru.risdeveau.pixeldragon.R
 import ru.risdeveau.pixeldragon.client
-import ru.risdeveau.pixeldragon.push.MatrixUnifiedPushManager
 import ru.risdeveau.pixeldragon.ui.item.Avatar
-import ru.risdeveau.pixeldragon.ui.layout.AccountSettingsScreen
-import ru.risdeveau.pixeldragon.ui.layout.AppearanceSettingsScreen
-import ru.risdeveau.pixeldragon.ui.layout.CreateRoomScreen
-import ru.risdeveau.pixeldragon.ui.layout.DevicesSettingsScreen
-import ru.risdeveau.pixeldragon.ui.layout.JoinRoomScreen
-import ru.risdeveau.pixeldragon.ui.layout.NotificationsSettingsScreen
 import ru.risdeveau.pixeldragon.ui.layout.Room
-import ru.risdeveau.pixeldragon.ui.layout.RoomActionsRoutes
-import ru.risdeveau.pixeldragon.ui.layout.RoomActionsSheet
 import ru.risdeveau.pixeldragon.ui.layout.RoomList
-import ru.risdeveau.pixeldragon.ui.layout.SettingsMainScreen
-import ru.risdeveau.pixeldragon.ui.layout.SettingsRoutes
-import ru.risdeveau.pixeldragon.ui.layout.settingsTitleForRoute
 import ru.risdeveau.pixeldragon.ui.theme.PixelDragonTheme
 import ru.risdeveau.pixeldragon.util.getMediaStore
 import ru.risdeveau.pixeldragon.util.getRoomStore
@@ -113,18 +99,6 @@ class MainActivity : ComponentActivity() {
                     val navController = rememberNavController()
                     val syncState by client!!.api.sync.currentSyncState
                         .collectAsState(initial = SyncState.STOPPED)
-                    val backStackEntry by navController.currentBackStackEntryAsState()
-                    val route = backStackEntry?.destination?.route
-                    var showRoomActionsSheet by remember { mutableStateOf(false) }
-
-                    if (showRoomActionsSheet) {
-                        RoomActionsSheet(
-                            onDismiss = { showRoomActionsSheet = false },
-                            onJoinRoom = { navController.navigate(RoomActionsRoutes.JoinRoom) },
-                            onCreateRoom = { navController.navigate(RoomActionsRoutes.CreateRoom) },
-                            onCreateSpace = { navController.navigate(RoomActionsRoutes.CreateSpace) },
-                        )
-                    }
 
                     Scaffold(
                         modifier = Modifier.fillMaxSize(),
@@ -134,16 +108,9 @@ class MainActivity : ComponentActivity() {
                                 syncState = syncState,
                             )
                         },
-                        floatingActionButton = {
-                            if (route == RoomActionsRoutes.Rooms) {
-                                FloatingActionButton(onClick = { showRoomActionsSheet = true }) {
-                                    Text("+")
-                                }
-                            }
-                        },
                     ) { innerPadding ->
-                        NavHost(navController = navController, startDestination = RoomActionsRoutes.Rooms) {
+                        NavHost(navController = navController, startDestination = "rooms") {
-                            composable(RoomActionsRoutes.Rooms) {
+                            composable("rooms") {
                                 RoomList(Modifier.padding(innerPadding), navController)
                             }
                             composable(
@@ -163,71 +130,6 @@ class MainActivity : ComponentActivity() {
                                     text = "Not implemented"
                                 )
                             }
-
-                            composable(RoomActionsRoutes.JoinRoom) {
-                                JoinRoomScreen(
-                                    modifier = Modifier.padding(innerPadding),
-                                    onJoined = { roomId ->
-                                        navController.navigate("room/${roomId.full}") {
-                                            popUpTo(RoomActionsRoutes.Rooms)
-                                        }
-                                    },
-                                )
-                            }
-
-                            composable(RoomActionsRoutes.CreateRoom) {
-                                CreateRoomScreen(
-                                    modifier = Modifier.padding(innerPadding),
-                                    isSpace = false,
-                                    onCreated = { roomId ->
-                                        navController.navigate("room/${roomId.full}") {
-                                            popUpTo(RoomActionsRoutes.Rooms)
-                                        }
-                                    },
-                                )
-                            }
-
-                            composable(RoomActionsRoutes.CreateSpace) {
-                                CreateRoomScreen(
-                                    modifier = Modifier.padding(innerPadding),
-                                    isSpace = true,
-                                    onCreated = { roomId ->
-                                        navController.navigate("space/${roomId.full}") {
-                                            popUpTo(RoomActionsRoutes.Rooms)
-                                        }
-                                    },
-                                )
-                            }
-
-                            navigation(
-                                route = SettingsRoutes.Graph,
-                                startDestination = SettingsRoutes.Main,
-                            ) {
-                                composable(SettingsRoutes.Main) {
-                                    SettingsMainScreen(
-                                        modifier = Modifier.padding(innerPadding),
-                                        onCategoryClick = { category ->
-                                            navController.navigate(category.route)
-                                        },
-                                    )
-                                }
-
-                                composable(SettingsRoutes.Account) {
-                                    AccountSettingsScreen(Modifier.padding(innerPadding))
-                                }
-
-                                composable(SettingsRoutes.Devices) {
-                                    DevicesSettingsScreen(Modifier.padding(innerPadding))
-                                }
-
-                                composable(SettingsRoutes.Notifications) {
-                                    NotificationsSettingsScreen(Modifier.padding(innerPadding))
-                                }
-
-                                composable(SettingsRoutes.Appearance) {
-                                    AppearanceSettingsScreen(Modifier.padding(innerPadding))
-                                }
-                            }
                         }
                     }
                 }
@@ -249,7 +151,6 @@ class MainActivity : ComponentActivity() {
 
                     Log.i("MainActivity", "Log in as ${client!!.userId}")
                     client!!.startSync()
-                    MatrixUnifiedPushManager.reconcileRegisteredPusher(appCtx)
                     isClientReady = true
                 }
             }
@@ -275,8 +176,6 @@ private fun PixelDragonTopBar(
     val route = backStackEntry?.destination?.route
     val rid = backStackEntry?.arguments?.getString("rid")
     val isRoomLikeScreen = route == "room/{rid}" || route == "space/{rid}"
-    val roomActionTitle = RoomActionsRoutes.titleFor(route)
-    val isSettingsScreen = route == SettingsRoutes.Graph || route?.startsWith("settings/") == true
 
     val roomsFlow = remember(client) {
         client!!.room.getAll().flattenValues().map { it.toList() }
@@ -291,50 +190,20 @@ private fun PixelDragonTopBar(
         }
     }
 
-    when {
+    if (isRoomLikeScreen) {
-        isRoomLikeScreen -> {
         RoomTopBar(
             room = currentRoom,
             fallbackTitle = rid ?: stringResource(R.string.app_name),
             onBack = { navController.popBackStack() },
         )
-        }
+    } else {
-
+        HomeTopBar(syncState = syncState)
-        roomActionTitle != null -> {
-            RoomTopBar(
-                room = null,
-                fallbackTitle = roomActionTitle,
-                onBack = { navController.popBackStack() },
-            )
-        }
-
-        isSettingsScreen -> {
-            RoomTopBar(
-                room = null,
-                fallbackTitle = settingsTitleForRoute(route),
-                onBack = { navController.popBackStack() },
-            )
-        }
-
-        else -> {
-            HomeTopBar(
-                syncState = syncState,
-                onAvatarClick = {
-                    navController.navigate(SettingsRoutes.Graph) {
-                        launchSingleTop = true
-                    }
-                },
-            )
-        }
     }
 }
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun HomeTopBar(
+private fun HomeTopBar(syncState: SyncState) {
-    syncState: SyncState,
-    onAvatarClick: () -> Unit,
-) {
     CenterAlignedTopAppBar(
         colors = topAppBarColors(
             containerColor = MaterialTheme.colorScheme.primaryContainer,
@@ -358,17 +227,13 @@ private fun HomeTopBar(
                 userAvatar = profile?.avatarUrl
             }
 
-            IconButton(onClick = onAvatarClick) {
             Avatar(
-                    Modifier
+                Modifier.size(32.dp).clip(CircleShape),
-                        .size(32.dp)
-                        .clip(CircleShape),
                 userAvatar,
                 userName,
                 MaterialTheme.colorScheme.background
             )
         }
-        }
     )
 }
 

app/src/main/java/ru/risdeveau/pixeldragon/ui/item/Avatar.kt

@@ -7,13 +7,11 @@ package ru.risdeveau.pixeldragon.ui.item
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 
@@ -24,19 +22,17 @@ fun Avatar(
     fallbackName: String,
     fallbackColor: Color = MaterialTheme.colorScheme.secondaryContainer,
 ) {
-    val avatarModifier = modifier.clip(CircleShape)
-
     if (url != null) {
         MXCImage(
             mxcUrl = url,
-            modifier = avatarModifier,
+            modifier = modifier,
             contentScale = ContentScale.Crop,
             contentDescription = fallbackName,
             showProgress = false,
         )
     } else {
         AvatarPlaceholder(
-            avatarModifier,
+            modifier,
             fallbackName,
             fallbackColor,
         )

app/src/main/java/ru/risdeveau/pixeldragon/ui/item/Image.kt

@@ -8,6 +8,7 @@ package ru.risdeveau.pixeldragon.ui.item
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import io.github.rabehx.iconsax.Iconsax
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
@@ -23,20 +24,16 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import coil3.compose.rememberAsyncImagePainter
 import coil3.request.ImageRequest
+import kotlinx.coroutines.flow.MutableStateFlow
 import de.connect2x.trixnity.client.media
 import de.connect2x.trixnity.clientserverapi.model.media.FileTransferProgress
-import io.github.rabehx.iconsax.Iconsax
 import io.github.rabehx.iconsax.outline.Warning2
-import kotlinx.coroutines.flow.MutableStateFlow
 import ru.risdeveau.pixeldragon.client
-import java.util.concurrent.ConcurrentHashMap
 
 enum class ImageLoadState {
     Loading, Success, Error
 }
 
-private val mxcImageByteCache = ConcurrentHashMap<String, ByteArray>()
-
 @Composable
 fun MXCImage(
     mxcUrl: String,
@@ -46,26 +43,16 @@ fun MXCImage(
     showProgress: Boolean = true
 ) {
     val context = LocalContext.current
-    val cachedBytes = remember(mxcUrl) { mxcImageByteCache[mxcUrl] }
+    var imageLoadState by remember { mutableStateOf(ImageLoadState.Loading) }
-    var imageLoadState by remember(mxcUrl) {
+    var imageBytes by remember { mutableStateOf<ByteArray?>(null) }
-        mutableStateOf(if (cachedBytes != null) ImageLoadState.Success else ImageLoadState.Loading)
-    }
-    var imageBytes by remember(mxcUrl) { mutableStateOf(cachedBytes) }
 
-    val progressFlow = remember(mxcUrl) { MutableStateFlow<FileTransferProgress?>(null) }
+    val progressFlow = remember { MutableStateFlow<FileTransferProgress?>(null) }
 
     LaunchedEffect(mxcUrl) {
         if (mxcUrl.isBlank()) {
             imageLoadState = ImageLoadState.Error
             return@LaunchedEffect
         }
-
-        mxcImageByteCache[mxcUrl]?.let { bytes ->
-            imageBytes = bytes
-            imageLoadState = ImageLoadState.Success
-            return@LaunchedEffect
-        }
-
         imageLoadState = ImageLoadState.Loading
         progressFlow.value = null
 
@@ -79,7 +66,6 @@ fun MXCImage(
             onSuccess = { media ->
                 val bytes = media.toByteArray()
                 if (bytes != null) {
-                    mxcImageByteCache[mxcUrl] = bytes
                     imageBytes = bytes
                     ImageLoadState.Success
                 } else {
@@ -101,8 +87,6 @@ fun MXCImage(
     val painter = rememberAsyncImagePainter(
         model = ImageRequest.Builder(context)
             .data(imageBytes)
-            .memoryCacheKey(mxcUrl)
-            .diskCacheKey(mxcUrl)
             .build()
     )
 

app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/CreateRoom.kt

@@ -1,195 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.ui.layout
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Switch
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import de.connect2x.trixnity.clientserverapi.model.room.CreateRoom
-import de.connect2x.trixnity.clientserverapi.model.room.DirectoryVisibility
-import de.connect2x.trixnity.core.model.RoomAliasId
-import de.connect2x.trixnity.core.model.RoomId
-import de.connect2x.trixnity.core.model.events.m.room.CreateEventContent
-import kotlinx.coroutines.launch
-import ru.risdeveau.pixeldragon.client
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun CreateRoomScreen(
-    modifier: Modifier = Modifier,
-    isSpace: Boolean,
-    onCreated: (RoomId) -> Unit,
-) {
-    val matrixClient = client!!
-    val scope = rememberCoroutineScope()
-
-    var name by remember { mutableStateOf("") }
-    var topic by remember { mutableStateOf("") }
-    var alias by remember { mutableStateOf("") }
-    var isPublic by remember { mutableStateOf(false) }
-    var isCreating by remember { mutableStateOf(false) }
-    var error by remember { mutableStateOf<String?>(null) }
-
-    Column(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(16.dp),
-        verticalArrangement = Arrangement.spacedBy(14.dp),
-    ) {
-        Text(
-            text = if (isSpace) "New space" else "New room",
-            style = MaterialTheme.typography.headlineSmall,
-        )
-
-        Text(
-            text = if (isSpace) {
-                "Spaces are useful for grouping related rooms."
-            } else {
-                "Create a room, then invite people or publish it in the directory."
-            },
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-
-        OutlinedTextField(
-            modifier = Modifier.fillMaxWidth(),
-            value = name,
-            onValueChange = { name = it },
-            singleLine = true,
-            label = { Text(if (isSpace) "Space name" else "Room name") },
-        )
-
-        OutlinedTextField(
-            modifier = Modifier.fillMaxWidth(),
-            value = topic,
-            onValueChange = { topic = it },
-            minLines = 2,
-            label = { Text("Topic") },
-        )
-
-        OutlinedTextField(
-            modifier = Modifier.fillMaxWidth(),
-            value = alias,
-            onValueChange = { alias = it.trim() },
-            singleLine = true,
-            label = { Text("Local alias, optional") },
-            supportingText = {
-                Text("Example: pixeldragon creates #pixeldragon:${matrixClient.userId.domain}")
-            },
-        )
-
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            Column(modifier = Modifier.weight(1f)) {
-                Text("Publish in room directory")
-                Text(
-                    text = "People can find it in public search. Join rules are still controlled by the server.",
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    style = MaterialTheme.typography.bodySmall,
-                )
-            }
-
-            Switch(
-                checked = isPublic,
-                onCheckedChange = { isPublic = it },
-            )
-        }
-
-        error?.let {
-            Text(
-                text = it,
-                color = MaterialTheme.colorScheme.error,
-            )
-        }
-
-        Spacer(Modifier.height(4.dp))
-
-        Button(
-            modifier = Modifier.fillMaxWidth(),
-            enabled = !isCreating && name.isNotBlank(),
-            onClick = {
-                isCreating = true
-                error = null
-
-                scope.launch {
-                    val aliasValue = alias.trim()
-                    val roomAliasId = aliasValue.toRoomAliasIdOrNull(matrixClient.userId.domain)
-
-                    if (aliasValue.isNotEmpty() && roomAliasId == null) {
-                        error = "Invalid alias"
-                        isCreating = false
-                        return@launch
-                    }
-
-                    val result = matrixClient.api.room.createRoom(
-                        visibility = if (isPublic) DirectoryVisibility.PUBLIC else DirectoryVisibility.PRIVATE,
-                        roomAliasId = roomAliasId,
-                        name = name.trim(),
-                        topic = topic.trim().takeIf { it.isNotEmpty() },
-                        preset = if (isPublic) CreateRoom.Request.Preset.PUBLIC else CreateRoom.Request.Preset.PRIVATE,
-                        creationContent = if (isSpace) {
-                            CreateEventContent(type = CreateEventContent.RoomType.Space)
-                        } else {
-                            null
-                        },
-                    )
-
-                    result.fold(
-                        onSuccess = { roomId -> onCreated(roomId) },
-                        onFailure = { throwable ->
-                            error = throwable.message ?: "Could not create ${if (isSpace) "space" else "room"}"
-                        },
-                    )
-
-                    isCreating = false
-                }
-            },
-        ) {
-            if (isCreating) {
-                CircularProgressIndicator()
-            } else {
-                Text(if (isSpace) "Create space" else "Create room")
-            }
-        }
-    }
-}
-
-private fun String.toRoomAliasIdOrNull(defaultDomain: String): RoomAliasId? {
-    val value = trim()
-    if (value.isEmpty()) return null
-
-    val fullAlias = when {
-        value.startsWith("#") && value.contains(":") -> value
-        value.startsWith("#") -> "$value:$defaultDomain"
-        value.contains(":") -> "#$value"
-        else -> "#$value:$defaultDomain"
-    }
-
-    return RoomAliasId(fullAlias).takeIf { it.isValid }
-}

app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/JoinRoom.kt

@@ -1,450 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.ui.layout
-
-import android.net.Uri
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.AssistChip
-import androidx.compose.material3.Button
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.OutlinedTextField
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import de.connect2x.trixnity.clientserverapi.model.room.GetPublicRoomsResponse
-import de.connect2x.trixnity.clientserverapi.model.room.GetPublicRoomsWithFilter
-import de.connect2x.trixnity.core.model.RoomAliasId
-import de.connect2x.trixnity.core.model.RoomId
-import de.connect2x.trixnity.core.model.events.m.room.CreateEventContent
-import de.connect2x.trixnity.core.model.events.m.room.JoinRulesEventContent
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import ru.risdeveau.pixeldragon.client
-import ru.risdeveau.pixeldragon.ui.item.Avatar
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun JoinRoomScreen(
-    modifier: Modifier = Modifier,
-    onJoined: (RoomId) -> Unit,
-) {
-    val matrixClient = client!!
-    val scope = rememberCoroutineScope()
-
-    var query by remember { mutableStateOf("") }
-    var server by remember { mutableStateOf(matrixClient.userId.domain) }
-    var results by remember { mutableStateOf<List<GetPublicRoomsResponse.PublicRoomsChunk>>(emptyList()) }
-    var nextBatch by remember { mutableStateOf<String?>(null) }
-    var isSearching by remember { mutableStateOf(false) }
-    var isJoining by remember { mutableStateOf(false) }
-    var error by remember { mutableStateOf<String?>(null) }
-
-    val directTarget = remember(query) { query.parseJoinTarget() }
-
-    fun searchPublicRooms(since: String? = null) {
-        isSearching = true
-        error = null
-
-        scope.launch {
-            val searchTerm = query.trim().takeUnless { directTarget != null }
-            val result = matrixClient.api.room.getPublicRooms(
-                limit = 30,
-                server = server.trim().ifEmpty { null },
-                since = since,
-                filter = GetPublicRoomsWithFilter.Request.Filter(
-                    genericSearchTerm = searchTerm?.takeIf { it.isNotBlank() },
-                ),
-            )
-
-            result.fold(
-                onSuccess = { response ->
-                    results = if (since == null) response.chunk else results + response.chunk
-                    nextBatch = response.nextBatch
-                },
-                onFailure = { throwable ->
-                    if (since == null) results = emptyList()
-                    nextBatch = null
-                    error = throwable.message ?: "Could not search rooms"
-                },
-            )
-
-            isSearching = false
-        }
-    }
-
-    fun joinTarget(target: JoinTarget) {
-        isJoining = true
-        error = null
-
-        scope.launch {
-            val result = when (target) {
-                is JoinTarget.Alias -> matrixClient.api.room.joinRoom(
-                    roomAliasId = RoomAliasId(target.alias),
-                    via = target.via.takeIf { it.isNotEmpty() },
-                )
-                is JoinTarget.Room -> matrixClient.api.room.joinRoom(
-                    roomId = RoomId(target.roomId),
-                    via = target.via.takeIf { it.isNotEmpty() },
-                )
-            }
-
-            result.fold(
-                onSuccess = { roomId -> onJoined(roomId) },
-                onFailure = { throwable ->
-                    error = throwable.message ?: "Could not join room"
-                },
-            )
-
-            isJoining = false
-        }
-    }
-
-    LaunchedEffect(query, server) {
-        delay(450)
-        if (query.parseJoinTarget() == null) {
-            searchPublicRooms()
-        } else {
-            results = emptyList()
-            nextBatch = null
-        }
-    }
-
-    LazyColumn(
-        modifier = modifier.fillMaxSize(),
-        contentPadding = PaddingValues(16.dp),
-        verticalArrangement = Arrangement.spacedBy(12.dp),
-    ) {
-        item {
-            Column(verticalArrangement = Arrangement.spacedBy(12.dp)) {
-                Text(
-                    text = "Join room or space",
-                    style = MaterialTheme.typography.headlineSmall,
-                )
-
-                Text(
-                    text = "Search a public room directory, paste #alias:server, !roomId:server or a matrix.to link.",
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-
-                OutlinedTextField(
-                    modifier = Modifier.fillMaxWidth(),
-                    value = query,
-                    onValueChange = { query = it },
-                    singleLine = true,
-                    label = { Text("Search, alias or Matrix link") },
-                )
-
-                OutlinedTextField(
-                    modifier = Modifier.fillMaxWidth(),
-                    value = server,
-                    onValueChange = { server = it.trim() },
-                    singleLine = true,
-                    label = { Text("Directory server") },
-                    supportingText = { Text("Leave current homeserver or enter another server, for example matrix.org") },
-                )
-            }
-        }
-
-        directTarget?.let { target ->
-            item {
-                ElevatedCard(
-                    modifier = Modifier.fillMaxWidth(),
-                    colors = CardDefaults.elevatedCardColors(
-                        containerColor = MaterialTheme.colorScheme.primaryContainer,
-                    ),
-                ) {
-                    Column(
-                        modifier = Modifier.padding(16.dp),
-                        verticalArrangement = Arrangement.spacedBy(10.dp),
-                    ) {
-                        Text(
-                            text = "Direct join",
-                            style = MaterialTheme.typography.titleMedium,
-                        )
-                        Text(
-                            text = target.id,
-                            maxLines = 2,
-                            overflow = TextOverflow.Ellipsis,
-                        )
-                        if (target.via.isNotEmpty()) {
-                            Text(
-                                text = "via ${target.via.joinToString()}",
-                                color = MaterialTheme.colorScheme.onSurfaceVariant,
-                            )
-                        }
-                        Button(
-                            enabled = !isJoining,
-                            onClick = { joinTarget(target) },
-                        ) {
-                            if (isJoining) {
-                                CircularProgressIndicator()
-                            } else {
-                                Text("Join")
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        error?.let {
-            item {
-                Text(
-                    text = it,
-                    color = MaterialTheme.colorScheme.error,
-                )
-            }
-        }
-
-        if (directTarget == null) {
-            item {
-                Row(
-                    modifier = Modifier.fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
-                ) {
-                    Text(
-                        text = if (query.isBlank()) "Public directory" else "Search results",
-                        style = MaterialTheme.typography.titleMedium,
-                    )
-
-                    if (isSearching) {
-                        CircularProgressIndicator(modifier = Modifier.size(24.dp))
-                    }
-                }
-            }
-
-            if (!isSearching && results.isEmpty()) {
-                item {
-                    Text(
-                        text = "No rooms found",
-                        color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    )
-                }
-            }
-
-            items(
-                items = results,
-                key = { it.roomId.full },
-            ) { room ->
-                PublicRoomItem(
-                    room = room,
-                    isJoining = isJoining,
-                    onJoin = {
-                        joinTarget(
-                            JoinTarget.Room(
-                                roomId = room.roomId.full,
-                                via = room.canonicalAlias?.domain?.let { setOf(it) }.orEmpty(),
-                            ),
-                        )
-                    },
-                    onKnock = {
-                        isJoining = true
-                        error = null
-                        scope.launch {
-                            val result = matrixClient.api.room.knockRoom(room.roomId)
-                            result.fold(
-                                onSuccess = { roomId -> onJoined(roomId) },
-                                onFailure = { throwable -> error = throwable.message ?: "Could not knock room" },
-                            )
-                            isJoining = false
-                        }
-                    },
-                )
-            }
-
-            nextBatch?.let { since ->
-                item {
-                    OutlinedButton(
-                        modifier = Modifier.fillMaxWidth(),
-                        enabled = !isSearching,
-                        onClick = { searchPublicRooms(since) },
-                    ) {
-                        Text("Load more")
-                    }
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun PublicRoomItem(
-    room: GetPublicRoomsResponse.PublicRoomsChunk,
-    isJoining: Boolean,
-    onJoin: () -> Unit,
-    onKnock: () -> Unit,
-) {
-    val isSpace = room.roomType == CreateEventContent.RoomType.Space
-    val title = room.name ?: room.canonicalAlias?.full ?: room.roomId.full
-    val avatarShape = if (isSpace) RoundedCornerShape(12.dp) else CircleShape
-    val canKnock = room.joinRule == JoinRulesEventContent.JoinRule.Knock ||
-            room.joinRule == JoinRulesEventContent.JoinRule.KnockRestricted
-
-    ElevatedCard(modifier = Modifier.fillMaxWidth()) {
-        Column(
-            modifier = Modifier.padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
-        ) {
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(12.dp),
-                verticalAlignment = Alignment.CenterVertically,
-            ) {
-                Avatar(
-                    modifier = Modifier
-                        .size(48.dp)
-                        .clip(avatarShape),
-                    url = room.avatarUrl,
-                    fallbackName = title,
-                )
-
-                Column(modifier = Modifier.weight(1f)) {
-                    Text(
-                        text = title,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        style = MaterialTheme.typography.titleMedium,
-                    )
-                    room.canonicalAlias?.let {
-                        Text(
-                            text = it.full,
-                            maxLines = 1,
-                            overflow = TextOverflow.Ellipsis,
-                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                        )
-                    }
-                }
-            }
-
-            room.topic?.takeIf { it.isNotBlank() }?.let {
-                Text(
-                    text = it,
-                    maxLines = 3,
-                    overflow = TextOverflow.Ellipsis,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                )
-            }
-
-            Row(
-                horizontalArrangement = Arrangement.spacedBy(8.dp),
-            ) {
-                AssistChip(
-                    onClick = {},
-                    label = { Text(if (isSpace) "space" else "room") },
-                )
-                AssistChip(
-                    onClick = {},
-                    label = { Text(room.joinRule.name) },
-                )
-                AssistChip(
-                    onClick = {},
-                    label = { Text("${room.joinedMembersCount} members") },
-                )
-            }
-
-            Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                Button(
-                    enabled = !isJoining,
-                    onClick = onJoin,
-                ) {
-                    Text("Join")
-                }
-
-                if (canKnock) {
-                    OutlinedButton(
-                        enabled = !isJoining,
-                        onClick = onKnock,
-                    ) {
-                        Text("Knock")
-                    }
-                }
-            }
-        }
-    }
-}
-
-private sealed interface JoinTarget {
-    val id: String
-    val via: Set<String>
-
-    data class Alias(
-        val alias: String,
-        override val via: Set<String> = emptySet(),
-    ) : JoinTarget {
-        override val id: String = alias
-    }
-
-    data class Room(
-        val roomId: String,
-        override val via: Set<String> = emptySet(),
-    ) : JoinTarget {
-        override val id: String = roomId
-    }
-}
-
-private fun String.parseJoinTarget(): JoinTarget? {
-    val value = trim()
-    if (value.isEmpty()) return null
-
-    if (value.startsWith("https://matrix.to/#/") || value.startsWith("http://matrix.to/#/")) {
-        return value.parseMatrixToTarget()
-    }
-
-    if (value.startsWith("#") && RoomAliasId(value).isValid) {
-        return JoinTarget.Alias(value)
-    }
-
-    if (value.startsWith("!") && RoomId(value).isReasonable) {
-        return JoinTarget.Room(value)
-    }
-
-    return null
-}
-
-private fun String.parseMatrixToTarget(): JoinTarget? {
-    val fragment = Uri.parse(this).fragment.orEmpty().removePrefix("/")
-    if (fragment.isBlank()) return null
-
-    val idPart = fragment.substringBefore('?')
-    val queryPart = fragment.substringAfter('?', missingDelimiterValue = "")
-    val id = Uri.decode(idPart)
-    val via = Uri.parse("https://matrix.to/?$queryPart")
-        .getQueryParameters("via")
-        .filter { it.isNotBlank() }
-        .toSet()
-
-    return when {
-        id.startsWith("#") && RoomAliasId(id).isValid -> JoinTarget.Alias(id, via)
-        id.startsWith("!") && RoomId(id).isReasonable -> JoinTarget.Room(id, via)
-        else -> null
-    }
-}

app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/Room.kt

@@ -88,10 +88,7 @@ import de.connect2x.trixnity.client.room.message.text
 import de.connect2x.trixnity.client.room.toFlowList
 import de.connect2x.trixnity.client.store.TimelineEvent
 import de.connect2x.trixnity.client.store.eventId
-import de.connect2x.trixnity.clientserverapi.model.user.avatarUrl
-import de.connect2x.trixnity.clientserverapi.model.user.displayName
 import de.connect2x.trixnity.core.model.RoomId
-import de.connect2x.trixnity.core.model.UserId
 import de.connect2x.trixnity.core.model.events.ClientEvent
 import de.connect2x.trixnity.core.model.events.m.FullyReadEventContent
 import de.connect2x.trixnity.core.model.events.m.room.AvatarEventContent
@@ -117,12 +114,10 @@ import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
 import org.jsoup.safety.Safelist
 import ru.risdeveau.pixeldragon.client
-import ru.risdeveau.pixeldragon.ui.item.Avatar
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Date
 import java.util.Locale
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.max
@@ -370,11 +365,7 @@ fun Room(modifier: Modifier = Modifier, rid: String) {
                         }
                         .zIndex(1f),
                 ) {
-                    TimelineAvatar(
+                    AvatarPlaceholder(avatarState.senderLabel)
-                        modifier = Modifier.size(TIMELINE_AVATAR_SIZE),
-                        senderId = avatarState.senderId,
-                        senderLabel = avatarState.senderLabel,
-                    )
                 }
             }
         }
@@ -458,7 +449,6 @@ private data class MessageTimelineItem(
 
 private data class StickyAvatarState(
     val groupKey: String,
-    val senderId: String?,
     val senderLabel: String,
     val yPx: Int,
 )
@@ -687,11 +677,7 @@ private fun MessageGroupRow(
                 if (hideInlineAvatar) {
                     Spacer(Modifier.size(TIMELINE_AVATAR_SIZE))
                 } else {
-                    TimelineAvatar(
+                    AvatarPlaceholder(group.senderLabel)
-                        modifier = Modifier.size(TIMELINE_AVATAR_SIZE),
-                        senderId = group.senderId,
-                        senderLabel = group.senderLabel,
-                    )
                 }
                 Spacer(Modifier.width(8.dp))
             }
@@ -713,61 +699,6 @@ private fun MessageGroupRow(
     }
 }
 
-private val timelineAvatarProfileCache = ConcurrentHashMap<String, TimelineAvatarProfile>()
-
-private data class TimelineAvatarProfile(
-    val displayName: String,
-    val avatarUrl: String?,
-)
-
-@Composable
-private fun TimelineAvatar(
-    modifier: Modifier = Modifier,
-    senderId: String?,
-    senderLabel: String,
-) {
-    val fallbackProfile = remember(senderId, senderLabel) {
-        TimelineAvatarProfile(senderLabel.takeUnless { it.isBlank() } ?: "?", null)
-    }
-    var profile by remember(senderId, senderLabel) {
-        mutableStateOf(senderId?.let(timelineAvatarProfileCache::get) ?: fallbackProfile)
-    }
-
-    LaunchedEffect(senderId, senderLabel) {
-        val id = senderId ?: run {
-            profile = fallbackProfile
-            return@LaunchedEffect
-        }
-
-        timelineAvatarProfileCache[id]?.let { cached ->
-            profile = cached
-            return@LaunchedEffect
-        }
-
-        val fetchedProfile = client?.api?.user
-            ?.getProfile(UserId(id))
-            ?.getOrNull()
-
-        val resolvedProfile = TimelineAvatarProfile(
-            displayName = fetchedProfile
-                ?.displayName
-                ?.takeUnless { it.isBlank() }
-                ?: senderLabel.takeUnless { it.isBlank() }
-                ?: "?",
-            avatarUrl = fetchedProfile?.avatarUrl,
-        )
-
-        timelineAvatarProfileCache[id] = resolvedProfile
-        profile = resolvedProfile
-    }
-
-    Avatar(
-        modifier = modifier,
-        url = profile.avatarUrl,
-        fallbackName = profile.displayName,
-    )
-}
-
 @Composable
 private fun MessageBubble(
     item: MessageTimelineItem,
@@ -813,6 +744,27 @@ private fun MessageBubble(
     }
 }
 
+@Composable
+private fun AvatarPlaceholder(senderLabel: String) {
+    val initial = senderLabel.trim().firstOrNull()?.uppercaseChar()?.toString() ?: "?"
+
+    Box(
+        modifier = Modifier
+            .size(32.dp)
+            .background(
+                color = MaterialTheme.colorScheme.secondaryContainer,
+                shape = CircleShape,
+            ),
+        contentAlignment = Alignment.Center,
+    ) {
+        Text(
+            text = initial,
+            style = MaterialTheme.typography.labelMedium,
+            color = MaterialTheme.colorScheme.onSecondaryContainer,
+        )
+    }
+}
+
 @Composable
 private fun MessageBody(
     content: RoomMessageEventContent,
@@ -869,7 +821,6 @@ private fun calculateStickyAvatarState(
 
             StickyAvatarState(
                 groupKey = group.key,
-                senderId = group.senderId,
                 senderLabel = group.senderLabel,
                 yPx = pinnedAvatarTop.coerceAtLeast(groupTop),
             )

app/src/main/java/ru/risdeveau/pixeldragon/ui/layout/RoomActions.kt

@@ -1,110 +0,0 @@
-/*
- * Created by sweetbread
- * Copyright (c) 2026. All rights reserved.
- */
-
-package ru.risdeveau.pixeldragon.ui.layout
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ModalBottomSheet
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-
-object RoomActionsRoutes {
-    const val Rooms = "rooms"
-    const val JoinRoom = "join-room"
-    const val CreateRoom = "create-room"
-    const val CreateSpace = "create-space"
-
-    fun titleFor(route: String?): String? {
-        return when (route) {
-            JoinRoom -> "Join room or space"
-            CreateRoom -> "Create room"
-            CreateSpace -> "Create space"
-            else -> null
-        }
-    }
-}
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun RoomActionsSheet(
-    onDismiss: () -> Unit,
-    onJoinRoom: () -> Unit,
-    onCreateRoom: () -> Unit,
-    onCreateSpace: () -> Unit,
-) {
-    ModalBottomSheet(onDismissRequest = onDismiss) {
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(horizontal = 16.dp),
-        ) {
-            Surface(
-                modifier = Modifier.fillMaxWidth(),
-                shape = RoundedCornerShape(24.dp),
-            ) {
-                Column {
-                    RoomActionItem(
-                        title = "Join room or space",
-                        subtitle = "Search public directories or paste a Matrix link",
-                        onClick = {
-                            onDismiss()
-                            onJoinRoom()
-                        },
-                    )
-
-                    HorizontalDivider(modifier = Modifier.padding(start = 16.dp))
-
-                    RoomActionItem(
-                        title = "Create room",
-                        subtitle = "Start a public or private room",
-                        onClick = {
-                            onDismiss()
-                            onCreateRoom()
-                        },
-                    )
-
-                    HorizontalDivider(modifier = Modifier.padding(start = 16.dp))
-
-                    RoomActionItem(
-                        title = "Create space",
-                        subtitle = "Group related rooms together",
-                        onClick = {
-                            onDismiss()
-                            onCreateSpace()
-                        },
-                    )
-                }
-            }
-
-            Spacer(Modifier.height(32.dp))
-        }
-    }
-}
-
-@Composable
-private fun RoomActionItem(
-    title: String,
-    subtitle: String,
-    onClick: () -> Unit,
-) {
-    ListItem(
-        modifier = Modifier.clickable(onClick = onClick),
-        headlineContent = { Text(title) },
-        supportingContent = { Text(subtitle) },
-        trailingContent = { Text("›") },
-    )
-}

gradle/libs.versions.toml

@@ -16,8 +16,7 @@ composeBom = "2026.03.00"
 navigationCompose = "2.9.7"
 room = "2.6.1"
 splittiesFunPackAndroidBase = "3.0.0"
-trixnityClient = "5.5.2"
+trixnityClient = "5.2.0"
-unifiedPushConnector = "3.3.2"
 uiUnit = "1.10.6"
 
 [libraries]
@@ -55,7 +54,6 @@ trixnity-client = { module = "de.connect2x.trixnity:trixnity-client", version.re
 trixnity-client-media-okio = { module = "de.connect2x.trixnity:trixnity-client-media-okio", version.ref = "trixnityClient" }
 trixnity-client-repository-room = { module = "de.connect2x.trixnity:trixnity-client-repository-room", version.ref = "trixnityClient" }
 trixnity-client-cryptodriver-vodozemac = { module = "de.connect2x.trixnity:trixnity-client-cryptodriver-vodozemac", version.ref = "trixnityClient" }
-unifiedpush-connector = { module = "org.unifiedpush.android:connector", version.ref = "unifiedPushConnector" }
 androidx-compose-ui-unit = { group = "androidx.compose.ui", name = "ui-unit", version.ref = "uiUnit" }
 
 [plugins]