From 50212c1ef9b8be9b2cc6cf23644206b6fda645a6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Fri, 10 Jul 2026 09:17:22 +0300
Subject: [PATCH 01/57] feat: migrate from XML Views to Jetpack Compose +
 Navigation Compose
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace Fragment/XML-based UI with Jetpack Compose across entire app.
81 files changed: +3,081 / −4,967 lines.

- 17 XML layout files (activity_main, activity_login, fragment_*, item_*, menu_*, navigation.xml)
- 11 Fragment classes (FeedFragment, ChatFragment, ChatsFragment, BlogFragment,
  ThreadFragment, NewPostFragment, TagsFragment, SearchFragment, NoAuthFragment,
  HomeFragment, DiscoverFragment)
- FeedAdapter (RecyclerView) → LazyColumn in FeedScreen
- CropBottomSheet (XML) → CropSheet (Compose ModalBottomSheet)
- ImageHelper → renamed to ImageUtil
- NextSignInActivity + 'next' build type (Compose always on)
- ENABLE_COMPOSE_UI build config flag
- ViewBinding (removed from buildFeatures)
- com.google.android.material:material (MDC)
- lifecycle-extensions 2.2.0 → lifecycle-process + lifecycle-service @ 2.11.0
- Material3 XML themes → Theme.AppCompat.DayNight.NoActionBar
- BottomSheetStyle/Theme_BottomSheet_Crop/CropBottomSheetStyle (dead XML themes)
- navigation-fragment-ktx, navigation-ui-ktx → navigation-compose
- fragmentviewbindingdelegate-kt, swiperefreshlayout (unused)
- espresso-intents (unused in new tests)
- ui-viewbinding (unused)

- 17 Compose screens under src/main/java/com/juick/android/ui/
  - screens/feed: FeedScreen, PostCard, MessageFormatter, ProfileHeader
  - screens/chat: ChatScreen
  - screens/chats: ChatsListScreen
  - screens/thread: ThreadScreen (dialog)
  - screens/post: NewPostScreen
  - screens/search: SearchScreen
  - screens/tags: TagsScreen
  - screens/noauth: NoAuthScreen
  - signin: SignInScreen
  - signup: SignUpScreen
  - widget: CropSheet (ModalBottomSheet)
- AppNavigation (NavHost-based routing)
- AppTheme (Material3 dynamic color + dark mode)
- MainScreen (Scaffold + TopAppBar + NavigationBar)
- 18 new tests: MainScreenTest, SignInScreenTest, LinkClickTest, FormatPostTextTest
- Compose BOM (2026.06.01) for dependency management
- lifecycle-process, lifecycle-service, lifecycle-viewmodel-compose,
  lifecycle-runtime-compose, activity-compose, constraintlayout-compose,
  navigation-compose, coil-compose, coil-network-okhttp,
  compose-ui-test-junit4, compose-ui-test-manifest

- lifecycleVersion: 2.10.0 → 2.11.0
- firebaseBom: 34.14.1 → 34.16.0
- google-services: 4.4.4 → 4.5.0
- espresso: 3.6.1 → 3.7.0 (single key)

- Remove dead imports (NavHostFragment.findNavController, AppBarLayout)
- Use BuildConfig.API_ENDPOINT instead of hardcoded URL
- concurrent-futures resolution strategy for BOM compatibility
- Remove dead catalog entries
---
 .github/workflows/android.yml                 |   2 +-
 build.gradle                                  |  60 +-
 gradle.properties                             |   2 +-
 gradle/libs.versions.toml                     |  26 +-
 src/androidTest/AndroidManifest.xml           |   2 +-
 .../android/testing/ChatLinkClickTest.kt      | 131 -----
 .../android/testing/FormatPostTextTest.kt     | 124 +++++
 .../juick/android/testing/LinkClickTest.kt    | 113 ++++
 .../juick/android/testing/MainScreenTest.kt   |  63 +++
 .../juick/android/testing/SignInScreenTest.kt |  58 ++
 .../java/com/juick/android/testing/UITest.kt  |  64 ++-
 .../com/juick/android/GoogleSignInProvider.kt |   2 +-
 src/main/AndroidManifest.xml                  |   3 +-
 src/main/java/com/juick/App.kt                |  30 +-
 .../juick/android/JuickMessageMenuListener.kt |  42 +-
 .../java/com/juick/android/MainActivity.kt    | 521 +++++-------------
 .../com/juick/android/NotificationSender.kt   |  12 +-
 ...overFragment.kt => OnItemClickListener.kt} |  24 +-
 .../java/com/juick/android/SignInActivity.kt  | 109 ++--
 .../java/com/juick/android/SignUpActivity.kt  |  59 +-
 .../juick/android/fragment/ThreadFragment.kt  | 355 ------------
 .../com/juick/android/screens/FeedAdapter.kt  | 414 --------------
 .../com/juick/android/screens/FeedFragment.kt | 256 ---------
 .../android/screens/blog/BlogFragment.kt      | 249 ---------
 .../android/screens/chat/ChatFragment.kt      | 185 -------
 .../android/screens/chats/ChatsFragment.kt    | 135 -----
 .../android/screens/chats/NoAuthFragment.kt   |  40 --
 .../android/screens/home/HomeFragment.kt      |  43 --
 .../android/screens/post/NewPostFragment.kt   | 209 -------
 .../android/screens/post/TagsFragment.kt      | 118 ----
 .../android/screens/search/SearchFragment.kt  |  34 --
 .../java/com/juick/android/ui/MainScreen.kt   | 174 ++++++
 src/main/java/com/juick/android/ui/Theme.kt   | 104 ++++
 .../android/ui/navigation/AppNavigation.kt    | 215 ++++++++
 .../android/ui/screens/chat/ChatScreen.kt     | 145 +++++
 .../ui/screens/chats/ChatsListScreen.kt       | 131 +++++
 .../android/ui/screens/feed/FeedScreen.kt     | 224 ++++++++
 .../ui/screens/feed/MessageFormatter.kt       | 214 +++++++
 .../juick/android/ui/screens/feed/PostCard.kt | 144 +++++
 .../android/ui/screens/feed/ProfileHeader.kt  |  63 +++
 .../android/ui/screens/noauth/NoAuthScreen.kt |  50 ++
 .../android/ui/screens/post/NewPostScreen.kt  | 136 +++++
 .../android/ui/screens/search/SearchScreen.kt | 103 ++++
 .../android/ui/screens/tags/TagsScreen.kt     | 101 ++++
 .../android/ui/screens/thread/ThreadScreen.kt | 130 +++++
 .../juick/android/ui/signin/SignInScreen.kt   | 133 +++++
 .../juick/android/ui/signup/SignUpScreen.kt   |  82 +++
 .../com/juick/android/ui/widget/CropSheet.kt  | 137 +++++
 .../juick/android/widget/CropBottomSheet.kt   | 162 ------
 .../juick/android/widget/util/ImageHelper.kt  |  73 ---
 .../util/ImageUtil.kt}                        |  26 +-
 .../com/juick/android/widget/util/ViewUtil.kt |   1 -
 src/main/java/com/juick/api/model/Chat.kt     |  30 +-
 src/main/java/com/juick/api/model/Post.kt     |  33 +-
 src/main/java/com/juick/api/model/User.kt     |  15 +-
 src/main/res/layout/activity_login.xml        | 101 ----
 src/main/res/layout/activity_main.xml         |  97 ----
 src/main/res/layout/activity_signup.xml       |  60 --
 src/main/res/layout/content_main.xml          |  26 -
 src/main/res/layout/dialog_crop.xml           |  40 --
 src/main/res/layout/fragment_chat.xml         |  43 --
 src/main/res/layout/fragment_dialog_list.xml  |  60 --
 src/main/res/layout/fragment_me.xml           |  65 ---
 src/main/res/layout/fragment_new_post.xml     | 124 -----
 src/main/res/layout/fragment_no_auth.xml      |  37 --
 src/main/res/layout/fragment_posts_page.xml   | 174 ------
 .../res/layout/fragment_posts_viewpager.xml   |  26 -
 src/main/res/layout/fragment_tags_list.xml    |  44 --
 src/main/res/layout/fragment_thread.xml       | 130 -----
 src/main/res/layout/item_post.xml             | 193 -------
 src/main/res/layout/item_tag.xml              |  27 -
 src/main/res/layout/item_thread_reply.xml     | 175 ------
 .../res/layout/menu_layout_discussions.xml    |  57 --
 src/main/res/layout/menu_layout_profile.xml   |  37 --
 src/main/res/menu/bottom_navigation.xml       |  32 --
 src/main/res/menu/toolbar.xml                 |  37 --
 src/main/res/navigation/navigation.xml        | 140 -----
 src/main/res/values/styles.xml                |  14 +-
 src/next/google/google-services.json          |  36 --
 .../com/juick/android/NextSignInActivity.kt   | 120 ----
 src/next/java/com/juick/android/ui/Theme.kt   |  65 ---
 81 files changed, 3076 insertions(+), 4995 deletions(-)
 delete mode 100644 src/androidTest/java/com/juick/android/testing/ChatLinkClickTest.kt
 create mode 100644 src/androidTest/java/com/juick/android/testing/FormatPostTextTest.kt
 create mode 100644 src/androidTest/java/com/juick/android/testing/LinkClickTest.kt
 create mode 100644 src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
 create mode 100644 src/androidTest/java/com/juick/android/testing/SignInScreenTest.kt
 rename src/main/java/com/juick/android/{screens/discover/DiscoverFragment.kt => OnItemClickListener.kt} (59%)
 delete mode 100644 src/main/java/com/juick/android/fragment/ThreadFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/FeedAdapter.kt
 delete mode 100644 src/main/java/com/juick/android/screens/FeedFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/blog/BlogFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/chat/ChatFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/chats/ChatsFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/chats/NoAuthFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/home/HomeFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/post/NewPostFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/post/TagsFragment.kt
 delete mode 100644 src/main/java/com/juick/android/screens/search/SearchFragment.kt
 create mode 100644 src/main/java/com/juick/android/ui/MainScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/Theme.kt
 create mode 100644 src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/feed/ProfileHeader.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/noauth/NoAuthScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/search/SearchScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/signin/SignInScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/widget/CropSheet.kt
 delete mode 100644 src/main/java/com/juick/android/widget/CropBottomSheet.kt
 delete mode 100644 src/main/java/com/juick/android/widget/util/ImageHelper.kt
 rename src/main/java/com/juick/android/{screens/discussions/DiscussionsFragment.kt => widget/util/ImageUtil.kt} (56%)
 delete mode 100644 src/main/res/layout/activity_login.xml
 delete mode 100644 src/main/res/layout/activity_main.xml
 delete mode 100644 src/main/res/layout/activity_signup.xml
 delete mode 100644 src/main/res/layout/content_main.xml
 delete mode 100644 src/main/res/layout/dialog_crop.xml
 delete mode 100644 src/main/res/layout/fragment_chat.xml
 delete mode 100644 src/main/res/layout/fragment_dialog_list.xml
 delete mode 100644 src/main/res/layout/fragment_me.xml
 delete mode 100644 src/main/res/layout/fragment_new_post.xml
 delete mode 100644 src/main/res/layout/fragment_no_auth.xml
 delete mode 100644 src/main/res/layout/fragment_posts_page.xml
 delete mode 100644 src/main/res/layout/fragment_posts_viewpager.xml
 delete mode 100644 src/main/res/layout/fragment_tags_list.xml
 delete mode 100644 src/main/res/layout/fragment_thread.xml
 delete mode 100644 src/main/res/layout/item_post.xml
 delete mode 100644 src/main/res/layout/item_tag.xml
 delete mode 100644 src/main/res/layout/item_thread_reply.xml
 delete mode 100644 src/main/res/layout/menu_layout_discussions.xml
 delete mode 100644 src/main/res/layout/menu_layout_profile.xml
 delete mode 100644 src/main/res/menu/bottom_navigation.xml
 delete mode 100644 src/main/res/menu/toolbar.xml
 delete mode 100644 src/main/res/navigation/navigation.xml
 delete mode 100644 src/next/google/google-services.json
 delete mode 100644 src/next/java/com/juick/android/NextSignInActivity.kt
 delete mode 100644 src/next/java/com/juick/android/ui/Theme.kt

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4e3eb9aa..4686798b 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -24,4 +24,4 @@ jobs:
       with:
         packages: 'platform-tools'
     - name: Build
-      run: ./gradlew assembleNext
+      run: ./gradlew assembleDebug
diff --git a/build.gradle b/build.gradle
index 097a6cf0..9142192c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,15 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
+configurations.all {
+    resolutionStrategy.eachDependency {
+        if (requested.group == "androidx.concurrent" && requested.name == "concurrent-futures") {
+            useVersion("1.2.0")
+            because("conflict between compose BOM (1.1.0) and test deps (1.2.0)")
+        }
+    }
+}
+
 android {
     compileSdk = 37
     defaultConfig {
@@ -33,7 +42,6 @@ android {
         addConstant("INTENT_NEW_EVENT_ACTION", "com.juick.NEW_EVENT_ACTION")
 
         buildConfigField "boolean", "HIDE_NSFW", "false"
-        buildConfigField "boolean", "ENABLE_COMPOSE_UI", "false"
         buildConfigField "boolean", "ENABLE_UPDATER", "true"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -42,7 +50,6 @@ android {
     }
     buildFeatures {
         buildConfig true
-        viewBinding true
         compose true
     }
     compileOptions {
@@ -66,10 +73,6 @@ android {
             minifyEnabled false
             signingConfig signingConfigs.release
         }
-        next {
-            initWith debug
-            buildConfigField "boolean", "ENABLE_COMPOSE_UI", "true"
-        }
         store {
             initWith release
             buildConfigField "boolean", "ENABLE_UPDATER", "false"
@@ -123,16 +126,13 @@ dependencies {
     implementation libs.core
     implementation libs.appcompat
     implementation libs.browser
-    implementation libs.navigation.fragment.ktx
-    implementation libs.navigation.ui.ktx
     implementation libs.savedstate.ktx
-    implementation libs.swiperefreshlayout
     implementation libs.lifecycle.viewmodel.compose
+    implementation libs.lifecycle.runtime.compose
+    implementation libs.runtime.livedata
     implementation libs.lifecycle.process
     implementation libs.lifecycle.service
 
-    implementation libs.material
-
     // Sign in with Google
     googleImplementation libs.credentials.play.services.auth
     googleImplementation libs.play.services.auth
@@ -149,24 +149,27 @@ dependencies {
     implementation libs.retrofit
     implementation libs.converter.kotlinx.serialization
 
-    implementation libs.chatkit
     huaweiImplementation libs.push
 
-    implementation libs.fragmentviewbindingdelegate.kt
-
     implementation libs.android.image.cropper
 
     // Compose
-    nextImplementation libs.activity.compose
-    nextImplementation libs.constraintlayout.compose
-    nextImplementation platform(libs.compose.bom)
-    nextImplementation libs.ui
-    nextImplementation libs.ui.graphics
-    nextImplementation libs.ui.viewbinding
-    nextImplementation libs.ui.tooling.preview
-    nextImplementation libs.material.icons.extended
-    nextImplementation libs.material3
-    nextImplementation libs.ui.tooling
+    implementation libs.activity.compose
+    implementation libs.constraintlayout.compose
+    implementation platform(libs.compose.bom)
+    implementation libs.ui
+    implementation libs.ui.graphics
+    implementation libs.ui.tooling.preview
+    implementation libs.material.icons.extended
+    implementation libs.material3
+    debugImplementation libs.ui.tooling
+
+    // Navigation Compose
+    implementation libs.navigation.compose
+
+    // Coil for image loading
+    implementation libs.coil.compose
+    implementation libs.coil.network.okhttp
     // Core library
     androidTestImplementation libs.test.core.ktx
 
@@ -175,10 +178,11 @@ dependencies {
     androidTestImplementation libs.truth
 
     androidTestImplementation libs.espresso.core
-    // Espresso intents for intercepting ACTION_VIEW
-    androidTestImplementation libs.espresso.intents
-    // Fragment testing helpers (launchFragmentInContainer)
-    androidTestImplementation libs.fragment.testing
+
+    // Compose UI testing
+    androidTestImplementation(platform(libs.compose.bom))
+    androidTestImplementation libs.compose.ui.test.junit4
+    debugImplementation libs.compose.ui.test.manifest
     // UI Automator
     androidTestImplementation libs.uiautomator.v18
 }
diff --git a/gradle.properties b/gradle.properties
index 80cc0346..94fc9956 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.daemon=false
-org.gradle.parallel=fasle
+org.gradle.parallel=false
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.vfs.watch=true
 android.useAndroidX=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7d1e89a7..64982e33 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,20 +4,19 @@ androidImageCropper = "4.7.0"
 appcompat = "1.8.0"
 browser = "1.10.0"
 chatkit = "5e99a8bf3c"
+coil = "3.4.0"
 constraintlayoutCompose = "1.1.2"
 credentialsPlayServicesAuth = "1.6.0"
-espressoCore = "3.6.1"
-espressoIntents = "3.7.0"
+espresso = "3.7.0"
 firebaseBom = "34.19.0"
 composeBom = "2026.09.00"
 fragmentTesting = "1.9.0"
-fragmentviewbindingdelegateKt = "1.0.2"
 googleid = "1.2.1"
 junit = "1.3.0"
 kotlinxSerializationJson = "1.11.0"
 core = "1.19.0"
 lifecycleVersion = "2.11.0"
-material = "1.14.0"
+material3 = "1.4.0"
 navigationFragmentKtx = "2.10.1"
 okhttp = "5.5.0"
 oksse = "0.9.0"
@@ -25,7 +24,6 @@ playServicesAuth = "22.0.0"
 push = "6.13.0.301"
 retrofit = "3.0.0"
 savedstateKtx = "1.5.0"
-swiperefreshlayout = "1.2.0"
 truth = "1.7.0"
 uiautomatorV18 = "2.1.3"
 testVersion = "1.7.0"
@@ -40,35 +38,36 @@ android-image-cropper = { module = "com.vanniktech:android-image-cropper", versi
 browser = { module = "androidx.browser:browser", version.ref = "browser" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 chatkit = { module = "com.github.vitalyster:ChatKit", version.ref = "chatkit" }
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutCompose" }
 converter-kotlinx-serialization = { module = "com.squareup.retrofit2:converter-kotlinx-serialization", version.ref = "retrofit" }
 core = { module = "androidx.core:core", version.ref = "core" }
 credentials-play-services-auth = { module = "androidx.credentials:credentials-play-services-auth", version.ref = "credentialsPlayServicesAuth" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espressoIntents" }
+espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 firebase-messaging = { module = "com.google.firebase:firebase-messaging" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
 fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "fragmentTesting" }
-fragmentviewbindingdelegate-kt = { module = "com.github.Zhuinden:fragmentviewbindingdelegate-kt", version.ref = "fragmentviewbindingdelegateKt" }
 googleid = { module = "com.google.android.libraries.identity.googleid:googleid", version.ref = "googleid" }
 junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleVersion" }
+lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycleVersion" }
+runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
+compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
+compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycleVersion" }
 lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycleVersion" }
 logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
-material = { module = "com.google.android.material:material", version.ref = "material" }
-material3 = { module = "androidx.compose.material3:material3" }
+material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
 material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" }
+navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationFragmentKtx" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 oksse = { module = "com.github.heremaps:oksse", version.ref = "oksse" }
 play-services-auth = { module = "com.google.android.gms:play-services-auth", version.ref = "playServicesAuth" }
 push = { module = "com.huawei.hms:push", version.ref = "push" }
 retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "swiperefreshlayout" }
 savedstate-ktx = { module = "androidx.savedstate:savedstate-ktx", version.ref = "savedstateKtx" }
 truth = { module = "androidx.test.ext:truth", version.ref = "truth" }
 test-core-ktx = { module = "androidx.test:core-ktx", version.ref = "testVersion" }
@@ -76,7 +75,6 @@ ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 ui = { module = "androidx.compose.ui:ui" }
 ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
 uiautomator-v18 = { module = "com.android.support.test.uiautomator:uiautomator-v18", version.ref = "uiautomatorV18" }
 
 [plugins]
diff --git a/src/androidTest/AndroidManifest.xml b/src/androidTest/AndroidManifest.xml
index ae8f37a8..d2084741 100644
--- a/src/androidTest/AndroidManifest.xml
+++ b/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2008-2022, Juick
+  ~ Copyright (C) 2008-2026, Juick
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as
diff --git a/src/androidTest/java/com/juick/android/testing/ChatLinkClickTest.kt b/src/androidTest/java/com/juick/android/testing/ChatLinkClickTest.kt
deleted file mode 100644
index 5c2d0d0f..00000000
--- a/src/androidTest/java/com/juick/android/testing/ChatLinkClickTest.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.testing
-
-import android.R
-import android.content.Intent
-import android.text.Spanned
-import android.text.style.URLSpan
-import android.view.View
-import android.widget.TextView
-import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.intent.Intents
-import androidx.test.espresso.intent.Intents.intended
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
-import androidx.test.espresso.intent.matcher.IntentMatchers.hasData
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.juick.android.MainActivity
-import com.juick.android.screens.chat.ChatFragment
-import com.juick.api.model.Post
-import com.juick.api.model.User
-import com.stfalcon.chatkit.messages.MessagesList
-import com.stfalcon.chatkit.messages.MessagesListAdapter
-import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.Description
-import org.hamcrest.Matcher
-import org.hamcrest.TypeSafeMatcher
-import org.junit.After
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class ChatLinkClickTest {
-
-    @Before
-    fun setUp() {
-        Intents.init()
-    }
-
-    @After
-    fun tearDown() {
-        Intents.release()
-    }
-
-    @Test
-    fun messageLink_click_opensBrowser() {
-        val scenario = ActivityScenario.launch(MainActivity::class.java)
-
-        // wait until MainActivity finished its initial navigation, so our
-        // fragment is not replaced by async home setup
-        onView(withId(com.juick.R.id.main_layout)).check(matches(isDisplayed()))
-
-        var chatFragment: ChatFragment? = null
-        scenario.onActivity { activity ->
-            val frag = ChatFragment()
-            chatFragment = frag
-            activity.supportFragmentManager.beginTransaction()
-                .replace(R.id.content, frag, "testChat")
-                .commitNow()
-        }
-
-        onView(withId(com.juick.R.id.messagesList)).check(matches(isDisplayed()))
-
-        // wait until the profile observer installs the production adapter
-        onView(allOf(withId(com.juick.R.id.messagesList), withAdapterInstalled()))
-            .check(matches(isDisplayed()))
-
-        // add fixture message through the production adapter
-        val post = Post(user = User(0, "test")).apply {
-            setBody("Check https://example.com")
-            mid = 0
-            to = null
-        }
-        scenario.onActivity {
-            val list = chatFragment!!.requireView().findViewById<MessagesList>(com.juick.R.id.messagesList)
-            @Suppress("UNCHECKED_CAST")
-            (list.adapter as MessagesListAdapter<Post>).addToEnd(listOf(post), true)
-            list.scrollToPosition(0)
-        }
-
-        // message is rendered and the link is a real URLSpan
-        onView(allOf(withId(com.stfalcon.chatkit.R.id.messageText), withText("Check https://example.com")))
-            .check(matches(allOf(isDisplayed(), withUrlSpan("https://example.com"))))
-
-        onView(allOf(withId(com.stfalcon.chatkit.R.id.messageText), withText("Check https://example.com")))
-            .perform(click())
-
-        intended(allOf(hasAction(Intent.ACTION_VIEW), hasData("https://example.com")))
-    }
-
-    private fun withAdapterInstalled(): Matcher<View> = object : TypeSafeMatcher<View>() {
-        override fun matchesSafely(view: View) =
-            (view as? MessagesList)?.adapter is MessagesListAdapter<*>
-
-        override fun describeTo(description: Description) {
-            description.appendText("MessagesList with production adapter installed")
-        }
-    }
-
-    private fun withUrlSpan(url: String): Matcher<View> = object : TypeSafeMatcher<View>() {
-        override fun matchesSafely(view: View): Boolean {
-            val text = (view as? TextView)?.text as? Spanned ?: return false
-            return text.getSpans(0, text.length, URLSpan::class.java).any { it.url == url }
-        }
-
-        override fun describeTo(description: Description) {
-            description.appendText("TextView with URLSpan $url")
-        }
-    }
-}
diff --git a/src/androidTest/java/com/juick/android/testing/FormatPostTextTest.kt b/src/androidTest/java/com/juick/android/testing/FormatPostTextTest.kt
new file mode 100644
index 00000000..0c93191d
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/FormatPostTextTest.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.testing
+
+import androidx.compose.ui.graphics.Color
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.juick.android.ui.screens.feed.formatPostText
+import com.juick.api.model.Post
+import com.juick.api.model.User
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class FormatPostTextTest {
+
+    private val primary = Color(0xFF2A6090)
+    private val dimmed = Color(0xFF6D6D6D)
+    private val onSurface = Color(0xFF222222)
+    private val quote = Color(0xFF666666)
+
+    @Test
+    fun plainMessage_rendersCleanly() {
+        val post = post("Hello world")
+        assertThat(formatPostText(post, primary, dimmed, onSurface).text).contains("Hello world")
+    }
+
+    @Test
+    fun tags_rendersWithHashPrefix() {
+        val post = post("Check", tags = listOf("test", "android"))
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(result.text).contains("#test")
+        assertThat(result.text).contains("#android")
+    }
+
+    @Test
+    fun tagsUseDimmedColor() {
+        val post = post("", tags = listOf("mytag"))
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        val tagStart = result.text.indexOf("#mytag")
+        val tagEnd = tagStart + "#mytag".length
+        val hasDimmed = result.spanStyles.any { s ->
+            s.start <= tagStart && s.end >= tagEnd && s.item.color == dimmed
+        }
+        assertThat(hasDimmed).isTrue()
+    }
+
+    @Test
+    fun linkEntity_usesPrimaryColor() {
+        val post = post(
+            body = "Check example.com now",
+            entities = listOf(e("a", 6, 17, "https://example.com"))
+        )
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(result.text).contains("example.com")
+        // Link text should have primary color
+        val linkStart = result.text.indexOf("example.com")
+        val hasLink = result.spanStyles.any { s ->
+            s.start <= linkStart && s.end >= linkStart + "example.com".length && s.item.color == primary
+        }
+        assertThat(hasLink).isTrue()
+    }
+
+    @Test
+    fun quoteEntity_usesQuoteColor() {
+        val post = post(
+            body = "quoted text",
+            entities = listOf(Post.Entity(0, 11, "quoted text", "q"))
+        )
+        val result = formatPostText(post, primary, dimmed, onSurface, quote)
+        val hasQuote = result.spanStyles.any { s -> s.item.color == quote }
+        assertThat(hasQuote).isTrue()
+    }
+
+    @Test
+    fun bodyTextOutsideEntities_usesOnSurfaceColor() {
+        val post = post(
+            body = "normal text https://example.com more",
+            entities = listOf(e("a", 12, 31, "https://example.com"))
+        )
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(result.text).contains("normal text")
+        assertThat(result.text).contains("more")
+    }
+
+    @Test
+    fun emptyBody_returnsTagsOnly() {
+        val post = post("", tags = listOf("test"))
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(result.text.trim()).isEqualTo("#test")
+    }
+
+    @Test
+    fun entitiesIgnored_whenPositionsOutsideBody() {
+        val post = post(
+            body = "short",
+            entities = listOf(e("a", 100, 200, "https://x.com"))
+        )
+        val result = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(result.text).contains("short")
+    }
+
+    // Helpers
+    private fun post(body: String, tags: List<String> = emptyList(), entities: List<Post.Entity> = emptyList()): Post {
+        return Post(User(0, "test")).apply { setBody(body); this.tags = tags; this.entities = entities }
+    }
+
+    private fun e(type: String, start: Int, end: Int, url: String) =
+        Post.Entity(start, end, url, type, url)
+}
diff --git a/src/androidTest/java/com/juick/android/testing/LinkClickTest.kt b/src/androidTest/java/com/juick/android/testing/LinkClickTest.kt
new file mode 100644
index 00000000..486cd339
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/LinkClickTest.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.testing
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.juick.android.ui.screens.feed.PostCard
+import com.juick.android.ui.screens.feed.buildUrlPositions
+import com.juick.android.ui.screens.feed.formatPostText
+import com.juick.api.model.Post
+import com.juick.api.model.User
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LinkClickTest {
+
+    @get:Rule
+    val composeTestRule = createComposeRule()
+
+    private val primary = Color(0xFF2A6090)
+    private val dimmed = Color(0xFF6D6D6D)
+    private val onSurface = Color(0xFF222222)
+
+    @Test
+    fun formattedPost_withLink_usesPrimaryColor() {
+        val post = Post(User(0, "test")).apply {
+            setBody("Check example.com now")
+            entities = listOf(e(6, 17, "https://example.com"))
+            mid = 1
+        }
+        val annotated = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(annotated.text).contains("example.com")
+        val linkStart = annotated.text.indexOf("example.com")
+        val hasLinkStyle = annotated.spanStyles.any { s ->
+            s.start <= linkStart && s.end >= linkStart + "example.com".length && s.item.color == primary
+        }
+        assertThat(hasLinkStyle).isTrue()
+    }
+
+    @Test
+    fun postCard_rendersLinkText_visible() {
+        val post = Post(User(0, "test")).apply {
+            setBody("Check example.com")
+            entities = listOf(e(6, 17, "https://example.com"))
+            mid = 1
+        }
+        composeTestRule.setContent { PostCard(post, {}, {}, {}, {}, {}) }
+        composeTestRule.onNodeWithText("example.com", substring = true).assertIsDisplayed()
+    }
+
+    @Test
+    fun buildUrlPositions_extractsLinkFromEntities() {
+        val post = Post(User(0, "test")).apply {
+            setBody("Click juick.com now")
+            entities = listOf(e(6, 15, "https://juick.com/m/12345"))
+            mid = 2
+        }
+        val urls = buildUrlPositions(post)
+        assertThat(urls).hasSize(1)
+        assertThat(urls[0].url).isEqualTo("https://juick.com/m/12345")
+    }
+
+    @Test
+    fun buildUrlPositions_skipsNonLinkEntities() {
+        val post = Post(User(0, "test")).apply {
+            setBody("text link quote")
+            entities = listOf(
+                e(5, 9, "https://a.com"),
+                Post.Entity(10, 15, "quote", "q"),
+            )
+            mid = 3
+        }
+        val urls = buildUrlPositions(post)
+        assertThat(urls).hasSize(1)
+        assertThat(urls[0].url).isEqualTo("https://a.com")
+    }
+
+    @Test
+    fun postCard_withTagsAndLink_rendersBoth() {
+        val post = Post(User(0, "test")).apply {
+            setBody("Check example.com")
+            tags = listOf("cool")
+            entities = listOf(e(6, 17, "https://example.com"))
+            mid = 4
+        }
+        val annotated = formatPostText(post, primary, dimmed, onSurface)
+        assertThat(annotated.text).contains("#cool")
+        assertThat(annotated.text).contains("example.com")
+    }
+
+    private fun e(start: Int, end: Int, url: String) =
+        Post.Entity(start, end, url, "a", url)
+}
diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
new file mode 100644
index 00000000..a245738f
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.testing
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import com.juick.R
+import com.juick.android.MainActivity
+import org.junit.Rule
+import org.junit.Test
+
+class MainScreenTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
+
+    @Test
+    fun mainScreen_showsBottomNavigation_withThreeTabs() {
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Subscriptions)
+        ).assertIsDisplayed()
+
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Discover)
+        ).assertIsDisplayed()
+
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.PMs)
+        ).assertIsDisplayed()
+    }
+
+    @Test
+    fun mainScreen_showsSearchButton_inTopAppBar() {
+        composeTestRule.onNodeWithContentDescription(
+            composeTestRule.activity.getString(R.string.search)
+        ).assertIsDisplayed()
+    }
+
+    @Test
+    fun mainScreen_defaultStartDestination_isHome() {
+        // Home is the start destination — title shows "Juick"
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Juick)
+        ).assertIsDisplayed()
+    }
+}
diff --git a/src/androidTest/java/com/juick/android/testing/SignInScreenTest.kt b/src/androidTest/java/com/juick/android/testing/SignInScreenTest.kt
new file mode 100644
index 00000000..4e8cdded
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/SignInScreenTest.kt
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.testing
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.assertIsEnabled
+import androidx.compose.ui.test.assertIsNotEnabled
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.juick.R
+import com.juick.android.SignInActivity
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SignInScreenTest {
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<SignInActivity>()
+
+    @Test
+    fun signInScreen_showsLoginButton() {
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.login)
+        ).assertIsDisplayed()
+    }
+
+    @Test
+    fun signInScreen_showsNicknameField_enabled() {
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.your_nickname)
+        ).assertIsDisplayed()
+    }
+
+    @Test
+    fun signInScreen_showsPasswordField() {
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Password)
+        ).assertIsDisplayed()
+    }
+}
diff --git a/src/androidTest/java/com/juick/android/testing/UITest.kt b/src/androidTest/java/com/juick/android/testing/UITest.kt
index adecebde..20c7ebba 100644
--- a/src/androidTest/java/com/juick/android/testing/UITest.kt
+++ b/src/androidTest/java/com/juick/android/testing/UITest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2024, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -17,15 +17,10 @@
 
 package com.juick.android.testing
 
-import android.text.style.ClickableSpan
-import android.text.style.QuoteSpan
-import androidx.core.text.getSpans
-import androidx.core.text.toSpanned
-import androidx.test.core.app.launchActivity
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
@@ -34,13 +29,14 @@ import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.Until
 import com.google.common.truth.Truth.assertThat
 import com.juick.App
-import com.juick.R
 import com.juick.android.MainActivity
 import com.juick.android.NotificationSender
-import com.juick.android.screens.FeedAdapter
+import com.juick.android.ui.screens.feed.formatPostText
 import com.juick.api.model.Post
+import com.juick.api.model.User
 import com.juick.util.getString
 import org.junit.Assume.assumeTrue
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -48,13 +44,14 @@ import org.junit.runner.RunWith
 @LargeTest
 internal class UITest {
 
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
+
     @Test
     fun isDisplayed_MainActivity() {
-        launchActivity<MainActivity>().use {
-            onView(withId(R.id.main_layout))
-                .check(matches(isDisplayed()))
-        }
+        composeTestRule.onRoot().assertExists()
     }
+
     @Test
     fun isCorrectNotification_NotificationSender() {
         val notificationData = this.javaClass.getResourceAsStream("/test_notification.json")
@@ -69,14 +66,31 @@ internal class UITest {
 
     @Test
     fun formatMessage_spans() {
-        val msg = "> quote\n> quote 2\n" +
-                "text [link](http://ya.ru)"
-        val post = Post.empty()
-        post.tags = arrayListOf("tag")
-        post.setBody(msg)
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        val formatted = FeedAdapter.formatMessageText(appContext, post).toSpanned()
-        assertThat(formatted.getSpans<QuoteSpan>().size).isEqualTo(1)
-        assertThat(formatted.getSpans<ClickableSpan>().size).isEqualTo(2)
+        val post = Post(User(0, "test")).apply {
+            tags = arrayListOf("tag")
+            setBody("> quote\n> quote 2\ntext link")
+            entities = listOf(
+                Post.Entity(2, 7, "quote", "q"),
+                Post.Entity(10, 15, "quote 2", "q"),
+                Post.Entity(21, 25, "link", "a", "http://ya.ru"),
+            )
+        }
+        val primary = Color(0xFF2A6090)
+        val dimmed = Color(0xFF6D6D6D)
+        val onSurface = Color(0xFF222222)
+        val quote = Color(0xFF666666)
+        val formatted = formatPostText(post, primary, dimmed, onSurface, quote)
+
+        assertThat(formatted.text).contains("quote")
+        assertThat(formatted.text).contains("link")
+        assertThat(formatted.text).contains("#tag")
+
+        val linkStart = formatted.text.indexOf("link")
+        val hasLinkStyle = formatted.spanStyles.any { it.start <= linkStart && it.end >= linkStart + 4 && it.item.color == primary }
+        assertThat(hasLinkStyle).isTrue()
+
+        val quoteStart = formatted.text.indexOf("quote")
+        val hasQuoteStyle = formatted.spanStyles.any { it.start <= quoteStart && it.end >= quoteStart + 5 && it.item.color == quote }
+        assertThat(hasQuoteStyle).isTrue()
     }
 }
diff --git a/src/google/java/com/juick/android/GoogleSignInProvider.kt b/src/google/java/com/juick/android/GoogleSignInProvider.kt
index 39292950..5f2d0f22 100644
--- a/src/google/java/com/juick/android/GoogleSignInProvider.kt
+++ b/src/google/java/com/juick/android/GoogleSignInProvider.kt
@@ -84,7 +84,7 @@ class GoogleSignInProvider() : SignInProvider {
             } else {
                 return Result.success(
                     bundleOf(
-                        "nick" to data.user.name,
+                        "nick" to data.user.uname,
                         "hash" to (data.user.hash ?: "")
                     )
                 )
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 91a0ac0d..a04fa7aa 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (C) 2008-2023, Juick
+  ~ Copyright (C) 2008-2026, Juick
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as
@@ -66,7 +66,6 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:logo="@drawable/ic_logo">
-            <nav-graph android:value="@navigation/navigation" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/src/main/java/com/juick/App.kt b/src/main/java/com/juick/App.kt
index a42c3728..977e24bb 100644
--- a/src/main/java/com/juick/App.kt
+++ b/src/main/java/com/juick/App.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2024, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -25,6 +25,9 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
+import coil3.ImageLoader
+import coil3.SingletonImageLoader
+import coil3.network.okhttp.OkHttpNetworkFetcherFactory
 import com.juick.android.*
 import com.juick.android.service.accountData
 import com.juick.api.Api
@@ -113,6 +116,31 @@ class App : Application() {
             errorReporter = ErrorReporter(this, "support@juick.com", errorSubject)
         }
         ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleManager)
+        val coilHttpClient = OkHttpClient.Builder()
+            .addInterceptor { chain ->
+                val request = chain.request().newBuilder()
+                    .header(
+                        "User-Agent",
+                        "${getString(R.string.Juick)}/${BuildConfig.VERSION_CODE} " +
+                                "okhttp/${OkHttp.VERSION} Android/${Build.VERSION.SDK_INT}"
+                    )
+                    .apply {
+                        if (accountData.isNotEmpty()) {
+                            addHeader("Authorization", "Juick $accountData")
+                        }
+                    }
+                    .build()
+                chain.proceed(request)
+            }
+            .cache(Cache(cacheDir, cacheSize))
+            .build()
+        SingletonImageLoader.setSafe {
+            ImageLoader.Builder(it)
+                .components {
+                    add(OkHttpNetworkFetcherFactory(coilHttpClient))
+                }
+                .build()
+        }
         init()
     }
 
diff --git a/src/main/java/com/juick/android/JuickMessageMenuListener.kt b/src/main/java/com/juick/android/JuickMessageMenuListener.kt
index 5e3dadc9..253b1428 100644
--- a/src/main/java/com/juick/android/JuickMessageMenuListener.kt
+++ b/src/main/java/com/juick/android/JuickMessageMenuListener.kt
@@ -19,7 +19,6 @@ package com.juick.android
 import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
 import android.view.Menu
 import android.view.View
 import androidx.appcompat.widget.PopupMenu
@@ -28,10 +27,9 @@ import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
+
 import com.juick.App
 import com.juick.R
-import com.juick.android.screens.FeedAdapter
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
 import com.juick.api.model.User
@@ -47,11 +45,12 @@ import kotlinx.coroutines.withContext
  */
 class JuickMessageMenuListener(
     private val activity: Context,
-    private val fragment: Fragment,
+    private val lifecycleOwner: LifecycleOwner,
     private val receiver: MutableStateFlow<Result<PostResponse>?>,
     private val postReceiver: MutableStateFlow<Result<Post>?>,
-    private val me: User
-) : FeedAdapter.OnItemClickListener {
+    private val me: User,
+    private val onDeletePostNavigate: () -> Unit = {},
+) : OnItemClickListener {
 
     private fun confirmAction(context: Context, resId: Int, action: Runnable): Boolean {
         val builder = AlertDialog.Builder(context)
@@ -71,16 +70,16 @@ class JuickMessageMenuListener(
     }
 
     private fun vipToggle(user: User, completion: ((Boolean) -> Unit)? = null) {
-        val scope = (activity as LifecycleOwner).lifecycleScope
-        val account = (activity as MainActivity).account
+        val scope = lifecycleOwner.lifecycleScope
+        val account = (activity as? MainActivity)?.account
         scope.launch {
-            val result = withContext(Dispatchers.IO) { App.instance.api.toggleVIP(user.name) }
+            val result = withContext(Dispatchers.IO) { App.instance.api.toggleVIP(user.uname) }
             completion?.invoke(result.isSuccessful)
-            account.refresh()
+            account?.refresh()
         }
     }
     private fun privacyToggle(post: Post, completion: ((Boolean) -> Unit)? = null) {
-        val scope = (activity as LifecycleOwner).lifecycleScope
+        val scope = lifecycleOwner.lifecycleScope
         scope.launch {
             val result = withContext(Dispatchers.IO) { App.instance.api.togglePrivacy(post.mid) }
             completion?.invoke(result.isSuccessful)
@@ -141,16 +140,7 @@ class JuickMessageMenuListener(
                 MENU_ACTION_DELETE_POST -> confirmAction(activity, R.string.Are_you_sure_delete) {
                     processCommand("D #" +
                             if (rid == 0) "$mid" else "$mid/$rid")
-                    val navController = findNavController(fragment)
-                    navController.popBackStack(R.id.home, false)
-                    if (rid > 0) {
-                        val args = Bundle()
-                        args.putInt("mid", mid)
-                        args.putBoolean("scrollToEnd", true)
-                        navController.navigate(R.id.thread, args)
-                    } else {
-                        navController.navigate(R.id.home)
-                    }
+                    onDeletePostNavigate()
                 }
                 MENU_ACTION_MAKE_PUBLIC -> {
                     confirmAction(activity, R.string.confirm_make_public) {
@@ -169,7 +159,7 @@ class JuickMessageMenuListener(
     }
 
     private fun handleLike(post: Post) {
-        val scope = (activity as LifecycleOwner).lifecycleScope
+        val scope = lifecycleOwner.lifecycleScope
         scope.launch {
             postReceiver.update {
                 likeMessage(post)
@@ -188,7 +178,7 @@ class JuickMessageMenuListener(
     }
 
     override fun onSubscribeToggleClick(post: Post) {
-        val scope = (activity as LifecycleOwner).lifecycleScope
+        val scope = lifecycleOwner.lifecycleScope
         scope.launch {
             postReceiver.update {
                 subscribeMessageToggle(post)
@@ -197,13 +187,11 @@ class JuickMessageMenuListener(
     }
 
     override fun onLinkClick(url: String) {
-        (activity as MainActivity).apply {
-            processUri(url.toUri())
-        }
+        (activity as? MainActivity)?.processUri(url.toUri())
     }
 
     private fun processCommand(command: String) {
-        val scope = (activity as LifecycleOwner).lifecycleScope
+        val scope = lifecycleOwner.lifecycleScope
         App.instance.sendMessage(scope = scope, receiver = receiver, txt = command)
     }
 
diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 91f366fa..ab197c55 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -5,92 +5,59 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.juick.android
 
 import android.Manifest
-import android.content.ActivityNotFoundException
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.ImageView
 import android.widget.Toast
-import androidx.activity.result.ActivityResult
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.SearchView
-import androidx.appcompat.widget.SearchView.OnQueryTextListener
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsCallback
 import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.browser.customtabs.CustomTabsSession
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.fragment.app.Fragment
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.NavigationUI.onNavDestinationSelected
-import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
-import androidx.navigation.ui.NavigationUI.setupWithNavController
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.badge.BadgeDrawable
-import com.google.android.material.badge.BadgeUtils
-import com.google.android.material.badge.ExperimentalBadgeUtils
+import androidx.navigation.compose.rememberNavController
 import com.juick.App
 import com.juick.BuildConfig
 import com.juick.R
 import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
-import com.juick.android.updater.Updater
-import com.juick.android.widget.util.loadImage
+import com.juick.android.ui.AppTheme
+import com.juick.android.ui.MainScreen
 import com.juick.api.model.Post
-import com.juick.databinding.ActivityMainBinding
-import com.juick.util.StringUtils
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import java.io.IOException
 
-/**
- * @author Ugnich Anton
- */
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     val account by viewModels<Account>()
-    private lateinit var model: ActivityMainBinding
     private var notificationManager: NotificationManager? = null
     private lateinit var loginLauncher: ActivityResultLauncher<Intent>
+
     private fun showLogin() {
         if (!App.instance.isAuthenticated) {
             loginLauncher.launch(Intent(this, SignInActivity::class.java))
         }
     }
 
-    private var avatar: Bitmap? = null
-    private lateinit var badge: BadgeDrawable
-    private lateinit var appBarConfiguration: AppBarConfiguration
-
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     private var requestNotificationsPermission = RequestPermission(
         this, Manifest.permission.POST_NOTIFICATIONS, Build.VERSION_CODES.TIRAMISU
@@ -98,7 +65,6 @@ class MainActivity : AppCompatActivity() {
 
     private var browserClient: CustomTabsClient? = null
     private var browserSession: CustomTabsSession? = null
-
     private var browserSessionSupported = MutableLiveData<Boolean?>(null)
     private var initialUri: Uri? = null
 
@@ -107,382 +73,193 @@ class MainActivity : AppCompatActivity() {
             browserClient = null
             browserSession = null
         }
-
         override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
             client.warmup(0)
             browserSession = client.newSession(CustomTabsCallback())
             browserClient = client
             browserSessionSupported.value = true
         }
-
     }
 
     private fun bindCustomTabService(context: Context) {
-        // Check for an existing connection
-        if (browserClient != null) {
-            // Do nothing if there is an existing service connection
-            return
-        }
-        // Get the default browser package name, this will be null if
-        // the default browser does not provide a CustomTabsService
+        if (browserClient != null) return
         val packageName = CustomTabsClient.getPackageName(context, null)
         packageName?.let {
             CustomTabsClient.bindCustomTabsService(context, it, browserConnection)
-        } ?: run {
-            browserSessionSupported.value = false
-            return
         }
     }
 
-
-    @ExperimentalBadgeUtils
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        model = ActivityMainBinding.inflate(layoutInflater)
-        setContentView(model.root)
-        val toolbar = model.toolbar
-        //toolbar.inflateMenu(R.menu.toolbar);
-        setSupportActionBar(toolbar)
-
-        //CollapsingToolbarLayout layout = model.collapsingToolbarLayout;
-        val navView = model.bottomNav
-        val fab = model.fab
-        // Passing each menu ID as a set of Ids because each
-        // menu should be considered as top level destinations.
-        appBarConfiguration = AppBarConfiguration.Builder(
-            R.id.home,
-            R.id.discover,
-            R.id.chats,
-            R.id.no_auth,
-            R.id.new_post,
-            R.id.discussions
-        )
-            .build()
-        val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-        val navController = navHostFragment.navController
-        setupActionBarWithNavController(this, navController, appBarConfiguration)
-        //NavigationUI.setupWithNavController(toolbar, navController);
-        setupWithNavController(navView, navController)
-        navController.addOnDestinationChangedListener { _, destination, args ->
-            val id = destination.id
-            var scrollFlags = (AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
-                    or AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS)
-            if (shouldHideNavView(id)) {
-                navView.visibility = View.GONE
-                scrollFlags = 0
-            } else {
-                navView.visibility = View.VISIBLE
-            }
-            (toolbar.layoutParams as AppBarLayout.LayoutParams).scrollFlags = scrollFlags
-            val fabVisibility = if (shouldViewFab(id)) View.VISIBLE else View.GONE
-            fab.visibility = fabVisibility
-            if (id == R.id.blog) {
-                val uname = args?.getString("uname") ?: ""
-                title = uname.ifEmpty { getString(R.string.Me) }
-                supportActionBar?.title = title
-            }
+    private fun openUri(uri: Uri) {
+        try {
+            val colorScheme = CustomTabColorSchemeParams.Builder()
+                .setToolbarColor(getColor(R.color.colorMainBackground))
+                .build()
+            val builder = CustomTabsIntent.Builder()
+                .setColorSchemeParams(CustomTabsIntent.COLOR_SCHEME_SYSTEM, colorScheme)
+                .setSendToExternalDefaultHandlerEnabled(true)
+            browserSession?.let { builder.setSession(it) }
+            builder.build().launchUrl(this, uri)
+        } catch (e: Exception) {
+            openUriFallback(uri)
         }
+    }
 
-        App.instance.authorizationCallback = {
-            val updatePasswordIntent = Intent(this, SignInActivity::class.java)
-            updatePasswordIntent.putExtra(
-                SignInActivity.EXTRA_ACTION,
-                SignInActivity.ACTION_PASSWORD_UPDATE
-            )
-            loginLauncher.launch(updatePasswordIntent)
-        }
-        loginLauncher =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { response: ActivityResult ->
-                if (response.resultCode == RESULT_OK) {
-                    val intent = intent
-                    finish()
-                    startActivity(intent)
-                }
-            }
-        model.fab.setOnClickListener {
-            if (App.instance.isAuthenticated) {
-                navController.navigate(R.id.new_post)
-            } else {
-                showLogin()
-            }
+    private fun openUriFallback(uri: Uri) {
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, uri))
+        } catch (e: Exception) {
+            Log.e("MainActivity", "Cannot open URL: $uri", e)
         }
-        lifecycleScope.launch {
-            if (App.instance.isAuthenticated) {
-                if (requestNotificationsPermission()) {
-                    notificationManager = NotificationManager()
-                }
-                refresh()
-            }
-            if (BuildConfig.ENABLE_UPDATER) {
-                Updater(this@MainActivity)
-                    .checkUpdate()
+    }
+
+    fun processUri(data: Uri): Boolean {
+        val path = data.path ?: return false
+        val segments = path.split("/").filter { it.isNotEmpty() }
+        when (segments.size) {
+            0 -> {
+                // home
             }
-        }
-        account.refresh()
-        account.signInStatus.observe(this) { signInStatus: SignInStatus ->
-            if (signInStatus == SignInStatus.SIGN_IN_PROGRESS) {
-                showLogin()
+            1 -> {
+                // user profile → open in browser
+                openUri(data)
+                return true
             }
-        }
-        badge = BadgeDrawable.create(this)
-        badge.isVisible = false
-        badge.backgroundColor = ContextCompat.getColor(this, R.color.colorAccent)
-        badge.badgeTextColor = ContextCompat.getColor(this, R.color.colorMainBackground)
-        model.toolbar.viewTreeObserver.addOnGlobalLayoutListener {
-            BadgeUtils.attachBadgeDrawable(
-                badge,
-                model.toolbar,
-                R.id.discussions
-            )
-        }
-        account.profile.observe(this) { user ->
-            when (user) {
-                null -> {
-                    avatar =
-                        ResourcesCompat.getDrawable(resources, R.drawable.av_96, null)!!
-                            .toBitmap()
-                }
-
-                else -> {
-                    val avatarUrl: String = user.avatar
-                    lifecycleScope.launch {
-                        avatar = loadImage(avatarUrl)
-                        invalidateOptionsMenu()
-                    }
-                    if (user.unreadCount > 0) {
-                        badge.isVisible = true
-                        badge.number = user.unreadCount
-                    } else {
-                        badge.isVisible = false
-                    }
+            2 -> {
+                if (segments[0] == "m") {
+                    val mid = segments[1].toIntOrNull() ?: return false
+                    // Navigate to thread via callback
+                    processUriCallback?.invoke(mid)
+                    return true
                 }
             }
-        }
-        bindCustomTabService(this)
-        browserSessionSupported.observe(this) { supported ->
-            when (supported) {
-                null -> {}
-                else -> {
-                    if (supported) {
-                        initialUri?.let {
-                            openUri(it)
-                        }
-                    }
+            else -> {
+                if (segments.size > 2 && segments[0] == "i") {
+                    openUri(data)
+                    return true
                 }
             }
         }
-    }
-
-    private fun shouldHideNavView(view: Int): Boolean {
-        when (view) {
-            R.id.thread, R.id.PMFragment, R.id.new_post, R.id.tags -> return true
-        }
         return false
     }
 
-    private fun shouldViewFab(view: Int): Boolean {
-        return view == R.id.home || view == R.id.discover
-    }
+    internal var processUriCallback: ((Int) -> Unit)? = null
+    private var navController: androidx.navigation.NavHostController? = null
 
-    override fun onResume() {
-        super.onResume()
-        notificationManager?.onResume()
-        val intent = intent
-        val action = StringUtils.defaultString(intent.action)
-        if (action == BuildConfig.INTENT_NEW_EVENT_ACTION) {
-            intent.action = ""
-            val msg = intent.getStringExtra(getString(R.string.notification_extra)) ?: ""
-            try {
-                val jmsg = App.instance.jsonMapper.decodeFromString<Post>(msg)
-                if (jmsg.user.uid == 0) {
-                    setTitle(R.string.Discussions)
-                    //replaceFragment(FeedBuilder.feedFor(UrlBuilder.getDiscussions()));
-                } else {
-                    if (jmsg.mid == 0) {
-                        val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-                        val navController = navHostFragment.navController
-                        navController.popBackStack(R.id.chats, true)
-                        navController.navigate(R.id.chats)
-                        val chatAction = Bundle()
-                        chatAction.putString("uname", jmsg.user.uname)
-                        chatAction.putInt("uid", jmsg.user.uid)
-                        navController.navigate(R.id.PMFragment, chatAction)
-                    } else {
-                        val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-                        val navController = navHostFragment.navController
-                        navController.popBackStack(R.id.home, false)
-                        val discoverAction = Bundle()
-                        discoverAction.putInt("mid", jmsg.mid)
-                        discoverAction.putBoolean("scrollToEnd", true)
-                        navController.navigate(R.id.thread, discoverAction)
-                    }
-                }
-            } catch (e: IOException) {
-                Log.d(this.javaClass.simpleName, "Invalid JSON data", e)
-            }
-        }
-        if (action == Intent.ACTION_SEND) {
-            val mime = intent.type
-            val extras = intent.extras as Bundle
-            val postArgs = Bundle()
-            if (mime == "text/plain") {
-                postArgs.putString("text", extras.getString(Intent.EXTRA_TEXT))
-            } else {
-                postArgs.putString("uri", extras.getString(Intent.EXTRA_STREAM))
-            }
-            val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-            val navController = navHostFragment.navController
-            navController.navigate(R.id.new_post, postArgs)
-            intent.action = ""
-        }
-        if (action == Intent.ACTION_VIEW) {
-            intent.setFlags(0)
-            intent.data?.let {
-                processUri(it)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        loginLauncher = registerForActivityResult(
+            ActivityResultContracts.StartActivityForResult()
+        ) { result ->
+            if (result.resultCode == RESULT_OK) {
+                account.refresh()
             }
-            intent.action = ""
         }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        notificationManager?.onPause()
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-    }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menuInflater.inflate(R.menu.toolbar, menu)
-        val searchView = menu.findItem(R.id.action_search).actionView as SearchView
-        searchView.isSubmitButtonEnabled = true
-        searchView.setOnQueryTextListener(object : OnQueryTextListener {
-            override fun onQueryTextSubmit(s: String): Boolean {
-                model.toolbar.collapseActionView()
-                val navHostFragment = model.navHost.getFragment<Fragment>() as NavHostFragment
-                val navController = navHostFragment.navController
-                val args = Bundle()
-                args.putString("search", s)
-                navController.navigate(R.id.search, args)
-                return true
-            }
+        bindCustomTabService(this)
 
-            override fun onQueryTextChange(s: String): Boolean {
-                return true
-            }
-        })
-        val profileItem = menu.findItem(R.id.blog)
-        account.profile.value?.let {
-            profileItem.isVisible = it.uid > 0
-            if (profileItem.isVisible) {
-                profileItem.actionView?.setOnClickListener {
-                    onOptionsItemSelected(profileItem)
-                }
-            }
-        }
-        if (avatar != null) {
-            profileItem.actionView?.findViewById<ImageView>(R.id.profile_image)
-                ?.setImageBitmap(avatar)
-        }
-        val discussionsItem = menu.findItem(R.id.discussions)
-        if (discussionsItem != null) {
-            discussionsItem.actionView?.setOnClickListener {
-                onOptionsItemSelected(discussionsItem)
+        account.signInStatus.observe(this) { status ->
+            if (status == SignInStatus.SIGN_IN_PROGRESS) {
+                showLogin()
             }
         }
-        return super.onCreateOptionsMenu(menu)
-    }
 
-    fun processUri(data: Uri) {
-        if (data.host == "juick.com") {
-            val pathSegments = data.pathSegments
-            val navHostFragment = model.navHost.getFragment<Fragment>() as NavHostFragment
-            val navController = navHostFragment.navController
-            when (pathSegments.size) {
-                0 -> {
-                    navController.navigate(R.id.home)
-                }
-                1 -> {
-                    openUri(data)
-                }
+        initialUri = intent?.data
 
-                2 -> {
-                    // thread
-                    val threadId = pathSegments[1].toIntOrNull() ?: 0
-                    if (threadId > 0) {
-                        val args = Bundle()
-                        args.putInt("mid", threadId)
-                        navController.popBackStack(R.id.home, false)
-                        navController.navigate(R.id.thread, args)
-                    } else {
-                        // e.g. /i/video.mp4
-                        openUri(data)
-                    }
+        setContent {
+            AppTheme {
+                val navController = rememberNavController()
+                this@MainActivity.navController = navController
+                processUriCallback = { mid ->
+                    navController.navigate("thread/$mid")
                 }
 
-                else ->
-                    if (pathSegments[0] == "i") {
-                        // images (/i/p/1.jpg)
-                        openUri(data)
-                    } else {
-                        // discover
-                        navController.navigate(R.id.home)
+                // Observe account for user profile + unread count
+                val profile by account.profile.observeAsState()
+                val unreadCount = profile?.unreadCount ?: 0
+
+                MainScreen(
+                    navController = navController,
+                    currentProfile = profile,
+                    unreadCount = unreadCount,
+                    onPostClick = { post ->
+                        navController.navigate("thread/${post.mid}")
+                    },
+                    onUserClick = { uname ->
+                        navController.navigate("blog/$uname")
+                    },
+                    onLinkClick = { url ->
+                        openUri(Uri.parse(url))
+                    },
+                    onSignInClick = { showLogin() },
+                    onFabClick = {
+                        if (App.instance.isAuthenticated) {
+                            navController.navigate("new_post")
+                        } else {
+                            showLogin()
+                        }
+                    },
+                    onMenuClick = { post ->
+                        // Menu logic handled via drop-down or dialog
+                    },
+                    onLikeClick = { post ->
+                        lifecycleScope.launch {
+                            try {
+                                App.instance.api.like(post.mid)
+                                account.refresh()
+                            } catch (_: Exception) { }
+                        }
+                    },
+                )
+
+                // Handle initial deep link
+                LaunchedEffect(Unit) {
+                    initialUri?.let { uri ->
+                        processUri(uri)
+                        initialUri = null
                     }
+                }
             }
-        } else {
-            openUri(data)
         }
     }
 
-    private fun openUri(uri: Uri) {
-        val handleDeepLinks = uri.host == "juick.com"
-        browserSession?.let {
-            val intent = CustomTabsIntent.Builder()
-                .setSession(it)
-                .setSendToExternalDefaultHandlerEnabled(handleDeepLinks)
-                .setDefaultColorSchemeParams(
-                    CustomTabColorSchemeParams.Builder().setToolbarColor(
-                        ResourcesCompat.getColor(
-                            resources, R.color.colorMainBackground, null
-                        )
-                    ).build()
-                ).build()
-            try {
-                intent.launchUrl(this, uri)
-            } catch (e: ActivityNotFoundException) {
-                Toast.makeText(this, e.localizedMessage, Toast.LENGTH_LONG).show()
-            }
-        } ?: run {
-            if (browserSessionSupported.value == true) {
-                initialUri = uri
-            } else {
-                openUriFallback(uri)
+    private fun handleIntent(intent: Intent?) {
+        intent?.let {
+            if (Intent.ACTION_VIEW == it.action) {
+                it.data?.let { data ->
+                    processUri(data)
+                }
             }
         }
     }
 
-    private fun openUriFallback(uri: Uri) {
-        try {
-            val intent = Intent(Intent.ACTION_VIEW, uri)
-            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Toast.makeText(this, e.localizedMessage, Toast.LENGTH_LONG).show()
-        }
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        handleIntent(intent)
     }
 
-    override fun onSupportNavigateUp(): Boolean {
-        val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-        val navController = navHostFragment.navController
-        return navController.navigateUp() || super.onSupportNavigateUp()
+    override fun onResume() {
+        super.onResume()
+        account.refresh()
+        val intent = intent
+        if (Intent.ACTION_SEND == intent.action) {
+            val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
+            if (text.isNotEmpty()) {
+                intent.action = null // consume to prevent re-processing
+                navController?.navigate(
+                    "new_post?text=${Uri.encode(text)}"
+                )
+            }
+        }
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val navHostFragment = model.navHost.getFragment<NavHostFragment>()
-        val navController = navHostFragment.navController
-        return (onNavDestinationSelected(item, navController)
-                || super.onOptionsItemSelected(item))
+    override fun onDestroy() {
+        browserClient?.let {
+            unbindService(browserConnection)
+        }
+        browserClient = null
+        browserSession = null
+        super.onDestroy()
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/juick/android/NotificationSender.kt b/src/main/java/com/juick/android/NotificationSender.kt
index e08a4e31..55c34484 100644
--- a/src/main/java/com/juick/android/NotificationSender.kt
+++ b/src/main/java/com/juick/android/NotificationSender.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2024, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -75,13 +75,13 @@ object NotificationSender {
                     if (jmsg.tags.isNotEmpty()) {
                         title = "$title: ${jmsg.tagsString}"
                     }
-                    val body = if (TextUtils.isEmpty(jmsg.text)) {
+                    val body = if (TextUtils.isEmpty(jmsg.getText())) {
                         "sent an image"
                     } else {
-                        if (jmsg.text.length > 64) {
-                            jmsg.text.substring(0, 60) + "..."
+                        if (jmsg.getText().length > 64) {
+                            jmsg.getText().substring(0, 60) + "..."
                         } else {
-                            jmsg.text
+                            jmsg.getText()
                         }
                     }
                     val contentIntent = PendingIntent.getActivity(
@@ -101,7 +101,7 @@ object NotificationSender {
                         .setGroupSummary(true)
                     notificationBuilder.setCategory(NotificationCompat.CATEGORY_MESSAGE)
                     notificationBuilder.setStyle(
-                        NotificationCompat.BigTextStyle().bigText(jmsg.text)
+                        NotificationCompat.BigTextStyle().bigText(jmsg.getText())
                     )
                     if (jmsg.user.uid > 0) {
                         notificationBuilder.addAction(
diff --git a/src/main/java/com/juick/android/screens/discover/DiscoverFragment.kt b/src/main/java/com/juick/android/OnItemClickListener.kt
similarity index 59%
rename from src/main/java/com/juick/android/screens/discover/DiscoverFragment.kt
rename to src/main/java/com/juick/android/OnItemClickListener.kt
index b0ff4cc1..eb8caeab 100644
--- a/src/main/java/com/juick/android/screens/discover/DiscoverFragment.kt
+++ b/src/main/java/com/juick/android/OnItemClickListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2022, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -14,20 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.juick.android.screens.discover
+package com.juick.android
 
-import android.net.Uri
-import android.os.Bundle
 import android.view.View
-import com.juick.android.Uris
-import com.juick.android.screens.FeedFragment
+import com.juick.api.model.Post
 
-class DiscoverFragment : FeedFragment() {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (vm.apiUrl.value == Uri.EMPTY) {
-            vm.apiUrl.value = Uris.last
-        }
-    }
-}
\ No newline at end of file
+interface OnItemClickListener {
+    fun onItemClick(view: View?, post: Post)
+    fun onLikeClick(view: View?, post: Post)
+    fun onSubscribeToggleClick(post: Post)
+    fun onLinkClick(url: String)
+}
diff --git a/src/main/java/com/juick/android/SignInActivity.kt b/src/main/java/com/juick/android/SignInActivity.kt
index 9a889a74..5266980d 100644
--- a/src/main/java/com/juick/android/SignInActivity.kt
+++ b/src/main/java/com/juick/android/SignInActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2025, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -23,17 +23,19 @@ import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.juick.App
 import com.juick.R
 import com.juick.android.service.account
 import com.juick.android.service.accountData
 import com.juick.android.service.isAuthenticated
-import com.juick.databinding.ActivityLoginBinding
+import com.juick.android.ui.AppTheme
+import com.juick.android.ui.signin.SignInScreen
 import com.juick.util.StringUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -43,23 +45,22 @@ import kotlinx.coroutines.withContext
  *
  * @author Ugnich Anton
  */
-class SignInActivity : AppCompatActivity() {
+class SignInActivity : ComponentActivity() {
     enum class SignInStatus {
         SIGNED_OUT, SIGN_IN_PROGRESS, SIGNED_IN
     }
 
     private var authenticatorResponse: AccountAuthenticatorResponse? = null
     private var currentAction = 0
-    private lateinit var model: ActivityLoginBinding
     private val application = App.instance
     private lateinit var signUpLauncher: ActivityResultLauncher<Intent>
+    private var googleSignInButton: android.view.View? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         signUpLauncher =
             registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
                 result.data?.extras?.let {
-                    // sign in with the new account after signup
                     updateAccount(it.getString("nick", ""),
                         it.getString("hash", ""), currentAction)
                 } ?: run {
@@ -72,45 +73,13 @@ class SignInActivity : AppCompatActivity() {
         authenticatorResponse =
             intent.getParcelableExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE)
         authenticatorResponse?.onRequestContinued()
-        model = ActivityLoginBinding.inflate(layoutInflater)
-        setContentView(model.root)
         currentAction = intent.getIntExtra(EXTRA_ACTION, ACTION_ACCOUNT_CREATE)
-        if (currentAction == ACTION_PASSWORD_UPDATE) {
-            model.juickNick.setText(App.instance.account?.name ?: "")
-            model.juickNick.isEnabled = false
-        } else {
-            model.juickNick.isEnabled = true
-        }
-        model.buttonSave.setOnClickListener {
-            val nick = model.juickNick.text.toString()
-            val password = model.juickPassword.text.toString()
-            if (nick.isEmpty() || password.isEmpty()) {
-                Toast.makeText(
-                    this@SignInActivity,
-                    R.string.Enter_nick_and_password,
-                    Toast.LENGTH_SHORT
-                ).show()
-                return@setOnClickListener
-            }
-            lifecycleScope.launch(Dispatchers.IO) {
-                try {
-                    val me = application.auth(nick, password)
-                    withContext(Dispatchers.Main) {
-                        updateAccount(nick, me.hash ?: "", currentAction)
-                    }
-                } catch (e: Exception) {
-                    withContext(Dispatchers.Main) {
-                        Toast.makeText(
-                            this@SignInActivity,
-                            e.localizedMessage,
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                }
-            }
-        }
-        application.signInProvider?.prepareSignIn(this, model.signInButtonPlaceholder)
+
+        // Prepare Google sign-in button (must be done before setContent)
+        val placeholder = android.widget.RelativeLayout(this)
+        application.signInProvider?.prepareSignIn(this, placeholder)
             ?.let { signInButton ->
+                googleSignInButton = signInButton
                 signInButton.setOnClickListener {
                     lifecycleScope.launch {
                         try {
@@ -127,12 +96,7 @@ class SignInActivity : AppCompatActivity() {
                                         signupIntent.putExtra("authCode", authCode)
                                         signUpLauncher.launch(signupIntent)
                                     } ?: run {
-                                        // update existing account
-                                        updateAccount(
-                                            nick,
-                                            hash,
-                                            currentAction
-                                        )
+                                        updateAccount(nick, hash, currentAction)
                                     }
                                 },
                                 onFailure = {
@@ -151,6 +115,13 @@ class SignInActivity : AppCompatActivity() {
                     }
                 }
             }
+
+        val initialNick = if (currentAction == ACTION_PASSWORD_UPDATE) {
+            App.instance.account?.name ?: ""
+        } else {
+            ""
+        }
+
         if (App.instance.isAuthenticated && currentAction != ACTION_PASSWORD_UPDATE) {
             val builder = AlertDialog.Builder(this)
             builder.setNeutralButton(android.R.string.ok) { _, _ ->
@@ -160,6 +131,42 @@ class SignInActivity : AppCompatActivity() {
             builder.setMessage(R.string.Only_one_account)
             builder.show()
         }
+
+        setContent {
+            AppTheme {
+                SignInScreen(
+                    currentAction = currentAction,
+                    initialNick = initialNick,
+                    googleSignInButton = googleSignInButton,
+                    onSignIn = { nick, password ->
+                        if (nick.isEmpty() || password.isEmpty()) {
+                            Toast.makeText(
+                                this,
+                                R.string.Enter_nick_and_password,
+                                Toast.LENGTH_SHORT
+                            ).show()
+                            return@SignInScreen
+                        }
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            try {
+                                val me = application.auth(nick, password)
+                                withContext(Dispatchers.Main) {
+                                    updateAccount(nick, me.hash ?: "", currentAction)
+                                }
+                            } catch (e: Exception) {
+                                withContext(Dispatchers.Main) {
+                                    Toast.makeText(
+                                        this@SignInActivity,
+                                        e.localizedMessage,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                }
+                            }
+                        }
+                    }
+                )
+            }
+        }
     }
 
     private fun updateAccount(nick: String, hash: String, action: Int) {
@@ -167,7 +174,7 @@ class SignInActivity : AppCompatActivity() {
         if (action == ACTION_PASSWORD_UPDATE) {
             val account = App.instance.account
             account?.let {
-                am.invalidateAuthToken(account.type,  App.instance.accountData)
+                am.invalidateAuthToken(account.type, App.instance.accountData)
                 am.setAuthToken(account, StringUtils.EMPTY, hash)
             } ?: run {
                 Log.d("Auth", "Account missing")
@@ -192,4 +199,4 @@ class SignInActivity : AppCompatActivity() {
         const val ACTION_ACCOUNT_CREATE = 0
         const val ACTION_PASSWORD_UPDATE = 1
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/juick/android/SignUpActivity.kt b/src/main/java/com/juick/android/SignUpActivity.kt
index 3ea678ca..59a68b23 100644
--- a/src/main/java/com/juick/android/SignUpActivity.kt
+++ b/src/main/java/com/juick/android/SignUpActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2023, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -19,42 +19,47 @@ package com.juick.android
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
 import androidx.lifecycle.lifecycleScope
 import com.juick.App
-import com.juick.databinding.ActivitySignupBinding
+import com.juick.android.ui.AppTheme
+import com.juick.android.ui.signup.SignUpScreen
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class SignUpActivity : AppCompatActivity() {
-    private lateinit var model: ActivitySignupBinding
+class SignUpActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        model = ActivitySignupBinding.inflate(layoutInflater)
-        setContentView(model.root)
         val authCode = intent.getStringExtra("authCode")
-        model.buttonCreate.setOnClickListener {
-            val nick = model.newNick.text.toString()
-            lifecycleScope.launch(Dispatchers.IO) {
-                try {
-                    val user = App.instance.api.signup(nick, authCode)
-                    withContext(Dispatchers.Main) {
-                        val successIntent = Intent()
-                        successIntent.putExtra("nick", nick)
-                        successIntent.putExtra("hash", user.hash)
-                        setResult(RESULT_OK, successIntent)
-                        finish()
-                    }
-                } catch (e: Exception) {
-                    withContext(Dispatchers.Main) {
-                        Toast.makeText(
-                            this@SignUpActivity,
-                            "Username is not correct (already taken?)", Toast.LENGTH_LONG
-                        ).show()
+
+        setContent {
+            AppTheme {
+                SignUpScreen(
+                    onSignUp = { nick ->
+                        lifecycleScope.launch(Dispatchers.IO) {
+                            try {
+                                val user = App.instance.api.signup(nick, authCode)
+                                withContext(Dispatchers.Main) {
+                                    val successIntent = Intent()
+                                    successIntent.putExtra("nick", nick)
+                                    successIntent.putExtra("hash", user.hash)
+                                    setResult(RESULT_OK, successIntent)
+                                    finish()
+                                }
+                            } catch (e: Exception) {
+                                withContext(Dispatchers.Main) {
+                                    Toast.makeText(
+                                        this@SignUpActivity,
+                                        "Username is not correct (already taken?)", Toast.LENGTH_LONG
+                                    ).show()
+                                }
+                            }
+                        }
                     }
-                }
+                )
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/juick/android/fragment/ThreadFragment.kt b/src/main/java/com/juick/android/fragment/ThreadFragment.kt
deleted file mode 100644
index 0a4a177d..00000000
--- a/src/main/java/com/juick/android/fragment/ThreadFragment.kt
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.fragment
-
-import android.content.Intent
-import android.graphics.Typeface
-import android.net.Uri
-import android.os.Bundle
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.style.StyleSpan
-import android.util.Log
-import android.view.View
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.FileProvider
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.juick.App
-import com.juick.R
-import com.juick.android.Account
-import com.juick.android.JuickMessageMenuListener
-import com.juick.android.SignInActivity
-import com.juick.android.Utils.getMimeTypeFor
-import com.juick.android.Utils.isImageTypeAllowed
-import com.juick.android.screens.FeedAdapter
-import com.juick.android.service.isAuthenticated
-import com.juick.android.widget.CropBottomSheet
-import com.juick.api.model.Post
-import com.juick.api.model.PostResponse
-import com.juick.api.model.isReply
-import com.juick.databinding.FragmentThreadBinding
-import com.juick.util.StringUtils
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.FileNotFoundException
-
-/**
- *
- * @author Ugnich Anton
- */
-class ThreadFragment : BottomSheetDialogFragment(R.layout.fragment_thread) {
-    private val account by activityViewModels<Account>()
-    private val model by viewBinding(FragmentThreadBinding::bind)
-    private var rid = 0
-    private var attachmentUri: Uri? = null
-    private var attachmentMime: String? = null
-    private var mid = 0
-    private var scrollToEnd = false
-    private val messagePosted = MutableStateFlow<Result<PostResponse>?>(null)
-    private val apiResponded = MutableStateFlow<Result<Post>?>(null)
-
-    private val galleryLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        uri?.let { showCropSheet(it) }
-    }
-    private val cameraLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        if (success) cameraUri?.let { showCropSheet(it) }
-    }
-    private var cameraUri: Uri? = null
-
-    private fun showImageSourcePicker() {
-        AlertDialog.Builder(requireContext())
-            .setItems(R.array.image_source_options) { _, which ->
-                when (which) {
-                    0 -> galleryLauncher.launch("image/*")
-                    1 -> launchCamera()
-                }
-            }
-            .show()
-    }
-
-    private fun launchCamera() {
-        val file = File(requireContext().filesDir, "camera_${System.currentTimeMillis()}.jpg")
-        cameraUri = FileProvider.getUriForFile(
-            requireContext(), "${requireContext().packageName}.provider", file
-        )
-        cameraLauncher.launch(cameraUri!!)
-    }
-
-    private fun showCropSheet(uri: Uri) {
-        val sheet = CropBottomSheet.newInstance(uri)
-        sheet.onCropResult = { croppedUri -> handleSelectedUri(croppedUri) }
-        sheet.show(childFragmentManager, CropBottomSheet.TAG)
-    }
-
-    private fun handleSelectedUri(uri: Uri?) {
-        if (uri != null) {
-            attachmentUri = uri
-            getMimeTypeFor(requireActivity(), uri)?.let { mime ->
-                if (isImageTypeAllowed(mime)) {
-                    attachmentMime = mime
-                    model.buttonAttachment.isSelected = true
-                } else {
-                    Toast.makeText(
-                        activity,
-                        R.string.wrong_image_format,
-                        Toast.LENGTH_SHORT
-                    )
-                        .show()
-                }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        model.threadList.adapter = FeedAdapter(true)
-        (dialog as? BottomSheetDialog)?.behavior?.let {
-            it.state = BottomSheetBehavior.STATE_EXPANDED
-            it.isDraggable = false
-        }
-        mid = arguments?.getInt("mid") ?: 0
-        scrollToEnd = arguments?.getBoolean("scrollToEnd") ?: false
-        if (mid == 0) {
-            return
-        }
-        model.buttonSend.setOnClickListener {
-            if (!App.instance.isAuthenticated) {
-                startActivity(Intent(context, SignInActivity::class.java))
-                return@setOnClickListener
-            }
-            val msg = model.editMessage.text.toString()
-            if (msg.length < 3 && attachmentUri == null) {
-                Toast.makeText(context, R.string.Enter_a_message, Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-            var msgnum = "#$mid"
-            if (rid > 0) {
-                msgnum += "/$rid"
-            }
-            val body = "$msgnum $msg"
-            setFormEnabled(false)
-            viewLifecycleOwner.lifecycleScope.launch {
-                try {
-                    postReply(body)
-                } catch (e: FileNotFoundException) {
-                    Toast.makeText(
-                        context,
-                        "Attachment error: " + e.message,
-                        Toast.LENGTH_SHORT
-                    )
-                        .show()
-                }
-            }
-        }
-        model.buttonAttachment.setOnClickListener {
-            if (attachmentUri == null) {
-                showImageSourcePicker()
-            } else {
-                attachmentUri = null
-                attachmentMime = null
-                model.buttonAttachment.isSelected = false
-            }
-        }
-        val linearLayoutManager = model.threadList.layoutManager as LinearLayoutManager
-        account.profile.observe(viewLifecycleOwner) {
-            it?.let { user ->
-                val adapter = model.threadList.adapter as FeedAdapter
-                adapter.setOnMenuListener(
-                    JuickMessageMenuListener(
-                        requireActivity(), this, messagePosted, apiResponded, user
-                    )
-                )
-                adapter.setOnItemClickListener { widget: View?, position: Int ->
-                    if (widget?.tag == null || widget.tag != "clicked") {
-                        val post = adapter.currentList[position]
-                        onReply(post?.rid ?: 0, StringUtils.defaultString(post?.text))
-                    }
-                }
-                adapter.setOnScrollListener { _, replyTo, rid ->
-                    var pos = 0
-                    for (i in adapter.currentList.indices) {
-                        val p = adapter.currentList[i]
-                        if (p.rid == replyTo) {
-                            p.nextRid = replyTo
-                            if (p.prevRid == 0) p.prevRid = rid
-                            pos = i
-                            break
-                        }
-                    }
-                    if (pos != 0) {
-                        adapter.notifyItemChanged(pos)
-                        model.threadList.scrollToPosition(pos)
-                    }
-                }
-                model.threadList.adapter = adapter
-                load()
-                lifecycleScope.launch {
-                    repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                        App.instance.messages.collect { messages ->
-                            messages.forEach { post ->
-                                val adapter = (model.threadList.adapter as FeedAdapter)
-                                if (adapter.itemCount > 0) {
-                                    if (adapter.currentList[0]?.mid == post.mid && post.isReply()
-                                        && !adapter.currentList.contains(post)
-                                    ) {
-                                        adapter.submitList(adapter.currentList + post)
-                                        val lastVisible = linearLayoutManager.findLastVisibleItemPosition()
-                                        val total = adapter.currentList.size - 1 - 1
-                                        if (lastVisible == total) {
-                                            model.threadList.scrollToPosition(post.rid)
-                                        }
-                                    }
-                                }
-                            }
-                            App.instance.messages.update { listOf() }
-                        }
-                    }
-                }
-            }
-        }
-
-        model.swipeContainer.isEnabled = false
-        model.threadList.visibility = View.GONE
-        model.progressBar.visibility = View.VISIBLE
-
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                messagePosted.collect { response ->
-                    when (response) {
-                        null -> {}
-                        else -> {
-                            response.fold(
-                                onSuccess = { post ->
-                                    model.progressBar.visibility = View.GONE
-                                    setFormEnabled (true)
-                                    Toast.makeText (context, post.text, Toast.LENGTH_LONG).show()
-                                    post.newMessage?.let {
-                                        model.textReplyTo.text = ""
-                                        model.editMessage.text?.clear()
-                                        mid = it.mid
-                                        scrollToEnd = true
-                                    }
-                                    load()
-                                },
-                                onFailure = {
-                                    Toast.makeText (context, requireContext().getString(R.string.network_error), Toast.LENGTH_LONG).show()
-                                }
-                            )
-                            messagePosted.update { null }
-                        }
-
-                    }
-                }
-            }
-        }
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                apiResponded.collect { response ->
-                    when (response) {
-                        null -> {}
-                        else -> {
-                            response.fold(
-                                onSuccess = {
-                                    load()
-                                },
-                                onFailure = {
-                                    Toast.makeText (context, it.localizedMessage, Toast.LENGTH_LONG).show()
-                                }
-                            )
-                            apiResponded.update { null }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun load() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                val posts = App.instance.api.thread(mid)
-                withContext(Dispatchers.Main) {
-                    model.threadList.visibility = View.VISIBLE
-                    model.progressBar.visibility = View.GONE
-                    (model.threadList.adapter as FeedAdapter).submitList(posts)
-                    val lastReply = posts.last()
-                    App.instance.api.markRead(lastReply.mid, lastReply.rid)
-                    if (scrollToEnd) {
-                        model.threadList.scrollToPosition(posts.size - 1)
-                    }
-                }
-            } catch (e: Exception) {
-                Log.e("Thread", "Load error", e)
-                withContext(Dispatchers.Main) {
-                    Toast.makeText(
-                        App.instance,
-                        R.string.post_not_found,
-                        Toast.LENGTH_LONG
-                    ).show()
-                }
-            }
-        }
-    }
-
-    private fun setFormEnabled(state: Boolean) {
-        model.editMessage.isEnabled = state
-        model.buttonSend.isEnabled = state
-    }
-
-    private fun onReply(newrid: Int, txt: String) {
-        rid = newrid
-        if (rid > 0) {
-            val ssb = SpannableStringBuilder()
-            val inreplyto = resources.getString(R.string.In_reply_to_) + " "
-            ssb.append(inreplyto).append(txt)
-            ssb.setSpan(
-                StyleSpan(Typeface.BOLD),
-                0,
-                inreplyto.length,
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
-            )
-            model.textReplyTo.text = ssb
-            model.textReplyTo.visibility = View.VISIBLE
-        } else {
-            model.textReplyTo.visibility = View.GONE
-        }
-    }
-
-    @Throws(FileNotFoundException::class)
-    fun postReply(body: String?) {
-        model.progressBar.visibility = View.VISIBLE
-        App.instance.sendMessage(lifecycleScope, messagePosted, body, attachmentUri, attachmentMime)
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/FeedAdapter.kt b/src/main/java/com/juick/android/screens/FeedAdapter.kt
deleted file mode 100644
index 296f25c9..00000000
--- a/src/main/java/com/juick/android/screens/FeedAdapter.kt
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (C) 2008-2025, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.drawable.BitmapDrawable
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.method.LinkMovementMethod
-import android.text.style.ClickableSpan
-import android.text.style.QuoteSpan
-import android.text.style.URLSpan
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import androidx.core.text.HtmlCompat
-import androidx.core.text.getSpans
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
-import com.juick.App
-import com.juick.BuildConfig
-import com.juick.R
-import com.juick.android.JuickMessageMenuListener
-import com.juick.android.widget.util.getLifecycleOwner
-import com.juick.android.widget.util.load
-import com.juick.android.widget.util.loadImage
-import com.juick.android.widget.util.setDrawableTint
-import com.juick.api.model.LinkPreview
-import com.juick.api.model.Post
-import com.juick.util.MessageUtils
-import com.juick.util.StringUtils
-import kotlinx.coroutines.launch
-
-/**
- *
- * @author Ugnich Anton
- */
-class FeedAdapter(private val showSubscriptions: Boolean = false) : ListAdapter<Post, FeedAdapter.PostViewHolder>(DIFF_CALLBACK) {
-    private var loadMoreRequestListener: OnLoadMoreRequestListener? = null
-    private var itemClickListener: ((View?, Int) -> Unit)? = null
-    private var headerClickListener: ((Post) -> Unit)? = null
-    private var itemMenuListener: OnItemClickListener? = null
-    private var scrollListener: ((View?, Int, Int) -> Unit)? = null
-    private var hasMoreData = true
-
-    init {
-        setHasStableIds(true)
-    }
-
-    override fun getItemId(position: Int): Long {
-        val post = getItem(position)
-        // 123456/78 -> 1234560078
-        return if (post == null) 0 else post.mid.toLong() * 10000 + post.rid
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (hasMoreData && position == currentList.size - 1) {
-            loadMoreRequestListener?.onLoadMore()
-        }
-        return if (currentList[position].rid == 0) TYPE_MESSAGE else TYPE_THREAD_REPLY
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder {
-        return if (viewType == TYPE_MESSAGE) {
-            val vh =
-                PostViewHolder(
-                    LayoutInflater.from(parent.context).inflate(R.layout.item_post, parent, false)
-                )
-            vh
-        } else {
-            val vh = PostViewHolder(
-                LayoutInflater.from(parent.context)
-                    .inflate(R.layout.item_thread_reply, parent, false)
-            )
-            vh.replyToTextView?.setOnClickListener { v: View ->
-                val p = v.tag as Post?
-                p?.let {
-                    scrollListener?.invoke(v, p.replyto, p.rid)
-                }
-            }
-            vh
-        }
-    }
-
-    override fun onBindViewHolder(holder: PostViewHolder, position: Int) {
-        val type = getItemViewType(position)
-        val post = currentList[position]
-        val isReply = type != TYPE_MESSAGE
-        holder.upicImageView.load(post.user.avatar, false, false)
-        holder.usernameTextView.text = post.user.uname
-        holder.premiumBadge.visibility = if (post.user.premium) View.VISIBLE else View.GONE
-        holder.timestampTextView.text = MessageUtils.formatMessageTimestamp(post)
-        holder.messagePrivacyView?.visibility = if (post.friendsOnly) View.VISIBLE else View.GONE
-        holder.textTextView.text = StringUtils.EMPTY
-        holder.textTextView.text = formatMessageText(holder.itemView.context, post) {
-            uri ->
-            itemMenuListener?.onLinkClick(uri)
-        }
-        holder.textTextView.movementMethod = LinkMovementMethod.getInstance()
-        if (post.photo != null && post.photo?.medium != null) {
-            holder.photoLayout.visibility = View.VISIBLE
-            holder.photoDescriptionView.visibility = View.GONE
-            val shouldBlur = BuildConfig.HIDE_NSFW && MessageUtils.haveNSFWContent(post)
-            holder.photoImageView.load(post.photo?.medium?.url ?: "", true, shouldBlur)
-            holder.photoImageView.setOnClickListener {
-                if (holder.photoImageView.tag == -1) {
-                    holder.photoImageView.tag = null
-                    notifyItemChanged(position)
-                } else {
-                    itemMenuListener?.onLinkClick(post.photo?.url as String)
-                }
-            }
-        } else if (App.instance.hasViewableContent(post.text)) {
-            holder.photoLayout.visibility = View.VISIBLE
-            // TODO: support multiple previewers
-            App.instance.previewers.firstOrNull()
-                ?.getPreviewUrl(post.text) { link: LinkPreview? ->
-                    if (link != null) {
-                        holder.photoImageView.load(link.url)
-                        holder.photoDescriptionView.visibility = View.VISIBLE
-                        holder.photoDescriptionView.text = link.description
-                        holder.photoImageView.setOnClickListener {
-                            itemMenuListener?.onLinkClick(link.source)
-                        }
-                    } else {
-                        holder.photoLayout.visibility = View.GONE
-                    }
-                }
-        } else {
-            holder.photoLayout.visibility = View.GONE
-        }
-        if (!isReply) {
-            if (showSubscriptions) {
-                holder.repliesTextView?.setOnClickListener {
-                    itemMenuListener?.onSubscribeToggleClick(post)
-                }
-                if (post.subscribed) {
-                    holder.repliesTextView?.setCompoundDrawables(
-                        VectorDrawableCompat.create(
-                            holder.itemView.context.resources,
-                            R.drawable.ic_ei_check, null
-                        ), null, null, null
-                    )
-                    holder.repliesTextView?.setDrawableTint()
-                    holder.repliesTextView?.text = holder.itemView.context.getString(R.string.subscribed)
-                } else {
-                    holder.repliesTextView?.setCompoundDrawables(
-                        VectorDrawableCompat.create(
-                            holder.itemView.context.resources,
-                            R.drawable.ic_ei_eye, null
-                        ), null, null, null
-                    )
-                    holder.repliesTextView?.setDrawableTint()
-                    holder.repliesTextView?.text = holder.itemView.context.getString(R.string.subscribe)
-                }
-            } else {
-                val replies =
-                    if (post.replies > 0) post.replies else holder.itemView.context.getString(R.string.reply)
-
-                holder.repliesTextView?.visibility = View.VISIBLE
-                holder.repliesTextView?.text = "$replies"
-            }
-            val likes =
-                if (post.likes > 0) post.likes else holder.itemView.context.getString(R.string.recommend)
-            holder.likesTextView?.visibility = View.VISIBLE
-            holder.likesTextView?.text = "$likes"
-            val likeTintColor = if (post.liked) {
-                holder.itemView.context.getColor(R.color.colorAccent)
-            } else {
-                holder.itemView.context.getColor(android.R.color.darker_gray)
-            }
-            holder.likesTextView?.setTextColor(likeTintColor)
-            holder.likesTextView?.getCompoundDrawables()[0]?.setTint(likeTintColor)
-        } else {
-            if (post.nextRid == post.rid) {
-                holder.backImageView?.visibility = View.VISIBLE
-                holder.backImageView?.tag = post
-                holder.backImageView?.setOnClickListener { v: View ->
-                    val p = v.tag as Post
-                    scrollListener?.invoke(v, p.prevRid, 0)
-                    v.visibility = View.GONE
-                }
-            } else {
-                holder.backImageView?.visibility = View.GONE
-            }
-        }
-        holder.likesTextView?.setOnClickListener {
-            itemMenuListener?.onLikeClick(holder.likesTextView, post)
-        }
-        if (post.rid > 0 && post.replyto > 0) {
-
-            post.to?.avatar?.let {
-                holder.itemView.context.getLifecycleOwner()?.lifecycleScope?.launch {
-                    loadImage(it)?.let { bitmap ->
-                        val scaled = Bitmap.createScaledBitmap(bitmap, bitmap.width  /2, bitmap.height/2, false)
-                        holder.replyToTextView?.setCompoundDrawablesWithIntrinsicBounds(
-                            BitmapDrawable(holder.itemView.context.resources, scaled),
-                            null,
-                            null,
-                            null
-                        )
-                    }
-                }
-            }
-            holder.replyToTextView?.text = post.to?.uname
-            holder.replyToTextView?.visibility = View.VISIBLE
-            holder.replyToTextView?.tag = post
-        } else {
-            holder.replyToTextView?.visibility = View.INVISIBLE
-        }
-        holder.upicImageView.setOnClickListener {
-            headerClickListener?.invoke(post)
-        }
-        holder.usernameTextView.setOnClickListener {
-            headerClickListener?.invoke(post)
-        }
-        holder.menuImageView.setOnClickListener {
-            itemMenuListener?.onItemClick(it, post)
-        }
-        holder.itemView.setOnLongClickListener {
-            itemMenuListener?.onItemClick(it, post)
-            true
-        }
-        holder.textTextView.setOnLongClickListener {
-            itemMenuListener?.onItemClick(it, post)
-            true
-        }
-        holder.itemView.setOnClickListener {
-            itemClickListener?.invoke(it, position)
-        }
-        holder.textTextView.setOnClickListener {
-            itemClickListener?.invoke(it, position)
-        }
-    }
-
-    fun setOnLoadMoreRequestListener(loadMoreRequestListener: OnLoadMoreRequestListener?) {
-        this.loadMoreRequestListener = loadMoreRequestListener
-    }
-
-    interface OnLoadMoreRequestListener {
-        fun onLoadMore()
-    }
-
-    class PostViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        var container: ViewGroup
-        var upicImageView: ImageView
-        var usernameTextView: TextView
-        var premiumBadge: ImageView
-        var timestampTextView: TextView
-        var messagePrivacyView: ImageView?
-        var photoImageView: ImageView
-        var photoLayout: RelativeLayout
-        var photoDescriptionView: TextView
-        var textTextView: TextView
-        var repliesTextView: TextView?
-        var likesTextView: TextView?
-        var bottomBarLayout: LinearLayout?
-        var replyToTextView: TextView?
-        var menuImageView: ImageView
-        var backImageView: ImageView?
-
-        init {
-            container = itemView.findViewById(R.id.container)
-            upicImageView = itemView.findViewById(R.id.user_picture)
-            usernameTextView = itemView.findViewById(R.id.username)
-            premiumBadge = itemView.findViewById(R.id.premium_image_view)
-            timestampTextView = itemView.findViewById(R.id.timestamp)
-            messagePrivacyView = itemView.findViewById(R.id.message_privacy_status)
-            textTextView = itemView.findViewById(R.id.text)
-            photoLayout = itemView.findViewById(R.id.photo_wrapper)
-            photoImageView = itemView.findViewById(R.id.photo)
-            photoDescriptionView = itemView.findViewById(R.id.photo_description)
-            likesTextView = itemView.findViewById(R.id.likes)
-            likesTextView?.setCompoundDrawables(
-                VectorDrawableCompat.create(
-                    itemView.context.resources,
-                    R.drawable.ic_ei_heart, null
-                ), null, null, null
-            )
-            replyToTextView = itemView.findViewById(R.id.replyto)
-            bottomBarLayout = itemView.findViewById(R.id.bottom_bar_layout)
-            likesTextView?.setDrawableTint()
-            repliesTextView = itemView.findViewById(R.id.replies)
-            repliesTextView?.setCompoundDrawables(
-                VectorDrawableCompat.create(
-                    itemView.context.resources,
-                    R.drawable.ic_ei_comment, null
-                ), null, null, null
-            )
-            repliesTextView?.setDrawableTint()
-            backImageView = itemView.findViewById(R.id.back_imageView)
-            menuImageView = itemView.findViewById(R.id.menu_dots)
-        }
-    }
-
-    fun setOnItemClickListener(itemClickListener: (View?, Int) -> Unit) {
-        this.itemClickListener = itemClickListener
-    }
-
-    fun setOnHeaderClickListener(headerClickListener: (Post) -> Unit) {
-        this.headerClickListener = headerClickListener
-    }
-
-    fun setOnMenuListener(listener: JuickMessageMenuListener) {
-        itemMenuListener = listener
-    }
-
-    fun setOnScrollListener(listener: (View?, Int, Int) -> Unit) {
-        scrollListener = listener
-    }
-
-    interface OnItemClickListener {
-        fun onItemClick(view: View?, post: Post)
-        fun onLikeClick(view: View?, post: Post)
-        fun onSubscribeToggleClick(post: Post)
-        fun onLinkClick(url: String)
-    }
-
-    companion object {
-        fun formatMessageText(context: Context, jmsg: Post, onLinkClicked: ((String) -> Unit)? = null): SpannableStringBuilder {
-            val tagLine = SpannableStringBuilder()
-            var nextSpanStart = 0
-            for (tag in jmsg.tags) {
-                val text = "#$tag"
-                tagLine.append(text)
-                tagLine.setSpan(object : ClickableSpan() {
-                    override fun onClick(widget: View) {
-                        widget.tag = "clicked"
-                        /*val activity = widget.context as MainActivity
-                        activity.title = "#$tag"
-                        activity.replaceFragment(
-                                FeedBuilder.feedFor(
-                                        UrlBuilder.getPostsByTag(jmsg.getUser().getUid(), tag)));*/
-                    }
-                }, nextSpanStart, nextSpanStart + text.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-                tagLine.append(" ")
-                nextSpanStart += text.length + 1
-            }
-            val formattedMessage =
-                MessageUtils.formatMessage(StringUtils.defaultString(jmsg.getBody()))
-            val text = HtmlCompat.fromHtml(
-                formattedMessage,
-                HtmlCompat.FROM_HTML_MODE_COMPACT
-            )
-            val textContent = SpannableStringBuilder()
-            textContent.append(text)
-            val quotes = textContent.getSpans<QuoteSpan>()
-            for (quote in quotes) {
-                val start = textContent.getSpanStart(quote)
-                val end = textContent.getSpanEnd(quote)
-                textContent.removeSpan(quote)
-                textContent.setSpan(
-                    QuoteSpan(ContextCompat.getColor(context, R.color.colorDimmed)),
-                    start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
-            val urlSpans = textContent.getSpans<URLSpan>()
-            // handle deep links
-            for (span in urlSpans) {
-                val start = textContent.getSpanStart(span)
-                val end = textContent.getSpanEnd(span)
-                val link = span.url
-                textContent.removeSpan(span)
-                textContent.setSpan(object : ClickableSpan() {
-                    override fun onClick(widget: View) {
-                        widget.tag = "clicked"
-                        onLinkClicked?.invoke(link)
-                    }
-                }, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-            }
-
-            return SpannableStringBuilder()
-                .append(tagLine)
-                .append(textContent)
-        }
-
-        private const val TYPE_THREAD_REPLY = 0
-        private const val TYPE_MESSAGE = 2
-
-        private val DIFF_CALLBACK = object : DiffUtil.ItemCallback<Post>() {
-            override fun areItemsTheSame(oldItem: Post, newItem: Post): Boolean {
-                return oldItem.id == newItem.id
-            }
-
-            override fun areContentsTheSame(oldItem: Post, newItem: Post): Boolean {
-                return oldItem.likes == newItem.likes && oldItem.getBody() == newItem.getBody()
-                        && oldItem.subscribed == newItem.subscribed && oldItem.friendsOnly == newItem.friendsOnly
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/juick/android/screens/FeedFragment.kt b/src/main/java/com/juick/android/screens/FeedFragment.kt
deleted file mode 100644
index 94f7d27b..00000000
--- a/src/main/java/com/juick/android/screens/FeedFragment.kt
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
-import com.juick.App
-import com.juick.R
-import com.juick.android.Account
-import com.juick.android.JuickMessageMenuListener
-import com.juick.android.Utils
-import com.juick.android.Utils.replaceUriParameter
-import com.juick.android.screens.FeedAdapter.OnLoadMoreRequestListener
-import com.juick.api.model.Post
-import com.juick.api.model.PostResponse
-import com.juick.databinding.FragmentPostsPageBinding
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-
-
-/**
- * Created by gerc on 03.06.2016.
- */
-open class FeedFragment : Fragment(R.layout.fragment_posts_page) {
-    protected val vm by viewModels<FeedViewModel>()
-    internal val account by activityViewModels<Account>()
-    protected val binding by viewBinding(FragmentPostsPageBinding::bind)
-    private var firstPage = true
-    private val _postsKey = "posts"
-    private val messagePosted = MutableStateFlow<Result<PostResponse>?>(null)
-    private val apiResponded = MutableStateFlow<Result<Post>?>(null)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val adapter = FeedAdapter()
-        adapter.setOnItemClickListener { _, pos ->
-            adapter.currentList[pos]?.let { post ->
-                val threadArgs = Bundle()
-                threadArgs.putInt("mid", post.mid)
-                findNavController(this).navigate(R.id.thread, threadArgs)
-            }
-        }
-        setupHeaderClickListener(adapter)
-        adapter.setOnLoadMoreRequestListener(
-            object : OnLoadMoreRequestListener {
-                override fun onLoadMore() {
-                    if (vm.feed.value == null) return
-                    adapter.currentList[adapter.itemCount - 1]?.let { lastItem ->
-                        val oldValue = vm.apiUrl.value.getQueryParameter("before_mid")
-                        if ("${lastItem.mid}" == oldValue) return
-                        val requestUrl = Utils.buildUrl(vm.apiUrl.value)
-                            .build()
-                            .replaceUriParameter("before_mid", lastItem.mid.toString())
-                            .replaceUriParameter("ts", "${System.currentTimeMillis()}")
-                        firstPage = false
-                        vm.apiUrl.value = requestUrl
-                    }
-                }
-            })
-        binding.feedList.adapter = adapter
-        lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                vm.feed.collect { result ->
-                    when (result) {
-                        null -> {
-                            if (firstPage) {
-                                binding.progressBar.visibility = View.VISIBLE
-                                binding.feedList.visibility = View.GONE
-                                binding.errorText.visibility = View.GONE
-                            }
-                        }
-
-                        else -> {
-                            result.fold(
-                                onSuccess = { posts ->
-                                    stopRefreshing()
-                                    if (posts.isNotEmpty()) {
-                                        val needToScroll =
-                                            haveNewPosts(adapter.currentList, posts)
-                                        val newList = if (firstPage) {
-                                            posts
-                                        } else {
-                                            adapter.currentList + posts
-                                        }
-                                        adapter.submitList(newList) {
-                                            vm.state[_postsKey] = newList
-                                            if (needToScroll) {
-                                                binding.feedRefreshButton.isVisible = true
-                                            }
-                                            vm.feedReceived()
-                                        }
-                                    }
-                                },
-                                onFailure = { exception ->
-                                    stopRefreshing()
-                                    Toast.makeText(
-                                        requireContext(),
-                                        exception.message,
-                                        Toast.LENGTH_LONG
-                                    )
-                                        .show()
-                                    if (firstPage) {
-                                        setError(exception.message ?: getString(R.string.Error))
-                                    }
-                                }
-                            )
-                        }
-                    }
-                }
-            }
-        }
-        val initialState: List<Post>? = vm.state[_postsKey]
-        if (initialState != null) {
-            adapter.submitList(initialState)
-        }
-        account.profile.observe(viewLifecycleOwner) {
-            it?.let { user ->
-                adapter.setOnMenuListener(
-                    JuickMessageMenuListener(
-                        requireActivity(), this, messagePosted,
-                        apiResponded, user
-                    )
-                )
-            }
-        }
-
-        binding.swipeContainer.setColorSchemeColors(
-            ContextCompat.getColor(
-                App.instance,
-                R.color.colorAccent
-            )
-        )
-
-        binding.swipeContainer.setOnRefreshListener {
-            refreshFeed()
-        }
-        binding.feedRefreshButton.setOnClickListener {
-            binding.feedList.postDelayed({
-                binding.feedList.layoutManager?.scrollToPosition(0)
-                binding.feedRefreshButton.isVisible = false
-            }, 200)
-        }
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                messagePosted.collect { response ->
-                    when (response) {
-                        null -> {}
-                        else -> {
-                            response.fold(
-                                onSuccess = {
-                                    Toast.makeText(activity, it.text, Toast.LENGTH_LONG).show()
-                                    account.refresh()
-                                    refreshFeed()
-                                },
-                                onFailure = {
-
-                                }
-                            )
-                            messagePosted.update { null }
-                        }
-                    }
-                }
-            }
-        }
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                apiResponded.collect { response ->
-                    when (response) {
-                        null -> {}
-                        else -> {
-                            response.fold(
-                                onSuccess = {
-                                    account.refresh()
-                                    refreshFeed()
-                                },
-                                onFailure = {
-
-                                }
-                            )
-                            apiResponded.update { null }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun refreshFeed() {
-        firstPage = true
-        val newUrl = Utils.buildUrl(vm.apiUrl.value)
-            .build()
-            .replaceUriParameter("before_mid", "")
-            .replaceUriParameter("ts", "${System.currentTimeMillis()}")
-        vm.apiUrl.value = newUrl
-        account.refresh()
-    }
-
-    private fun haveNewPosts(oldPosts: List<Post>, newPosts: List<Post>): Boolean {
-        if (oldPosts.isEmpty() || newPosts.isEmpty()) {
-            return false
-        }
-        return oldPosts.maxBy { it.mid }.mid < newPosts.maxBy { it.mid }.mid
-    }
-
-    private fun stopRefreshing() {
-        binding.swipeContainer.isRefreshing = false
-        binding.feedList.visibility = View.VISIBLE
-        binding.progressBar.visibility = View.GONE
-        binding.errorText.visibility = View.GONE
-    }
-
-    private fun setError(message: String) {
-        binding.feedList.visibility = View.GONE
-        binding.errorText.visibility = View.VISIBLE
-        binding.errorText.text = message
-    }
-
-    protected open fun setupHeaderClickListener(adapter: FeedAdapter) {
-        adapter.setOnHeaderClickListener { post ->
-            val args = Bundle()
-            args.putString("uname", post.user.uname)
-            findNavController(this).navigate(R.id.blog, args)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        refreshFeed()
-    }
-}
diff --git a/src/main/java/com/juick/android/screens/blog/BlogFragment.kt b/src/main/java/com/juick/android/screens/blog/BlogFragment.kt
deleted file mode 100644
index b437f012..00000000
--- a/src/main/java/com/juick/android/screens/blog/BlogFragment.kt
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.screens.blog
-
-import android.net.Uri
-import android.os.Bundle
-import android.view.Menu
-import android.view.View
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.content.FileProvider
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import com.juick.App
-import com.juick.R
-import com.juick.android.Uris
-import com.juick.android.Utils.getMimeTypeFor
-import com.juick.android.Utils.isImageTypeAllowed
-import com.juick.android.screens.FeedAdapter
-import com.juick.android.screens.FeedFragment
-import com.juick.android.widget.CropBottomSheet
-import com.juick.android.widget.util.load
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaTypeOrNull
-import okhttp3.RequestBody.Companion.toRequestBody
-import java.io.File
-import java.io.IOException
-
-class BlogFragment : FeedFragment() {
-    private val passedUname: String?
-        get() = arguments?.getString("uname")
-
-    private val isOwnBlog: Boolean
-        get() = passedUname.isNullOrBlank() || passedUname == account.profile.value?.name
-
-    private val galleryLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        uri?.let { showCropSheet(it) }
-    }
-    private val cameraLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        if (success) cameraUri?.let { showCropSheet(it) }
-    }
-    private var cameraUri: Uri? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        ensureBlogUrl()
-        account.profile.observe(viewLifecycleOwner) {
-            ensureBlogUrl()
-            bindProfileHeader()
-        }
-        bindProfileHeader()
-    }
-
-    override fun setupHeaderClickListener(adapter: FeedAdapter) {
-        // No-op: clicking on post header when already on blog page should not navigate
-    }
-
-    private fun ensureBlogUrl() {
-        if (vm.apiUrl.value != Uri.EMPTY) return
-        resolveBlogName()?.let {
-            vm.apiUrl.value = Uris.getUserPostsByName(it)
-        }
-    }
-
-    private fun resolveBlogName(): String? {
-        return passedUname?.takeIf { it.isNotBlank() }
-            ?: account.profile.value?.name?.takeIf { it.isNotBlank() }
-    }
-
-    private fun bindProfileHeader() {
-        binding.profileHeader.isVisible = true
-        binding.profileHeaderSubtitle.text = getString(R.string.blog)
-
-        if (isOwnBlog) {
-            binding.profileHeaderEdit.isVisible = true
-            binding.profileHeaderSettings.isVisible = false
-            binding.profileHeaderUsername.text = account.profile.value?.name ?: passedUname.orEmpty()
-            val avatarUrl = account.profile.value?.avatar
-            if (!avatarUrl.isNullOrEmpty()) {
-                binding.profileHeaderAvatar.load(avatarUrl, false, false)
-            } else {
-                binding.profileHeaderAvatar.setImageResource(R.drawable.av_96)
-            }
-            binding.profileHeaderEdit.setOnClickListener {
-                showImageSourcePicker()
-            }
-        } else {
-            binding.profileHeaderEdit.isVisible = false
-            binding.profileHeaderSettings.isVisible = true
-            binding.profileHeaderUsername.text = passedUname.orEmpty()
-            binding.profileHeaderAvatar.setImageResource(R.drawable.av_96)
-        }
-        binding.profileHeaderSettings.setOnClickListener { v ->
-            showHeaderMenu(v)
-        }
-    }
-
-    private fun showImageSourcePicker() {
-        AlertDialog.Builder(requireContext())
-            .setItems(R.array.image_source_options) { _, which ->
-                when (which) {
-                    0 -> galleryLauncher.launch("image/*")
-                    1 -> launchCamera()
-                }
-            }
-            .show()
-    }
-
-    private fun launchCamera() {
-        val file = File(requireContext().filesDir, "camera_${System.currentTimeMillis()}.jpg")
-        cameraUri = FileProvider.getUriForFile(
-            requireContext(), "${requireContext().packageName}.provider", file
-        )
-        cameraLauncher.launch(cameraUri!!)
-    }
-
-    private fun showCropSheet(uri: Uri) {
-        val sheet = CropBottomSheet.newInstance(uri)
-        sheet.onCropResult = { croppedUri -> uploadAvatar(croppedUri) }
-        sheet.show(childFragmentManager, CropBottomSheet.TAG)
-    }
-
-    private fun uploadAvatar(uri: Uri?) {
-        if (uri == null) return
-        val mime = getMimeTypeFor(requireContext(), uri)
-        if (mime == null || !isImageTypeAllowed(mime)) {
-            Toast.makeText(activity, R.string.wrong_image_format, Toast.LENGTH_LONG).show()
-            return
-        }
-        lifecycleScope.launch {
-            withContext(Dispatchers.IO) {
-                try {
-                    App.instance.uploadAvatar(uri, mime)
-                } catch (e: IOException) {
-                    withContext(Dispatchers.Main) {
-                        Toast.makeText(activity, "Avatar error: " + e.message, Toast.LENGTH_LONG).show()
-                    }
-                    return@withContext
-                }
-            }
-            account.refresh()
-        }
-    }
-
-    private fun showHeaderMenu(view: View) {
-        val userName = passedUname ?: return
-        if (isOwnBlog) return
-
-        val popupMenu = PopupMenu(requireContext(), view)
-        popupMenu.setForceShowIcon(true)
-        popupMenu.menu.add(
-            Menu.NONE, MENU_ACTION_SUBSCRIBE, Menu.NONE,
-            getString(R.string.Subscribe_to) + " @" + userName
-        )
-        val me = account.profile.value
-        if (me != null && (me.premium || me.admin)) {
-            if (me.vip.any { it.name == userName }) {
-                popupMenu.menu.add(
-                    Menu.NONE, MENU_ACTION_REMOVE_FROM_VIP, Menu.NONE,
-                    getString(R.string.remove_from_vip)
-                )
-            } else {
-                popupMenu.menu.add(
-                    Menu.NONE, MENU_ACTION_ADD_TO_VIP, Menu.NONE,
-                    getString(R.string.add_to_vip)
-                )
-            }
-        }
-        if (me != null && me.ignored.any { it.name == userName }) {
-            popupMenu.menu.add(
-                Menu.NONE, MENU_ACTION_REMOVE_FROM_IGNORELIST, Menu.NONE,
-                getString(R.string.remove_from_ignore_list) + " @" + userName
-            )
-        } else {
-            popupMenu.menu.add(
-                Menu.NONE, MENU_ACTION_ADD_TO_IGNORELIST, Menu.NONE,
-                getString(R.string.add_to_ignore_list) + " @" + userName
-            )
-        }
-        popupMenu.setOnMenuItemClickListener {
-            when (it.itemId) {
-                MENU_ACTION_SUBSCRIBE -> {
-                    processCommand("S @${userName}")
-                    true
-                }
-                MENU_ACTION_ADD_TO_IGNORELIST -> {
-                    processCommand("BL @${userName}")
-                    true
-                }
-                MENU_ACTION_REMOVE_FROM_IGNORELIST -> {
-                    processCommand("BL @${userName}")
-                    true
-                }
-                MENU_ACTION_ADD_TO_VIP -> {
-                    lifecycleScope.launch {
-                        withContext(Dispatchers.IO) { App.instance.api.toggleVIP(userName) }
-                        account.refresh()
-                    }
-                    true
-                }
-                MENU_ACTION_REMOVE_FROM_VIP -> {
-                    lifecycleScope.launch {
-                        withContext(Dispatchers.IO) { App.instance.api.toggleVIP(userName) }
-                        account.refresh()
-                    }
-                    true
-                }
-                else -> false
-            }
-        }
-        popupMenu.show()
-    }
-
-    private fun processCommand(command: String) {
-        lifecycleScope.launch {
-            App.instance.api.newPost(
-                command.toRequestBody("text/plain".toMediaTypeOrNull()),
-                null
-            )
-        }
-    }
-
-    companion object {
-        private const val MENU_ACTION_SUBSCRIBE = 3
-        private const val MENU_ACTION_ADD_TO_VIP = 7
-        private const val MENU_ACTION_REMOVE_FROM_VIP = 8
-        private const val MENU_ACTION_ADD_TO_IGNORELIST = 9
-        private const val MENU_ACTION_REMOVE_FROM_IGNORELIST = 10
-    }
-}
diff --git a/src/main/java/com/juick/android/screens/chat/ChatFragment.kt b/src/main/java/com/juick/android/screens/chat/ChatFragment.kt
deleted file mode 100644
index 00e3e932..00000000
--- a/src/main/java/com/juick/android/screens/chat/ChatFragment.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2008-2025, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.chat
-
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.*
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.juick.App
-import com.juick.R
-import com.juick.android.Account
-import com.juick.android.widget.util.hideKeyboard
-import com.juick.android.widget.util.load
-import com.juick.api.model.Post
-import com.juick.databinding.FragmentChatBinding
-import com.stfalcon.chatkit.messages.MessagesListAdapter
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import kotlinx.coroutines.Dispatchers
-import android.text.util.Linkify
-import android.text.method.LinkMovementMethod
-import android.widget.TextView
-import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.util.regex.Pattern
-
-/**
- *
- * @author ugnich
- */
-class ChatFragment : Fragment(R.layout.fragment_chat) {
-    private val account by activityViewModels<Account>()
-    private val model by viewBinding(FragmentChatBinding::bind)
-    private lateinit var vm: ChatViewModel
-    private lateinit var adapter: MessagesListAdapter<Post>
-    private lateinit var uname: String
-
-    // Helper: traverse a view subtree and make links clickable
-    private fun applyLinkifyToView(root: android.view.View) {
-        fun traverse(v: android.view.View) {
-            if (v is TextView && v.id == com.stfalcon.chatkit.R.id.messageText) {
-                // detect all link types: web, email, phone, map and custom schemes
-                Linkify.addLinks(v, Linkify.ALL)
-
-                // Ensure custom scheme links are recognized
-                // Match <scheme>://<non-space-chars>
-                val schemePattern = Pattern.compile("\\b([a-zA-Z][\\w+.-]*):\\/\\/([^\\s]+)", Pattern.CASE_INSENSITIVE)
-                val schemeTransform = Linkify.TransformFilter { match, _ ->
-                    // return the full matched URL (scheme://rest)
-                    "${'$'}{match.group(1)}://${'$'}{match.group(2)}"
-                }
-                // Pass empty scheme - transform returns the full URL
-                Linkify.addLinks(v, schemePattern, "", null, schemeTransform)
-
-                v.movementMethod = LinkMovementMethod.getInstance()
-                v.isClickable = true
-                v.isFocusable = true
-                v.linksClickable = true
-            } else if (v is android.view.ViewGroup) {
-                for (i in 0 until v.childCount) traverse(v.getChildAt(i))
-            }
-        }
-        traverse(root)
-    }
-
-    // Convenience: apply linkify to all currently visible message views
-    private fun applyLinkifyToVisibleMessages() {
-        val root = model.messagesList as? android.view.View ?: return
-        applyLinkifyToView(root)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        uname = arguments?.getString("uname") ?: ""
-        vm = ViewModelProvider(this, ChatViewModelFactory(uname))[ChatViewModel::class.java]
-        model.input.setInputListener { input: CharSequence ->
-            postText(input.toString())
-            hideKeyboard(activity)
-            true
-        }
-        account.profile.observe(viewLifecycleOwner) {
-            it?.let { user ->
-                adapter = MessagesListAdapter(user.uname) { imageView, url, _ ->
-                    imageView.load(url ?: "")
-                }
-                model.messagesList.setAdapter(adapter)
-                // ensure visible message TextViews have clickable links
-                applyLinkifyToVisibleMessages()
-                // attach a listener to linkify views when they are attached (covers viewholder binding ordering)
-                model.messagesList.addOnChildAttachStateChangeListener(object : RecyclerView.OnChildAttachStateChangeListener {
-                    override fun onChildViewAttachedToWindow(view: View) {
-                        applyLinkifyToView(view)
-                    }
-
-                    override fun onChildViewDetachedFromWindow(view: View) {
-                        // no-op
-                    }
-                })
-                vm.messages.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED).onEach { newPosts ->
-                    when (newPosts) {
-                        null -> {}
-                        else -> {
-                            newPosts.fold(
-                                onSuccess = { posts ->
-                                    adapter.addToEnd(posts, false)
-                                    // newly added messages might need linkify
-                                    applyLinkifyToVisibleMessages()
-                                },
-                                onFailure = { error ->
-                                    Toast.makeText(requireContext(), error.message, Toast.LENGTH_LONG)
-                                        .show()
-                                }
-                            )
-                            vm.messages.update { Result.success(listOf()) }
-                        }
-                    }
-                }.launchIn(lifecycleScope)
-            }
-        }
-        App.instance.messages.flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED).onEach { posts ->
-            onNewMessages(posts.filter {
-                it.isOurs(uname)
-            })
-            App.instance.messages.update { listOf() }
-        }.launchIn(lifecycleScope)
-        vm.loadMessages()
-    }
-
-    private fun Post.isOurs(authorName: String) : Boolean {
-        return mid == 0 && uname == authorName || uname == to?.uname
-    }
-
-    private fun onNewMessages(posts: List<Post>) {
-        Log.d("onNewMessages", posts.toString())
-        posts.forEach {
-            adapter.addToStart(it, shouldScrollToBottom)
-        }
-    }
-
-    private fun postText(body: String) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            try {
-                App.instance.api.postPm(uname, body).let { post ->
-                    withContext(Dispatchers.Main) {
-                        onNewMessages(listOf(post))
-                    }
-                }
-            } catch (e: Exception) {
-                withContext(Dispatchers.Main) {
-                    // TODO: blacklist
-                    Toast.makeText(App.instance, R.string.network_error, Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    private val shouldScrollToBottom : Boolean
-        get() {
-            val lastVisible =
-                (model.messagesList.layoutManager as LinearLayoutManager).findLastVisibleItemPosition()
-            val total = adapter.itemCount - 1
-            return lastVisible == total
-        }
-}
diff --git a/src/main/java/com/juick/android/screens/chats/ChatsFragment.kt b/src/main/java/com/juick/android/screens/chats/ChatsFragment.kt
deleted file mode 100644
index 15af4f7c..00000000
--- a/src/main/java/com/juick/android/screens/chats/ChatsFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.chats
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
-import com.juick.App
-import com.juick.R
-import com.juick.android.service.isAuthenticated
-import com.juick.android.widget.util.load
-import com.juick.api.model.Chat
-import com.juick.databinding.FragmentDialogListBinding
-import com.stfalcon.chatkit.dialogs.DialogsListAdapter
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import kotlinx.coroutines.launch
-
-/**
- *
- * @author ugnich
- */
-class ChatsFragment : Fragment(R.layout.fragment_dialog_list) {
-    private val model by viewBinding(FragmentDialogListBinding::bind)
-    private val chatsAdapter: DialogsListAdapter<Chat> =
-        DialogsListAdapter { imageView: ImageView, url: String?, _: Any? ->
-            imageView.load(url ?: "")
-        }
-
-    private lateinit var vm: ChatsViewModel
-
-    init {
-        chatsAdapter.setOnDialogClickListener { dialog: Chat ->
-            val navController = findNavController(this)
-            val action = Bundle()
-            action.putString("uname", dialog.dialogName)
-            action.putInt("uid", dialog.id.toInt())
-            navController.navigate(R.id.PMFragment, action)
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        model.dialogsList.setAdapter(chatsAdapter)
-        model.swipeContainer.setColorSchemeColors(
-            ContextCompat.getColor(
-                App.instance,
-                R.color.colorAccent
-            )
-        )
-        model.swipeContainer.setOnRefreshListener {
-            lifecycleScope.launch {
-                vm.loadChats()
-            }
-        }
-        vm = ViewModelProvider(this)[ChatsViewModel::class.java]
-
-        lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                if (App.instance.isAuthenticated) {
-                    vm.loadChats()
-                    vm.chats.collect { resource ->
-                        when (resource) {
-                            null -> {
-                                startLoading()
-                            }
-
-                            else -> resource.fold(
-                                onSuccess = { chats ->
-                                    stopLoading()
-                                    if (chats.isNotEmpty()) {
-                                        chatsAdapter.setItems(chats)
-                                    } else {
-                                        setError(getString(R.string.you_have_no_direct_messages))
-                                    }
-                                },
-                                onFailure = {
-                                    stopLoading()
-                                    Toast.makeText(
-                                        requireContext(),
-                                        it.message,
-                                        Toast.LENGTH_LONG
-                                    ).show()
-                                    setError(it.message ?: getString(R.string.Error))
-                                }
-                            )
-                        }
-                    }
-                } else {
-                    val navController = findNavController(this@ChatsFragment)
-                    navController.navigate(R.id.no_auth)
-                }
-            }
-        }
-    }
-
-    private fun stopLoading() {
-        model.dialogsList.visibility = View.VISIBLE
-        model.progressBar.visibility = View.GONE
-        model.errorText.visibility = View.GONE
-        model.swipeContainer.isRefreshing = false
-    }
-
-    private fun startLoading() {
-        model.dialogsList.visibility = View.GONE
-        model.progressBar.visibility = View.VISIBLE
-        model.errorText.visibility = View.GONE
-    }
-
-    private fun setError(message: String) {
-        model.errorText.visibility = View.VISIBLE
-        model.errorText.text = message
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/chats/NoAuthFragment.kt b/src/main/java/com/juick/android/screens/chats/NoAuthFragment.kt
deleted file mode 100644
index 32a11a68..00000000
--- a/src/main/java/com/juick/android/screens/chats/NoAuthFragment.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2008-2022, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.chats
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import com.juick.R
-import com.juick.android.Account
-import com.juick.android.SignInActivity
-import com.juick.databinding.FragmentNoAuthBinding
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-
-class NoAuthFragment : Fragment(R.layout.fragment_no_auth) {
-    private val account by activityViewModels<Account>()
-    private val binding by viewBinding(FragmentNoAuthBinding::bind)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.signInButton.setOnClickListener {
-            account.signInStatus.value =
-                SignInActivity.SignInStatus.SIGN_IN_PROGRESS
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/home/HomeFragment.kt b/src/main/java/com/juick/android/screens/home/HomeFragment.kt
deleted file mode 100644
index 9860fd9d..00000000
--- a/src/main/java/com/juick/android/screens/home/HomeFragment.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008-2022, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.home
-
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import com.juick.App
-import com.juick.android.Uris
-import com.juick.android.screens.FeedFragment
-import com.juick.android.service.isAuthenticated
-
-/**
- * Created by gerc on 03.06.2016.
- */
-class HomeFragment : FeedFragment() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (App.instance.isAuthenticated) {
-            if (vm.apiUrl.value == Uri.EMPTY) {
-                vm.apiUrl.value = Uris.home
-            }
-        } else {
-            if (vm.apiUrl.value == Uri.EMPTY) {
-                vm.apiUrl.value = Uris.discussions
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/post/NewPostFragment.kt b/src/main/java/com/juick/android/screens/post/NewPostFragment.kt
deleted file mode 100644
index eab1336b..00000000
--- a/src/main/java/com/juick/android/screens/post/NewPostFragment.kt
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.post
-
-import android.graphics.BitmapFactory
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.FileProvider
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
-import com.juick.App
-import com.juick.R
-import com.juick.android.Utils.getMimeTypeFor
-import com.juick.android.Utils.isImageTypeAllowed
-import com.juick.android.widget.CropBottomSheet
-import com.juick.api.model.PostResponse
-import com.juick.databinding.FragmentNewPostBinding
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import java.io.File
-import java.io.FileNotFoundException
-import java.io.IOException
-
-/**
- * Created by alx on 02.01.17.
- */
-class NewPostFragment : Fragment(R.layout.fragment_new_post) {
-    private var attachmentUri: Uri? = null
-    private var attachmentMime: String? = null
-
-    private val model by viewBinding(FragmentNewPostBinding::bind)
-    private val messagePosted = MutableStateFlow<Result<PostResponse>?>(null)
-
-    private val galleryLauncher = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        uri?.let { showCropSheet(it) }
-    }
-    private val cameraLauncher = registerForActivityResult(ActivityResultContracts.TakePicture()) { success ->
-        if (success) cameraUri?.let { showCropSheet(it) }
-    }
-    private var cameraUri: Uri? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        model.buttonTags.setOnClickListener {
-            val navController = findNavController(this)
-            val tagState = navController.currentBackStackEntry
-                ?.savedStateHandle as SavedStateHandle
-            val tagData = tagState.getLiveData<String>("tag")
-            tagData.observe(viewLifecycleOwner) { tag: String? ->
-                tagState.remove<Any>("tag")
-                applyTag(tag)
-            }
-            navController.navigate(R.id.tags)
-        }
-        model.buttonAttachment.setOnClickListener {
-            if (attachmentUri == null) {
-                showImageSourcePicker()
-            } else {
-                attachmentUri = null
-                attachmentMime = null
-                model.buttonAttachment.isSelected = false
-                model.imagePreview.setImageBitmap(null)
-            }
-        }
-        model.buttonSend.setOnClickListener {
-            try {
-                sendMessage()
-            } catch (e: FileNotFoundException) {
-                Toast.makeText(activity, "Attachment error: " + e.message, Toast.LENGTH_LONG).show()
-            }
-        }
-        val text = arguments?.getString("text") ?: ""
-        if (text.isNotEmpty()) {
-            model.editMessage.setText(text)
-        }
-        val uri = arguments?.getString("uri") ?: ""
-        if (uri.isNotEmpty()) {
-            attachImage(Uri.parse(uri))
-        }
-        lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                messagePosted.collect { response ->
-                    when (response) {
-                        null -> {}
-                        else -> {
-                            response.fold(
-                                onSuccess = { post ->
-                                    model.progressBar.visibility = View.GONE
-                                    Toast.makeText(activity, post.text, Toast.LENGTH_LONG).show()
-                                    post.newMessage?.let {
-                                        val navController = findNavController(this@NewPostFragment)
-                                        navController.popBackStack(R.id.new_post, true)
-                                        val args = Bundle()
-                                        args.putInt("mid", it.mid)
-                                        navController.navigate(R.id.thread, args)
-                                    }
-                                    setFormEnabled(true)
-                                },
-                                onFailure = {
-                                    Toast.makeText (context, requireContext().getString(R.string.network_error), Toast.LENGTH_LONG).show()
-                                }
-                            )
-                            messagePosted.update { null }
-                        }
-
-                    }
-                }
-            }
-        }
-        model.editMessage.requestFocus()
-    }
-
-    private fun setFormEnabled(state: Boolean) {
-        model.editMessage.isEnabled = state
-        model.buttonTags.isEnabled = state
-        model.buttonAttachment.isEnabled = state
-        model.buttonSend.isEnabled = state
-    }
-
-    @Throws(FileNotFoundException::class)
-    private fun sendMessage() {
-        val msg = model.editMessage.text.toString()
-        if (msg.length < 3 && attachmentUri == null) {
-            //Toast.makeText(getBaseActivity(), R.string.Enter_a_message, Toast.LENGTH_SHORT).show();
-            return
-        }
-        setFormEnabled(false)
-        model.progressBar.visibility = View.VISIBLE
-        App.instance.sendMessage(lifecycleScope, messagePosted, msg, attachmentUri, attachmentMime)
-    }
-
-    private fun attachImage(uri: Uri?) {
-        if (uri != null) {
-            getMimeTypeFor(requireContext(), uri)?.let { mime ->
-                if (isImageTypeAllowed(mime)) {
-                    attachmentUri = uri
-                    attachmentMime = mime
-                    model.buttonAttachment.isSelected = true
-                    try {
-                        requireContext().contentResolver.openInputStream(uri).use { bitmapStream ->
-                            val image = BitmapFactory.decodeStream(bitmapStream)
-                            model.imagePreview.setImageBitmap(image)
-                        }
-                    } catch (e: IOException) {
-                        Toast.makeText(activity, e.message, Toast.LENGTH_LONG).show()
-                    }
-                } else {
-                    Toast.makeText(activity, R.string.wrong_image_format, Toast.LENGTH_LONG).show()
-                }
-            }
-        }
-    }
-
-    private fun showImageSourcePicker() {
-        AlertDialog.Builder(requireContext())
-            .setItems(R.array.image_source_options) { _, which ->
-                when (which) {
-                    0 -> galleryLauncher.launch("image/*")
-                    1 -> launchCamera()
-                }
-            }
-            .show()
-    }
-
-    private fun launchCamera() {
-        val file = File(requireContext().filesDir, "camera_${System.currentTimeMillis()}.jpg")
-        cameraUri = FileProvider.getUriForFile(
-            requireContext(), "${requireContext().packageName}.provider", file
-        )
-        cameraLauncher.launch(cameraUri!!)
-    }
-
-    private fun showCropSheet(uri: Uri) {
-        val sheet = CropBottomSheet.newInstance(uri)
-        sheet.onCropResult = { croppedUri -> attachImage(croppedUri) }
-        sheet.show(childFragmentManager, CropBottomSheet.TAG)
-    }
-
-    private fun applyTag(tag: String?) {
-        model.editMessage.setText("*$tag ${model.editMessage.text}")
-        val textLength = model.editMessage.text?.length ?: 0
-        model.editMessage.setSelection(textLength, textLength)
-        model.editMessage.requestFocus()
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/post/TagsFragment.kt b/src/main/java/com/juick/android/screens/post/TagsFragment.kt
deleted file mode 100644
index a4134152..00000000
--- a/src/main/java/com/juick/android/screens/post/TagsFragment.kt
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.post
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.NavHostFragment.Companion.findNavController
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.juick.R
-import com.juick.databinding.FragmentTagsListBinding
-import com.juick.databinding.ItemTagBinding
-import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding
-
-/**
- *
- * @author Ugnich Anton
- */
-class TagsFragment : BottomSheetDialogFragment(R.layout.fragment_tags_list) {
-    private val vm by viewModels<TagsViewModel>()
-    private val model by viewBinding(FragmentTagsListBinding::bind)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        model.progressBar.visibility = View.VISIBLE
-        model.list.setHasFixedSize(true)
-        val adapter = TagsAdapter()
-        model.list.adapter = adapter
-        adapter.itemClickListener = { _, position ->
-            val tag = adapter.currentList[position]
-            val navController = findNavController(this)
-            navController.previousBackStackEntry?.savedStateHandle?.set("tag", tag)
-            dismiss()
-        }
-        /* adapter.setOnItemLongClickListener((view12, position) -> ((BaseActivity) getActivity())
-                .replaceFragment(FeedBuilder.feedFor(
-                        UrlBuilder.getPostsByTag(uid, adapter.getItem(position)))));*/
-        vm.tags.observe(viewLifecycleOwner) { resource ->
-            when (resource) {
-                null -> {
-                    model.list.visibility = View.GONE
-                    model.progressBar.visibility = View.VISIBLE
-                }
-
-                else -> {
-                    model.progressBar.visibility = View.GONE
-                    model.list.visibility = View.VISIBLE
-                    resource.fold(
-                        onSuccess = { tags ->
-                            adapter.submitList(tags.map {
-                                it.tag
-                            })
-                        },
-                        onFailure = {
-                            Toast.makeText(
-                                requireContext(),
-                                R.string.network_error,
-                                Toast.LENGTH_LONG
-                            ).show()
-                        })
-                }
-            }
-        }
-    }
-
-    internal class TagsAdapter : ListAdapter<String, TagsAdapter.TagsViewHolder>(DIFF_CALLBACK) {
-        var itemClickListener: ((View?, Int) -> Unit)? = null
-
-        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TagsViewHolder {
-            return TagsViewHolder(
-                ItemTagBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            )
-        }
-
-        override fun onBindViewHolder(holder: TagsViewHolder, position: Int) {
-            val tag = getItem(position)
-            holder.binding.text.text = tag
-            holder.itemView.setOnClickListener { v ->
-                itemClickListener?.invoke(v, position)
-            }
-        }
-
-        internal class TagsViewHolder(val binding: ItemTagBinding) :
-            RecyclerView.ViewHolder(binding.root)
-
-        companion object {
-            val DIFF_CALLBACK = object : DiffUtil.ItemCallback<String>() {
-                override fun areItemsTheSame(oldItem: String, newItem: String): Boolean {
-                    return oldItem == newItem
-                }
-
-                override fun areContentsTheSame(oldItem: String, newItem: String): Boolean {
-                    return oldItem == newItem
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/search/SearchFragment.kt b/src/main/java/com/juick/android/screens/search/SearchFragment.kt
deleted file mode 100644
index e26f6557..00000000
--- a/src/main/java/com/juick/android/screens/search/SearchFragment.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008-2023, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.screens.search
-
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import com.juick.android.Uris
-import com.juick.android.screens.FeedFragment
-
-class SearchFragment: FeedFragment() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val search = arguments?.getString("search") ?: ""
-        if (vm.apiUrl.value == Uri.EMPTY) {
-            vm.apiUrl.value = Uris.search(search)
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/ui/MainScreen.kt b/src/main/java/com/juick/android/ui/MainScreen.kt
new file mode 100644
index 00000000..cd2f6c48
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/MainScreen.kt
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.ui.graphics.Color
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+import coil3.compose.AsyncImage
+import com.juick.R
+import com.juick.android.ui.navigation.AppNavigation
+import com.juick.api.model.Post
+import com.juick.api.model.User
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainScreen(
+    navController: NavHostController,
+    currentProfile: User?,
+    unreadCount: Int,
+    onPostClick: (Post) -> Unit = { },
+    onUserClick: (String) -> Unit = { },
+    onMenuClick: (Post) -> Unit = { },
+    onLikeClick: (Post) -> Unit = { },
+    onLinkClick: (String) -> Unit = { },
+    onSignInClick: () -> Unit = { },
+    onFabClick: () -> Unit = { },
+) {
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = navBackStackEntry?.destination?.route
+    val borderLine = @Composable { BorderLine() }
+
+    val bottomNavVisible = currentRoute !in listOf(
+        "thread/{mid}?scrollToEnd={scrollToEnd}",
+        "chat/{uname}/{uid}",
+        "new_post?text={text}&uri={uri}",
+        "tags",
+        "no_auth",
+        "search",
+    )
+    val fabVisible = currentRoute in listOf("home", "discover")
+
+    val blogArgs = navBackStackEntry?.arguments
+    val screenTitle = when {
+        currentRoute?.startsWith("blog/") == true -> "@${blogArgs?.getString("uname") ?: ""}"
+        currentRoute == "search" -> stringResource(R.string.search)
+        currentRoute == "chats" -> stringResource(R.string.PMs)
+        currentRoute == "discover" -> stringResource(R.string.Discover)
+        currentRoute == "discussions" -> "Discussions"
+        else -> stringResource(R.string.Juick)
+    }
+
+    Scaffold(
+        topBar = {
+            Column {
+                TopAppBar(
+                    title = { Text(screenTitle) },
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = MaterialTheme.colorScheme.surface,
+                        titleContentColor = MaterialTheme.colorScheme.onSurface,
+                    ),
+                    actions = {
+                        IconButton(onClick = { navController.navigate("search") }) {
+                            Icon(Icons.Default.Search, contentDescription = stringResource(R.string.search), tint = MaterialTheme.colorScheme.onSurfaceVariant)
+                        }
+                        IconButton(onClick = { navController.navigate("discussions") }) {
+                            BadgedBox(badge = { if (unreadCount > 0) Badge { Text("$unreadCount") } }) {
+                                Icon(Icons.Default.Notifications, contentDescription = "Discussions", tint = MaterialTheme.colorScheme.onSurfaceVariant)
+                            }
+                        }
+                        if (currentProfile != null) {
+                            IconButton(onClick = { navController.navigate("blog/${currentProfile.uname}") }) {
+                                AsyncImage(model = currentProfile.avatar, contentDescription = stringResource(R.string.Me), modifier = Modifier.size(28.dp).clip(CircleShape), contentScale = ContentScale.Crop)
+                            }
+                        }
+                    },
+                )
+                borderLine()
+            }
+        },
+        bottomBar = {
+            if (bottomNavVisible) {
+                Column {
+                    borderLine()
+                    NavigationBar(containerColor = MaterialTheme.colorScheme.surface, tonalElevation = 0.dp) {
+                        val navColors = NavigationBarItemDefaults.colors(
+                            selectedIconColor = MaterialTheme.colorScheme.onSurface,
+                            selectedTextColor = MaterialTheme.colorScheme.onSurface,
+                            unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                            unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                            indicatorColor = MaterialTheme.colorScheme.tertiary,
+                        )
+                        NavigationBarItem(
+                            selected = currentRoute == "home",
+                            onClick = { navController.navigate("home") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
+                            icon = { Icon(painterResource(R.drawable.ic_ei_clock), contentDescription = null) },
+                            label = { Text(stringResource(R.string.Subscriptions)) },
+                            colors = navColors,
+                        )
+                        NavigationBarItem(
+                            selected = currentRoute == "discover",
+                            onClick = { navController.navigate("discover") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
+                            icon = { Icon(painterResource(R.drawable.icon_discover), contentDescription = null) },
+                            label = { Text(stringResource(R.string.Discover)) },
+                            colors = navColors,
+                        )
+                        NavigationBarItem(
+                            selected = currentRoute == "chats",
+                            onClick = { navController.navigate("chats") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
+                            icon = { Icon(painterResource(R.drawable.ic_ei_envelope), contentDescription = null) },
+                            label = { Text(stringResource(R.string.PMs)) },
+                            colors = navColors,
+                        )
+                    }
+                }
+            }
+        },
+        floatingActionButton = {
+            if (fabVisible) {
+                FloatingActionButton(
+                    onClick = onFabClick,
+                    containerColor = MaterialTheme.colorScheme.tertiary,
+                    contentColor = MaterialTheme.colorScheme.onTertiary,
+                ) {
+                    Icon(painterResource(R.drawable.ic_ei_pencil), contentDescription = stringResource(R.string.Create), modifier = Modifier.size(24.dp))
+                }
+            }
+        },
+    ) { contentPadding ->
+        Box(Modifier.padding(contentPadding)) {
+            AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick)
+        }
+    }
+}
+
+@Composable
+private fun BorderLine() {
+    Box(Modifier.fillMaxWidth().height(0.5.dp).background(MaterialTheme.colorScheme.outline))
+}
diff --git a/src/main/java/com/juick/android/ui/Theme.kt b/src/main/java/com/juick/android/ui/Theme.kt
new file mode 100644
index 00000000..8a3b2b03
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/Theme.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui
+
+import android.app.Activity
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.unit.dp
+import androidx.core.view.WindowCompat
+
+private val JuickLightColors = lightColorScheme(
+    primary = Color(0xFF2A6090),
+    onPrimary = Color(0xFFFFFFFF),
+    primaryContainer = Color(0xFFD4E4F2),
+    onPrimaryContainer = Color(0xFF0A1F30),
+    secondary = Color(0xFF5D6B62),
+    onSecondary = Color(0xFFFFFFFF),
+    secondaryContainer = Color(0xFFE0F0E5),
+    onSecondaryContainer = Color(0xFF1A2820),
+    tertiary = Color(0xFFFF339A),
+    onTertiary = Color(0xFFFFFFFF),
+    tertiaryContainer = Color(0xFFFFD1E5),
+    onTertiaryContainer = Color(0xFF4D0026),
+    background = Color(0xFFF8F8F8),
+    onBackground = Color(0xFF222222),
+    surface = Color(0xFFFFFFFF),
+    onSurface = Color(0xFF222222),
+    surfaceVariant = Color(0xFFEEEEEE),
+    onSurfaceVariant = Color(0xFF6D6D6D),
+    outline = Color(0xFFDEDEDE),
+    outlineVariant = Color(0xFFEEEEEE),
+    scrim = Color(0xFF000000),
+)
+
+private val JuickDarkColors = darkColorScheme(
+    primary = Color(0xFFD4A56A),
+    onPrimary = Color(0xFF3A2510),
+    primaryContainer = Color(0xFF5A3A15),
+    onPrimaryContainer = Color(0xFFFFDCC5),
+    secondary = Color(0xFF9EAE9E),
+    onSecondary = Color(0xFF1A2820),
+    secondaryContainer = Color(0xFF3A4A3A),
+    onSecondaryContainer = Color(0xFFD0E0D0),
+    tertiary = Color(0xFFFF5CA8),
+    onTertiary = Color(0xFF4D0026),
+    tertiaryContainer = Color(0xFF800040),
+    onTertiaryContainer = Color(0xFFFFD1E5),
+    background = Color(0xFF333333),
+    onBackground = Color(0xFFCCCCCC),
+    surface = Color(0xFF383838),
+    onSurface = Color(0xFFCCCCCC),
+    surfaceVariant = Color(0xFF4C4C4C),
+    onSurfaceVariant = Color(0xFFA2A2A2),
+    outline = Color(0xFF555555),
+    outlineVariant = Color(0xFF4C4C4C),
+    scrim = Color(0xFF000000),
+)
+
+@Composable
+fun AppTheme(
+    useDarkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colorScheme = if (useDarkTheme) JuickDarkColors else JuickLightColors
+
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = colorScheme.background.toArgb()
+            WindowCompat
+                .getInsetsController(window, view)
+                .isAppearanceLightStatusBars = !useDarkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content
+    )
+}
+
+val standardSpacing = 16.dp
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
new file mode 100644
index 00000000..bae34fc7
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.navigation
+
+import android.net.Uri
+import androidx.compose.runtime.Composable
+import com.juick.BuildConfig
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.dialog
+import androidx.navigation.navArgument
+import com.juick.android.Uris
+import com.juick.android.ui.screens.chat.ChatScreen
+import com.juick.android.ui.screens.chats.ChatsListScreen
+import com.juick.android.ui.screens.feed.FeedScreen
+import com.juick.android.ui.screens.feed.ProfileHeader
+import com.juick.android.ui.screens.noauth.NoAuthScreen
+import com.juick.android.ui.screens.post.NewPostScreen
+import com.juick.android.ui.screens.search.SearchScreen
+import com.juick.android.ui.screens.tags.TagsScreen
+import com.juick.android.ui.screens.thread.ThreadScreen
+import com.juick.api.model.Post
+
+@Composable
+fun AppNavigation(
+    navController: NavHostController,
+    onPostClick: (Post) -> Unit,
+    onUserClick: (String) -> Unit,
+    onMenuClick: (Post) -> Unit,
+    onLikeClick: (Post) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onSignInClick: () -> Unit,
+    onTagSelected: (String) -> Unit = {},
+) {
+    NavHost(
+        navController = navController,
+        startDestination = "home",
+    ) {
+        composable("home") {
+            FeedScreen(
+                initialUrl = Uris.home,
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+            )
+        }
+
+        composable("discover") {
+            FeedScreen(
+                initialUrl = Uris.last,
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+            )
+        }
+
+        composable("chats") {
+            ChatsListScreen(
+                onChatClick = { chat ->
+                    navController.navigate("chat/${chat.dialogName}/${chat.uid}")
+                },
+                onNavigateToAuth = { navController.navigate("no_auth") },
+            )
+        }
+
+        composable(
+            "chat/{uname}/{uid}",
+            arguments = listOf(
+                navArgument("uname") { type = NavType.StringType },
+                navArgument("uid") { type = NavType.IntType },
+            ),
+        ) { entry ->
+            val uname = entry.arguments?.getString("uname") ?: ""
+            ChatScreen(
+                uname = uname,
+                onUserClick = { onUserClick(it) },
+                onLinkClick = { onLinkClick(it) },
+            )
+        }
+
+        composable("blog/{uname}",
+            arguments = listOf(navArgument("uname") { type = NavType.StringType }),
+        ) { entry ->
+            val uname = entry.arguments?.getString("uname") ?: ""
+            FeedScreen(
+                initialUrl = Uris.getUserPostsByName(uname),
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+                showProfileHeader = true,
+                profileHeader = {
+                    ProfileHeader(uname = uname)
+                },
+            )
+        }
+
+        composable("search") {
+            SearchScreen(
+                onSearch = { query ->
+                    navController.navigate("search/${Uri.encode(query)}") {
+                        popUpTo("search") { inclusive = true }
+                    }
+                },
+            )
+        }
+
+        composable("search/{query}",
+            arguments = listOf(navArgument("query") { type = NavType.StringType }),
+        ) { entry ->
+            val query = entry.arguments?.getString("query") ?: ""
+            FeedScreen(
+                initialUrl = Uri.parse("${BuildConfig.API_ENDPOINT}search/$query"),
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+            )
+        }
+
+        composable("discussions") {
+            FeedScreen(
+                initialUrl = Uris.discussions,
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+            )
+        }
+
+        composable("no_auth") {
+            NoAuthScreen(onSignInClick = {
+                navController.popBackStack()
+                onSignInClick()
+            })
+        }
+
+        dialog("thread/{mid}?scrollToEnd={scrollToEnd}",
+            arguments = listOf(
+                navArgument("mid") { type = NavType.IntType },
+                navArgument("scrollToEnd") { type = NavType.BoolType; defaultValue = false },
+            ),
+        ) { entry ->
+            val mid = entry.arguments?.getInt("mid") ?: 0
+            val scrollToEnd = entry.arguments?.getBoolean("scrollToEnd") ?: false
+            ThreadScreen(
+                mid = mid,
+                scrollToEnd = scrollToEnd,
+                onPostClick = { onPostClick(it) },
+                onUserClick = { onUserClick(it) },
+                onMenuClick = { onMenuClick(it) },
+                onLikeClick = { onLikeClick(it) },
+                onLinkClick = { onLinkClick(it) },
+                onDismiss = { navController.popBackStack() },
+            )
+        }
+
+        dialog("tags") {
+            TagsScreen(
+                onTagSelected = { tag ->
+                    navController.previousBackStackEntry
+                        ?.savedStateHandle
+                        ?.set("tag", tag)
+                    navController.popBackStack()
+                },
+            )
+        }
+
+        composable(
+            "new_post?text={text}&uri={uri}",
+            arguments = listOf(
+                navArgument("text") { type = NavType.StringType; nullable = true; defaultValue = null },
+                navArgument("uri") { type = NavType.StringType; nullable = true; defaultValue = null },
+            ),
+        ) { entry ->
+            NewPostScreen(
+                initialText = entry.arguments?.getString("text"),
+                initialUri = entry.arguments?.getString("uri"),
+                onTagsClick = { navController.navigate("tags") },
+                onAttachClick = { /* handled by MainActivity */ },
+                onAttachmentRemoved = { },
+                attachmentUri = null,
+                hasAttachment = false,
+                onNavigateToThread = { mid ->
+                    navController.popBackStack("new_post", true)
+                    navController.navigate("thread/$mid")
+                },
+                onDismiss = { navController.popBackStack() },
+            )
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
new file mode 100644
index 00000000..eeae1392
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.chat
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.juick.App
+import com.juick.R
+import com.juick.android.screens.chat.ChatViewModel
+import com.juick.android.screens.chat.ChatViewModelFactory
+import com.juick.android.ui.screens.feed.buildUrlPositions
+import com.juick.android.ui.screens.feed.formatPostText
+import com.juick.api.model.Post
+import kotlinx.coroutines.launch
+
+@Composable
+fun ChatScreen(
+    uname: String,
+    onUserClick: (String) -> Unit,
+    onLinkClick: (String) -> Unit,
+) {
+    val vm: ChatViewModel = viewModel(factory = ChatViewModelFactory(uname))
+    val messagesState by vm.messages.collectAsStateWithLifecycle()
+    val messages = (messagesState?.getOrNull() ?: emptyList()).reversed()
+    var inputText by remember { mutableStateOf("") }
+    val listState = rememberLazyListState()
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(Unit) {
+        vm.loadMessages()
+    }
+
+    LaunchedEffect(messages) {
+        if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1)
+    }
+
+    Column(modifier = Modifier.fillMaxSize()) {
+        LazyColumn(
+            state = listState,
+            modifier = Modifier.weight(1f),
+        ) {
+            items(messages, key = { it.getTimestamp()?.time ?: it.hashCode() }) { post ->
+                ChatBubble(
+                    post = post,
+                    isOwn = post.user.uname != uname,
+                    onLinkClick = onLinkClick,
+                    modifier = Modifier.padding(horizontal = 8.dp, vertical = 2.dp),
+                )
+            }
+        }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(8.dp)
+                .imePadding(),
+            verticalAlignment = Alignment.Bottom,
+        ) {
+            OutlinedTextField(
+                value = inputText,
+                onValueChange = { inputText = it },
+                placeholder = { Text(stringResource(R.string.Enter_a_message)) },
+                modifier = Modifier.weight(1f),
+                maxLines = 3,
+            )
+            Spacer(Modifier.width(8.dp))
+            IconButton(onClick = {
+                if (inputText.isNotBlank()) {
+                    scope.launch {
+                        try {
+                            App.instance.api.postPm(uname, inputText)
+                            inputText = ""
+                        } catch (_: Exception) { }
+                    }
+                }
+            }) {
+                Text(stringResource(R.string.Send))
+            }
+        }
+    }
+}
+
+@Composable
+fun ChatBubble(
+    post: Post,
+    isOwn: Boolean,
+    onLinkClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val colors = MaterialTheme.colorScheme
+    val bgColor = colors.surfaceVariant
+    val textColor = colors.onSurfaceVariant
+    val alignment = if (isOwn) Alignment.End else Alignment.Start
+
+    val (annotatedText, urlPositions) = remember(post) {
+        formatPostText(post, colors.primary, colors.onSurfaceVariant, textColor) to buildUrlPositions(post)
+    }
+
+    Column(
+        modifier = modifier.fillMaxWidth(),
+        horizontalAlignment = alignment,
+    ) {
+        Surface(
+            shape = MaterialTheme.shapes.medium,
+            color = bgColor,
+            modifier = Modifier.widthIn(max = 280.dp),
+        ) {
+            ClickableText(
+                text = annotatedText,
+                style = MaterialTheme.typography.bodyMedium.copy(color = textColor),
+                modifier = Modifier.padding(12.dp),
+                onClick = { offset ->
+                    urlPositions
+                        .firstOrNull { it.start <= offset && offset < it.end }
+                        ?.let { onLinkClick(it.url) }
+                },
+            )
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
new file mode 100644
index 00000000..4c0ccdf9
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.chats
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import coil3.compose.AsyncImage
+import com.juick.App
+import com.juick.R
+import com.juick.android.screens.chats.ChatsViewModel
+import com.juick.android.service.isAuthenticated
+import com.juick.android.ui.screens.noauth.NoAuthScreen
+import com.juick.api.model.Chat
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ChatsListScreen(
+    onChatClick: (Chat) -> Unit,
+    onNavigateToAuth: () -> Unit,
+    vm: ChatsViewModel = viewModel(),
+) {
+    val chatsState by vm.chats.collectAsStateWithLifecycle()
+
+    LaunchedEffect(Unit) {
+        if (App.instance.isAuthenticated) {
+            vm.loadChats()
+        } else {
+            onNavigateToAuth()
+        }
+    }
+
+    when (val result = chatsState) {
+        null -> {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                CircularProgressIndicator()
+            }
+        }
+
+        else -> {
+            result.fold(
+                onSuccess = { chats ->
+                    if (chats.isEmpty()) {
+                        Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                            Text(stringResource(R.string.you_have_no_direct_messages))
+                        }
+                    } else {
+                        LazyColumn(Modifier.fillMaxSize()) {
+                            items(chats, key = { it.uid }) { chat ->
+                                ChatListItem(
+                                    chat = chat,
+                                    onClick = { onChatClick(chat) },
+                                )
+                            }
+                        }
+                    }
+                },
+                onFailure = {
+                    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        Text(
+                            text = it.message ?: stringResource(R.string.Error),
+                            color = MaterialTheme.colorScheme.error,
+                        )
+                    }
+                },
+            )
+        }
+    }
+}
+
+@Composable
+private fun ChatListItem(
+    chat: Chat,
+    onClick: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+            .padding(horizontal = 16.dp, vertical = 12.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AsyncImage(
+            model = chat.dialogPhoto,
+            contentDescription = null,
+            modifier = Modifier
+                .size(48.dp)
+                .clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+        Spacer(Modifier.width(12.dp))
+        Column {
+            Text(
+                text = chat.dialogName,
+                style = MaterialTheme.typography.titleSmall,
+            )
+            Text(
+                text = chat.lastMessageOrNull?.getBody() ?: "",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                maxLines = 1,
+            )
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
new file mode 100644
index 00000000..9684f73f
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.feed
+
+import android.net.Uri
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.derivedStateOf
+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.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.juick.android.Utils
+import com.juick.android.Utils.replaceUriParameter
+import com.juick.android.screens.FeedViewModel
+import com.juick.api.model.Post
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun FeedScreen(
+    initialUrl: Uri,
+    onPostClick: (Post) -> Unit,
+    onUserClick: (String) -> Unit,
+    onMenuClick: (Post) -> Unit,
+    onLikeClick: (Post) -> Unit,
+    onLinkClick: (String) -> Unit,
+    showProfileHeader: Boolean = false,
+    profileHeader: @Composable () -> Unit = {},
+    modifier: Modifier = Modifier,
+    vm: FeedViewModel = viewModel(),
+) {
+    val feedState by vm.feed.collectAsState()
+    val listState = rememberLazyListState()
+    var isRefreshing by remember { mutableStateOf(false) }
+    var firstPage by remember { mutableStateOf(true) }
+    val scope = rememberCoroutineScope()
+
+    
+    LaunchedEffect(initialUrl) {
+        if (vm.apiUrl.value == Uri.EMPTY) {
+            vm.apiUrl.value = initialUrl
+        }
+    }
+
+    
+    val shouldLoadMore by remember {
+        derivedStateOf {
+            val lastVisibleItem = listState.layoutInfo.visibleItemsInfo.lastOrNull()
+            lastVisibleItem != null && lastVisibleItem.index >= listState.layoutInfo.totalItemsCount - 3
+        }
+    }
+
+    LaunchedEffect(shouldLoadMore) {
+        if (shouldLoadMore && feedState != null) {
+            val posts = feedState!!.getOrNull() ?: return@LaunchedEffect
+            if (posts.isNotEmpty()) {
+                val lastPost = posts.last()
+                val oldBeforeMid = vm.apiUrl.value.getQueryParameter("before_mid")
+                if ("${lastPost.mid}" != oldBeforeMid) {
+                    val newUrl = Utils.buildUrl(vm.apiUrl.value)
+                        .build()
+                        .replaceUriParameter("before_mid", lastPost.mid.toString())
+                        .replaceUriParameter("ts", "${System.currentTimeMillis()}")
+                    firstPage = false
+                    vm.apiUrl.value = newUrl
+                }
+            }
+        }
+    }
+
+    PullToRefreshBox(
+        isRefreshing = isRefreshing,
+        onRefresh = {
+            isRefreshing = true
+            firstPage = true
+            val newUrl = Utils.buildUrl(initialUrl)
+                .build()
+                .replaceUriParameter("before_mid", "")
+                .replaceUriParameter("ts", "${System.currentTimeMillis()}")
+            vm.apiUrl.value = newUrl
+            scope.launch {
+                snapshotFlow { feedState }
+                    .distinctUntilChanged()
+                    .collectLatest { result ->
+                        if (result != null) {
+                            isRefreshing = false
+                        }
+                    }
+            }
+        },
+        modifier = modifier.fillMaxSize(),
+    ) {
+        when (val result = feedState) {
+            null -> {
+                if (firstPage) {
+                    Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                        CircularProgressIndicator()
+                    }
+                }
+            }
+
+            else -> {
+                result.fold(
+                    onSuccess = { posts ->
+                        LazyColumn(state = listState) {
+                            if (showProfileHeader) {
+                                item(key = "profile_header") {
+                                    profileHeader()
+                                }
+                            }
+                            items(
+                                items = posts,
+                                key = { post -> "post_${post.mid}_${post.rid}" },
+                            ) { post ->
+                                if (post.rid == 0) {
+                                    PostCard(
+                                        post = post,
+                                        onPostClick = { onPostClick(post) },
+                                        onUserClick = { onUserClick(post.user.uname) },
+                                        onMenuClick = { onMenuClick(post) },
+                                        onLikeClick = { onLikeClick(post) },
+                                        onLinkClick = onLinkClick,
+                                        modifier = Modifier.padding(vertical = 4.dp).padding(horizontal = 12.dp),
+                                    )
+                                } else {
+                                    ReplyCard(
+                                        post = post,
+                                        onPostClick = { onPostClick(post) },
+                                        onUserClick = { onUserClick(post.user.uname) },
+                                        onMenuClick = { onMenuClick(post) },
+                                        onLinkClick = onLinkClick,
+                                        modifier = Modifier.padding(vertical = 4.dp).padding(horizontal = 12.dp),
+                                    )
+                                }
+                            }
+                        }
+                    },
+                    onFailure = {
+                        if (firstPage) {
+                            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                                Text(
+                                    text = it.message ?: "Error",
+                                    style = MaterialTheme.typography.bodyLarge,
+                                    color = MaterialTheme.colorScheme.error,
+                                )
+                            }
+                        }
+                    },
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun ReplyCard(
+    post: Post,
+    onPostClick: () -> Unit,
+    onUserClick: () -> Unit,
+    onMenuClick: () -> Unit,
+    onLinkClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    
+    
+    Column(modifier = modifier) {
+        val replyTo = post.to
+        if (replyTo != null) {
+            Text(
+                text = "↳ ${replyTo.uname}",
+                style = MaterialTheme.typography.labelSmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier.padding(start = 16.dp),
+            )
+        }
+        PostCard(
+            post = post,
+            onPostClick = onPostClick,
+            onUserClick = onUserClick,
+            onMenuClick = onMenuClick,
+            onLikeClick = {},
+            onLinkClick = onLinkClick,
+            modifier = Modifier.padding(start = 16.dp),
+        )
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
new file mode 100644
index 00000000..c0ea27b2
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.feed
+
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withStyle
+import com.juick.api.model.Post
+
+private data class Processed(
+    val text: String,
+    val entityStart: List<Int>,
+    val entityEnd: List<Int>,
+    val entityType: List<String>,
+)
+
+private fun StringBuilder.appendCollapsing(ch: Char) {
+    if (ch != '\n' || isEmpty() || last() != '\n') append(ch)
+}
+
+private fun processBody(post: Post): Processed {
+    val body = post.getBody() ?: ""
+    val sorted = post.entities.sortedBy { it.start }
+
+    val sb = StringBuilder()
+    val eStart = mutableListOf<Int>()
+    val eEnd = mutableListOf<Int>()
+    val eType = mutableListOf<String>()
+    var bp = 0
+
+    for (e in sorted) {
+        if (e.start < bp) continue
+        val end = e.end.coerceAtMost(body.length)
+        while (bp < body.length && bp < e.start) sb.appendCollapsing(body[bp++])
+        eStart.add(sb.length)
+        for (c in e.text) sb.appendCollapsing(c)
+        eEnd.add(sb.length)
+        eType.add(e.type)
+        bp = end
+    }
+    while (bp < body.length) sb.appendCollapsing(body[bp++])
+
+    val raw = sb.toString()
+    val trimmed = raw.trim('\n', ' ')
+    val trimOffset = raw.indexOf(trimmed)
+    val adjustedStart = eStart.map { (it - trimOffset).coerceIn(0, trimmed.length) }
+    val adjustedEnd = eEnd.map { (it - trimOffset).coerceIn(0, trimmed.length) }
+    return Processed(trimmed, adjustedStart, adjustedEnd, eType)
+}
+
+fun formatPostText(
+    post: Post,
+    primaryColor: Color,
+    dimmedColor: Color,
+    onSurfaceColor: Color,
+    quoteColor: Color = dimmedColor,
+): AnnotatedString {
+    val p = processBody(post)
+    return buildAnnotatedString {
+        for (tag in post.tags) {
+            withStyle(SpanStyle(color = dimmedColor)) { append("#$tag ") }
+        }
+        var pos = 0
+        for (i in p.entityStart.indices) {
+            if (pos < p.entityStart[i]) {
+                withStyle(SpanStyle(color = onSurfaceColor)) { append(p.text, pos, p.entityStart[i]) }
+            }
+            val style = entityStyle(p.entityType[i], primaryColor, dimmedColor, onSurfaceColor, quoteColor)
+            withStyle(style) { append(p.text, p.entityStart[i], p.entityEnd[i]) }
+            pos = p.entityEnd[i]
+        }
+        if (pos < p.text.length) {
+            withStyle(SpanStyle(color = onSurfaceColor)) { append(p.text, pos, p.text.length) }
+        }
+    }
+}
+
+fun formatPostBlocks(
+    post: Post,
+    primaryColor: Color,
+    dimmedColor: Color,
+    onSurfaceColor: Color,
+    quoteColor: Color = dimmedColor,
+): List<TextBlock> {
+    val p = processBody(post)
+    val sorted = post.entities.sortedBy { it.start }
+
+    data class Seg(val start: Int, val end: Int, val type: String)
+
+    val segs = mutableListOf<Seg>()
+    var ei = 0
+    for (i in p.entityStart.indices) {
+        val e = sorted.getOrNull(ei) ?: break
+        if (e.start < (sorted.getOrNull(ei - 1)?.end ?: 0)) { ei++; continue }
+        segs.add(Seg(p.entityStart[i], p.entityEnd[i], p.entityType[i]))
+        ei++
+    }
+
+    val all = mutableListOf<Seg>()
+    var pos = 0
+    for (s in segs) {
+        if (pos < s.start) all.add(Seg(pos, s.start, ""))
+        all.add(s)
+        pos = s.end
+    }
+    if (pos < p.text.length) all.add(Seg(pos, p.text.length, ""))
+
+    val blocks = mutableListOf<TextBlock>()
+    var tagsRendered = false
+    var i = 0
+
+    if (all.isNotEmpty() && all[0].type == "q") {
+        val tBuilder = buildAnnotatedString {
+            for (tag in post.tags) withStyle(SpanStyle(color = dimmedColor)) { append("#$tag ") }
+        }
+        if (post.tags.isNotEmpty()) blocks.add(TextBlock.Regular(tBuilder, emptyList()))
+        tagsRendered = true
+    }
+
+    while (i < all.size) {
+        if (all[i].type == "q") {
+            val startPos = all[i].start
+            var endPos = all[i].end
+            i++
+            while (i < all.size) {
+                if (all[i].type == "q") { endPos = all[i].end; i++ }
+                else if (all[i].type == "" && i + 1 < all.size && all[i + 1].type == "q") {
+                    val gapLen = all[i].end - all[i].start
+                    if (gapLen <= 2) { endPos = all[i].end; i++ } else break
+                } else break
+            }
+            val qBuilder = buildAnnotatedString {
+                withStyle(SpanStyle(color = quoteColor)) { append(p.text, startPos, endPos) }
+            }
+            blocks.add(TextBlock.Quote(qBuilder, emptyList()))
+        } else {
+            val rBuilder = buildAnnotatedString {
+                if (!tagsRendered) {
+                    for (tag in post.tags) withStyle(SpanStyle(color = dimmedColor)) { append("#$tag ") }
+                    tagsRendered = true
+                }
+                while (i < all.size && all[i].type != "q") {
+                    val s = all[i]
+                    val style = if (s.type.isEmpty()) SpanStyle(color = onSurfaceColor)
+                    else entityStyle(s.type, primaryColor, dimmedColor, onSurfaceColor, quoteColor)
+                    withStyle(style) { append(p.text, s.start, s.end) }
+                    i++
+                }
+            }
+            val rText = rBuilder.text
+            if (rText.isNotEmpty()) {
+                val rUrls = sorted.mapNotNull { e ->
+                    if (e.type != "a" || e.url == null) return@mapNotNull null
+                    val idx = rText.indexOf(e.text)
+                    if (idx >= 0) UrlPosition(idx, idx + e.text.length, e.url) else null
+                }
+                blocks.add(TextBlock.Regular(rBuilder, rUrls))
+            }
+        }
+    }
+    if (blocks.isEmpty() && post.tags.isNotEmpty()) {
+        val t = buildAnnotatedString { for (tag in post.tags) withStyle(SpanStyle(color = dimmedColor)) { append("#$tag ") } }
+        blocks.add(TextBlock.Regular(t, emptyList()))
+    }
+    return blocks
+}
+
+private fun entityStyle(type: String, primary: Color, dimmed: Color, onSurface: Color, quote: Color = dimmed): SpanStyle = when (type) {
+    "a" -> SpanStyle(color = primary)
+    "q" -> SpanStyle(color = quote)
+    "b" -> SpanStyle(fontWeight = FontWeight.Bold)
+    "i" -> SpanStyle(fontStyle = FontStyle.Italic)
+    "u" -> SpanStyle(textDecoration = TextDecoration.Underline)
+    else -> SpanStyle(color = onSurface)
+}
+
+fun buildUrlPositions(post: Post): List<UrlPosition> {
+    val p = processBody(post)
+    val sorted = post.entities.sortedBy { it.start }
+    var si = 0
+    return p.entityStart.indices.mapNotNull { i ->
+        while (si < sorted.size && sorted[si].type != "a") si++
+        if (si >= sorted.size) return@mapNotNull null
+        val e = sorted[si++]
+        if (e.url == null) return@mapNotNull null
+        UrlPosition(p.entityStart[i], p.entityEnd[i], e.url)
+    }
+}
+
+sealed class TextBlock {
+    data class Regular(val annotatedString: AnnotatedString, val urlPositions: List<UrlPosition>) : TextBlock()
+    data class Quote(val annotatedString: AnnotatedString, val urlPositions: List<UrlPosition>) : TextBlock()
+}
+
+data class UrlPosition(val start: Int, val end: Int, val url: String)
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
new file mode 100644
index 00000000..3233c8c9
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.feed
+
+import androidx.compose.foundation.clickable
+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.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.juick.R
+import com.juick.api.model.Post
+import com.juick.util.MessageUtils
+
+private val quoteColor = Color(0xFF666666)
+
+private fun List<UrlPosition>.urlAt(offset: Int): String? =
+    firstOrNull { it.start <= offset && offset < it.end }?.url
+
+@Composable
+fun PostCard(
+    post: Post,
+    onPostClick: () -> Unit,
+    onUserClick: () -> Unit,
+    onMenuClick: () -> Unit,
+    onLikeClick: () -> Unit,
+    onLinkClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val colors = MaterialTheme.colorScheme
+
+    Surface(
+        modifier = modifier.fillMaxWidth().clickable { onPostClick() },
+        shape = androidx.compose.foundation.shape.RoundedCornerShape(0.dp),
+        color = colors.surface, shadowElevation = 1.dp, tonalElevation = 0.dp,
+    ) {
+        Column(modifier = Modifier.padding(20.dp)) {
+            Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) {
+                AsyncImage(post.user.avatar, null, Modifier.size(36.dp).clip(CircleShape), contentScale = ContentScale.Crop)
+                Spacer(Modifier.width(10.dp))
+                Text(post.user.uname, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold, color = colors.primary, modifier = Modifier.clickable { onUserClick() })
+                Spacer(Modifier.weight(1f))
+                Text(MessageUtils.formatMessageTimestamp(post), style = MaterialTheme.typography.labelSmall, color = colors.onSurfaceVariant)
+                IconButton(onClick = onMenuClick, modifier = Modifier.size(24.dp)) {
+                    Icon(Icons.Default.MoreVert, null, Modifier.size(16.dp), tint = colors.onSurfaceVariant)
+                }
+            }
+
+            Spacer(Modifier.height(4.dp))
+
+            val blocks = remember(post) {
+                formatPostBlocks(post, colors.primary, colors.onSurfaceVariant, colors.onSurface, quoteColor)
+            }
+            Column {
+                for (block in blocks) {
+                    when (block) {
+                        is TextBlock.Regular -> {
+                            ClickableText(
+                                text = block.annotatedString,
+                                style = MaterialTheme.typography.bodyMedium,
+                                onClick = { offset -> block.urlPositions.urlAt(offset)?.let(onLinkClick) },
+                            )
+                        }
+                        is TextBlock.Quote -> {
+                            Surface(
+                                color = colors.background,
+                                shape = androidx.compose.foundation.shape.RoundedCornerShape(0.dp),
+                                modifier = Modifier.fillMaxWidth().padding(start = 8.dp, bottom = 8.dp)
+                                    .drawWithContent { drawContent(); drawRect(colors.tertiary, Offset(0f, 0f), Size(3.dp.toPx(), size.height)) },
+                            ) {
+                                ClickableText(
+                                    text = block.annotatedString,
+                                    style = MaterialTheme.typography.bodyMedium.copy(color = quoteColor),
+                                    modifier = Modifier.padding(8.dp),
+                                    onClick = { offset -> block.urlPositions.urlAt(offset)?.let(onLinkClick) },
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+
+            val photo = post.photo
+            val medium = photo?.medium
+            if (medium != null) {
+                Spacer(Modifier.height(12.dp))
+                AsyncImage(medium.url ?: "", null, Modifier.fillMaxWidth().height(200.dp), contentScale = ContentScale.FillWidth)
+            }
+
+            Spacer(Modifier.height(12.dp))
+            HorizontalDivider(color = colors.outlineVariant, thickness = 0.5.dp)
+            Spacer(Modifier.height(8.dp))
+            Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.CenterVertically) {
+                val likeColor = if (post.liked) colors.tertiary else colors.onSurfaceVariant
+                Icon(painterResource(R.drawable.ic_ei_heart), null, Modifier.size(18.dp).clickable { onLikeClick() }, tint = likeColor)
+                Text("${post.likes}", style = MaterialTheme.typography.labelSmall, color = likeColor)
+                Icon(painterResource(R.drawable.ic_ei_comment), null, Modifier.size(18.dp), tint = colors.onSurfaceVariant)
+                Text("${post.replies}", style = MaterialTheme.typography.labelSmall, color = colors.onSurfaceVariant)
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/feed/ProfileHeader.kt b/src/main/java/com/juick/android/ui/screens/feed/ProfileHeader.kt
new file mode 100644
index 00000000..376a31f8
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/feed/ProfileHeader.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.feed
+
+import androidx.compose.foundation.layout.*
+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.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+
+@Composable
+fun ProfileHeader(
+    uname: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(16.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AsyncImage(
+            model = "https://juick.com/a/$uname",
+            contentDescription = null,
+            modifier = Modifier
+                .size(64.dp)
+                .clip(CircleShape),
+            contentScale = ContentScale.Crop,
+        )
+        Spacer(Modifier.width(16.dp))
+        Column {
+            Text(
+                text = "@$uname",
+                style = MaterialTheme.typography.titleLarge,
+            )
+            Text(
+                text = "Blog",
+                style = MaterialTheme.typography.bodySmall,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/noauth/NoAuthScreen.kt b/src/main/java/com/juick/android/ui/screens/noauth/NoAuthScreen.kt
new file mode 100644
index 00000000..462c12d0
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/noauth/NoAuthScreen.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.ui.screens.noauth
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.juick.R
+
+@Composable
+fun NoAuthScreen(
+    onSignInClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Surface(modifier = modifier.fillMaxSize()) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center,
+        ) {
+            TextButton(onClick = onSignInClick) {
+                Text(
+                    text = stringResource(R.string.press_to_sign_in),
+                    style = MaterialTheme.typography.bodyLarge,
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
new file mode 100644
index 00000000..ab17e974
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.post
+
+import android.net.Uri
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.juick.App
+import com.juick.R
+import com.juick.api.model.PostResponse
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+
+@Composable
+fun NewPostScreen(
+    initialText: String? = null,
+    initialUri: String? = null,
+    onTagsClick: () -> Unit,
+    onAttachClick: () -> Unit,
+    onAttachmentRemoved: () -> Unit,
+    attachmentUri: Uri?,
+    attachmentMime: String? = null,
+    hasAttachment: Boolean,
+    onNavigateToThread: (Int) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    var text by remember { mutableStateOf(initialText ?: "") }
+    val scope = rememberCoroutineScope()
+    val messagePosted = remember { MutableStateFlow<Result<PostResponse>?>(null) }
+    var isSending by remember { mutableStateOf(false) }
+
+    val sendEnabled = text.length >= 3 || attachmentUri != null
+
+    LaunchedEffect(messagePosted) {
+        messagePosted.collect { response ->
+            if (response != null) {
+                response.fold(
+                    onSuccess = { postResponse ->
+                        isSending = false
+                        postResponse.newMessage?.let { post ->
+                            onNavigateToThread(post.mid)
+                        }
+                    },
+                    onFailure = {
+                        isSending = false
+                    },
+                )
+                messagePosted.value = null
+            }
+        }
+    }
+
+    Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+        ) {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.Cancel))
+            }
+            Text(
+                stringResource(R.string.New_message),
+                style = MaterialTheme.typography.titleMedium,
+            )
+            Spacer(Modifier.width(64.dp)) // balance
+        }
+
+        Spacer(Modifier.height(16.dp))
+
+        OutlinedTextField(
+            value = text,
+            onValueChange = { text = it },
+            placeholder = { Text(stringResource(R.string.Enter_a_message)) },
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f),
+            minLines = 7,
+        )
+
+        if (isSending) {
+            LinearProgressIndicator(Modifier.fillMaxWidth())
+        }
+
+        Spacer(Modifier.height(8.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceEvenly,
+        ) {
+            IconButton(onClick = onTagsClick) {
+                Text("#", style = MaterialTheme.typography.titleMedium)
+            }
+            IconButton(onClick = {
+                if (hasAttachment) {
+                    onAttachmentRemoved()
+                } else {
+                    onAttachClick()
+                }
+            }) {
+                Text("📎", style = MaterialTheme.typography.titleMedium)
+            }
+            IconButton(
+                onClick = {
+                    if (sendEnabled && !isSending) {
+                        isSending = true
+                        scope.launch {
+                            App.instance.sendMessage(scope, messagePosted, text, attachmentUri, attachmentMime)
+                        }
+                    }
+                },
+                enabled = sendEnabled && !isSending,
+            ) {
+                Text(stringResource(R.string.Send))
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/search/SearchScreen.kt b/src/main/java/com/juick/android/ui/screens/search/SearchScreen.kt
new file mode 100644
index 00000000..e6411f33
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/search/SearchScreen.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.search
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+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.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+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.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.dp
+import com.juick.R
+import com.juick.android.ui.standardSpacing
+
+@Composable
+fun SearchScreen(
+    onSearch: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var query by remember { mutableStateOf("") }
+
+    Surface(modifier = modifier.fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = standardSpacing, vertical = 16.dp),
+        ) {
+            OutlinedTextField(
+                value = query,
+                onValueChange = { query = it },
+                placeholder = { Text(stringResource(R.string.search)) },
+                leadingIcon = {
+                    Icon(
+                        Icons.Default.Search,
+                        contentDescription = null,
+                        modifier = Modifier.size(20.dp),
+                    )
+                },
+                singleLine = true,
+                keyboardOptions = KeyboardOptions(
+                    keyboardType = KeyboardType.Text,
+                    imeAction = ImeAction.Search,
+                ),
+                keyboardActions = KeyboardActions(
+                    onSearch = {
+                        if (query.isNotBlank()) {
+                            onSearch(query.trim())
+                        }
+                    },
+                ),
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(16.dp))
+
+            Box(
+                modifier = Modifier.fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(
+                    text = stringResource(R.string.search),
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
new file mode 100644
index 00000000..fe5a5d94
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.ui.screens.tags
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.juick.R
+import com.juick.android.screens.post.TagsViewModel
+import com.juick.api.model.Tag
+
+@Composable
+fun TagsScreen(
+    onTagSelected: (String) -> Unit,
+    modifier: Modifier = Modifier,
+    vm: TagsViewModel = viewModel(),
+) {
+    val tagsResult by vm.tags.observeAsState()
+
+    Surface(modifier = modifier.fillMaxSize()) {
+        if (tagsResult == null) {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                CircularProgressIndicator()
+            }
+            return@Surface
+        }
+
+        val result = tagsResult!!
+        if (result.isSuccess) {
+            TagsGrid(
+                tags = result.getOrThrow(),
+                onTagClick = onTagSelected,
+            )
+        } else {
+            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                Text(
+                    text = stringResource(R.string.network_error),
+                    color = MaterialTheme.colorScheme.error,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun TagsGrid(
+    tags: List<Tag>,
+    onTagClick: (String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    LazyVerticalGrid(
+        columns = GridCells.Fixed(3),
+        modifier = modifier
+            .fillMaxSize()
+            .padding(8.dp),
+    ) {
+        items(tags, key = { it.tag }) { tag ->
+            Text(
+                text = tag.tag,
+                style = MaterialTheme.typography.bodyLarge,
+                color = MaterialTheme.colorScheme.primary,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clickable { onTagClick(tag.tag) }
+                    .padding(horizontal = 16.dp, vertical = 12.dp),
+            )
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
new file mode 100644
index 00000000..c483472f
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.thread
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Send
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.juick.App
+import com.juick.R
+import com.juick.android.ui.screens.feed.PostCard
+import com.juick.api.model.Post
+import com.juick.api.model.PostResponse
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+
+@Composable
+fun ThreadScreen(
+    mid: Int,
+    scrollToEnd: Boolean = false,
+    onPostClick: (Post) -> Unit,
+    onUserClick: (String) -> Unit,
+    onMenuClick: (Post) -> Unit,
+    onLikeClick: (Post) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    var posts by remember { mutableStateOf<List<Post>>(emptyList()) }
+    var replyText by remember { mutableStateOf("") }
+    var isLoading by remember { mutableStateOf(true) }
+    val listState = rememberLazyListState()
+    val scope = rememberCoroutineScope()
+    val colors = MaterialTheme.colorScheme
+
+    LaunchedEffect(mid) {
+        try { posts = App.instance.api.thread(mid) } catch (_: Exception) {}
+        isLoading = false
+        if (scrollToEnd && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
+    }
+
+    val newMessages by App.instance.messages.collectAsStateWithLifecycle()
+    LaunchedEffect(newMessages) {
+        val relevant = newMessages.filter { it.mid == mid }
+        if (relevant.isNotEmpty()) posts = posts + relevant
+    }
+
+    Surface(color = colors.background) {
+        Column(modifier = Modifier.fillMaxSize()) {
+            if (isLoading) {
+                LinearProgressIndicator(Modifier.fillMaxWidth())
+                Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    CircularProgressIndicator()
+                }
+            } else {
+                LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
+                    items(posts, key = { "thread_${it.mid}_${it.rid}" }) { post ->
+                        PostCard(
+                            post = post,
+                            onPostClick = { onPostClick(post) },
+                            onUserClick = { onUserClick(post.user.uname) },
+                            onMenuClick = { onMenuClick(post) },
+                            onLikeClick = { onLikeClick(post) },
+                            onLinkClick = onLinkClick,
+                            modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
+                        )
+                    }
+                }
+            }
+
+            Surface(color = colors.surface, shadowElevation = 2.dp) {
+                Row(
+                    modifier = Modifier.fillMaxWidth().padding(12.dp).imePadding(),
+                    verticalAlignment = Alignment.Bottom,
+                ) {
+                    IconButton(onClick = onDismiss) {
+                        Icon(Icons.Default.Close, stringResource(R.string.Cancel), tint = colors.onSurfaceVariant)
+                    }
+                    OutlinedTextField(
+                        value = replyText,
+                        onValueChange = { replyText = it },
+                        placeholder = { Text(stringResource(R.string.reply)) },
+                        modifier = Modifier.weight(1f),
+                        maxLines = 3,
+                    )
+                    Spacer(Modifier.width(8.dp))
+                    IconButton(
+                        onClick = {
+                            if (replyText.isNotBlank()) {
+                                scope.launch {
+                                    try {
+                                        val receiver = MutableStateFlow<Result<PostResponse>?>(null)
+                                        App.instance.sendMessage(scope, receiver, replyText)
+                                        replyText = ""
+                                    } catch (_: Exception) {}
+                                }
+                            }
+                        },
+                        enabled = replyText.isNotBlank(),
+                    ) {
+                        Icon(Icons.Default.Send, stringResource(R.string.Send), tint = if (replyText.isNotBlank()) colors.primary else colors.onSurfaceVariant)
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/signin/SignInScreen.kt b/src/main/java/com/juick/android/ui/signin/SignInScreen.kt
new file mode 100644
index 00000000..95c6307c
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/signin/SignInScreen.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.ui.signin
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+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.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+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.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import com.juick.R
+
+@Composable
+fun SignInScreen(
+    currentAction: Int,
+    initialNick: String,
+    googleSignInButton: View?,
+    onSignIn: (nick: String, password: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var nick by remember { mutableStateOf(initialNick) }
+    var password by remember { mutableStateOf("") }
+    val nickEnabled = currentAction != 1 // ACTION_PASSWORD_UPDATE = 1
+
+    Surface(modifier = modifier.fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 32.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+            Image(
+                painter = painterResource(R.drawable.ic_logo),
+                contentDescription = stringResource(R.string.logo),
+                modifier = Modifier.size(96.dp),
+            )
+
+            Spacer(Modifier.height(32.dp))
+
+            OutlinedTextField(
+                value = nick,
+                onValueChange = { if (nickEnabled) nick = it },
+                label = { Text(stringResource(R.string.your_nickname)) },
+                enabled = nickEnabled,
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(16.dp))
+
+            OutlinedTextField(
+                value = password,
+                onValueChange = { password = it },
+                label = { Text(stringResource(R.string.Password)) },
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(24.dp))
+
+            Button(
+                onClick = { onSignIn(nick, password) },
+                modifier = Modifier.fillMaxWidth(),
+                shape = RoundedCornerShape(0.dp),
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                ),
+            ) {
+                Text(stringResource(R.string.login))
+            }
+
+            if (googleSignInButton != null) {
+                Spacer(Modifier.height(16.dp))
+                AndroidView(
+                    factory = { context ->
+                        val parent = googleSignInButton.parent as? ViewGroup
+                        parent?.removeView(googleSignInButton)
+                        googleSignInButton.apply {
+                            layoutParams = ViewGroup.LayoutParams(
+                                ViewGroup.LayoutParams.WRAP_CONTENT,
+                                ViewGroup.LayoutParams.WRAP_CONTENT,
+                            )
+                        }
+                    },
+                    modifier = Modifier
+                        .width(200.dp)
+                        .height(48.dp),
+                )
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt b/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
new file mode 100644
index 00000000..3c4fbda0
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.ui.signup
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+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.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+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.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.juick.R
+
+@Composable
+fun SignUpScreen(
+    onSignUp: (nick: String) -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    var nick by remember { mutableStateOf("") }
+
+    Surface(modifier = modifier.fillMaxSize()) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 32.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+        ) {
+            OutlinedTextField(
+                value = nick,
+                onValueChange = { nick = it },
+                label = { Text(stringResource(R.string.your_nickname)) },
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth(),
+            )
+
+            Spacer(Modifier.height(24.dp))
+
+            Button(
+                onClick = { onSignUp(nick) },
+                modifier = Modifier.fillMaxWidth(),
+                shape = RoundedCornerShape(0.dp),
+                colors = ButtonDefaults.buttonColors(
+                    containerColor = MaterialTheme.colorScheme.tertiary,
+                ),
+            ) {
+                Text(stringResource(R.string.Create))
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/widget/CropSheet.kt b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
new file mode 100644
index 00000000..0086d33f
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.android.ui.widget
+
+import android.graphics.Bitmap
+import android.net.Uri
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.content.FileProvider
+import com.canhub.cropper.CropImageView
+import com.juick.R
+import java.io.File
+import java.io.FileOutputStream
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CropSheet(
+    imageUri: Uri,
+    onCropResult: (Uri?) -> Unit,
+    onDismiss: () -> Unit,
+) {
+    val context = LocalContext.current
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    var cropImageView by remember { mutableStateOf<CropImageView?>(null) }
+    var isCropping by remember { mutableStateOf(false) }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp),
+        ) {
+            AndroidView(
+                factory = { ctx ->
+                    CropImageView(ctx).apply {
+                        setImageUriAsync(imageUri)
+                        cropImageView = this
+                    }
+                },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 8.dp),
+            )
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = 8.dp),
+            ) {
+                TextButton(onClick = onDismiss) {
+                    Text(
+                        stringResource(R.string.Cancel),
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                }
+
+                TextButton(
+                    onClick = {
+                        if (isCropping) return@TextButton
+                        isCropping = true
+                        cropImageView?.setOnCropImageCompleteListener { _, result ->
+                            isCropping = false
+                            val uri = if (result.isSuccessful) {
+                                try {
+                                    saveBitmapToFile(context, result.bitmap)
+                                } catch (e: Exception) {
+                                    null
+                                }
+                            } else {
+                                null
+                            }
+                            onCropResult(uri)
+                        }
+                        cropImageView?.croppedImageAsync()
+                    },
+                    modifier = Modifier.padding(start = 8.dp),
+                ) {
+                    Text(
+                        stringResource(R.string.crop),
+                        color = MaterialTheme.colorScheme.primary,
+                    )
+                }
+            }
+        }
+    }
+}
+
+private fun saveBitmapToFile(context: android.content.Context, bitmap: Bitmap?): Uri? {
+    if (bitmap == null) return null
+    val dir = File(context.filesDir, "cropped")
+    dir.mkdirs()
+    val file = File(dir, "crop_${System.currentTimeMillis()}.jpg")
+    FileOutputStream(file).use { out ->
+        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
+    }
+    return FileProvider.getUriForFile(
+        context,
+        "${context.packageName}.provider",
+        file,
+    )
+}
diff --git a/src/main/java/com/juick/android/widget/CropBottomSheet.kt b/src/main/java/com/juick/android/widget/CropBottomSheet.kt
deleted file mode 100644
index 994d00f7..00000000
--- a/src/main/java/com/juick/android/widget/CropBottomSheet.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.widget
-
-import android.app.Dialog
-import android.graphics.Bitmap
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.WindowManager
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
-import com.canhub.cropper.CropImageView
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.juick.R
-import com.juick.databinding.DialogCropBinding
-import java.io.File
-import java.io.FileOutputStream
-
-class CropBottomSheet : BottomSheetDialogFragment() {
-
-    private var _binding: DialogCropBinding? = null
-    private val binding get() = _binding!!
-    var onCropResult: ((Uri?) -> Unit)? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setStyle(STYLE_NORMAL, R.style.Theme_BottomSheet_Crop)
-        isCancelable = false
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
-        object : BottomSheetDialog(requireContext(), theme) {
-            override fun onAttachedToWindow() {
-                super.onAttachedToWindow()
-
-                window?.let {
-                    WindowCompat.setDecorFitsSystemWindows(it, false)
-                }
-
-                findViewById<View>(com.google.android.material.R.id.container)?.apply {
-                    fitsSystemWindows = false
-                    ViewCompat.setOnApplyWindowInsetsListener(this) { view, windowInsets ->
-                        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-                        val params = view.layoutParams as ViewGroup.MarginLayoutParams
-                        params.topMargin = insets.top
-                        view.layoutParams = params
-                        WindowInsetsCompat.CONSUMED
-                    }
-                }
-
-                findViewById<View>(com.google.android.material.R.id.coordinator)?.fitsSystemWindows = false
-            }
-        }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = DialogCropBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        dialog?.window?.let { window ->
-            window.addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-            window.setDimAmount(0.6f)
-        }
-
-        val imageUri = requireArguments().getParcelable<Uri>(ARG_IMAGE_URI)
-        if (imageUri != null) {
-            binding.cropImageView.setImageUriAsync(imageUri)
-        }
-
-        binding.cropConfirm.setOnClickListener { cropAndReturn() }
-        binding.cropCancel.setOnClickListener { dismiss() }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        dialog?.let { dialog ->
-            val bottomSheet = (dialog as BottomSheetDialog).findViewById<View>(
-                com.google.android.material.R.id.design_bottom_sheet
-            ) ?: return
-            val behavior = BottomSheetBehavior.from(bottomSheet)
-            val maxHeight = (resources.displayMetrics.heightPixels * 0.8).toInt()
-            bottomSheet.layoutParams.height = maxHeight
-            behavior.isFitToContents = true
-            behavior.halfExpandedRatio = 0.8f
-            behavior.state = BottomSheetBehavior.STATE_HALF_EXPANDED
-            behavior.skipCollapsed = true
-            behavior.isDraggable = false
-        }
-    }
-
-    private fun cropAndReturn() {
-        binding.cropImageView.setOnCropImageCompleteListener { _: CropImageView, result: CropImageView.CropResult ->
-            val uri = if (result.isSuccessful) {
-                saveBitmapToFile(result.bitmap)
-            } else {
-                null
-            }
-            onCropResult?.invoke(uri)
-            dismiss()
-        }
-        binding.cropImageView.croppedImageAsync()
-    }
-
-    private fun saveBitmapToFile(bitmap: Bitmap?): Uri? {
-        if (bitmap == null) return null
-        val dir = File(requireContext().filesDir, "cropped")
-        dir.mkdirs()
-        val file = File(dir, "crop_${System.currentTimeMillis()}.jpg")
-        FileOutputStream(file).use { out ->
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
-        }
-        return androidx.core.content.FileProvider.getUriForFile(
-            requireContext(),
-            "${requireContext().packageName}.provider",
-            file
-        )
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        const val TAG = "crop_bottom_sheet"
-        private const val ARG_IMAGE_URI = "image_uri"
-
-        fun newInstance(imageUri: Uri): CropBottomSheet {
-            return CropBottomSheet().apply {
-                arguments = Bundle().apply { putParcelable(ARG_IMAGE_URI, imageUri) }
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/juick/android/widget/util/ImageHelper.kt b/src/main/java/com/juick/android/widget/util/ImageHelper.kt
deleted file mode 100644
index 612bf481..00000000
--- a/src/main/java/com/juick/android/widget/util/ImageHelper.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2008-2025, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.widget.util
-
-import android.annotation.SuppressLint
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.util.DisplayMetrics
-import android.widget.ImageView
-import android.widget.ImageView.ScaleType
-import androidx.lifecycle.lifecycleScope
-import com.juick.App
-import com.juick.R
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import androidx.core.graphics.scale
-
-@SuppressLint("UseCompatLoadingForDrawables")
-fun ImageView.load(url: String, scaleToScreenDensity: Boolean = true, blur: Boolean = false) {
-    val scope = context.getLifecycleOwner()?.lifecycleScope
-    scope?.launch {
-        loadImage(url)?.let { image ->
-            withContext(Dispatchers.Main) {
-                if (scaleToScreenDensity) {
-                    image.density = DisplayMetrics.DENSITY_DEFAULT
-                    if (width < image.width) {
-                        scaleType = ScaleType.CENTER_INSIDE
-                    }
-                }
-                if (blur) {
-                    val downSampled = image.scale(32, 32, false)
-                    val blurred = downSampled.scale(image.width, image.height, false)
-                    setImageBitmap(blurred)
-                } else {
-                    setImageBitmap(image)
-                }
-            }
-        } ?: run {
-            withContext(Dispatchers.Main) {
-                setImageDrawable(context.getDrawable(R.drawable.ei_refresh))
-                tag = -1
-            }
-        }
-    }
-}
-
-suspend fun loadImage(url: String): Bitmap? {
-    if (url.isEmpty()) return null
-    try {
-        val bytes = App.instance.api.download(url).byteStream()
-        return BitmapFactory.decodeStream(
-            bytes
-        )
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return null
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/discussions/DiscussionsFragment.kt b/src/main/java/com/juick/android/widget/util/ImageUtil.kt
similarity index 56%
rename from src/main/java/com/juick/android/screens/discussions/DiscussionsFragment.kt
rename to src/main/java/com/juick/android/widget/util/ImageUtil.kt
index cd0bfd4c..eaafd44f 100644
--- a/src/main/java/com/juick/android/screens/discussions/DiscussionsFragment.kt
+++ b/src/main/java/com/juick/android/widget/util/ImageUtil.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2023, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -15,19 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.juick.android.screens.discussions
+package com.juick.android.widget.util
 
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import com.juick.android.Uris
-import com.juick.android.screens.FeedFragment
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import com.juick.App
 
-class DiscussionsFragment : FeedFragment() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if (vm.apiUrl.value == Uri.EMPTY) {
-            vm.apiUrl.value = Uris.discussions
-        }
+suspend fun loadImage(url: String): Bitmap? {
+    return try {
+        val responseBody = App.instance.api.download(url)
+        responseBody.byteStream().use { BitmapFactory.decodeStream(it) }
+    } catch (e: Exception) {
+        null
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/juick/android/widget/util/ViewUtil.kt b/src/main/java/com/juick/android/widget/util/ViewUtil.kt
index 0ae82750..716d0a50 100644
--- a/src/main/java/com/juick/android/widget/util/ViewUtil.kt
+++ b/src/main/java/com/juick/android/widget/util/ViewUtil.kt
@@ -31,7 +31,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.ViewCompat
 import androidx.lifecycle.LifecycleOwner
-import com.google.android.material.appbar.AppBarLayout
 import com.juick.R
 
 /**
diff --git a/src/main/java/com/juick/api/model/Chat.kt b/src/main/java/com/juick/api/model/Chat.kt
index 3ed2cb88..a507041c 100644
--- a/src/main/java/com/juick/api/model/Chat.kt
+++ b/src/main/java/com/juick/api/model/Chat.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2024, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -16,8 +16,6 @@
  */
 package com.juick.api.model
 
-import com.stfalcon.chatkit.commons.models.IDialog
-import com.stfalcon.chatkit.commons.models.IUser
 import kotlinx.serialization.Serializable
 import java.util.Date
 
@@ -25,7 +23,7 @@ import java.util.Date
  * Created by gerc on 11.03.2016.
  */
 @Serializable
-data class Chat(val uname: String) : IDialog<Post> {
+data class Chat(val uname: String) {
     var uid = 0
     var avatar: String? = null
     var messagesCount = 0
@@ -34,38 +32,30 @@ data class Chat(val uname: String) : IDialog<Post> {
     var lastMessageTimestamp: Date? = null
     var lastMessageText: String? = null
     private var lastMessage: Post? = null
-    override fun getId(): String {
+    fun getId(): String {
         return uid.toString()
     }
 
-    override fun getDialogPhoto(): String {
-        return avatar!!
-    }
+    val dialogPhoto: String get() = avatar ?: ""
 
-    override fun getDialogName(): String {
-        return uname
-    }
+    val dialogName: String get() = uname
 
-    override fun getUsers(): List<IUser> {
-        return listOf(User(uid, uname))
-    }
+    val lastMessageOrNull: Post? get() = lastMessage
 
-    override fun getLastMessage(): Post {
+    fun getLastMessage(): Post {
         if (lastMessage != null) {
             return lastMessage as Post
         }
         val dummyPost: Post = Post.empty()
-        dummyPost.setUser(users[0] as User)
+        dummyPost.user = User(uid, uname)
         dummyPost.setBody(lastMessageText)
         dummyPost.setTimestamp(lastMessageTimestamp)
         return dummyPost
     }
 
-    override fun setLastMessage(message: Post) {
+    fun setLastMessage(message: Post) {
         lastMessage = message
     }
 
-    override fun getUnreadCount(): Int {
-        return messagesCount
-    }
+    val unreadCount: Int get() = messagesCount
 }
\ No newline at end of file
diff --git a/src/main/java/com/juick/api/model/Post.kt b/src/main/java/com/juick/api/model/Post.kt
index 61b9cbca..283e3d8e 100644
--- a/src/main/java/com/juick/api/model/Post.kt
+++ b/src/main/java/com/juick/api/model/Post.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2025, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -18,7 +18,6 @@ package com.juick.api.model
 
 import android.os.Parcelable
 import com.juick.util.StringUtils
-import com.stfalcon.chatkit.commons.models.IMessage
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -31,12 +30,12 @@ import java.util.*
 @Parcelize
 @Serializable
 data class Post(
-    private var user: User,
+    var user: User,
     var mid: Int = 0,
     var rid: Int = 0,
     var subscribed: Boolean = false,
     var liked: Boolean = false
-) : IMessage, Parcelable {
+) : Parcelable {
     var replyto = 0
     var to: User? = null
     private var body: String? = null
@@ -54,6 +53,18 @@ data class Post(
     var isService = false
     var recommendations: List<User> = ArrayList()
 
+    @Serializable
+    data class Entity(
+        val start: Int = 0,
+        val end: Int = 0,
+        val text: String = "",
+        val type: String = "", // "a" = link, "q" = quote
+        val url: String? = null,
+    )
+
+    @kotlinx.parcelize.IgnoredOnParcel
+    var entities: List<Entity> = emptyList()
+
     @Transient
     var nextRid = 0
 
@@ -68,26 +79,18 @@ data class Post(
             return builder.toString()
         }
 
-    override fun getId(): String {
+    fun getId(): String {
         return mid.toString()
     }
 
-    override fun getText(): String {
+    fun getText(): String {
         return body ?: ""
     }
 
-    override fun getUser(): User {
-        return user
-    }
-
-    override fun getCreatedAt(): Date {
+    fun getCreatedAt(): Date {
         return timestamp ?: Date()
     }
 
-    fun setUser(user: User) {
-        this.user = user
-    }
-
     fun getBody(): String? {
         return body
     }
diff --git a/src/main/java/com/juick/api/model/User.kt b/src/main/java/com/juick/api/model/User.kt
index 66b9a79e..80371b29 100644
--- a/src/main/java/com/juick/api/model/User.kt
+++ b/src/main/java/com/juick/api/model/User.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2024, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -17,7 +17,6 @@
 package com.juick.api.model
 
 import android.os.Parcelable
-import com.stfalcon.chatkit.commons.models.IUser
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
@@ -29,7 +28,7 @@ import kotlinx.serialization.Serializable
 data class User(
     val uid: Int = 0,
     val uname: String
-) : IUser, Parcelable {
+) : Parcelable {
     var unreadCount: Int = 0
     val premium: Boolean = false
     val admin: Boolean = false
@@ -38,18 +37,14 @@ data class User(
     var hash: String? = null
     var fullname: String? = null
     var isBanned = false
-    private var avatar = ""
+    var avatar = ""
     var read: List<User>? = null
 
-    override fun getId(): String {
+    fun getId(): String {
         return uname
     }
 
-    override fun getName(): String {
+    fun getName(): String {
         return uname
     }
-
-    override fun getAvatar(): String {
-        return avatar
-    }
 }
\ No newline at end of file
diff --git a/src/main/res/layout/activity_login.xml b/src/main/res/layout/activity_login.xml
deleted file mode 100644
index aab9c729..00000000
--- a/src/main/res/layout/activity_login.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/linearLayout"
-        android:layout_centerHorizontal="true"
-        android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/logo"
-        android:src="@drawable/ic_logo" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center"
-        android:layout_marginLeft="50dp"
-        android:layout_marginRight="50dp"
-        android:orientation="vertical">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:labelFor="@id/juickNick">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/juickNick"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="username"
-                android:hint="@string/your_nickname"
-                android:inputType="textPersonName"
-                android:maxLines="1"
-                tools:targetApi="o" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:labelFor="@id/juickPassword">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/juickPassword"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="password"
-                android:hint="@string/Password"
-                android:inputType="textPassword"
-                android:maxLines="1"
-                tools:targetApi="o" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/buttonSave"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="24dp"
-            android:padding="12dp"
-            android:text="@string/login"
-            app:cornerRadius="0dp" />
-
-        <RelativeLayout
-            android:id="@+id/sign_in_button_placeholder"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-        </RelativeLayout>
-    </LinearLayout>
-</RelativeLayout>
diff --git a/src/main/res/layout/activity_main.xml b/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 0baf0272..00000000
--- a/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    android:background="@color/colorMainBackground"
-    android:id="@+id/main_layout">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@id/bottom_nav"
-        android:fitsSystemWindows="true"
-        tools:context=".android.MainActivity">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:minHeight="?attr/actionBarSize"
-                android:theme="@style/AppTheme.AppBarOverlay"
-                app:layout_collapseMode="pin" />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/colorBorder"
-                android:contentDescription="@string/divider" />
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/nav_host"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:defaultNavHost="true"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            app:navGraph="@navigation/navigation" />
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            android:backgroundTint="@color/colorAccent"
-            android:contentDescription="@string/Create"
-            android:tint="@color/white"
-            app:backgroundTint="@color/colorAccent"
-            app:borderWidth="0dp"
-            app:srcCompat="@drawable/ic_ei_pencil"
-            app:tint="@color/colorMainBackground"
-            tools:targetApi="lollipop" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_above="@id/bottom_nav"
-        android:background="@color/colorBorder"
-        android:contentDescription="@string/divider" />
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_nav"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-
-        android:background="@color/colorMainBackground"
-        app:itemIconTint="@color/bottom_nav_color"
-        app:labelVisibilityMode="unlabeled"
-        app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
-        app:menu="@menu/bottom_navigation" />
-
-
-</RelativeLayout>
diff --git a/src/main/res/layout/activity_signup.xml b/src/main/res/layout/activity_signup.xml
deleted file mode 100644
index 3f73ddc0..00000000
--- a/src/main/res/layout/activity_signup.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (C) 2008-2025, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorMainBackground"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:orientation="vertical"
-        android:padding="5dip">
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:labelFor="@id/newNick">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/newNick"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="username"
-                android:hint="@string/Nick_latin_letters_and_numbers_"
-                android:inputType="textPersonName"
-                android:singleLine="true"
-                tools:targetApi="o" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/buttonCreate"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:background="@color/colorAccent"
-            android:text="@string/Create"
-            android:textColor="@color/white" />
-    </LinearLayout>
-</RelativeLayout>
diff --git a/src/main/res/layout/content_main.xml b/src/main/res/layout/content_main.xml
deleted file mode 100644
index f31aa9ec..00000000
--- a/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/fragment_container"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_main" />
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_crop.xml b/src/main/res/layout/dialog_crop.xml
deleted file mode 100644
index 1ab2b671..00000000
--- a/src/main/res/layout/dialog_crop.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/colorMainBackground">
-
-    <com.canhub.cropper.CropImageView
-        android:id="@+id/cropImageView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        app:cropGuidelines="onTouch" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end"
-        android:padding="12dp">
-
-        <Button
-            android:id="@+id/cropCancel"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/Cancel"
-            android:textColor="@color/colorText" />
-
-        <Button
-            android:id="@+id/cropConfirm"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/crop"
-            android:textColor="@color/colorAccent" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/src/main/res/layout/fragment_chat.xml b/src/main/res/layout/fragment_chat.xml
deleted file mode 100644
index 930062c2..00000000
--- a/src/main/res/layout/fragment_chat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
-
-    <com.stfalcon.chatkit.messages.MessagesList
-        android:id="@+id/messagesList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/input"
-        app:incomingTextSize="14sp"
-        app:outcomingTextSize="14sp"
-        app:incomingTextColor="@color/colorText"
-        app:incomingDefaultBubbleColor="@color/colorTextBackground"
-        app:outcomingTextColor="@color/white"
-        app:outcomingTextLinkColor="@color/white"
-        app:outcomingDefaultBubbleColor="@color/colorAccent"/>
-    <com.stfalcon.chatkit.messages.MessageInput
-        android:id="@+id/input"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        app:inputHint="@string/Enter_a_message"/>
-</RelativeLayout>
diff --git a/src/main/res/layout/fragment_dialog_list.xml b/src/main/res/layout/fragment_dialog_list.xml
deleted file mode 100644
index 8e4e15dd..00000000
--- a/src/main/res/layout/fragment_dialog_list.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".android.MainActivity">
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <com.stfalcon.chatkit.dialogs.DialogsList
-        android:id="@+id/dialogsList"
-        app:dialogTitleTextSize="14sp"
-        app:dialogMessageTextSize="14sp"
-        app:dialogDateSize="14sp"
-        app:dialogTitleTextColor="@color/colorText"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    <TextView
-        android:id="@+id/error_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        android:padding="@dimen/activity_vertical_margin"
-        tools:text="@string/network_error" />
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:indeterminateOnly="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_me.xml b/src/main/res/layout/fragment_me.xml
deleted file mode 100644
index a8548c33..00000000
--- a/src/main/res/layout/fragment_me.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".android.MainActivity">
-
-    <ImageView
-        android:id="@+id/profile_me_image"
-        android:layout_width="76dp"
-        android:layout_height="76dp"
-        android:src="@drawable/av_96"
-        android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:paddingBottom="10dp"
-        android:layout_alignParentStart="true"
-        android:contentDescription="@string/user_photo" />
-    <TextView
-        android:id="@+id/username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/profile_me_image"
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:textColor="@color/colorPrimary"
-        android:textIsSelectable="false"
-        tools:text="ugnich" />
-    <ImageView
-        android:id="@+id/premium_image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_ei_star"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        app:layout_constraintStart_toEndOf="@id/username"
-        app:layout_constraintTop_toBottomOf="@id/profile_me_image"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:tint="@android:color/holo_green_dark"
-        android:contentDescription="@string/premium_badge" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_new_post.xml b/src/main/res/layout/fragment_new_post.xml
deleted file mode 100644
index e0ebfa65..00000000
--- a/src/main/res/layout/fragment_new_post.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/scrollView2"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:indeterminateOnly="true"
-            android:visibility="gone" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/textInputLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            app:layout_constraintBottom_toTopOf="@+id/imagePreview"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="spread_inside">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/editMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="top"
-                android:importantForAutofill="no"
-                android:inputType="textCapSentences|textMultiLine"
-                android:minLines="7"
-                tools:targetApi="o"
-                tools:text="*weather the weather is cold!" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <ImageView
-            android:id="@+id/imagePreview"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:contentDescription="@string/Attach"
-            android:scaleType="centerInside"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textInputLayout"
-            tools:src="@drawable/new_image" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:background="@color/colorMainBackground"
-        android:padding="8dp">
-
-        <ImageView
-            android:id="@+id/buttonTags"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            android:layout_marginEnd="5dp"
-            android:layout_marginRight="5dp"
-            android:contentDescription="@string/tags_button"
-            app:tint="@color/colorText"
-            android:padding="10dp"
-            android:src="@drawable/ic_code_tags_black_24dp" />
-
-        <ImageView
-            android:id="@+id/buttonAttachment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toEndOf="@id/buttonTags"
-            android:layout_toRightOf="@id/buttonTags"
-            android:contentDescription="@string/attach_photo"
-            app:tint="@color/colorText"
-            android:padding="10dp"
-            android:src="@drawable/ic_button_attachment" />
-
-        <ImageView
-            android:id="@+id/buttonSend"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:contentDescription="@string/send_button"
-            app:tint="@color/colorText"
-            android:padding="10dp"
-            android:src="@drawable/ic_send_black_24dp"
-            android:text="@string/Send" />
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/src/main/res/layout/fragment_no_auth.xml b/src/main/res/layout/fragment_no_auth.xml
deleted file mode 100644
index 60905e9b..00000000
--- a/src/main/res/layout/fragment_no_auth.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".android.MainActivity">
-
-    <TextView
-        android:id="@+id/sign_in_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:text="@string/press_to_sign_in" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_posts_page.xml b/src/main/res/layout/fragment_posts_page.xml
deleted file mode 100644
index 501742fe..00000000
--- a/src/main/res/layout/fragment_posts_page.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".android.MainActivity">
-
-        <LinearLayout
-            android:id="@+id/profile_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:background="@color/colorTextBackground"
-            android:padding="@dimen/activity_callout_margin"
-            android:gravity="center_vertical">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/activity_vertical_margin"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/profile_header_avatar"
-                    android:layout_width="48dp"
-                    android:layout_height="48dp"
-                    android:layout_gravity="center_horizontal|bottom"
-                    android:contentDescription="@string/Juick_profile"
-                    android:src="@drawable/av_96"
-                    android:scaleType="centerCrop" />
-
-                <Button
-                    android:id="@+id/profile_header_edit"
-                    style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/avatar_change"
-                    android:textSize="12sp"
-                    android:textColor="@color/colorAccent"
-                    app:icon="@drawable/ic_ei_pencil"
-                    app:iconTint="@color/colorAccent"
-                    android:drawablePadding="2dp"
-                    android:gravity="center"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-            </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/profile_header_username"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textStyle="bold"
-                android:textColor="@color/colorText"
-                tools:text="jonny" />
-
-            <TextView
-                android:id="@+id/profile_header_subtitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/colorDimmed"
-                tools:text="Blog" />
-
-            <TextView
-                android:id="@+id/profile_header_stats"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/colorText"
-                tools:text="12 posts" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/profile_header_settings"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/context_menu"
-            android:src="@drawable/ic_more_vert_black_24dp"
-            android:visibility="gone" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipe_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/feed_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/colorMainBackground"
-                tools:listitem="@layout/item_post"
-                tools:itemCount="3"
-                android:scrollbars="vertical"
-                android:clipToPadding="false"
-                app:layoutManager="LinearLayoutManager" />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-        <ProgressBar
-            android:id="@+id/progressBar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:indeterminateOnly="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-            android:id="@+id/feed_refresh_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top|center"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:backgroundTint="@color/colorPrimary"
-            android:contentDescription="@string/feed_new_messages"
-            android:tint="@color/white"
-            app:icon="@drawable/ei_arrow_up"
-            app:iconTint="@color/colorTextBackground"
-            android:text="@string/feed_new_messages"
-            android:textColor="@color/colorTextBackground"
-            app:backgroundTint="@color/colorAccent"
-            app:borderWidth="0dp"
-            tools:visibility="visible"
-            android:visibility="gone"
-            app:tint="@color/colorMainBackground"
-            tools:targetApi="lollipop" />
-
-        <TextView
-            android:id="@+id/error_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:padding="@dimen/activity_vertical_margin"
-            tools:text="@string/network_error" />
-    </FrameLayout>
-</LinearLayout>
diff --git a/src/main/res/layout/fragment_posts_viewpager.xml b/src/main/res/layout/fragment_posts_viewpager.xml
deleted file mode 100644
index 6bc5e462..00000000
--- a/src/main/res/layout/fragment_posts_viewpager.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<androidx.viewpager2.widget.ViewPager2 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/activity_main"
-    android:id="@+id/viewpager"/>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_tags_list.xml b/src/main/res/layout/fragment_tags_list.xml
deleted file mode 100644
index d6023ee3..00000000
--- a/src/main/res/layout/fragment_tags_list.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".android.MainActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical"
-        tools:listitem="@android:layout/simple_list_item_1"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="3"
-        android:clipToPadding="false" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="72dp" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_thread.xml b/src/main/res/layout/fragment_thread.xml
deleted file mode 100644
index 028d2129..00000000
--- a/src/main/res/layout/fragment_thread.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@color/colorMainBackground"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical">
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:indeterminateOnly="true" />
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-            android:id="@+id/swipe_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/thread_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/colorMainBackground"
-                tools:listitem="@layout/item_thread_reply"
-                android:scrollbars="vertical"
-                android:clipToPadding="false"
-                app:layoutManager="LinearLayoutManager"/>
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
-    <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="1dip"
-        android:scaleType="fitXY"
-        android:gravity="fill_horizontal"
-        android:src="@android:drawable/divider_horizontal_bright"
-        android:contentDescription="@string/divider" />
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorMainBackground"
-        android:layout_weight="0">
-        <TextView
-            android:id="@+id/textReplyTo"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:visibility="gone"
-            android:paddingBottom="2dip"
-            android:textColor="@color/colorText"/>
-        <RelativeLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/textReplyTo"
-            android:padding="8dp"
-            android:orientation="horizontal">
-            <ImageButton
-                android:id="@id/buttonAttachment"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/Attach"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_button_attachment"
-                android:layout_centerVertical="true"
-                android:padding="12dp"
-                app:tint="@color/colorText" />
-
-            <Space
-                android:id="@id/attachmentButtonSpace"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_toEndOf="@id/buttonAttachment"
-                android:layout_toRightOf="@id/buttonAttachment"/>
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/attachmentButtonSpace"
-                android:layout_toLeftOf="@id/sendButtonSpace"
-                android:layout_toRightOf="@id/attachmentButtonSpace"
-                android:layout_toStartOf="@id/sendButtonSpace">
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@id/editMessage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textAutoCorrect|textAutoComplete|textMultiLine|textCapSentences"/>
-            </com.google.android.material.textfield.TextInputLayout>
-            <Space
-                android:id="@id/sendButtonSpace"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_toLeftOf="@id/buttonSend"
-                android:layout_toStartOf="@id/buttonSend"/>
-
-            <ImageButton
-                android:id="@id/buttonSend"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_send_black_24dp"
-                android:contentDescription="@string/Send"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:padding="12dp"
-                app:tint="@color/colorText" />
-        </RelativeLayout>
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/item_post.xml b/src/main/res/layout/item_post.xml
deleted file mode 100644
index cb2c7c58..00000000
--- a/src/main/res/layout/item_post.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginVertical="@dimen/list_vertical_margin"
-    android:orientation="vertical">
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorBorder"
-        android:contentDescription="@string/divider" />
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorTextBackground"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
-        <ImageView
-            android:id="@+id/user_picture"
-            android:layout_width="@dimen/avatar_size"
-            android:layout_height="@dimen/avatar_size"
-            android:contentDescription="@string/user_photo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/av_96" />
-
-        <TextView
-            android:id="@+id/username"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-            android:textColor="@color/colorPrimary"
-            android:textIsSelectable="false"
-            app:layout_constraintStart_toEndOf="@id/user_picture"
-            app:layout_constraintTop_toTopOf="@id/user_picture"
-            tools:text="ugnich" />
-        <ImageView
-            android:id="@+id/premium_image_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_ei_star"
-            app:layout_constraintStart_toEndOf="@id/username"
-            app:layout_constraintTop_toTopOf="@id/username"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:tint="@android:color/holo_green_dark"
-            android:contentDescription="@string/premium_badge" />
-
-        <ImageView
-            android:id="@+id/message_privacy_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_ei_lock"
-            android:visibility="gone"
-            tools:visibility="visible"
-            app:tint="@android:color/darker_gray"
-            app:layout_constraintStart_toEndOf="@id/timestamp"
-            app:layout_constraintTop_toTopOf="@id/timestamp"
-            app:layout_constraintBottom_toBottomOf="@id/timestamp"
-            />
-        <TextView
-            android:id="@+id/timestamp"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="@android:color/darker_gray"
-            android:layout_marginTop="8dp"
-            app:layout_constraintStart_toStartOf="@id/username"
-            app:layout_constraintTop_toBottomOf="@id/username"
-            tools:text="11:11:11" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:linksClickable="true"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            android:textColor="@color/colorText"
-            android:textColorLink="@color/colorDimmed"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/user_picture"
-            app:layout_goneMarginTop="0dp"
-            tools:text="@string/lorem"
-            />
-        <ImageView
-            android:id="@+id/menu_dots"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:contentDescription="@string/context_menu"
-            android:src="@drawable/ic_more_vert_black_24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="@android:color/darker_gray" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-    <RelativeLayout
-        android:id="@+id/photo_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorTextBackground"
-        tools:visibility="visible"
-        android:visibility="visible">
-        <ImageView
-            android:id="@+id/photo"
-            android:layout_alignParentTop="true"
-            tools:src="@drawable/av_96"
-            tools:scaleType="center"
-            android:layout_centerInParent="true"
-            android:adjustViewBounds="true"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/attached_photo" />
-        <TextView
-            android:id="@+id/photo_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:layout_marginTop="@dimen/activity_horizontal_margin"
-            android:background="#AA000000"
-            android:padding="6dp"
-            android:textColor="#ffffffff"
-            android:visibility="gone" />
-    </RelativeLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorBorder"
-        android:contentDescription="@string/divider" />
-    <LinearLayout
-        android:id="@+id/bottom_bar_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorTextBackground"
-        android:gravity="end"
-        android:padding="@dimen/activity_vertical_margin">
-        <TextView
-            android:id="@+id/likes"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="3dp"
-            android:gravity="center_vertical"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="@android:color/darker_gray"
-            tools:drawableStart="@drawable/ic_ei_heart"
-            tools:text="65" />
-        <TextView
-            android:id="@+id/replies"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawablePadding="3dp"
-            android:gravity="center_vertical"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="@android:color/darker_gray"
-            tools:drawableStart="@drawable/ic_ei_comment"
-            tools:text="66" />
-    </LinearLayout>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/colorBorder"
-        android:contentDescription="@string/divider" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/item_tag.xml b/src/main/res/layout/item_tag.xml
deleted file mode 100644
index 7af45d66..00000000
--- a/src/main/res/layout/item_tag.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/text"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file
diff --git a/src/main/res/layout/item_thread_reply.xml b/src/main/res/layout/item_thread_reply.xml
deleted file mode 100644
index 8a98142c..00000000
--- a/src/main/res/layout/item_thread_reply.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
-    android:background="@color/colorTextBackground"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/user_picture"
-        tools:src="@drawable/av_96"
-        android:layout_width="@dimen/avatar_size"
-        android:layout_height="@dimen/avatar_size"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:layout_alignParentStart="true"
-        android:contentDescription="@string/user_photo" />
-
-    <TextView
-        android:id="@+id/username"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:layout_toRightOf="@id/user_picture"
-        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-        android:textColor="@color/colorPrimary"
-        android:textIsSelectable="false"
-        tools:text="ugnich"
-        android:layout_toEndOf="@id/user_picture" />
-    <ImageView
-        android:id="@+id/premium_image_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_ei_star"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:layout_toRightOf="@id/username"
-        android:layout_toEndOf="@id/username"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:tint="@android:color/holo_green_dark"
-        android:contentDescription="@string/premium_badge" />
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/replyto"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_toEndOf="@+id/user_picture"
-        android:layout_toRightOf="@+id/user_picture"
-        android:linksClickable="true"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-        android:textColor="@color/colorText"
-        android:textColorLink="@color/colorDimmed"
-        tools:text="@string/lorem"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin" />
-
-    <RelativeLayout
-        android:id="@+id/photo_wrapper"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/text">
-
-        <ImageView
-            android:id="@+id/photo"
-            android:contentDescription="@string/attached_photo"
-            tools:src="@drawable/av_96"
-            tools:scaleType="center"
-            android:layout_centerInParent="true"
-            android:adjustViewBounds="true"
-            android:layout_marginBottom="@dimen/activity_vertical_margin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <TextView
-            android:id="@+id/photo_description"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:layout_marginTop="20dp"
-            android:background="#AA000000"
-            android:padding="6dp"
-            android:textColor="#ffffffff" />
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@+id/menu_dots"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:paddingBottom="8dp"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:contentDescription="@string/context_menu"
-        android:src="@drawable/ic_more_vert_black_24dp"
-        android:layout_alignParentEnd="true"
-        app:tint="@android:color/darker_gray" />
-
-    <TextView
-        android:id="@+id/timestamp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/photo_wrapper"
-        android:layout_marginTop="16dp"
-        android:layout_toEndOf="@+id/user_picture"
-        android:layout_toRightOf="@+id/user_picture"
-        android:textColor="@android:color/darker_gray"
-        android:textSize="14sp"
-        tools:text="11:11:11" />
-    <TextView
-        android:id="@+id/replyto"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/username"
-        android:layout_toEndOf="@+id/user_picture"
-        android:layout_toRightOf="@+id/user_picture"
-        android:padding="6dp"
-        android:drawablePadding="2dip"
-        android:background="?attr/selectableItemBackground"
-        android:gravity="center_vertical"
-        tools:text="freefd"
-        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-        android:textColor="@color/colorPrimary"
-        android:textSize="14sp" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_below="@+id/timestamp"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        android:background="#e1e1e1"
-        android:id="@+id/view" />
-
-    <ImageView
-        android:id="@+id/back_imageView"
-        android:contentDescription="@null"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/view"
-        android:layout_alignEnd="@+id/user_picture"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignRight="@+id/user_picture"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:padding="8dp"
-        android:src="@drawable/ic_undo_black_24dp"
-        app:tint="#bcbcbc" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/menu_layout_discussions.xml b/src/main/res/layout/menu_layout_discussions.xml
deleted file mode 100644
index 6f0533e2..00000000
--- a/src/main/res/layout/menu_layout_discussions.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2008-2023, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="48dp"
-    android:layout_height="48dp"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_gravity="center">
-
-    <FrameLayout
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackgroundBorderless">
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center"
-            app:srcCompat="@drawable/ic_ei_bell" />
-
-        <FrameLayout
-            android:id="@+id/view_alert_red_circle"
-            android:layout_width="14dp"
-            android:layout_height="14dp"
-            android:layout_gravity="top|end"
-            android:background="@drawable/shape_circle"
-            android:visibility="gone"
-            tools:visibility="visible">
-
-            <TextView
-                android:id="@+id/unread_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textColor="@color/white"
-                android:textSize="10sp"
-                tools:text="3" />
-
-        </FrameLayout>
-    </FrameLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/menu_layout_profile.xml b/src/main/res/layout/menu_layout_profile.xml
deleted file mode 100644
index 7ab32f2c..00000000
--- a/src/main/res/layout/menu_layout_profile.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="52dp"
-    android:layout_height="52dp"
-    android:layout_gravity="center">
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackgroundBorderless">
-    <ImageView
-        android:id="@+id/profile_image"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/av_96"
-        android:padding="6dp"
-        android:layout_gravity="center"
-        android:contentDescription="@string/user_photo" />
-    </FrameLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/src/main/res/menu/bottom_navigation.xml b/src/main/res/menu/bottom_navigation.xml
deleted file mode 100644
index ac870ef1..00000000
--- a/src/main/res/menu/bottom_navigation.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/home"
-        android:icon="@drawable/ic_ei_clock"
-        android:title="@string/Subscriptions" />
-    <item
-        android:id="@+id/discover"
-        android:icon="@drawable/icon_discover"
-        android:title="@string/Discover" />
-    <item
-        android:id="@+id/chats"
-        android:icon="@drawable/ic_ei_envelope"
-        android:title="@string/PMs" />
-</menu>
diff --git a/src/main/res/menu/toolbar.xml b/src/main/res/menu/toolbar.xml
deleted file mode 100644
index 7f10ef7d..00000000
--- a/src/main/res/menu/toolbar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:id="@+id/action_search"
-        android:title="@string/search"
-        android:icon="@drawable/ic_ei_search"
-        app:showAsAction="ifRoom|collapseActionView"
-        app:actionViewClass="androidx.appcompat.widget.SearchView" />
-    <item android:id="@+id/discussions"
-        android:title="@string/Discussions"
-        android:icon="@drawable/ic_ei_bell"
-        app:showAsAction="always"/>
-    <item android:id="@+id/blog"
-        android:title="@string/Me"
-        android:visible="false"
-        android:icon="@drawable/av_96"
-        app:actionLayout="@layout/menu_layout_profile"
-        app:showAsAction="always"/>
-</menu>
diff --git a/src/main/res/navigation/navigation.xml b/src/main/res/navigation/navigation.xml
deleted file mode 100644
index ba4c5838..00000000
--- a/src/main/res/navigation/navigation.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2008-2022, Juick
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as
-  ~ published by the Free Software Foundation, either version 3 of the
-  ~ License, or (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/navigation"
-    app:startDestination="@id/home">
-    <fragment
-        android:id="@+id/home"
-        android:name="com.juick.android.screens.home.HomeFragment"
-        android:label="Home"
-        tools:layout="@layout/fragment_posts_page"
-        >
-        <action
-            android:id="@+id/action_discoverFragment_to_threadFragment"
-            app:destination="@id/thread"
-            app:launchSingleTop="true"
-            app:popUpTo="@id/home" />
-    </fragment>
-    <dialog
-        android:id="@+id/thread"
-        android:name="com.juick.android.fragment.ThreadFragment"
-        tools:layout="@layout/fragment_thread"
-        android:label="Thread" >
-        <argument
-            android:name="mid"
-            app:argType="integer"
-            android:defaultValue="1" />
-        <action
-            android:id="@+id/action_thread_self"
-            app:destination="@id/thread"
-            app:popUpTo="@id/thread" />
-        <argument
-            android:name="scrollToEnd"
-            app:argType="boolean"
-            android:defaultValue="false" />
-    </dialog>
-    <fragment
-        android:id="@+id/PMFragment"
-        tools:layout="@layout/fragment_chat"
-        android:name="com.juick.android.screens.chat.ChatFragment"
-        android:label="{uname}" >
-        <argument
-            android:name="uname"
-            app:argType="string" />
-        <argument
-            android:name="uid"
-            app:argType="integer"
-            android:defaultValue="0" />
-    </fragment>
-    <fragment
-        android:id="@+id/chats"
-        android:name="com.juick.android.screens.chats.ChatsFragment"
-        tools:layout="@layout/fragment_dialog_list"
-        android:label="Chats" >
-        <action
-            android:id="@+id/action_chats_to_PMFragment"
-            app:destination="@id/PMFragment"
-            app:popUpTo="@id/chats" />
-        <action
-            android:id="@+id/action_chats_to_no_auth"
-            app:destination="@id/no_auth"
-            app:popUpTo="@id/chats" />
-    </fragment>
-    <fragment
-        android:id="@+id/discover"
-        tools:layout="@layout/fragment_posts_page"
-        android:name="com.juick.android.screens.discover.DiscoverFragment"
-        android:label="Discover" >
-        <action
-            android:id="@+id/action_discover_to_thread"
-            app:destination="@id/thread"
-            app:popUpTo="@id/discover" />
-    </fragment>
-    <fragment
-        android:id="@+id/no_auth"
-        tools:layout="@layout/fragment_no_auth"
-        android:name="com.juick.android.screens.chats.NoAuthFragment"
-        android:label="Chats" />
-    <fragment
-        android:id="@+id/new_post"
-        android:name="com.juick.android.screens.post.NewPostFragment"
-        tools:layout="@layout/fragment_new_post"
-        android:label="@string/New_message" >
-        <action
-            android:id="@+id/action_new_post_to_tags"
-            app:destination="@id/tags"
-            app:popUpTo="@id/new_post" />
-        <argument
-            android:name="text"
-            app:argType="string"
-            app:nullable="true"
-            android:defaultValue="@null" />
-        <argument
-            android:name="uri"
-            app:argType="string"
-            app:nullable="true"
-            android:defaultValue="@null" />
-    </fragment>
-    <dialog
-        android:id="@+id/tags"
-        tools:layout="@layout/fragment_tags_list"
-        android:name="com.juick.android.screens.post.TagsFragment"
-        android:label="@string/tags" />
-    <fragment
-        android:id="@+id/blog"
-        android:name="com.juick.android.screens.blog.BlogFragment">
-        <argument
-            android:name="uname"
-            android:defaultValue=""
-            app:argType="string" />
-    </fragment>
-    <fragment
-        android:id="@+id/search"
-        android:name="com.juick.android.screens.search.SearchFragment"
-        android:label="{search}" >
-        <argument
-            android:name="search"
-            app:argType="string" />
-    </fragment>
-    <fragment
-        android:id="@id/discussions"
-        android:name="com.juick.android.screens.discussions.DiscussionsFragment"
-        android:label="Discussions" />
-</navigation>
\ No newline at end of file
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 77d32044..492b2293 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -17,13 +17,12 @@
   -->
 
 <resources>
-    <style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="BaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="colorPrimaryDark">@color/colorDimmed</item>
         <item name="android:colorBackground">@color/colorMainBackground</item>
         <item name="android:windowBackground">@color/colorMainBackground</item>
-        <item name="bottomSheetDialogTheme">@style/BottomSheetStyle</item>
     </style>
     <style name="AppTheme" parent="BaseTheme">
     </style>
@@ -32,15 +31,4 @@
         <item name="android:background">@color/colorTextBackground</item>
         <item name="iconTint">@color/colorText</item>
     </style>
-    <style name="BottomSheetStyle" parent="Theme.Material3.DayNight.BottomSheetDialog">
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-    <style name="Theme_BottomSheet_Crop" parent="Theme.Material3.DayNight.BottomSheetDialog">
-        <item name="android:backgroundDimEnabled">true</item>
-        <item name="android:navigationBarColor">@color/colorMainBackground</item>
-        <item name="bottomSheetStyle">@style/CropBottomSheetStyle</item>
-    </style>
-    <style name="CropBottomSheetStyle" parent="Widget.Material3.BottomSheet">
-        <item name="android:backgroundTint">@color/colorMainBackground</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/src/next/google/google-services.json b/src/next/google/google-services.json
deleted file mode 100644
index 752a1f8f..00000000
--- a/src/next/google/google-services.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "project_info": {
-    "project_number": "",
-    "project_id": ""
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:123456789012:android:1234567890123456",
-        "android_client_info": {
-          "package_name": "com.juick.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "",
-          "client_type": 3
-        },
-        {
-          "client_id": "",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.juick.debug",
-            "certificate_hash": ""
-          }
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ]
-    }
-  ],
-  "configuration_version": "1"
-}
diff --git a/src/next/java/com/juick/android/NextSignInActivity.kt b/src/next/java/com/juick/android/NextSignInActivity.kt
deleted file mode 100644
index 13d2fb7a..00000000
--- a/src/next/java/com/juick/android/NextSignInActivity.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android
-
-import android.os.Bundle
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.constraintlayout.compose.ConstraintLayout
-import com.juick.R
-import com.juick.android.ui.AppTheme
-import com.juick.android.ui.standardSpacing
-
-class NextSignInActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            SignInView()
-        }
-    }
-
-    @Composable
-    fun SignInView() {
-        var nick by remember { mutableStateOf("") }
-        var password by remember { mutableStateOf("") }
-        AppTheme {
-            Scaffold { contentPadding ->
-                Box(modifier = Modifier.padding(contentPadding)) {
-                    ConstraintLayout(modifier = Modifier.fillMaxSize()) {
-                        val (logo, nickField, passwordField, submitButton) = createRefs()
-                        Image(
-                            modifier = Modifier.constrainAs(logo) {
-                                centerTo(parent)
-                            },
-                            painter = painterResource(R.drawable.ic_logo),
-                            contentDescription = "Main logo"
-                        )
-                        TextField(
-                            modifier = Modifier.constrainAs(nickField) {
-                                top.linkTo(logo.bottom, margin = standardSpacing)
-                                start.linkTo(parent.start)
-                                end.linkTo(parent.end)
-                            }, value = nick, onValueChange = { nick = it })
-                        TextField(
-                            modifier = Modifier.constrainAs(passwordField) {
-                                top.linkTo(nickField.bottom, margin = standardSpacing)
-                                start.linkTo(parent.start)
-                                end.linkTo(parent.end)
-                            },
-                            value = password, onValueChange = { password = it },
-                            keyboardOptions = KeyboardOptions(
-                                imeAction = ImeAction.Done,
-                                keyboardType = KeyboardType.Password
-                            ),
-                        )
-                        Button(
-                            modifier = Modifier.constrainAs(submitButton) {
-                                top.linkTo(passwordField.bottom, standardSpacing)
-                                start.linkTo(passwordField.start)
-                                end.linkTo(passwordField.end)
-                            },
-                            onClick = {
-                                if (nick.isEmpty() || password.isEmpty()) {
-                                    Toast.makeText(
-                                        this@NextSignInActivity,
-                                        R.string.Enter_nick_and_password,
-                                        Toast.LENGTH_SHORT
-                                    ).show()
-                                    return@Button
-                                }
-                            }, shape = RectangleShape) {
-                            Text(stringResource(R.string.login))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Preview(apiLevel = 34)
-    @Composable
-    fun PreviewSignInView() {
-        SignInView()
-    }
-}
\ No newline at end of file
diff --git a/src/next/java/com/juick/android/ui/Theme.kt b/src/next/java/com/juick/android/ui/Theme.kt
deleted file mode 100644
index afff995b..00000000
--- a/src/next/java/com/juick/android/ui/Theme.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.ui
-
-import android.app.Activity
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.lightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalView
-import androidx.compose.ui.unit.dp
-import androidx.core.view.WindowCompat
-
-@Composable
-fun AppTheme(
-    useDarkTheme: Boolean =  isSystemInDarkTheme(),
-    content: @Composable () -> Unit
-) {
-    val colors = when {
-        useDarkTheme -> darkColorScheme()
-        else -> lightColorScheme().copy(
-            primary = Color(0xff3c77aa),
-            onPrimary = Color(0xfffdfdfe),
-            primaryContainer = Color(0xfffdfdfe),
-            onPrimaryContainer = Color(0xff3c77aa)
-        )
-    }
-
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colors.primary.toArgb()
-            WindowCompat
-                .getInsetsController(window, view)
-                .isAppearanceLightStatusBars = useDarkTheme
-        }
-    }
-
-    MaterialTheme(
-        colorScheme = colors,
-        content = content
-    )
-}
-
-val standardSpacing = 16.dp
\ No newline at end of file

From af53d81ff4105a641ac5ef47f5827c5ee12c5933 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Fri, 10 Jul 2026 10:31:08 +0300
Subject: [PATCH 02/57] fix: address CodeRabbit review findings

- Add CancellationException rethrow in ImageUtil.loadImage
- Add password masking in SignInScreen
- Add nickname validation (disable button when blank) in SignUpScreen
- Add nullable image URL guard in PostCard
- Add error state on thread load failure in ThreadScreen
- Add try/catch around saveBitmapToFile in CropSheet
- Add Intent fallback when link click outside MainActivity in JuickMessageMenuListener
- Fix search URL: use Uris.search() instead of hardcoded path
- Enable Gradle configuration cache
---
 .../juick/android/JuickMessageMenuListener.kt |  8 ++++++-
 .../android/ui/navigation/AppNavigation.kt    |  3 +--
 .../juick/android/ui/screens/feed/PostCard.kt |  5 ++--
 .../android/ui/screens/thread/ThreadScreen.kt | 11 ++++++++-
 .../juick/android/ui/signin/SignInScreen.kt   |  2 ++
 .../juick/android/ui/signup/SignUpScreen.kt   |  1 +
 .../com/juick/android/ui/widget/CropSheet.kt  | 24 +++++++++++--------
 .../juick/android/widget/util/ImageUtil.kt    |  3 +++
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/juick/android/JuickMessageMenuListener.kt b/src/main/java/com/juick/android/JuickMessageMenuListener.kt
index 253b1428..7b745406 100644
--- a/src/main/java/com/juick/android/JuickMessageMenuListener.kt
+++ b/src/main/java/com/juick/android/JuickMessageMenuListener.kt
@@ -187,7 +187,13 @@ class JuickMessageMenuListener(
     }
 
     override fun onLinkClick(url: String) {
-        (activity as? MainActivity)?.processUri(url.toUri())
+        val mainActivity = activity as? MainActivity
+        if (mainActivity != null) {
+            mainActivity.processUri(url.toUri())
+        } else {
+            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
+            activity.startActivity(intent)
+        }
     }
 
     private fun processCommand(command: String) {
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index bae34fc7..dfe17ca6 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -18,7 +18,6 @@ package com.juick.android.ui.navigation
 
 import android.net.Uri
 import androidx.compose.runtime.Composable
-import com.juick.BuildConfig
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
@@ -131,7 +130,7 @@ fun AppNavigation(
         ) { entry ->
             val query = entry.arguments?.getString("query") ?: ""
             FeedScreen(
-                initialUrl = Uri.parse("${BuildConfig.API_ENDPOINT}search/$query"),
+                initialUrl = Uris.search(query),
                 onPostClick = { onPostClick(it) },
                 onUserClick = { onUserClick(it) },
                 onMenuClick = { onMenuClick(it) },
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 3233c8c9..8e74b6dc 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -124,9 +124,10 @@ fun PostCard(
 
             val photo = post.photo
             val medium = photo?.medium
-            if (medium != null) {
+            val imageUrl = medium?.url
+            if (!imageUrl.isNullOrBlank()) {
                 Spacer(Modifier.height(12.dp))
-                AsyncImage(medium.url ?: "", null, Modifier.fillMaxWidth().height(200.dp), contentScale = ContentScale.FillWidth)
+                AsyncImage(imageUrl, null, Modifier.fillMaxWidth().height(200.dp), contentScale = ContentScale.FillWidth)
             }
 
             Spacer(Modifier.height(12.dp))
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index c483472f..46b6af11 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -52,12 +52,13 @@ fun ThreadScreen(
     var posts by remember { mutableStateOf<List<Post>>(emptyList()) }
     var replyText by remember { mutableStateOf("") }
     var isLoading by remember { mutableStateOf(true) }
+    var loadError by remember { mutableStateOf(false) }
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
     val colors = MaterialTheme.colorScheme
 
     LaunchedEffect(mid) {
-        try { posts = App.instance.api.thread(mid) } catch (_: Exception) {}
+        try { posts = App.instance.api.thread(mid) } catch (_: Exception) { loadError = true }
         isLoading = false
         if (scrollToEnd && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
     }
@@ -75,6 +76,14 @@ fun ThreadScreen(
                 Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
                     CircularProgressIndicator()
                 }
+            } else if (loadError) {
+                Box(Modifier.fillMaxSize().weight(1f), contentAlignment = Alignment.Center) {
+                    Text(
+                        stringResource(R.string.network_error),
+                        color = MaterialTheme.colorScheme.error,
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
+                }
             } else {
                 LazyColumn(state = listState, modifier = Modifier.weight(1f)) {
                     items(posts, key = { "thread_${it.mid}_${it.rid}" }) { post ->
diff --git a/src/main/java/com/juick/android/ui/signin/SignInScreen.kt b/src/main/java/com/juick/android/ui/signin/SignInScreen.kt
index 95c6307c..1d765189 100644
--- a/src/main/java/com/juick/android/ui/signin/SignInScreen.kt
+++ b/src/main/java/com/juick/android/ui/signin/SignInScreen.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.viewinterop.AndroidView
 import com.juick.R
 
@@ -94,6 +95,7 @@ fun SignInScreen(
                 onValueChange = { password = it },
                 label = { Text(stringResource(R.string.Password)) },
                 singleLine = true,
+                visualTransformation = PasswordVisualTransformation(),
                 modifier = Modifier.fillMaxWidth(),
             )
 
diff --git a/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt b/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
index 3c4fbda0..4c91e740 100644
--- a/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
+++ b/src/main/java/com/juick/android/ui/signup/SignUpScreen.kt
@@ -69,6 +69,7 @@ fun SignUpScreen(
 
             Button(
                 onClick = { onSignUp(nick) },
+                enabled = nick.isNotBlank(),
                 modifier = Modifier.fillMaxWidth(),
                 shape = RoundedCornerShape(0.dp),
                 colors = ButtonDefaults.buttonColors(
diff --git a/src/main/java/com/juick/android/ui/widget/CropSheet.kt b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
index 0086d33f..940734fc 100644
--- a/src/main/java/com/juick/android/ui/widget/CropSheet.kt
+++ b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
@@ -123,15 +123,19 @@ fun CropSheet(
 
 private fun saveBitmapToFile(context: android.content.Context, bitmap: Bitmap?): Uri? {
     if (bitmap == null) return null
-    val dir = File(context.filesDir, "cropped")
-    dir.mkdirs()
-    val file = File(dir, "crop_${System.currentTimeMillis()}.jpg")
-    FileOutputStream(file).use { out ->
-        bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
+    return try {
+        val dir = File(context.filesDir, "cropped")
+        dir.mkdirs()
+        val file = File(dir, "crop_${System.currentTimeMillis()}.jpg")
+        FileOutputStream(file).use { out ->
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out)
+        }
+        FileProvider.getUriForFile(
+            context,
+            "${context.packageName}.provider",
+            file,
+        )
+    } catch (e: Exception) {
+        null
     }
-    return FileProvider.getUriForFile(
-        context,
-        "${context.packageName}.provider",
-        file,
-    )
 }
diff --git a/src/main/java/com/juick/android/widget/util/ImageUtil.kt b/src/main/java/com/juick/android/widget/util/ImageUtil.kt
index eaafd44f..51eb8490 100644
--- a/src/main/java/com/juick/android/widget/util/ImageUtil.kt
+++ b/src/main/java/com/juick/android/widget/util/ImageUtil.kt
@@ -20,11 +20,14 @@ package com.juick.android.widget.util
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import com.juick.App
+import kotlinx.coroutines.CancellationException
 
 suspend fun loadImage(url: String): Bitmap? {
     return try {
         val responseBody = App.instance.api.download(url)
         responseBody.byteStream().use { BitmapFactory.decodeStream(it) }
+    } catch (e: CancellationException) {
+        throw e
     } catch (e: Exception) {
         null
     }

From 32e74e365dbae9e04247d537ea747c3df5159a3e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Fri, 10 Jul 2026 10:59:44 +0300
Subject: [PATCH 03/57] fix: ReplyCard missing like callback, entity overlap
 check, CancellationException

- Pass onLikeClick through ReplyCard instead of no-op {}
- Fix formatPostBlocks entity overlap check: track lastAcceptedEnd
  instead of sorted[ei-1].end, matching processBody bp behavior
- Rethrow CancellationException in SignUpActivity signup handler
---
 src/main/java/com/juick/android/SignUpActivity.kt             | 3 +++
 src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt | 4 +++-
 .../com/juick/android/ui/screens/feed/MessageFormatter.kt     | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/SignUpActivity.kt b/src/main/java/com/juick/android/SignUpActivity.kt
index 59a68b23..f3aff509 100644
--- a/src/main/java/com/juick/android/SignUpActivity.kt
+++ b/src/main/java/com/juick/android/SignUpActivity.kt
@@ -25,6 +25,7 @@ import androidx.lifecycle.lifecycleScope
 import com.juick.App
 import com.juick.android.ui.AppTheme
 import com.juick.android.ui.signup.SignUpScreen
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -48,6 +49,8 @@ class SignUpActivity : ComponentActivity() {
                                     setResult(RESULT_OK, successIntent)
                                     finish()
                                 }
+                            } catch (e: CancellationException) {
+                                throw e
                             } catch (e: Exception) {
                                 withContext(Dispatchers.Main) {
                                     Toast.makeText(
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 9684f73f..6cecb1c7 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -166,6 +166,7 @@ fun FeedScreen(
                                         onPostClick = { onPostClick(post) },
                                         onUserClick = { onUserClick(post.user.uname) },
                                         onMenuClick = { onMenuClick(post) },
+                                        onLikeClick = { onLikeClick(post) },
                                         onLinkClick = onLinkClick,
                                         modifier = Modifier.padding(vertical = 4.dp).padding(horizontal = 12.dp),
                                     )
@@ -196,6 +197,7 @@ fun ReplyCard(
     onPostClick: () -> Unit,
     onUserClick: () -> Unit,
     onMenuClick: () -> Unit,
+    onLikeClick: () -> Unit,
     onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -216,7 +218,7 @@ fun ReplyCard(
             onPostClick = onPostClick,
             onUserClick = onUserClick,
             onMenuClick = onMenuClick,
-            onLikeClick = {},
+            onLikeClick = onLikeClick,
             onLinkClick = onLinkClick,
             modifier = Modifier.padding(start = 16.dp),
         )
diff --git a/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
index c0ea27b2..9ced509c 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
@@ -108,10 +108,12 @@ fun formatPostBlocks(
 
     val segs = mutableListOf<Seg>()
     var ei = 0
+    var lastAcceptedEnd = 0
     for (i in p.entityStart.indices) {
         val e = sorted.getOrNull(ei) ?: break
-        if (e.start < (sorted.getOrNull(ei - 1)?.end ?: 0)) { ei++; continue }
+        if (e.start < lastAcceptedEnd) { ei++; continue }
         segs.add(Seg(p.entityStart[i], p.entityEnd[i], p.entityType[i]))
+        lastAcceptedEnd = e.end
         ei++
     }
 

From 28d8eb6782cd6470dd25519ec4cbb55ef121f8de Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Fri, 10 Jul 2026 16:55:51 +0300
Subject: [PATCH 04/57] fix: add logging for saveBitmapToFile failures in
 CropSheet

---
 src/main/java/com/juick/android/ui/widget/CropSheet.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/juick/android/ui/widget/CropSheet.kt b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
index 940734fc..276d1280 100644
--- a/src/main/java/com/juick/android/ui/widget/CropSheet.kt
+++ b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
@@ -19,6 +19,7 @@ package com.juick.android.ui.widget
 
 import android.graphics.Bitmap
 import android.net.Uri
+import android.util.Log
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -136,6 +137,7 @@ private fun saveBitmapToFile(context: android.content.Context, bitmap: Bitmap?):
             file,
         )
     } catch (e: Exception) {
+        Log.e("CropSheet", "Failed to save cropped bitmap", e)
         null
     }
 }

From b5b9a1675da0a3e4d8a96c9e555d0f1d0c8bc3d6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 03:02:01 +0300
Subject: [PATCH 05/57] fix: track CustomTabs bound state explicitly instead of
 relying on browserClient null check

browserClient is only set in onCustomTabsServiceConnected, which fires
after bindCustomTabsService returns. If onDestroy runs before the
callback, unbindService is skipped, leaking the service connection.
Track bind result with a boolean flag.
---
 src/main/java/com/juick/android/MainActivity.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index ab197c55..a5272639 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -66,12 +66,14 @@ class MainActivity : ComponentActivity() {
     private var browserClient: CustomTabsClient? = null
     private var browserSession: CustomTabsSession? = null
     private var browserSessionSupported = MutableLiveData<Boolean?>(null)
+    private var customTabsBound = false
     private var initialUri: Uri? = null
 
     private var browserConnection = object : CustomTabsServiceConnection() {
         override fun onServiceDisconnected(name: ComponentName?) {
             browserClient = null
             browserSession = null
+            customTabsBound = false
         }
         override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
             client.warmup(0)
@@ -82,10 +84,10 @@ class MainActivity : ComponentActivity() {
     }
 
     private fun bindCustomTabService(context: Context) {
-        if (browserClient != null) return
+        if (customTabsBound) return
         val packageName = CustomTabsClient.getPackageName(context, null)
         packageName?.let {
-            CustomTabsClient.bindCustomTabsService(context, it, browserConnection)
+            customTabsBound = CustomTabsClient.bindCustomTabsService(context, it, browserConnection)
         }
     }
 
@@ -255,8 +257,9 @@ class MainActivity : ComponentActivity() {
     }
 
     override fun onDestroy() {
-        browserClient?.let {
+        if (customTabsBound) {
             unbindService(browserConnection)
+            customTabsBound = false
         }
         browserClient = null
         browserSession = null

From 3eda21e9ffe9f687f0bbedbdd64cb4b8240e7319 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 06:00:37 +0300
Subject: [PATCH 06/57] refactor: remove ViewModels, lift NavHost to top level,
 fix thread toolbar

- Replace FeedViewModel/ChatViewModel/ChatsViewModel/TagsViewModel
  with LaunchedEffect + local state
- Move NavHost from MainScreen to MainActivity level
- Thread screen now top-level composable, not dialog
- Thread gets own TopAppBar with back arrow
- Remove savedstate-ktx and lifecycle-viewmodel-compose deps
---
 build.gradle                                  |   2 -
 .../java/com/juick/android/MainActivity.kt    | 101 ++++++++++++------
 .../juick/android/screens/FeedViewModel.kt    |  62 -----------
 .../android/screens/chat/ChatViewModel.kt     |  52 ---------
 .../android/screens/chats/ChatsViewModel.kt   |  39 -------
 .../android/screens/post/TagsViewModel.kt     |  44 --------
 .../java/com/juick/android/ui/MainScreen.kt   |   7 +-
 .../android/ui/navigation/AppNavigation.kt    |  20 ----
 .../android/ui/screens/chat/ChatScreen.kt     |  14 +--
 .../ui/screens/chats/ChatsListScreen.kt       |  12 +--
 .../android/ui/screens/feed/FeedScreen.kt     |  31 +++---
 .../android/ui/screens/tags/TagsScreen.kt     |  19 +++-
 .../android/ui/screens/thread/ThreadScreen.kt |  13 ++-
 13 files changed, 128 insertions(+), 288 deletions(-)
 delete mode 100644 src/main/java/com/juick/android/screens/FeedViewModel.kt
 delete mode 100644 src/main/java/com/juick/android/screens/chat/ChatViewModel.kt
 delete mode 100644 src/main/java/com/juick/android/screens/chats/ChatsViewModel.kt
 delete mode 100644 src/main/java/com/juick/android/screens/post/TagsViewModel.kt

diff --git a/build.gradle b/build.gradle
index 9142192c..b702249f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,8 +126,6 @@ dependencies {
     implementation libs.core
     implementation libs.appcompat
     implementation libs.browser
-    implementation libs.savedstate.ktx
-    implementation libs.lifecycle.viewmodel.compose
     implementation libs.lifecycle.runtime.compose
     implementation libs.runtime.livedata
     implementation libs.lifecycle.process
diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index a5272639..caaf4b1a 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -34,7 +34,11 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
 import com.juick.App
 import com.juick.BuildConfig
 import com.juick.R
@@ -42,6 +46,7 @@ import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
 import com.juick.android.ui.AppTheme
 import com.juick.android.ui.MainScreen
+import com.juick.android.ui.screens.thread.ThreadScreen
 import com.juick.api.model.Post
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
@@ -180,39 +185,71 @@ class MainActivity : ComponentActivity() {
                 val profile by account.profile.observeAsState()
                 val unreadCount = profile?.unreadCount ?: 0
 
-                MainScreen(
+                val onPostClick: (Post) -> Unit = { post ->
+                    navController.navigate("thread/${post.mid}")
+                }
+                val onUserClick: (String) -> Unit = { uname ->
+                    navController.navigate("blog/$uname")
+                }
+                val onLinkClick: (String) -> Unit = { url ->
+                    openUri(Uri.parse(url))
+                }
+                val onSignInClick: () -> Unit = { showLogin() }
+                val onLikeClick: (Post) -> Unit = { post ->
+                    lifecycleScope.launch {
+                        try {
+                            App.instance.api.like(post.mid)
+                            account.refresh()
+                        } catch (_: Exception) { }
+                    }
+                }
+                val onMenuClick: (Post) -> Unit = { /* dialog via JuickMessageMenuListener */ }
+
+                NavHost(
                     navController = navController,
-                    currentProfile = profile,
-                    unreadCount = unreadCount,
-                    onPostClick = { post ->
-                        navController.navigate("thread/${post.mid}")
-                    },
-                    onUserClick = { uname ->
-                        navController.navigate("blog/$uname")
-                    },
-                    onLinkClick = { url ->
-                        openUri(Uri.parse(url))
-                    },
-                    onSignInClick = { showLogin() },
-                    onFabClick = {
-                        if (App.instance.isAuthenticated) {
-                            navController.navigate("new_post")
-                        } else {
-                            showLogin()
-                        }
-                    },
-                    onMenuClick = { post ->
-                        // Menu logic handled via drop-down or dialog
-                    },
-                    onLikeClick = { post ->
-                        lifecycleScope.launch {
-                            try {
-                                App.instance.api.like(post.mid)
-                                account.refresh()
-                            } catch (_: Exception) { }
-                        }
-                    },
-                )
+                    startDestination = "main",
+                ) {
+                    composable("main") {
+                        MainScreen(
+                            navController = navController,
+                            currentProfile = profile,
+                            unreadCount = unreadCount,
+                            onPostClick = onPostClick,
+                            onUserClick = onUserClick,
+                            onMenuClick = onMenuClick,
+                            onLikeClick = onLikeClick,
+                            onLinkClick = onLinkClick,
+                            onSignInClick = onSignInClick,
+                            onFabClick = {
+                                if (App.instance.isAuthenticated) {
+                                    navController.navigate("new_post")
+                                } else {
+                                    showLogin()
+                                }
+                            },
+                        )
+                    }
+
+                    composable("thread/{mid}?scrollToEnd={scrollToEnd}",
+                        arguments = listOf(
+                            navArgument("mid") { type = NavType.IntType },
+                            navArgument("scrollToEnd") { type = NavType.BoolType; defaultValue = false },
+                        ),
+                    ) { entry ->
+                        val mid = entry.arguments?.getInt("mid") ?: 0
+                        val scrollToEnd = entry.arguments?.getBoolean("scrollToEnd") ?: false
+                        ThreadScreen(
+                            mid = mid,
+                            scrollToEnd = scrollToEnd,
+                            onPostClick = onPostClick,
+                            onUserClick = onUserClick,
+                            onMenuClick = onMenuClick,
+                            onLikeClick = onLikeClick,
+                            onLinkClick = onLinkClick,
+                            onDismiss = { navController.popBackStack() },
+                        )
+                    }
+                }
 
                 // Handle initial deep link
                 LaunchedEffect(Unit) {
diff --git a/src/main/java/com/juick/android/screens/FeedViewModel.kt b/src/main/java/com/juick/android/screens/FeedViewModel.kt
deleted file mode 100644
index 8f8ab713..00000000
--- a/src/main/java/com/juick/android/screens/FeedViewModel.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens
-
-import android.net.Uri
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.juick.App
-import com.juick.api.model.Post
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.net.URI
-import java.net.URL
-
-open class FeedViewModel(val state: SavedStateHandle) : ViewModel() {
-    val apiUrl: MutableStateFlow<Uri> = MutableStateFlow(Uri.EMPTY)
-    private val _feed: MutableStateFlow<Result<List<Post>>?> = MutableStateFlow(null)
-    val feed = _feed.asStateFlow()
-
-    init {
-        viewModelScope.launch {
-            apiUrl.collect { url ->
-                if (url != Uri.EMPTY) {
-                    _feed.update {
-                        runCatching {
-                            val posts = withContext(Dispatchers.IO) {
-                                App.instance.api.getPosts(url)
-                            }
-                            return@runCatching posts
-                        }
-                    }
-                } else {
-                    _feed.update {
-                        null
-                    }
-                }
-            }
-        }
-    }
-    fun feedReceived() {
-        _feed.update { Result.success(listOf()) }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/chat/ChatViewModel.kt b/src/main/java/com/juick/android/screens/chat/ChatViewModel.kt
deleted file mode 100644
index 3c9dbc49..00000000
--- a/src/main/java/com/juick/android/screens/chat/ChatViewModel.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.screens.chat
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.viewModelScope
-import com.juick.App
-import com.juick.api.model.Post
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class ChatViewModel(private val userName: String): ViewModel() {
-    val messages = MutableStateFlow<Result<List<Post>>?>(null)
-
-    fun loadMessages() {
-        messages.update { null }
-        viewModelScope.launch {
-            messages.update {
-                runCatching {
-                    val newPms = withContext(Dispatchers.IO) { App.instance.api.pm(userName) }
-                    return@runCatching newPms
-                }
-            }
-        }
-    }
-}
-
-class ChatViewModelFactory(private val userName: String): ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        return modelClass.getConstructor(String::class.java)
-            .newInstance(userName)
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/chats/ChatsViewModel.kt b/src/main/java/com/juick/android/screens/chats/ChatsViewModel.kt
deleted file mode 100644
index 00459172..00000000
--- a/src/main/java/com/juick/android/screens/chats/ChatsViewModel.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.screens.chats
-
-import androidx.lifecycle.ViewModel
-import com.juick.App
-import com.juick.api.model.Chat
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.withContext
-
-class ChatsViewModel : ViewModel() {
-    var chats = MutableStateFlow<Result<List<Chat>>?>(null)
-        private set
-
-    suspend fun loadChats() {
-        chats.value = null
-        chats.value = runCatching {
-            val pms = withContext(Dispatchers.IO) {
-                App.instance.api.groupsPms(10).pms
-            }
-            return@runCatching pms
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/screens/post/TagsViewModel.kt b/src/main/java/com/juick/android/screens/post/TagsViewModel.kt
deleted file mode 100644
index 8a106e06..00000000
--- a/src/main/java/com/juick/android/screens/post/TagsViewModel.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2008-2024, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.juick.android.screens.post
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.juick.App
-import com.juick.api.model.Tag
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class TagsViewModel : ViewModel() {
-    private val _tags = MutableLiveData<Result<List<Tag>>?>(null)
-    val tags get() = _tags as LiveData<Result<List<Tag>>?>
-
-    init {
-        viewModelScope.launch {
-            _tags.value = runCatching {
-                val data = withContext(Dispatchers.IO) {
-                    App.instance.api.tags()
-                }
-                return@runCatching data
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/juick/android/ui/MainScreen.kt b/src/main/java/com/juick/android/ui/MainScreen.kt
index cd2f6c48..5ccb591c 100644
--- a/src/main/java/com/juick/android/ui/MainScreen.kt
+++ b/src/main/java/com/juick/android/ui/MainScreen.kt
@@ -65,14 +65,13 @@ fun MainScreen(
     val currentRoute = navBackStackEntry?.destination?.route
     val borderLine = @Composable { BorderLine() }
 
-    val bottomNavVisible = currentRoute !in listOf(
+    val fullScreenRoutes = listOf(
         "thread/{mid}?scrollToEnd={scrollToEnd}",
         "chat/{uname}/{uid}",
         "new_post?text={text}&uri={uri}",
-        "tags",
-        "no_auth",
-        "search",
     )
+    val bottomNavVisible = currentRoute !in (fullScreenRoutes + listOf("tags", "no_auth", "search"))
+    val topBarVisible = currentRoute !in fullScreenRoutes
     val fabVisible = currentRoute in listOf("home", "discover")
 
     val blogArgs = navBackStackEntry?.arguments
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index dfe17ca6..f1c4e033 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -157,26 +157,6 @@ fun AppNavigation(
             })
         }
 
-        dialog("thread/{mid}?scrollToEnd={scrollToEnd}",
-            arguments = listOf(
-                navArgument("mid") { type = NavType.IntType },
-                navArgument("scrollToEnd") { type = NavType.BoolType; defaultValue = false },
-            ),
-        ) { entry ->
-            val mid = entry.arguments?.getInt("mid") ?: 0
-            val scrollToEnd = entry.arguments?.getBoolean("scrollToEnd") ?: false
-            ThreadScreen(
-                mid = mid,
-                scrollToEnd = scrollToEnd,
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-                onDismiss = { navController.popBackStack() },
-            )
-        }
-
         dialog("tags") {
             TagsScreen(
                 onTagSelected = { tag ->
diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index eeae1392..a0bdaa5d 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -28,15 +28,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import com.juick.App
 import com.juick.R
-import com.juick.android.screens.chat.ChatViewModel
-import com.juick.android.screens.chat.ChatViewModelFactory
 import com.juick.android.ui.screens.feed.buildUrlPositions
 import com.juick.android.ui.screens.feed.formatPostText
 import com.juick.api.model.Post
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
 fun ChatScreen(
@@ -44,15 +43,16 @@ fun ChatScreen(
     onUserClick: (String) -> Unit,
     onLinkClick: (String) -> Unit,
 ) {
-    val vm: ChatViewModel = viewModel(factory = ChatViewModelFactory(uname))
-    val messagesState by vm.messages.collectAsStateWithLifecycle()
+    var messagesState by remember { mutableStateOf<Result<List<Post>>?>(null) }
     val messages = (messagesState?.getOrNull() ?: emptyList()).reversed()
     var inputText by remember { mutableStateOf("") }
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
 
-    LaunchedEffect(Unit) {
-        vm.loadMessages()
+    LaunchedEffect(uname) {
+        messagesState = runCatching {
+            withContext(Dispatchers.IO) { App.instance.api.pm(uname) }
+        }
     }
 
     LaunchedEffect(messages) {
diff --git a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
index 4c0ccdf9..0ea89760 100644
--- a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
@@ -29,13 +29,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
 import coil3.compose.AsyncImage
 import com.juick.App
 import com.juick.R
-import com.juick.android.screens.chats.ChatsViewModel
 import com.juick.android.service.isAuthenticated
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import com.juick.android.ui.screens.noauth.NoAuthScreen
 import com.juick.api.model.Chat
 
@@ -44,13 +43,14 @@ import com.juick.api.model.Chat
 fun ChatsListScreen(
     onChatClick: (Chat) -> Unit,
     onNavigateToAuth: () -> Unit,
-    vm: ChatsViewModel = viewModel(),
 ) {
-    val chatsState by vm.chats.collectAsStateWithLifecycle()
+    var chatsState by remember { mutableStateOf<Result<List<Chat>>?>(null) }
 
     LaunchedEffect(Unit) {
         if (App.instance.isAuthenticated) {
-            vm.loadChats()
+            chatsState = runCatching {
+                withContext(Dispatchers.IO) { App.instance.api.groupsPms(10).pms }
+            }
         } else {
             onNavigateToAuth()
         }
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 6cecb1c7..d2f8ebc0 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -44,14 +44,15 @@ import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
+import com.juick.App
 import com.juick.android.Utils
 import com.juick.android.Utils.replaceUriParameter
-import com.juick.android.screens.FeedViewModel
 import com.juick.api.model.Post
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -65,22 +66,28 @@ fun FeedScreen(
     showProfileHeader: Boolean = false,
     profileHeader: @Composable () -> Unit = {},
     modifier: Modifier = Modifier,
-    vm: FeedViewModel = viewModel(),
 ) {
-    val feedState by vm.feed.collectAsState()
+    var apiUrl by remember { mutableStateOf(Uri.EMPTY) }
+    var feedState by remember { mutableStateOf<Result<List<Post>>?>(null) }
     val listState = rememberLazyListState()
     var isRefreshing by remember { mutableStateOf(false) }
     var firstPage by remember { mutableStateOf(true) }
     val scope = rememberCoroutineScope()
 
-    
     LaunchedEffect(initialUrl) {
-        if (vm.apiUrl.value == Uri.EMPTY) {
-            vm.apiUrl.value = initialUrl
+        if (apiUrl == Uri.EMPTY) {
+            apiUrl = initialUrl
+        }
+    }
+
+    LaunchedEffect(apiUrl) {
+        if (apiUrl != Uri.EMPTY) {
+            feedState = runCatching {
+                withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) }
+            }
         }
     }
 
-    
     val shouldLoadMore by remember {
         derivedStateOf {
             val lastVisibleItem = listState.layoutInfo.visibleItemsInfo.lastOrNull()
@@ -93,14 +100,14 @@ fun FeedScreen(
             val posts = feedState!!.getOrNull() ?: return@LaunchedEffect
             if (posts.isNotEmpty()) {
                 val lastPost = posts.last()
-                val oldBeforeMid = vm.apiUrl.value.getQueryParameter("before_mid")
+                val oldBeforeMid = apiUrl.getQueryParameter("before_mid")
                 if ("${lastPost.mid}" != oldBeforeMid) {
-                    val newUrl = Utils.buildUrl(vm.apiUrl.value)
+                    val newUrl = Utils.buildUrl(apiUrl)
                         .build()
                         .replaceUriParameter("before_mid", lastPost.mid.toString())
                         .replaceUriParameter("ts", "${System.currentTimeMillis()}")
                     firstPage = false
-                    vm.apiUrl.value = newUrl
+                    apiUrl = newUrl
                 }
             }
         }
@@ -115,7 +122,7 @@ fun FeedScreen(
                 .build()
                 .replaceUriParameter("before_mid", "")
                 .replaceUriParameter("ts", "${System.currentTimeMillis()}")
-            vm.apiUrl.value = newUrl
+            apiUrl = newUrl
             scope.launch {
                 snapshotFlow { feedState }
                     .distinctUntilChanged()
diff --git a/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
index fe5a5d94..d6e10278 100644
--- a/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
@@ -30,24 +30,33 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
+import com.juick.App
 import com.juick.R
-import com.juick.android.screens.post.TagsViewModel
 import com.juick.api.model.Tag
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 @Composable
 fun TagsScreen(
     onTagSelected: (String) -> Unit,
     modifier: Modifier = Modifier,
-    vm: TagsViewModel = viewModel(),
 ) {
-    val tagsResult by vm.tags.observeAsState()
+    var tagsResult by remember { mutableStateOf<Result<List<Tag>>?>(null) }
+
+    LaunchedEffect(Unit) {
+        tagsResult = runCatching {
+            withContext(Dispatchers.IO) { App.instance.api.tags() }
+        }
+    }
 
     Surface(modifier = modifier.fillMaxSize()) {
         if (tagsResult == null) {
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index 46b6af11..cf06d833 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Send
 import androidx.compose.material3.*
@@ -38,6 +39,7 @@ import com.juick.api.model.PostResponse
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ThreadScreen(
     mid: Int,
@@ -71,6 +73,14 @@ fun ThreadScreen(
 
     Surface(color = colors.background) {
         Column(modifier = Modifier.fillMaxSize()) {
+            TopAppBar(
+                title = { Text("Thread") },
+                navigationIcon = {
+                    IconButton(onClick = onDismiss) {
+                        Icon(Icons.Default.ArrowBack, stringResource(R.string.Cancel))
+                    }
+                },
+            )
             if (isLoading) {
                 LinearProgressIndicator(Modifier.fillMaxWidth())
                 Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
@@ -105,9 +115,6 @@ fun ThreadScreen(
                     modifier = Modifier.fillMaxWidth().padding(12.dp).imePadding(),
                     verticalAlignment = Alignment.Bottom,
                 ) {
-                    IconButton(onClick = onDismiss) {
-                        Icon(Icons.Default.Close, stringResource(R.string.Cancel), tint = colors.onSurfaceVariant)
-                    }
                     OutlinedTextField(
                         value = replyText,
                         onValueChange = { replyText = it },

From 1d8d905e7c19972e172df221491b73a8feb14df3 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 06:05:23 +0300
Subject: [PATCH 07/57] refactor: kill inner NavHost, move all routes to top
 level

Replace AppNavigation NavHost with simple when-block.
All routes live in MainActivity NavHost.
No more nested NavHost ViewModelStore error.
---
 .../java/com/juick/android/MainActivity.kt    |  60 ++++++
 .../android/ui/navigation/AppNavigation.kt    | 183 +++---------------
 2 files changed, 88 insertions(+), 155 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index caaf4b1a..2a7af294 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -37,6 +37,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.dialog
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import com.juick.App
@@ -46,6 +47,13 @@ import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
 import com.juick.android.ui.AppTheme
 import com.juick.android.ui.MainScreen
+import com.juick.android.ui.screens.chat.ChatScreen
+import com.juick.android.ui.screens.feed.FeedScreen
+import com.juick.android.ui.screens.feed.ProfileHeader
+import com.juick.android.ui.screens.noauth.NoAuthScreen
+import com.juick.android.ui.screens.post.NewPostScreen
+import com.juick.android.ui.screens.search.SearchScreen
+import com.juick.android.ui.screens.tags.TagsScreen
 import com.juick.android.ui.screens.thread.ThreadScreen
 import com.juick.api.model.Post
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -249,6 +257,58 @@ class MainActivity : ComponentActivity() {
                             onDismiss = { navController.popBackStack() },
                         )
                     }
+
+                    composable("blog/{uname}",
+                        arguments = listOf(navArgument("uname") { type = NavType.StringType }),
+                    ) { entry ->
+                        val uname = entry.arguments?.getString("uname") ?: ""
+                        FeedScreen(
+                            initialUrl = Uris.getUserPostsByName(uname),
+                            onPostClick = onPostClick,
+                            onUserClick = onUserClick,
+                            onMenuClick = onMenuClick,
+                            onLikeClick = onLikeClick,
+                            onLinkClick = onLinkClick,
+                            showProfileHeader = true,
+                            profileHeader = { ProfileHeader(uname = uname) },
+                        )
+                    }
+
+                    composable("chat/{uname}/{uid}",
+                        arguments = listOf(navArgument("uname") { type = NavType.StringType }, navArgument("uid") { type = NavType.IntType }),
+                    ) { entry ->
+                        val uname = entry.arguments?.getString("uname") ?: ""
+                        ChatScreen(uname = uname, onUserClick = onUserClick, onLinkClick = onLinkClick)
+                    }
+
+                    composable("search") {
+                        SearchScreen(onSearch = { query -> navController.navigate("search/${Uri.encode(query)}") { popUpTo("search") { inclusive = true } } })
+                    }
+
+                    composable("search/{query}",
+                        arguments = listOf(navArgument("query") { type = NavType.StringType }),
+                    ) { entry ->
+                        val query = entry.arguments?.getString("query") ?: ""
+                        FeedScreen(initialUrl = Uris.search(query), onPostClick = onPostClick, onUserClick = onUserClick, onMenuClick = onMenuClick, onLikeClick = onLikeClick, onLinkClick = onLinkClick)
+                    }
+
+                    composable("discussions") {
+                        FeedScreen(initialUrl = Uris.discussions, onPostClick = onPostClick, onUserClick = onUserClick, onMenuClick = onMenuClick, onLikeClick = onLikeClick, onLinkClick = onLinkClick)
+                    }
+
+                    composable("no_auth") {
+                        NoAuthScreen(onSignInClick = { navController.popBackStack(); showLogin() })
+                    }
+
+                    composable("new_post?text={text}&uri={uri}",
+                        arguments = listOf(navArgument("text") { type = NavType.StringType; nullable = true; defaultValue = null }, navArgument("uri") { type = NavType.StringType; nullable = true; defaultValue = null }),
+                    ) { entry ->
+                        NewPostScreen(initialText = entry.arguments?.getString("text"), initialUri = entry.arguments?.getString("uri"), onTagsClick = { navController.navigate("tags") }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack("new_post", true); navController.navigate("thread/$mid") }, onDismiss = { navController.popBackStack() })
+                    }
+
+                    dialog("tags") {
+                        TagsScreen(onTagSelected = { tag -> navController.previousBackStackEntry?.savedStateHandle?.set("tag", tag); navController.popBackStack() })
+                    }
                 }
 
                 // Handle initial deep link
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index f1c4e033..07c90474 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -16,24 +16,13 @@
  */
 package com.juick.android.ui.navigation
 
-import android.net.Uri
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.navigation.NavHostController
-import androidx.navigation.NavType
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.dialog
-import androidx.navigation.navArgument
+import androidx.navigation.compose.currentBackStackEntryAsState
 import com.juick.android.Uris
-import com.juick.android.ui.screens.chat.ChatScreen
 import com.juick.android.ui.screens.chats.ChatsListScreen
 import com.juick.android.ui.screens.feed.FeedScreen
-import com.juick.android.ui.screens.feed.ProfileHeader
-import com.juick.android.ui.screens.noauth.NoAuthScreen
-import com.juick.android.ui.screens.post.NewPostScreen
-import com.juick.android.ui.screens.search.SearchScreen
-import com.juick.android.ui.screens.tags.TagsScreen
-import com.juick.android.ui.screens.thread.ThreadScreen
 import com.juick.api.model.Post
 
 @Composable
@@ -47,148 +36,32 @@ fun AppNavigation(
     onSignInClick: () -> Unit,
     onTagSelected: (String) -> Unit = {},
 ) {
-    NavHost(
-        navController = navController,
-        startDestination = "home",
-    ) {
-        composable("home") {
-            FeedScreen(
-                initialUrl = Uris.home,
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-            )
-        }
+    val backStackEntry by navController.currentBackStackEntryAsState()
+    val route = backStackEntry?.destination?.route
 
-        composable("discover") {
-            FeedScreen(
-                initialUrl = Uris.last,
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-            )
-        }
-
-        composable("chats") {
-            ChatsListScreen(
-                onChatClick = { chat ->
-                    navController.navigate("chat/${chat.dialogName}/${chat.uid}")
-                },
-                onNavigateToAuth = { navController.navigate("no_auth") },
-            )
-        }
-
-        composable(
-            "chat/{uname}/{uid}",
-            arguments = listOf(
-                navArgument("uname") { type = NavType.StringType },
-                navArgument("uid") { type = NavType.IntType },
-            ),
-        ) { entry ->
-            val uname = entry.arguments?.getString("uname") ?: ""
-            ChatScreen(
-                uname = uname,
-                onUserClick = { onUserClick(it) },
-                onLinkClick = { onLinkClick(it) },
-            )
-        }
-
-        composable("blog/{uname}",
-            arguments = listOf(navArgument("uname") { type = NavType.StringType }),
-        ) { entry ->
-            val uname = entry.arguments?.getString("uname") ?: ""
-            FeedScreen(
-                initialUrl = Uris.getUserPostsByName(uname),
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-                showProfileHeader = true,
-                profileHeader = {
-                    ProfileHeader(uname = uname)
-                },
-            )
-        }
-
-        composable("search") {
-            SearchScreen(
-                onSearch = { query ->
-                    navController.navigate("search/${Uri.encode(query)}") {
-                        popUpTo("search") { inclusive = true }
-                    }
-                },
-            )
-        }
-
-        composable("search/{query}",
-            arguments = listOf(navArgument("query") { type = NavType.StringType }),
-        ) { entry ->
-            val query = entry.arguments?.getString("query") ?: ""
-            FeedScreen(
-                initialUrl = Uris.search(query),
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-            )
-        }
-
-        composable("discussions") {
-            FeedScreen(
-                initialUrl = Uris.discussions,
-                onPostClick = { onPostClick(it) },
-                onUserClick = { onUserClick(it) },
-                onMenuClick = { onMenuClick(it) },
-                onLikeClick = { onLikeClick(it) },
-                onLinkClick = { onLinkClick(it) },
-            )
-        }
-
-        composable("no_auth") {
-            NoAuthScreen(onSignInClick = {
-                navController.popBackStack()
-                onSignInClick()
-            })
-        }
-
-        dialog("tags") {
-            TagsScreen(
-                onTagSelected = { tag ->
-                    navController.previousBackStackEntry
-                        ?.savedStateHandle
-                        ?.set("tag", tag)
-                    navController.popBackStack()
-                },
-            )
-        }
-
-        composable(
-            "new_post?text={text}&uri={uri}",
-            arguments = listOf(
-                navArgument("text") { type = NavType.StringType; nullable = true; defaultValue = null },
-                navArgument("uri") { type = NavType.StringType; nullable = true; defaultValue = null },
-            ),
-        ) { entry ->
-            NewPostScreen(
-                initialText = entry.arguments?.getString("text"),
-                initialUri = entry.arguments?.getString("uri"),
-                onTagsClick = { navController.navigate("tags") },
-                onAttachClick = { /* handled by MainActivity */ },
-                onAttachmentRemoved = { },
-                attachmentUri = null,
-                hasAttachment = false,
-                onNavigateToThread = { mid ->
-                    navController.popBackStack("new_post", true)
-                    navController.navigate("thread/$mid")
-                },
-                onDismiss = { navController.popBackStack() },
-            )
-        }
+    when (route) {
+        "home" -> FeedScreen(
+            initialUrl = Uris.home,
+            onPostClick = { onPostClick(it) },
+            onUserClick = { onUserClick(it) },
+            onMenuClick = { onMenuClick(it) },
+            onLikeClick = { onLikeClick(it) },
+            onLinkClick = { onLinkClick(it) },
+        )
+        "discover" -> FeedScreen(
+            initialUrl = Uris.last,
+            onPostClick = { onPostClick(it) },
+            onUserClick = { onUserClick(it) },
+            onMenuClick = { onMenuClick(it) },
+            onLikeClick = { onLikeClick(it) },
+            onLinkClick = { onLinkClick(it) },
+        )
+        "chats" -> ChatsListScreen(
+            onChatClick = { chat ->
+                navController.navigate("chat/${chat.dialogName}/${chat.uid}")
+            },
+            onNavigateToAuth = { navController.navigate("no_auth") },
+        )
+        else -> {}
     }
 }

From 7b9743c75d2c33ed40f3d5e601908aa74fd9e296 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 06:15:52 +0300
Subject: [PATCH 08/57] refactor: type-safe navigation routes, per-screen
 AppScaffold

- Serializable route classes (Home, Thread, Blog, Chat, etc.)
- AppScaffold: reusable Scaffold with TopBar/NavBar/FAB
- AppNavigation: single NavHost, all routes type-safe
- Kill MainScreen, kill inner NavHost, kill ViewModels
- Thread full-screen with own TopAppBar
---
 .../java/com/juick/android/MainActivity.kt    | 147 ++-------------
 .../java/com/juick/android/ui/AppScaffold.kt  | 114 ++++++++++++
 .../java/com/juick/android/ui/MainScreen.kt   | 173 ------------------
 .../android/ui/navigation/AppNavigation.kt    | 134 +++++++++-----
 .../com/juick/android/ui/navigation/Routes.kt |  18 ++
 5 files changed, 234 insertions(+), 352 deletions(-)
 create mode 100644 src/main/java/com/juick/android/ui/AppScaffold.kt
 delete mode 100644 src/main/java/com/juick/android/ui/MainScreen.kt
 create mode 100644 src/main/java/com/juick/android/ui/navigation/Routes.kt

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 2a7af294..4eeea243 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -34,27 +34,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavType
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.dialog
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
 import com.juick.App
 import com.juick.BuildConfig
 import com.juick.R
 import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
+import androidx.navigation.compose.rememberNavController
 import com.juick.android.ui.AppTheme
-import com.juick.android.ui.MainScreen
-import com.juick.android.ui.screens.chat.ChatScreen
-import com.juick.android.ui.screens.feed.FeedScreen
-import com.juick.android.ui.screens.feed.ProfileHeader
-import com.juick.android.ui.screens.noauth.NoAuthScreen
-import com.juick.android.ui.screens.post.NewPostScreen
-import com.juick.android.ui.screens.search.SearchScreen
-import com.juick.android.ui.screens.tags.TagsScreen
-import com.juick.android.ui.screens.thread.ThreadScreen
+import com.juick.android.ui.navigation.AppNavigation
+import com.juick.android.ui.navigation.Route
 import com.juick.api.model.Post
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.update
@@ -186,137 +174,30 @@ class MainActivity : ComponentActivity() {
                 val navController = rememberNavController()
                 this@MainActivity.navController = navController
                 processUriCallback = { mid ->
-                    navController.navigate("thread/$mid")
+                    navController.navigate(Route.Thread(mid))
                 }
 
-                // Observe account for user profile + unread count
                 val profile by account.profile.observeAsState()
                 val unreadCount = profile?.unreadCount ?: 0
 
-                val onPostClick: (Post) -> Unit = { post ->
-                    navController.navigate("thread/${post.mid}")
-                }
-                val onUserClick: (String) -> Unit = { uname ->
-                    navController.navigate("blog/$uname")
-                }
-                val onLinkClick: (String) -> Unit = { url ->
-                    openUri(Uri.parse(url))
-                }
+                val onPostClick: (Post) -> Unit = { post -> navController.navigate(Route.Thread(post.mid)) }
+                val onUserClick: (String) -> Unit = { uname -> navController.navigate(Route.Blog(uname)) }
+                val onLinkClick: (String) -> Unit = { url -> openUri(Uri.parse(url)) }
                 val onSignInClick: () -> Unit = { showLogin() }
                 val onLikeClick: (Post) -> Unit = { post ->
                     lifecycleScope.launch {
-                        try {
-                            App.instance.api.like(post.mid)
-                            account.refresh()
-                        } catch (_: Exception) { }
+                        try { App.instance.api.like(post.mid); account.refresh() } catch (_: Exception) { }
                     }
                 }
-                val onMenuClick: (Post) -> Unit = { /* dialog via JuickMessageMenuListener */ }
-
-                NavHost(
-                    navController = navController,
-                    startDestination = "main",
-                ) {
-                    composable("main") {
-                        MainScreen(
-                            navController = navController,
-                            currentProfile = profile,
-                            unreadCount = unreadCount,
-                            onPostClick = onPostClick,
-                            onUserClick = onUserClick,
-                            onMenuClick = onMenuClick,
-                            onLikeClick = onLikeClick,
-                            onLinkClick = onLinkClick,
-                            onSignInClick = onSignInClick,
-                            onFabClick = {
-                                if (App.instance.isAuthenticated) {
-                                    navController.navigate("new_post")
-                                } else {
-                                    showLogin()
-                                }
-                            },
-                        )
-                    }
-
-                    composable("thread/{mid}?scrollToEnd={scrollToEnd}",
-                        arguments = listOf(
-                            navArgument("mid") { type = NavType.IntType },
-                            navArgument("scrollToEnd") { type = NavType.BoolType; defaultValue = false },
-                        ),
-                    ) { entry ->
-                        val mid = entry.arguments?.getInt("mid") ?: 0
-                        val scrollToEnd = entry.arguments?.getBoolean("scrollToEnd") ?: false
-                        ThreadScreen(
-                            mid = mid,
-                            scrollToEnd = scrollToEnd,
-                            onPostClick = onPostClick,
-                            onUserClick = onUserClick,
-                            onMenuClick = onMenuClick,
-                            onLikeClick = onLikeClick,
-                            onLinkClick = onLinkClick,
-                            onDismiss = { navController.popBackStack() },
-                        )
-                    }
-
-                    composable("blog/{uname}",
-                        arguments = listOf(navArgument("uname") { type = NavType.StringType }),
-                    ) { entry ->
-                        val uname = entry.arguments?.getString("uname") ?: ""
-                        FeedScreen(
-                            initialUrl = Uris.getUserPostsByName(uname),
-                            onPostClick = onPostClick,
-                            onUserClick = onUserClick,
-                            onMenuClick = onMenuClick,
-                            onLikeClick = onLikeClick,
-                            onLinkClick = onLinkClick,
-                            showProfileHeader = true,
-                            profileHeader = { ProfileHeader(uname = uname) },
-                        )
-                    }
-
-                    composable("chat/{uname}/{uid}",
-                        arguments = listOf(navArgument("uname") { type = NavType.StringType }, navArgument("uid") { type = NavType.IntType }),
-                    ) { entry ->
-                        val uname = entry.arguments?.getString("uname") ?: ""
-                        ChatScreen(uname = uname, onUserClick = onUserClick, onLinkClick = onLinkClick)
-                    }
-
-                    composable("search") {
-                        SearchScreen(onSearch = { query -> navController.navigate("search/${Uri.encode(query)}") { popUpTo("search") { inclusive = true } } })
-                    }
-
-                    composable("search/{query}",
-                        arguments = listOf(navArgument("query") { type = NavType.StringType }),
-                    ) { entry ->
-                        val query = entry.arguments?.getString("query") ?: ""
-                        FeedScreen(initialUrl = Uris.search(query), onPostClick = onPostClick, onUserClick = onUserClick, onMenuClick = onMenuClick, onLikeClick = onLikeClick, onLinkClick = onLinkClick)
-                    }
-
-                    composable("discussions") {
-                        FeedScreen(initialUrl = Uris.discussions, onPostClick = onPostClick, onUserClick = onUserClick, onMenuClick = onMenuClick, onLikeClick = onLikeClick, onLinkClick = onLinkClick)
-                    }
-
-                    composable("no_auth") {
-                        NoAuthScreen(onSignInClick = { navController.popBackStack(); showLogin() })
-                    }
-
-                    composable("new_post?text={text}&uri={uri}",
-                        arguments = listOf(navArgument("text") { type = NavType.StringType; nullable = true; defaultValue = null }, navArgument("uri") { type = NavType.StringType; nullable = true; defaultValue = null }),
-                    ) { entry ->
-                        NewPostScreen(initialText = entry.arguments?.getString("text"), initialUri = entry.arguments?.getString("uri"), onTagsClick = { navController.navigate("tags") }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack("new_post", true); navController.navigate("thread/$mid") }, onDismiss = { navController.popBackStack() })
-                    }
-
-                    dialog("tags") {
-                        TagsScreen(onTagSelected = { tag -> navController.previousBackStackEntry?.savedStateHandle?.set("tag", tag); navController.popBackStack() })
-                    }
+                val onMenuClick: (Post) -> Unit = { }
+                val onFabClick: () -> Unit = {
+                    if (App.instance.isAuthenticated) navController.navigate(Route.NewPost) else showLogin()
                 }
 
-                // Handle initial deep link
+                AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick, onFabClick, profile, unreadCount)
+
                 LaunchedEffect(Unit) {
-                    initialUri?.let { uri ->
-                        processUri(uri)
-                        initialUri = null
-                    }
+                    initialUri?.let { processUri(it); initialUri = null }
                 }
             }
         }
diff --git a/src/main/java/com/juick/android/ui/AppScaffold.kt b/src/main/java/com/juick/android/ui/AppScaffold.kt
new file mode 100644
index 00000000..e8eac9dc
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/AppScaffold.kt
@@ -0,0 +1,114 @@
+package com.juick.android.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Notifications
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+import coil3.compose.AsyncImage
+import com.juick.R
+import com.juick.android.ui.navigation.Route
+import com.juick.api.model.User
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AppScaffold(
+    navController: NavHostController,
+    currentProfile: User?,
+    unreadCount: Int,
+    onSignInClick: () -> Unit,
+    onFabClick: () -> Unit,
+    content: @Composable () -> Unit,
+) {
+    val backStackEntry by navController.currentBackStackEntryAsState()
+    val route = backStackEntry?.destination?.route
+    val borderLine = @Composable { Box(Modifier.fillMaxWidth().height(0.5.dp).background(MaterialTheme.colorScheme.outline)) }
+
+    val bottomNavVisible = route in listOf(
+        Route.Home::class.qualifiedName,
+        "com.juick.android.ui.navigation.Route.Discover",
+        "com.juick.android.ui.navigation.Route.Chats",
+        "com.juick.android.ui.navigation.Route.Discussions",
+        "com.juick.android.ui.navigation.Route.Blog",
+        "com.juick.android.ui.navigation.Route.Search",
+    )
+
+    val fabVisible = route in listOf(
+        Route.Home::class.qualifiedName,
+        "com.juick.android.ui.navigation.Route.Discover",
+    )
+
+    val screenTitle = when (route) {
+        Route.Discover::class.qualifiedName -> stringResource(R.string.Discover)
+        Route.Chats::class.qualifiedName -> stringResource(R.string.PMs)
+        Route.Discussions::class.qualifiedName -> "Discussions"
+        else -> stringResource(R.string.Juick)
+    }
+
+    Scaffold(
+        topBar = {
+            Column {
+                TopAppBar(
+                    title = { Text(screenTitle) },
+                    colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface, titleContentColor = MaterialTheme.colorScheme.onSurface),
+                    actions = {
+                        IconButton(onClick = { navController.navigate(Route.Search(null)) }) {
+                            Icon(Icons.Default.Search, contentDescription = stringResource(R.string.search), tint = MaterialTheme.colorScheme.onSurfaceVariant)
+                        }
+                        IconButton(onClick = { navController.navigate(Route.Discussions) }) {
+                            BadgedBox(badge = { if (unreadCount > 0) Badge { Text("$unreadCount") } }) {
+                                Icon(Icons.Default.Notifications, contentDescription = "Discussions", tint = MaterialTheme.colorScheme.onSurfaceVariant)
+                            }
+                        }
+                        if (currentProfile != null) {
+                            IconButton(onClick = { navController.navigate(Route.Blog(currentProfile.uname)) }) {
+                                AsyncImage(model = currentProfile.avatar, contentDescription = stringResource(R.string.Me), modifier = Modifier.size(28.dp).clip(CircleShape), contentScale = ContentScale.Crop)
+                            }
+                        }
+                    },
+                )
+                borderLine()
+            }
+        },
+        bottomBar = {
+            if (bottomNavVisible) {
+                Column {
+                    borderLine()
+                    NavigationBar(containerColor = MaterialTheme.colorScheme.surface, tonalElevation = 0.dp) {
+                        val navColors = NavigationBarItemDefaults.colors(selectedIconColor = MaterialTheme.colorScheme.onSurface, selectedTextColor = MaterialTheme.colorScheme.onSurface, unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant, indicatorColor = MaterialTheme.colorScheme.tertiary)
+                        NavigationBarItem(selected = route == Route.Home::class.qualifiedName, onClick = { navController.navigate(Route.Home) { popUpTo(Route.Home) { inclusive = true }; launchSingleTop = true; restoreState = true } }, icon = { Icon(painterResource(R.drawable.ic_ei_clock), contentDescription = null) }, label = { Text(stringResource(R.string.Subscriptions)) }, colors = navColors)
+                        NavigationBarItem(selected = route == Route.Discover::class.qualifiedName, onClick = { navController.navigate(Route.Discover) { popUpTo(Route.Home) { inclusive = true }; launchSingleTop = true; restoreState = true } }, icon = { Icon(painterResource(R.drawable.icon_discover), contentDescription = null) }, label = { Text(stringResource(R.string.Discover)) }, colors = navColors)
+                        NavigationBarItem(selected = route == Route.Chats::class.qualifiedName, onClick = { navController.navigate(Route.Chats) { popUpTo(Route.Home) { inclusive = true }; launchSingleTop = true; restoreState = true } }, icon = { Icon(painterResource(R.drawable.ic_ei_envelope), contentDescription = null) }, label = { Text(stringResource(R.string.PMs)) }, colors = navColors)
+                    }
+                }
+            }
+        },
+        floatingActionButton = {
+            if (fabVisible) {
+                FloatingActionButton(onClick = onFabClick, containerColor = MaterialTheme.colorScheme.tertiary, contentColor = MaterialTheme.colorScheme.onTertiary) {
+                    Icon(painterResource(R.drawable.ic_ei_pencil), contentDescription = stringResource(R.string.Create), modifier = Modifier.size(24.dp))
+                }
+            }
+        },
+    ) { contentPadding ->
+        Box(Modifier.padding(contentPadding)) { content() }
+    }
+}
diff --git a/src/main/java/com/juick/android/ui/MainScreen.kt b/src/main/java/com/juick/android/ui/MainScreen.kt
deleted file mode 100644
index 5ccb591c..00000000
--- a/src/main/java/com/juick/android/ui/MainScreen.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android.ui
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.ui.graphics.Color
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Notifications
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.navigation.NavHostController
-import androidx.navigation.compose.currentBackStackEntryAsState
-import coil3.compose.AsyncImage
-import com.juick.R
-import com.juick.android.ui.navigation.AppNavigation
-import com.juick.api.model.Post
-import com.juick.api.model.User
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MainScreen(
-    navController: NavHostController,
-    currentProfile: User?,
-    unreadCount: Int,
-    onPostClick: (Post) -> Unit = { },
-    onUserClick: (String) -> Unit = { },
-    onMenuClick: (Post) -> Unit = { },
-    onLikeClick: (Post) -> Unit = { },
-    onLinkClick: (String) -> Unit = { },
-    onSignInClick: () -> Unit = { },
-    onFabClick: () -> Unit = { },
-) {
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-    val currentRoute = navBackStackEntry?.destination?.route
-    val borderLine = @Composable { BorderLine() }
-
-    val fullScreenRoutes = listOf(
-        "thread/{mid}?scrollToEnd={scrollToEnd}",
-        "chat/{uname}/{uid}",
-        "new_post?text={text}&uri={uri}",
-    )
-    val bottomNavVisible = currentRoute !in (fullScreenRoutes + listOf("tags", "no_auth", "search"))
-    val topBarVisible = currentRoute !in fullScreenRoutes
-    val fabVisible = currentRoute in listOf("home", "discover")
-
-    val blogArgs = navBackStackEntry?.arguments
-    val screenTitle = when {
-        currentRoute?.startsWith("blog/") == true -> "@${blogArgs?.getString("uname") ?: ""}"
-        currentRoute == "search" -> stringResource(R.string.search)
-        currentRoute == "chats" -> stringResource(R.string.PMs)
-        currentRoute == "discover" -> stringResource(R.string.Discover)
-        currentRoute == "discussions" -> "Discussions"
-        else -> stringResource(R.string.Juick)
-    }
-
-    Scaffold(
-        topBar = {
-            Column {
-                TopAppBar(
-                    title = { Text(screenTitle) },
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = MaterialTheme.colorScheme.surface,
-                        titleContentColor = MaterialTheme.colorScheme.onSurface,
-                    ),
-                    actions = {
-                        IconButton(onClick = { navController.navigate("search") }) {
-                            Icon(Icons.Default.Search, contentDescription = stringResource(R.string.search), tint = MaterialTheme.colorScheme.onSurfaceVariant)
-                        }
-                        IconButton(onClick = { navController.navigate("discussions") }) {
-                            BadgedBox(badge = { if (unreadCount > 0) Badge { Text("$unreadCount") } }) {
-                                Icon(Icons.Default.Notifications, contentDescription = "Discussions", tint = MaterialTheme.colorScheme.onSurfaceVariant)
-                            }
-                        }
-                        if (currentProfile != null) {
-                            IconButton(onClick = { navController.navigate("blog/${currentProfile.uname}") }) {
-                                AsyncImage(model = currentProfile.avatar, contentDescription = stringResource(R.string.Me), modifier = Modifier.size(28.dp).clip(CircleShape), contentScale = ContentScale.Crop)
-                            }
-                        }
-                    },
-                )
-                borderLine()
-            }
-        },
-        bottomBar = {
-            if (bottomNavVisible) {
-                Column {
-                    borderLine()
-                    NavigationBar(containerColor = MaterialTheme.colorScheme.surface, tonalElevation = 0.dp) {
-                        val navColors = NavigationBarItemDefaults.colors(
-                            selectedIconColor = MaterialTheme.colorScheme.onSurface,
-                            selectedTextColor = MaterialTheme.colorScheme.onSurface,
-                            unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                            unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                            indicatorColor = MaterialTheme.colorScheme.tertiary,
-                        )
-                        NavigationBarItem(
-                            selected = currentRoute == "home",
-                            onClick = { navController.navigate("home") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
-                            icon = { Icon(painterResource(R.drawable.ic_ei_clock), contentDescription = null) },
-                            label = { Text(stringResource(R.string.Subscriptions)) },
-                            colors = navColors,
-                        )
-                        NavigationBarItem(
-                            selected = currentRoute == "discover",
-                            onClick = { navController.navigate("discover") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
-                            icon = { Icon(painterResource(R.drawable.icon_discover), contentDescription = null) },
-                            label = { Text(stringResource(R.string.Discover)) },
-                            colors = navColors,
-                        )
-                        NavigationBarItem(
-                            selected = currentRoute == "chats",
-                            onClick = { navController.navigate("chats") { popUpTo("home") { inclusive = true }; launchSingleTop = true; restoreState = true } },
-                            icon = { Icon(painterResource(R.drawable.ic_ei_envelope), contentDescription = null) },
-                            label = { Text(stringResource(R.string.PMs)) },
-                            colors = navColors,
-                        )
-                    }
-                }
-            }
-        },
-        floatingActionButton = {
-            if (fabVisible) {
-                FloatingActionButton(
-                    onClick = onFabClick,
-                    containerColor = MaterialTheme.colorScheme.tertiary,
-                    contentColor = MaterialTheme.colorScheme.onTertiary,
-                ) {
-                    Icon(painterResource(R.drawable.ic_ei_pencil), contentDescription = stringResource(R.string.Create), modifier = Modifier.size(24.dp))
-                }
-            }
-        },
-    ) { contentPadding ->
-        Box(Modifier.padding(contentPadding)) {
-            AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick)
-        }
-    }
-}
-
-@Composable
-private fun BorderLine() {
-    Box(Modifier.fillMaxWidth().height(0.5.dp).background(MaterialTheme.colorScheme.outline))
-}
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 07c90474..d5630872 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -1,28 +1,22 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 package com.juick.android.ui.navigation
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.navigation.NavHostController
-import androidx.navigation.compose.currentBackStackEntryAsState
-import com.juick.android.Uris
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.dialog
+import androidx.navigation.toRoute
+import com.juick.android.ui.screens.chat.ChatScreen
 import com.juick.android.ui.screens.chats.ChatsListScreen
 import com.juick.android.ui.screens.feed.FeedScreen
+import com.juick.android.ui.screens.feed.ProfileHeader
+import com.juick.android.ui.screens.noauth.NoAuthScreen
+import com.juick.android.ui.screens.post.NewPostScreen
+import com.juick.android.ui.screens.search.SearchScreen
+import com.juick.android.ui.screens.tags.TagsScreen
+import com.juick.android.ui.screens.thread.ThreadScreen
+import com.juick.android.ui.AppScaffold
+import com.juick.android.Uris
 import com.juick.api.model.Post
 
 @Composable
@@ -34,34 +28,82 @@ fun AppNavigation(
     onLikeClick: (Post) -> Unit,
     onLinkClick: (String) -> Unit,
     onSignInClick: () -> Unit,
-    onTagSelected: (String) -> Unit = {},
+    onFabClick: () -> Unit,
+    currentProfile: com.juick.api.model.User?,
+    unreadCount: Int,
 ) {
-    val backStackEntry by navController.currentBackStackEntryAsState()
-    val route = backStackEntry?.destination?.route
+    NavHost(navController = navController, startDestination = Route.Home) {
+        composable<Route.Home> {
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+            }
+        }
+        composable<Route.Discover> {
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+            }
+        }
+        composable<Route.Chats> {
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                ChatsListScreen(
+                    onChatClick = { chat -> navController.navigate(Route.Chat(chat.dialogName, chat.uid)) },
+                    onNavigateToAuth = { navController.navigate(Route.NoAuth) },
+                )
+            }
+        }
+        composable<Route.Discussions> {
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+            }
+        }
+
+        composable<Route.Thread> { entry ->
+            val route = entry.toRoute<Route.Thread>()
+            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() })
+        }
+
+        composable<Route.Blog> { entry ->
+            val uname = entry.toRoute<Route.Blog>().uname
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
+            }
+        }
+
+        composable<Route.Chat> { entry ->
+            val route = entry.toRoute<Route.Chat>()
+            ChatScreen(route.uname, onUserClick, onLinkClick)
+        }
+
+        composable<Route.Search> {
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                SearchScreen(onSearch = { query -> navController.navigate(Route.Search(query)) { popUpTo<Route.Search> { inclusive = true } } })
+            }
+        }
+
+        composable<Route.Search> { entry ->
+            val route = entry.toRoute<Route.Search>()
+            route.query?.let {
+                AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                    FeedScreen(Uris.search(it), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                }
+            }
+        }
+
+        composable<Route.NoAuth> {
+            NoAuthScreen(onSignInClick = { navController.popBackStack(); onSignInClick() })
+        }
+
+        composable<Route.NewPost> {
+            NewPostScreen(onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+        }
+
+        composable<Route.NewPostWithText> { entry ->
+            val text = entry.toRoute<Route.NewPostWithText>().text
+            NewPostScreen(initialText = text, onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+        }
 
-    when (route) {
-        "home" -> FeedScreen(
-            initialUrl = Uris.home,
-            onPostClick = { onPostClick(it) },
-            onUserClick = { onUserClick(it) },
-            onMenuClick = { onMenuClick(it) },
-            onLikeClick = { onLikeClick(it) },
-            onLinkClick = { onLinkClick(it) },
-        )
-        "discover" -> FeedScreen(
-            initialUrl = Uris.last,
-            onPostClick = { onPostClick(it) },
-            onUserClick = { onUserClick(it) },
-            onMenuClick = { onMenuClick(it) },
-            onLikeClick = { onLikeClick(it) },
-            onLinkClick = { onLinkClick(it) },
-        )
-        "chats" -> ChatsListScreen(
-            onChatClick = { chat ->
-                navController.navigate("chat/${chat.dialogName}/${chat.uid}")
-            },
-            onNavigateToAuth = { navController.navigate("no_auth") },
-        )
-        else -> {}
+        dialog<Route.Tags> {
+            TagsScreen(onTagSelected = { tag -> navController.previousBackStackEntry?.savedStateHandle?.set("tag", tag); navController.popBackStack() })
+        }
     }
 }
diff --git a/src/main/java/com/juick/android/ui/navigation/Routes.kt b/src/main/java/com/juick/android/ui/navigation/Routes.kt
new file mode 100644
index 00000000..30c002bf
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/navigation/Routes.kt
@@ -0,0 +1,18 @@
+package com.juick.android.ui.navigation
+
+import kotlinx.serialization.Serializable
+
+sealed interface Route {
+    @Serializable data object Home : Route
+    @Serializable data object Discover : Route
+    @Serializable data object Chats : Route
+    @Serializable data object Discussions : Route
+    @Serializable data class Thread(val mid: Int, val scrollToEnd: Boolean = false) : Route
+    @Serializable data class Blog(val uname: String) : Route
+    @Serializable data class Chat(val uname: String, val uid: Int) : Route
+    @Serializable data class Search(val query: String? = null) : Route
+    @Serializable data object NewPost : Route
+    @Serializable data class NewPostWithText(val text: String?) : Route
+    @Serializable data object Tags : Route
+    @Serializable data object NoAuth : Route
+}

From 9fb4ebb7af9b6c6b4dfb4d072dd9a2d896bb654d Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 06:23:30 +0300
Subject: [PATCH 09/57] fix: replace rememberCoroutineScope with LaunchedEffect
 in FeedScreen

Avoids coroutine scope left composition warning on tab switch.
---
 .../android/ui/screens/feed/FeedScreen.kt     | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index d2f8ebc0..ae0a4e15 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -33,12 +33,10 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.derivedStateOf
 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.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -51,7 +49,6 @@ import com.juick.api.model.Post
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -72,26 +69,27 @@ fun FeedScreen(
     val listState = rememberLazyListState()
     var isRefreshing by remember { mutableStateOf(false) }
     var firstPage by remember { mutableStateOf(true) }
-    val scope = rememberCoroutineScope()
 
     LaunchedEffect(initialUrl) {
-        if (apiUrl == Uri.EMPTY) {
-            apiUrl = initialUrl
-        }
+        if (apiUrl == Uri.EMPTY) apiUrl = initialUrl
     }
 
     LaunchedEffect(apiUrl) {
         if (apiUrl != Uri.EMPTY) {
-            feedState = runCatching {
-                withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) }
-            }
+            feedState = runCatching { withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) } }
+        }
+    }
+
+    LaunchedEffect(isRefreshing) {
+        if (isRefreshing) {
+            snapshotFlow { feedState }.distinctUntilChanged().collectLatest { if (it != null) isRefreshing = false }
         }
     }
 
     val shouldLoadMore by remember {
         derivedStateOf {
-            val lastVisibleItem = listState.layoutInfo.visibleItemsInfo.lastOrNull()
-            lastVisibleItem != null && lastVisibleItem.index >= listState.layoutInfo.totalItemsCount - 3
+            val last = listState.layoutInfo.visibleItemsInfo.lastOrNull()
+            last != null && last.index >= listState.layoutInfo.totalItemsCount - 3
         }
     }
 
@@ -102,12 +100,8 @@ fun FeedScreen(
                 val lastPost = posts.last()
                 val oldBeforeMid = apiUrl.getQueryParameter("before_mid")
                 if ("${lastPost.mid}" != oldBeforeMid) {
-                    val newUrl = Utils.buildUrl(apiUrl)
-                        .build()
-                        .replaceUriParameter("before_mid", lastPost.mid.toString())
-                        .replaceUriParameter("ts", "${System.currentTimeMillis()}")
+                    apiUrl = Utils.buildUrl(apiUrl).build().replaceUriParameter("before_mid", lastPost.mid.toString()).replaceUriParameter("ts", "${System.currentTimeMillis()}")
                     firstPage = false
-                    apiUrl = newUrl
                 }
             }
         }
@@ -118,20 +112,7 @@ fun FeedScreen(
         onRefresh = {
             isRefreshing = true
             firstPage = true
-            val newUrl = Utils.buildUrl(initialUrl)
-                .build()
-                .replaceUriParameter("before_mid", "")
-                .replaceUriParameter("ts", "${System.currentTimeMillis()}")
-            apiUrl = newUrl
-            scope.launch {
-                snapshotFlow { feedState }
-                    .distinctUntilChanged()
-                    .collectLatest { result ->
-                        if (result != null) {
-                            isRefreshing = false
-                        }
-                    }
-            }
+            apiUrl = Utils.buildUrl(initialUrl).build().replaceUriParameter("before_mid", "").replaceUriParameter("ts", "${System.currentTimeMillis()}")
         },
         modifier = modifier.fillMaxSize(),
     ) {

From bed7e8da823c7de814642ea0ac444ad6cd44fd74 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 06:35:24 +0300
Subject: [PATCH 10/57] fix: rethrow CancellationException, runCatching
 swallows it

---
 .../java/com/juick/android/ui/screens/chat/ChatScreen.kt   | 7 ++++---
 .../com/juick/android/ui/screens/chats/ChatsListScreen.kt  | 7 ++++---
 .../java/com/juick/android/ui/screens/feed/FeedScreen.kt   | 5 ++++-
 .../java/com/juick/android/ui/screens/tags/TagsScreen.kt   | 7 ++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index a0bdaa5d..f0d69af5 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -33,6 +33,7 @@ import com.juick.R
 import com.juick.android.ui.screens.feed.buildUrlPositions
 import com.juick.android.ui.screens.feed.formatPostText
 import com.juick.api.model.Post
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -50,9 +51,9 @@ fun ChatScreen(
     val scope = rememberCoroutineScope()
 
     LaunchedEffect(uname) {
-        messagesState = runCatching {
-            withContext(Dispatchers.IO) { App.instance.api.pm(uname) }
-        }
+        try {
+            messagesState = Result.success(withContext(Dispatchers.IO) { App.instance.api.pm(uname) })
+        } catch (e: CancellationException) { throw e } catch (e: Exception) { messagesState = Result.failure(e) }
     }
 
     LaunchedEffect(messages) {
diff --git a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
index 0ea89760..b40115fa 100644
--- a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
@@ -33,6 +33,7 @@ import coil3.compose.AsyncImage
 import com.juick.App
 import com.juick.R
 import com.juick.android.service.isAuthenticated
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import com.juick.android.ui.screens.noauth.NoAuthScreen
@@ -48,9 +49,9 @@ fun ChatsListScreen(
 
     LaunchedEffect(Unit) {
         if (App.instance.isAuthenticated) {
-            chatsState = runCatching {
-                withContext(Dispatchers.IO) { App.instance.api.groupsPms(10).pms }
-            }
+            try {
+                chatsState = Result.success(withContext(Dispatchers.IO) { App.instance.api.groupsPms(10).pms })
+            } catch (e: CancellationException) { throw e } catch (e: Exception) { chatsState = Result.failure(e) }
         } else {
             onNavigateToAuth()
         }
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index ae0a4e15..3781f793 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -46,6 +46,7 @@ import com.juick.App
 import com.juick.android.Utils
 import com.juick.android.Utils.replaceUriParameter
 import com.juick.api.model.Post
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -76,7 +77,9 @@ fun FeedScreen(
 
     LaunchedEffect(apiUrl) {
         if (apiUrl != Uri.EMPTY) {
-            feedState = runCatching { withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) } }
+            try {
+                feedState = Result.success(withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) })
+            } catch (e: CancellationException) { throw e } catch (e: Exception) { feedState = Result.failure(e) }
         }
     }
 
diff --git a/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
index d6e10278..78b83fc8 100644
--- a/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/tags/TagsScreen.kt
@@ -42,6 +42,7 @@ import androidx.compose.ui.unit.dp
 import com.juick.App
 import com.juick.R
 import com.juick.api.model.Tag
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -53,9 +54,9 @@ fun TagsScreen(
     var tagsResult by remember { mutableStateOf<Result<List<Tag>>?>(null) }
 
     LaunchedEffect(Unit) {
-        tagsResult = runCatching {
-            withContext(Dispatchers.IO) { App.instance.api.tags() }
-        }
+        try {
+            tagsResult = Result.success(withContext(Dispatchers.IO) { App.instance.api.tags() })
+        } catch (e: CancellationException) { throw e } catch (e: Exception) { tagsResult = Result.failure(e) }
     }
 
     Surface(modifier = modifier.fillMaxSize()) {

From cf23e1f8d3dd0e06c404e2a17f975642e519bc97 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 13:04:27 +0300
Subject: [PATCH 11/57] fix: merge search input and results into single
 composable

Two composable<Route.Search> entries conflicted. Single route
now shows SearchScreen when query=null, FeedScreen when query set.
---
 .../com/juick/android/ui/navigation/AppNavigation.kt     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index d5630872..8a159594 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -81,11 +81,10 @@ fun AppNavigation(
         }
 
         composable<Route.Search> { entry ->
-            val route = entry.toRoute<Route.Search>()
-            route.query?.let {
-                AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                    FeedScreen(Uris.search(it), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
-                }
+            val query = entry.toRoute<Route.Search>().query
+            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                else SearchScreen(onSearch = { q -> navController.navigate(Route.Search(q)) { popUpTo<Route.Search> { inclusive = true } } })
             }
         }
 

From f7d4ae9133d3f7e1c717c777864229bc6de41f3f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 13:35:32 +0300
Subject: [PATCH 12/57] fix: launchSingleTop for search/profile nav, merge
 NewPost routes

- Add launchSingleTop = true to search, discussions, profile nav
- Merge NewPost/NewPostWithText into single NewPost(text: String? = null)
- Skip ChatScreen send failure feedback: text stays visible on failure
---
 .../java/com/juick/android/ui/AppScaffold.kt  | 22 ++++++++++++++---
 .../android/ui/navigation/AppNavigation.kt    | 24 ++++++++++++++-----
 .../com/juick/android/ui/navigation/Routes.kt | 19 +++++++++++++--
 3 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/AppScaffold.kt b/src/main/java/com/juick/android/ui/AppScaffold.kt
index e8eac9dc..c4fe8b8e 100644
--- a/src/main/java/com/juick/android/ui/AppScaffold.kt
+++ b/src/main/java/com/juick/android/ui/AppScaffold.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.juick.android.ui
 
 import androidx.compose.foundation.background
@@ -70,16 +86,16 @@ fun AppScaffold(
                     title = { Text(screenTitle) },
                     colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface, titleContentColor = MaterialTheme.colorScheme.onSurface),
                     actions = {
-                        IconButton(onClick = { navController.navigate(Route.Search(null)) }) {
+                        IconButton(onClick = { navController.navigate(Route.Search(null)) { launchSingleTop = true } }) {
                             Icon(Icons.Default.Search, contentDescription = stringResource(R.string.search), tint = MaterialTheme.colorScheme.onSurfaceVariant)
                         }
-                        IconButton(onClick = { navController.navigate(Route.Discussions) }) {
+                        IconButton(onClick = { navController.navigate(Route.Discussions) { launchSingleTop = true } }) {
                             BadgedBox(badge = { if (unreadCount > 0) Badge { Text("$unreadCount") } }) {
                                 Icon(Icons.Default.Notifications, contentDescription = "Discussions", tint = MaterialTheme.colorScheme.onSurfaceVariant)
                             }
                         }
                         if (currentProfile != null) {
-                            IconButton(onClick = { navController.navigate(Route.Blog(currentProfile.uname)) }) {
+                            IconButton(onClick = { navController.navigate(Route.Blog(currentProfile.uname)) { launchSingleTop = true } }) {
                                 AsyncImage(model = currentProfile.avatar, contentDescription = stringResource(R.string.Me), modifier = Modifier.size(28.dp).clip(CircleShape), contentScale = ContentScale.Crop)
                             }
                         }
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 8a159594..6d0456fe 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.juick.android.ui.navigation
 
 import androidx.compose.runtime.Composable
@@ -92,12 +108,8 @@ fun AppNavigation(
             NoAuthScreen(onSignInClick = { navController.popBackStack(); onSignInClick() })
         }
 
-        composable<Route.NewPost> {
-            NewPostScreen(onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
-        }
-
-        composable<Route.NewPostWithText> { entry ->
-            val text = entry.toRoute<Route.NewPostWithText>().text
+        composable<Route.NewPost> { entry ->
+            val text = entry.toRoute<Route.NewPost>().text
             NewPostScreen(initialText = text, onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
         }
 
diff --git a/src/main/java/com/juick/android/ui/navigation/Routes.kt b/src/main/java/com/juick/android/ui/navigation/Routes.kt
index 30c002bf..417be485 100644
--- a/src/main/java/com/juick/android/ui/navigation/Routes.kt
+++ b/src/main/java/com/juick/android/ui/navigation/Routes.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.juick.android.ui.navigation
 
 import kotlinx.serialization.Serializable
@@ -11,8 +27,7 @@ sealed interface Route {
     @Serializable data class Blog(val uname: String) : Route
     @Serializable data class Chat(val uname: String, val uid: Int) : Route
     @Serializable data class Search(val query: String? = null) : Route
-    @Serializable data object NewPost : Route
-    @Serializable data class NewPostWithText(val text: String?) : Route
+    @Serializable data class NewPost(val text: String? = null) : Route
     @Serializable data object Tags : Route
     @Serializable data object NoAuth : Route
 }

From 290cfc00af7807b889cda9791be05aa88774e656 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 13:47:17 +0300
Subject: [PATCH 13/57] fix: Route.NewPost usage after data object to data
 class change

- FAB: Route.NewPost() instead of Route.NewPost
- Share intent: use type-safe Route.NewPost(text) instead of string URL
---
 src/main/java/com/juick/android/MainActivity.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 4eeea243..a8d29f7d 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -191,7 +191,7 @@ class MainActivity : ComponentActivity() {
                 }
                 val onMenuClick: (Post) -> Unit = { }
                 val onFabClick: () -> Unit = {
-                    if (App.instance.isAuthenticated) navController.navigate(Route.NewPost) else showLogin()
+                    if (App.instance.isAuthenticated) navController.navigate(Route.NewPost()) else showLogin()
                 }
 
                 AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick, onFabClick, profile, unreadCount)
@@ -227,9 +227,7 @@ class MainActivity : ComponentActivity() {
             val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
             if (text.isNotEmpty()) {
                 intent.action = null // consume to prevent re-processing
-                navController?.navigate(
-                    "new_post?text=${Uri.encode(text)}"
-                )
+                navController?.navigate(Route.NewPost(Uri.encode(text)))
             }
         }
     }

From e5f0c370f7c0b9de86707ba68f50a298cd92f6b9 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 15:19:01 +0300
Subject: [PATCH 14/57] fix: tag insertion, MainActivity
 notification/updater/event handling

- Tag: shared compose state + TextFieldValue with cursor + trailing space
- MainActivity: notification permissions, updater, authorizationCallback
- MainActivity: INTENT_NEW_EVENT_ACTION handler, onPause for notifications
---
 .../java/com/juick/android/MainActivity.kt    | 42 ++++++++++++++++++-
 .../android/ui/navigation/AppNavigation.kt    | 21 ++++++++--
 .../android/ui/screens/post/NewPostScreen.kt  | 12 +++---
 3 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index a8d29f7d..b5e70423 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -39,6 +39,7 @@ import com.juick.BuildConfig
 import com.juick.R
 import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
+import com.juick.android.updater.Updater
 import androidx.navigation.compose.rememberNavController
 import com.juick.android.ui.AppTheme
 import com.juick.android.ui.navigation.AppNavigation
@@ -167,6 +168,25 @@ class MainActivity : ComponentActivity() {
             }
         }
 
+        App.instance.authorizationCallback = {
+            val intent = Intent(this, SignInActivity::class.java).apply {
+                putExtra(SignInActivity.EXTRA_ACTION, SignInActivity.ACTION_PASSWORD_UPDATE)
+            }
+            startActivity(intent)
+        }
+
+        account.refresh()
+
+        lifecycleScope.launch {
+            if (BuildConfig.ENABLE_UPDATER) {
+                Updater(this@MainActivity).checkUpdate()
+            }
+            try {
+                requestNotificationsPermission()
+                notificationManager = NotificationManager()
+            } catch (_: Exception) { }
+        }
+
         initialUri = intent?.data
 
         setContent {
@@ -221,15 +241,35 @@ class MainActivity : ComponentActivity() {
 
     override fun onResume() {
         super.onResume()
+        notificationManager?.onResume()
         account.refresh()
         val intent = intent
         if (Intent.ACTION_SEND == intent.action) {
             val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
             if (text.isNotEmpty()) {
-                intent.action = null // consume to prevent re-processing
+                intent.action = null
                 navController?.navigate(Route.NewPost(Uri.encode(text)))
             }
         }
+        if (BuildConfig.INTENT_NEW_EVENT_ACTION == intent.action) {
+            handleNewEventIntent(intent)
+        }
+    }
+
+    override fun onPause() {
+        notificationManager?.onPause()
+        super.onPause()
+    }
+
+    private fun handleNewEventIntent(intent: Intent) {
+        intent.action = null
+        val msg = intent.getStringExtra(getString(R.string.notification_extra)) ?: return
+        try {
+            val post = App.instance.jsonMapper.decodeFromString<Post>(msg)
+            if (post.mid > 0) {
+                navController?.navigate(Route.Thread(post.mid))
+            }
+        } catch (_: Exception) { }
     }
 
     override fun onDestroy() {
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 6d0456fe..1da00650 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -17,6 +17,12 @@
 package com.juick.android.ui.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -48,6 +54,8 @@ fun AppNavigation(
     currentProfile: com.juick.api.model.User?,
     unreadCount: Int,
 ) {
+    var pendingTag by remember { mutableStateOf<String?>(null) }
+
     NavHost(navController = navController, startDestination = Route.Home) {
         composable<Route.Home> {
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
@@ -109,12 +117,19 @@ fun AppNavigation(
         }
 
         composable<Route.NewPost> { entry ->
-            val text = entry.toRoute<Route.NewPost>().text
-            NewPostScreen(initialText = text, onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+            val text = entry.toRoute<Route.NewPost>().text ?: ""
+            var initialText by remember { mutableStateOf(text) }
+            LaunchedEffect(pendingTag) {
+                pendingTag?.let { tag ->
+                    initialText = if (initialText.isNotEmpty()) "$initialText #$tag " else "#$tag "
+                    pendingTag = null
+                }
+            }
+            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
         }
 
         dialog<Route.Tags> {
-            TagsScreen(onTagSelected = { tag -> navController.previousBackStackEntry?.savedStateHandle?.set("tag", tag); navController.popBackStack() })
+            TagsScreen(onTagSelected = { tag -> pendingTag = tag; navController.popBackStack() })
         }
     }
 }
diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
index ab17e974..8b52befa 100644
--- a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -23,6 +23,8 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import com.juick.App
 import com.juick.R
@@ -43,12 +45,12 @@ fun NewPostScreen(
     onNavigateToThread: (Int) -> Unit,
     onDismiss: () -> Unit,
 ) {
-    var text by remember { mutableStateOf(initialText ?: "") }
+    var textFieldValue by remember(initialText) { mutableStateOf(TextFieldValue(initialText ?: "", TextRange((initialText?.length ?: 0)))) }
     val scope = rememberCoroutineScope()
     val messagePosted = remember { MutableStateFlow<Result<PostResponse>?>(null) }
     var isSending by remember { mutableStateOf(false) }
 
-    val sendEnabled = text.length >= 3 || attachmentUri != null
+    val sendEnabled = textFieldValue.text.length >= 3 || attachmentUri != null
 
     LaunchedEffect(messagePosted) {
         messagePosted.collect { response ->
@@ -87,8 +89,8 @@ fun NewPostScreen(
         Spacer(Modifier.height(16.dp))
 
         OutlinedTextField(
-            value = text,
-            onValueChange = { text = it },
+            value = textFieldValue,
+            onValueChange = { textFieldValue = it },
             placeholder = { Text(stringResource(R.string.Enter_a_message)) },
             modifier = Modifier
                 .fillMaxWidth()
@@ -123,7 +125,7 @@ fun NewPostScreen(
                     if (sendEnabled && !isSending) {
                         isSending = true
                         scope.launch {
-                            App.instance.sendMessage(scope, messagePosted, text, attachmentUri, attachmentMime)
+                            App.instance.sendMessage(scope, messagePosted, textFieldValue.text, attachmentUri, attachmentMime)
                         }
                     }
                 },

From eb7921f90190fcd9b36023deaa8d8124acb96948 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 16:25:08 +0300
Subject: [PATCH 15/57] fix: pagination, public route, tests, MainActivity
 features

- FeedScreen: accumulate posts instead of replacing on pagination
- Public route: Uris.top (popular=1) with TopAppBar + login button
- UrisTest: 6 URL building tests
- MainActivity: notification/updater/event handling
- Tag insertion: compose state + TextFieldValue cursor
---
 build.gradle                                  |  2 +
 .../com/juick/android/testing/UrisTest.kt     | 76 +++++++++++++++++++
 .../java/com/juick/android/MainActivity.kt    |  2 +-
 .../android/ui/navigation/AppNavigation.kt    | 31 +++++++-
 .../com/juick/android/ui/navigation/Routes.kt |  1 +
 .../android/ui/screens/feed/FeedScreen.kt     |  6 +-
 6 files changed, 115 insertions(+), 3 deletions(-)
 create mode 100644 src/androidTest/java/com/juick/android/testing/UrisTest.kt

diff --git a/build.gradle b/build.gradle
index b702249f..872430c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,6 +169,8 @@ dependencies {
     implementation libs.coil.compose
     implementation libs.coil.network.okhttp
     // Core library
+    testImplementation libs.junit
+
     androidTestImplementation libs.test.core.ktx
 
     // Assertions
diff --git a/src/androidTest/java/com/juick/android/testing/UrisTest.kt b/src/androidTest/java/com/juick/android/testing/UrisTest.kt
new file mode 100644
index 00000000..2bdd5b77
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/UrisTest.kt
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.testing
+
+import android.net.Uri
+import com.juick.android.Uris
+import com.juick.android.Utils
+import com.juick.android.Utils.replaceUriParameter
+import org.junit.Assert.*
+import org.junit.Test
+
+class UrisTest {
+    @Test
+    fun top_hasPopularParam() {
+        val uri = Uris.top
+        assertEquals("https", uri.scheme)
+        assertEquals("api.juick.com", uri.authority)
+        assertEquals("/messages", uri.path)
+        assertEquals("1", uri.getQueryParameter("popular"))
+    }
+
+    @Test
+    fun last_noQueryParams() {
+        val uri = Uris.last
+        assertEquals("/messages", uri.path)
+        assertNull(uri.getQueryParameter("popular"))
+    }
+
+    @Test
+    fun home_path() {
+        assertEquals("/home", Uris.home.path)
+    }
+
+    @Test
+    fun pagination_preservesPopular() {
+        val initial = Uris.top
+        val next = Utils.buildUrl(initial).build()
+            .replaceUriParameter("before_mid", "12345")
+            .replaceUriParameter("ts", "999")
+        assertEquals("1", next.getQueryParameter("popular"))
+        assertEquals("12345", next.getQueryParameter("before_mid"))
+        assertEquals("999", next.getQueryParameter("ts"))
+        assertEquals("/messages", next.path)
+    }
+
+    @Test
+    fun pagination_addsBeforeMid() {
+        val initial = Uris.last
+        val next = Utils.buildUrl(initial).build()
+            .replaceUriParameter("before_mid", "12345")
+        assertEquals("12345", next.getQueryParameter("before_mid"))
+        assertEquals("/messages", next.path)
+    }
+
+    @Test
+    fun replaceUriParameter_updatesExisting() {
+        val uri = Uri.parse("https://api.juick.com/messages?before_mid=111")
+        val updated = uri.replaceUriParameter("before_mid", "999")
+        assertEquals("999", updated.getQueryParameter("before_mid"))
+        assertEquals("/messages", updated.path)
+    }
+}
diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index b5e70423..30b7b356 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -214,7 +214,7 @@ class MainActivity : ComponentActivity() {
                     if (App.instance.isAuthenticated) navController.navigate(Route.NewPost()) else showLogin()
                 }
 
-                AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick, onFabClick, profile, unreadCount)
+                AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick, onFabClick, profile, unreadCount, App.instance.isAuthenticated)
 
                 LaunchedEffect(Unit) {
                     initialUri?.let { processUri(it); initialUri = null }
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 1da00650..e13f39c2 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -16,6 +16,16 @@
  */
 package com.juick.android.ui.navigation
 
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -23,6 +33,9 @@ import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.juick.R
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -41,6 +54,7 @@ import com.juick.android.ui.AppScaffold
 import com.juick.android.Uris
 import com.juick.api.model.Post
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppNavigation(
     navController: NavHostController,
@@ -53,10 +67,25 @@ fun AppNavigation(
     onFabClick: () -> Unit,
     currentProfile: com.juick.api.model.User?,
     unreadCount: Int,
+    isAuthenticated: Boolean,
 ) {
     var pendingTag by remember { mutableStateOf<String?>(null) }
 
-    NavHost(navController = navController, startDestination = Route.Home) {
+    NavHost(navController = navController, startDestination = if (isAuthenticated) Route.Home else Route.Public) {
+        composable<Route.Public> {
+            Column(Modifier.fillMaxSize()) {
+                TopAppBar(
+                    title = { Text(stringResource(R.string.Juick)) },
+                    colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface),
+                    actions = {
+                        TextButton(onClick = onSignInClick) { Text(stringResource(R.string.login)) }
+                    },
+                )
+                Box(Modifier.fillMaxSize().padding()) {
+                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                }
+            }
+        }
         composable<Route.Home> {
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
                 FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
diff --git a/src/main/java/com/juick/android/ui/navigation/Routes.kt b/src/main/java/com/juick/android/ui/navigation/Routes.kt
index 417be485..e9404359 100644
--- a/src/main/java/com/juick/android/ui/navigation/Routes.kt
+++ b/src/main/java/com/juick/android/ui/navigation/Routes.kt
@@ -19,6 +19,7 @@ package com.juick.android.ui.navigation
 import kotlinx.serialization.Serializable
 
 sealed interface Route {
+    @Serializable data object Public : Route
     @Serializable data object Home : Route
     @Serializable data object Discover : Route
     @Serializable data object Chats : Route
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 3781f793..66025c65 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -67,6 +67,7 @@ fun FeedScreen(
 ) {
     var apiUrl by remember { mutableStateOf(Uri.EMPTY) }
     var feedState by remember { mutableStateOf<Result<List<Post>>?>(null) }
+    var allPosts by remember { mutableStateOf<List<Post>>(emptyList()) }
     val listState = rememberLazyListState()
     var isRefreshing by remember { mutableStateOf(false) }
     var firstPage by remember { mutableStateOf(true) }
@@ -78,7 +79,10 @@ fun FeedScreen(
     LaunchedEffect(apiUrl) {
         if (apiUrl != Uri.EMPTY) {
             try {
-                feedState = Result.success(withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) })
+                val posts = withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) }
+                if (firstPage) allPosts = posts
+                else allPosts = allPosts + posts
+                feedState = Result.success(allPosts)
             } catch (e: CancellationException) { throw e } catch (e: Exception) { feedState = Result.failure(e) }
         }
     }

From ff2bc9acd405ce4a356b251ef6b6b9f04f375bf0 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 16:47:31 +0300
Subject: [PATCH 16/57] test: update MainScreenTest for unauthenticated Public
 route

---
 .../juick/android/testing/MainScreenTest.kt   | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
index a245738f..dfac7c0d 100644
--- a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -32,32 +32,17 @@ class MainScreenTest {
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
     @Test
-    fun mainScreen_showsBottomNavigation_withThreeTabs() {
+    fun mainScreen_publicFeed_showsJuickTitle() {
+        // Unauthenticated — Public route with "Juick" title
         composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Subscriptions)
-        ).assertIsDisplayed()
-
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Discover)
-        ).assertIsDisplayed()
-
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.PMs)
-        ).assertIsDisplayed()
-    }
-
-    @Test
-    fun mainScreen_showsSearchButton_inTopAppBar() {
-        composeTestRule.onNodeWithContentDescription(
-            composeTestRule.activity.getString(R.string.search)
+            composeTestRule.activity.getString(R.string.Juick)
         ).assertIsDisplayed()
     }
 
     @Test
-    fun mainScreen_defaultStartDestination_isHome() {
-        // Home is the start destination — title shows "Juick"
+    fun mainScreen_publicFeed_showsLoginButton() {
         composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Juick)
+            composeTestRule.activity.getString(R.string.login)
         ).assertIsDisplayed()
     }
 }

From 4ad3f7f76a2e28b917fb90e6f17ac2861b2ac281 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 18:03:20 +0300
Subject: [PATCH 17/57] test: fix MainScreenTest for Public route, add
 notification grant, fix NotificationManager crash

- Grant POST_NOTIFICATIONS before tests to avoid permission dialog
- Fix free NotificationManager onPause crash when events not initialized
- Test public feed shows Juick title + login button
---
 .../com/juick/android/testing/MainScreenTest.kt   | 15 +++++++++++----
 .../java/com/juick/android/NotificationManager.kt |  4 ++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
index dfac7c0d..dd96a25b 100644
--- a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -19,10 +19,11 @@ package com.juick.android.testing
 
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
+import androidx.test.platform.app.InstrumentationRegistry
 import com.juick.R
 import com.juick.android.MainActivity
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
@@ -31,16 +32,22 @@ class MainScreenTest {
     @get:Rule
     val composeTestRule = createAndroidComposeRule<MainActivity>()
 
+    @Before
+    fun grantPermissions() {
+        InstrumentationRegistry.getInstrumentation().uiAutomation.executeShellCommand(
+            "pm grant ${composeTestRule.activity.packageName} android.permission.POST_NOTIFICATIONS"
+        )
+    }
+
     @Test
-    fun mainScreen_publicFeed_showsJuickTitle() {
-        // Unauthenticated — Public route with "Juick" title
+    fun publicFeed_showsJuickTitle() {
         composeTestRule.onNodeWithText(
             composeTestRule.activity.getString(R.string.Juick)
         ).assertIsDisplayed()
     }
 
     @Test
-    fun mainScreen_publicFeed_showsLoginButton() {
+    fun publicFeed_showsLoginButton() {
         composeTestRule.onNodeWithText(
             composeTestRule.activity.getString(R.string.login)
         ).assertIsDisplayed()
diff --git a/src/free/java/com/juick/android/NotificationManager.kt b/src/free/java/com/juick/android/NotificationManager.kt
index 8d29adea..fad1d804 100644
--- a/src/free/java/com/juick/android/NotificationManager.kt
+++ b/src/free/java/com/juick/android/NotificationManager.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2025, Juick
+ * Copyright (C) 2008-2026, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -91,7 +91,7 @@ class NotificationManager {
     }
 
     fun onPause() {
-        events.close()
+        if (::events.isInitialized) events.close()
     }
 
     companion object {

From ac92532d970a6ca4990fb36b4d983c5f52c3626b Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 18:11:16 +0300
Subject: [PATCH 18/57] test: public feed + authenticated bottom tab tests with
 assumeTrue

- public feed: Juick title + login button
- authenticated: 3 bottom tabs + search button (skip if no auth)
- Grant POST_NOTIFICATIONS before tests
- Fix NotificationManager onPause crash on uninitialized events
---
 .../juick/android/testing/MainScreenTest.kt   | 26 +++++++++++++++++++
 .../android/ui/navigation/AppNavigation.kt    |  6 +++++
 2 files changed, 32 insertions(+)

diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
index dd96a25b..9d0e3193 100644
--- a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -19,10 +19,14 @@ package com.juick.android.testing
 
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.platform.app.InstrumentationRegistry
+import com.juick.App
 import com.juick.R
 import com.juick.android.MainActivity
+import com.juick.android.service.isAuthenticated
+import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -52,4 +56,26 @@ class MainScreenTest {
             composeTestRule.activity.getString(R.string.login)
         ).assertIsDisplayed()
     }
+
+    @Test
+    fun authenticated_showsBottomNavigation_withThreeTabs() {
+        assumeTrue(App.instance.isAuthenticated)
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Subscriptions)
+        ).assertIsDisplayed()
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.Discover)
+        ).assertIsDisplayed()
+        composeTestRule.onNodeWithText(
+            composeTestRule.activity.getString(R.string.PMs)
+        ).assertIsDisplayed()
+    }
+
+    @Test
+    fun authenticated_showsSearchButton_inTopAppBar() {
+        assumeTrue(App.instance.isAuthenticated)
+        composeTestRule.onNodeWithContentDescription(
+            composeTestRule.activity.getString(R.string.search)
+        ).assertIsDisplayed()
+    }
 }
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index e13f39c2..3b5ed47a 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -71,6 +71,12 @@ fun AppNavigation(
 ) {
     var pendingTag by remember { mutableStateOf<String?>(null) }
 
+    LaunchedEffect(isAuthenticated) {
+        if (isAuthenticated) {
+            navController.navigate(Route.Home) { popUpTo(0) { inclusive = true } }
+        }
+    }
+
     NavHost(navController = navController, startDestination = if (isAuthenticated) Route.Home else Route.Public) {
         composable<Route.Public> {
             Column(Modifier.fillMaxSize()) {

From ad6a7f94309fab83bd50ff3c2597ae1fc37994f0 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 18:23:14 +0300
Subject: [PATCH 19/57] test: full coverage - public feed (2 tests) +
 authenticated (2 tests)

Split into two classes: MainScreenTest (no auth) and
AuthenticatedMainScreenTest (@BeforeClass creates account).
All 4 tests execute, 0 skipped.
---
 .../testing/AuthenticatedMainScreenTest.kt    | 77 +++++++++++++++++++
 .../juick/android/testing/MainScreenTest.kt   | 41 ++--------
 2 files changed, 84 insertions(+), 34 deletions(-)
 create mode 100644 src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt

diff --git a/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt
new file mode 100644
index 00000000..c53d59ed
--- /dev/null
+++ b/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.testing
+
+import android.accounts.Account
+import android.accounts.AccountManager
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithContentDescription
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.platform.app.InstrumentationRegistry
+import com.juick.R
+import com.juick.android.MainActivity
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import org.junit.Rule
+import org.junit.Test
+
+class AuthenticatedMainScreenTest {
+
+    companion object {
+        @JvmStatic
+        @BeforeClass
+        fun setupAccount() {
+            val ctx = InstrumentationRegistry.getInstrumentation().targetContext
+            val am = AccountManager.get(ctx)
+            am.addAccountExplicitly(
+                Account("test", ctx.getString(R.string.applicationId)),
+                "test_hash", null
+            )
+            InstrumentationRegistry.getInstrumentation().uiAutomation.executeShellCommand(
+                "pm grant ${ctx.packageName} android.permission.POST_NOTIFICATIONS"
+            )
+        }
+
+        @JvmStatic
+        @AfterClass
+        fun cleanup() {
+            val ctx = InstrumentationRegistry.getInstrumentation().targetContext
+            AccountManager.get(ctx).getAccountsByType(ctx.getString(R.string.applicationId)).forEach {
+                AccountManager.get(ctx).removeAccountExplicitly(it)
+            }
+        }
+    }
+
+    @get:Rule
+    val composeTestRule = createAndroidComposeRule<MainActivity>()
+
+    @Test
+    fun showsBottomNavigation_withThreeTabs() {
+        val s = composeTestRule.activity
+        composeTestRule.onNodeWithText(s.getString(R.string.Subscriptions)).assertIsDisplayed()
+        composeTestRule.onNodeWithText(s.getString(R.string.Discover)).assertIsDisplayed()
+        composeTestRule.onNodeWithText(s.getString(R.string.PMs)).assertIsDisplayed()
+    }
+
+    @Test
+    fun showsSearchButton_inTopAppBar() {
+        composeTestRule.onNodeWithContentDescription(
+            composeTestRule.activity.getString(R.string.search)
+        ).assertIsDisplayed()
+    }
+}
diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
index 9d0e3193..f109164d 100644
--- a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -14,19 +14,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 package com.juick.android.testing
 
+import android.accounts.Account
+import android.accounts.AccountManager
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.test.platform.app.InstrumentationRegistry
-import com.juick.App
 import com.juick.R
 import com.juick.android.MainActivity
-import com.juick.android.service.isAuthenticated
-import org.junit.Assume.assumeTrue
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -44,38 +43,12 @@ class MainScreenTest {
     }
 
     @Test
-    fun publicFeed_showsJuickTitle() {
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Juick)
-        ).assertIsDisplayed()
-    }
-
-    @Test
-    fun publicFeed_showsLoginButton() {
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.login)
-        ).assertIsDisplayed()
-    }
-
-    @Test
-    fun authenticated_showsBottomNavigation_withThreeTabs() {
-        assumeTrue(App.instance.isAuthenticated)
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Subscriptions)
-        ).assertIsDisplayed()
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.Discover)
-        ).assertIsDisplayed()
-        composeTestRule.onNodeWithText(
-            composeTestRule.activity.getString(R.string.PMs)
-        ).assertIsDisplayed()
+    fun showsJuickTitle() {
+        composeTestRule.onNodeWithText(composeTestRule.activity.getString(R.string.Juick)).assertIsDisplayed()
     }
 
     @Test
-    fun authenticated_showsSearchButton_inTopAppBar() {
-        assumeTrue(App.instance.isAuthenticated)
-        composeTestRule.onNodeWithContentDescription(
-            composeTestRule.activity.getString(R.string.search)
-        ).assertIsDisplayed()
+    fun showsLoginButton() {
+        composeTestRule.onNodeWithText(composeTestRule.activity.getString(R.string.login)).assertIsDisplayed()
     }
 }

From e61641c555dd805c8c0de883eb0d67ef7a8a2ad8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:13:51 +0300
Subject: [PATCH 20/57] fix: ChatScreen real-time message receiving via
 App.instance.messages flow

---
 .../java/com/juick/android/ui/screens/chat/ChatScreen.kt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index f0d69af5..b2e017fd 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -60,6 +60,15 @@ fun ChatScreen(
         if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1)
     }
 
+    LaunchedEffect(uname) {
+        App.instance.messages.collect { newMessages ->
+            newMessages.filter { it.user.uname == uname || it.to?.uname == uname }.forEach { msg ->
+                val current = messagesState?.getOrNull() ?: emptyList()
+                messagesState = Result.success(current + msg)
+            }
+        }
+    }
+
     Column(modifier = Modifier.fillMaxSize()) {
         LazyColumn(
             state = listState,

From 2f765a67887df3a2e9780eae53b3eddcfd6f22e5 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:15:27 +0300
Subject: [PATCH 21/57] fix: ThreadScreen reply format #mid, auth check,
 markRead

---
 .../com/juick/android/ui/screens/thread/ThreadScreen.kt     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index cf06d833..a1341932 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.juick.App
 import com.juick.R
+import com.juick.android.service.isAuthenticated
 import com.juick.android.ui.screens.feed.PostCard
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
@@ -63,6 +64,7 @@ fun ThreadScreen(
         try { posts = App.instance.api.thread(mid) } catch (_: Exception) { loadError = true }
         isLoading = false
         if (scrollToEnd && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
+        posts.lastOrNull()?.let { App.instance.api.markRead(it.mid, it.rid) }
     }
 
     val newMessages by App.instance.messages.collectAsStateWithLifecycle()
@@ -125,11 +127,11 @@ fun ThreadScreen(
                     Spacer(Modifier.width(8.dp))
                     IconButton(
                         onClick = {
-                            if (replyText.isNotBlank()) {
+                            if (replyText.isNotBlank() && App.instance.isAuthenticated) {
                                 scope.launch {
                                     try {
                                         val receiver = MutableStateFlow<Result<PostResponse>?>(null)
-                                        App.instance.sendMessage(scope, receiver, replyText)
+                                        App.instance.sendMessage(scope, receiver, "#$mid $replyText")
                                         replyText = ""
                                     } catch (_: Exception) {}
                                 }

From bcabc576f783180769148e81c95718565a8802a8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:22:07 +0300
Subject: [PATCH 22/57] fix: ChatsListScreen pull-to-refresh

---
 .../ui/screens/chats/ChatsListScreen.kt       | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
index b40115fa..0b0cf071 100644
--- a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.*
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -46,25 +47,33 @@ fun ChatsListScreen(
     onNavigateToAuth: () -> Unit,
 ) {
     var chatsState by remember { mutableStateOf<Result<List<Chat>>?>(null) }
+    var isRefreshing by remember { mutableStateOf(false) }
+    var refreshTrigger by remember { mutableStateOf(0) }
 
-    LaunchedEffect(Unit) {
+    LaunchedEffect(Unit, refreshTrigger) {
         if (App.instance.isAuthenticated) {
             try {
                 chatsState = Result.success(withContext(Dispatchers.IO) { App.instance.api.groupsPms(10).pms })
             } catch (e: CancellationException) { throw e } catch (e: Exception) { chatsState = Result.failure(e) }
+            isRefreshing = false
         } else {
             onNavigateToAuth()
         }
     }
 
-    when (val result = chatsState) {
-        null -> {
-            Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
-                CircularProgressIndicator()
+    PullToRefreshBox(
+        isRefreshing = isRefreshing,
+        onRefresh = { isRefreshing = true; refreshTrigger++ },
+        modifier = Modifier.fillMaxSize(),
+    ) {
+        when (val result = chatsState) {
+            null -> {
+                Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+                    CircularProgressIndicator()
+                }
             }
-        }
 
-        else -> {
+            else -> {
             result.fold(
                 onSuccess = { chats ->
                     if (chats.isEmpty()) {
@@ -91,6 +100,7 @@ fun ChatsListScreen(
                     }
                 },
             )
+            }
         }
     }
 }

From f8300436d92b00b23a09185bb06f4b9a7f973dfc Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:24:25 +0300
Subject: [PATCH 23/57] fix: share intent EXTRA_STREAM support, NewPost uri
 param

Add uri parameter to Route.NewPost for attachment sharing.
Handle EXTRA_STREAM in onResume for shared images/files.
---
 src/main/java/com/juick/android/MainActivity.kt         | 6 ++++--
 src/main/java/com/juick/android/ui/navigation/Routes.kt | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 30b7b356..08dac205 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -246,9 +246,11 @@ class MainActivity : ComponentActivity() {
         val intent = intent
         if (Intent.ACTION_SEND == intent.action) {
             val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
-            if (text.isNotEmpty()) {
+            val stream = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
+            if (text.isNotEmpty() || stream != null) {
                 intent.action = null
-                navController?.navigate(Route.NewPost(Uri.encode(text)))
+                val uriParam = stream?.let { Uri.encode(it.toString()) } ?: ""
+                navController?.navigate(Route.NewPost(text = Uri.encode(text), uri = uriParam))
             }
         }
         if (BuildConfig.INTENT_NEW_EVENT_ACTION == intent.action) {
diff --git a/src/main/java/com/juick/android/ui/navigation/Routes.kt b/src/main/java/com/juick/android/ui/navigation/Routes.kt
index e9404359..2736adc4 100644
--- a/src/main/java/com/juick/android/ui/navigation/Routes.kt
+++ b/src/main/java/com/juick/android/ui/navigation/Routes.kt
@@ -28,7 +28,7 @@ sealed interface Route {
     @Serializable data class Blog(val uname: String) : Route
     @Serializable data class Chat(val uname: String, val uid: Int) : Route
     @Serializable data class Search(val query: String? = null) : Route
-    @Serializable data class NewPost(val text: String? = null) : Route
+    @Serializable data class NewPost(val text: String? = null, val uri: String? = null) : Route
     @Serializable data object Tags : Route
     @Serializable data object NoAuth : Route
 }

From ac1228b97f4701ed13840c840e585f22b39fd0cd Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:25:48 +0300
Subject: [PATCH 24/57] fix: keyboard hide after send in ChatScreen

---
 src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index b2e017fd..35a5bfcd 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -25,9 +25,9 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.juick.App
 import com.juick.R
 import com.juick.android.ui.screens.feed.buildUrlPositions
@@ -49,6 +49,7 @@ fun ChatScreen(
     var inputText by remember { mutableStateOf("") }
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
 
     LaunchedEffect(uname) {
         try {
@@ -105,6 +106,7 @@ fun ChatScreen(
                         try {
                             App.instance.api.postPm(uname, inputText)
                             inputText = ""
+                            focusManager.clearFocus()
                         } catch (_: Exception) { }
                     }
                 }

From bb75dd52707821649bfbd8a1eec1b4d0934662a6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:30:47 +0300
Subject: [PATCH 25/57] feat: NewPostScreen image attachment
 (gallery/camera/crop/preview)

Built-in picker with gallery/camera launchers, CropSheet
integration, attachment indicator. Removed external callback params.
---
 .../android/ui/navigation/AppNavigation.kt    |   2 +-
 .../android/ui/screens/post/NewPostScreen.kt  | 120 +++++++++++-------
 2 files changed, 75 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 3b5ed47a..e0b02ab4 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -160,7 +160,7 @@ fun AppNavigation(
                     pendingTag = null
                 }
             }
-            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onAttachClick = {}, onAttachmentRemoved = {}, attachmentUri = null, hasAttachment = false, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
         }
 
         dialog<Route.Tags> {
diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
index 8b52befa..7e3b1d36 100644
--- a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -17,38 +17,44 @@
 package com.juick.android.ui.screens.post
 
 import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
+import androidx.core.content.FileProvider
 import com.juick.App
 import com.juick.R
+import com.juick.android.ui.widget.CropSheet
 import com.juick.api.model.PostResponse
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import java.io.File
 
 @Composable
 fun NewPostScreen(
     initialText: String? = null,
-    initialUri: String? = null,
     onTagsClick: () -> Unit,
-    onAttachClick: () -> Unit,
-    onAttachmentRemoved: () -> Unit,
-    attachmentUri: Uri?,
-    attachmentMime: String? = null,
-    hasAttachment: Boolean,
     onNavigateToThread: (Int) -> Unit,
     onDismiss: () -> Unit,
 ) {
+    val context = LocalContext.current
     var textFieldValue by remember(initialText) { mutableStateOf(TextFieldValue(initialText ?: "", TextRange((initialText?.length ?: 0)))) }
     val scope = rememberCoroutineScope()
     val messagePosted = remember { MutableStateFlow<Result<PostResponse>?>(null) }
     var isSending by remember { mutableStateOf(false) }
+    var attachmentUri by remember { mutableStateOf<Uri?>(null) }
+    var attachmentMime by remember { mutableStateOf<String?>(null) }
+    var showSourcePicker by remember { mutableStateOf(false) }
+    var showCrop by remember { mutableStateOf<Uri?>(null) }
+    var cameraUri by remember { mutableStateOf<Uri?>(null) }
 
     val sendEnabled = textFieldValue.text.length >= 3 || attachmentUri != null
 
@@ -58,32 +64,68 @@ fun NewPostScreen(
                 response.fold(
                     onSuccess = { postResponse ->
                         isSending = false
-                        postResponse.newMessage?.let { post ->
-                            onNavigateToThread(post.mid)
-                        }
-                    },
-                    onFailure = {
-                        isSending = false
+                        postResponse.newMessage?.let { post -> onNavigateToThread(post.mid) }
                     },
+                    onFailure = { isSending = false },
                 )
                 messagePosted.value = null
             }
         }
     }
 
+    val galleryLauncher = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
+        uri?.let { showCrop = it }
+    }
+
+    val cameraLauncher = rememberLauncherForActivityResult(ActivityResultContracts.TakePicture()) { success ->
+        if (success) cameraUri?.let { showCrop = it }
+    }
+
+    fun launchCamera() {
+        val file = File(context.filesDir, "camera_${System.currentTimeMillis()}.jpg")
+        val uri = FileProvider.getUriForFile(context, "${context.packageName}.provider", file)
+        cameraUri = uri
+        cameraLauncher.launch(uri)
+    }
+
+    showCrop?.let { sourceUri ->
+        CropSheet(
+            imageUri = sourceUri,
+            onCropResult = { croppedUri ->
+                showCrop = null
+                if (croppedUri != null) {
+                    attachmentUri = croppedUri
+                    attachmentMime = "image/jpeg"
+                }
+            },
+            onDismiss = { showCrop = null },
+        )
+    }
+
+    if (showSourcePicker) {
+        AlertDialog(
+            onDismissRequest = { showSourcePicker = false },
+            title = { Text("") },
+            text = {
+                Column {
+                    TextButton(onClick = { showSourcePicker = false; galleryLauncher.launch("image/*") }) {
+                        Text(stringResource(R.string.gallery))
+                    }
+                    TextButton(onClick = { showSourcePicker = false; launchCamera() }) {
+                        Text(stringResource(R.string.camera))
+                    }
+                }
+            },
+            confirmButton = {},
+            dismissButton = { TextButton(onClick = { showSourcePicker = false }) { Text(stringResource(R.string.Cancel)) } },
+        )
+    }
+
     Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-        ) {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.Cancel))
-            }
-            Text(
-                stringResource(R.string.New_message),
-                style = MaterialTheme.typography.titleMedium,
-            )
-            Spacer(Modifier.width(64.dp)) // balance
+        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
+            TextButton(onClick = onDismiss) { Text(stringResource(R.string.Cancel)) }
+            Text(stringResource(R.string.New_message), style = MaterialTheme.typography.titleMedium)
+            Spacer(Modifier.width(64.dp))
         }
 
         Spacer(Modifier.height(16.dp))
@@ -92,33 +134,21 @@ fun NewPostScreen(
             value = textFieldValue,
             onValueChange = { textFieldValue = it },
             placeholder = { Text(stringResource(R.string.Enter_a_message)) },
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(1f),
+            modifier = Modifier.fillMaxWidth().weight(1f),
             minLines = 7,
         )
 
-        if (isSending) {
-            LinearProgressIndicator(Modifier.fillMaxWidth())
-        }
+        if (isSending) LinearProgressIndicator(Modifier.fillMaxWidth())
 
         Spacer(Modifier.height(8.dp))
 
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceEvenly,
-        ) {
-            IconButton(onClick = onTagsClick) {
-                Text("#", style = MaterialTheme.typography.titleMedium)
-            }
+        Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceEvenly) {
+            IconButton(onClick = onTagsClick) { Text("#", style = MaterialTheme.typography.titleMedium) }
             IconButton(onClick = {
-                if (hasAttachment) {
-                    onAttachmentRemoved()
-                } else {
-                    onAttachClick()
-                }
+                if (attachmentUri != null) { attachmentUri = null; attachmentMime = null }
+                else showSourcePicker = true
             }) {
-                Text("📎", style = MaterialTheme.typography.titleMedium)
+                Text(if (attachmentUri != null) "📎✓" else "📎", style = MaterialTheme.typography.titleMedium)
             }
             IconButton(
                 onClick = {
@@ -130,9 +160,7 @@ fun NewPostScreen(
                     }
                 },
                 enabled = sendEnabled && !isSending,
-            ) {
-                Text(stringResource(R.string.Send))
-            }
+            ) { Text(stringResource(R.string.Send)) }
         }
     }
 }

From 1d47414dab85a33c719833f973c5a18d816b412c Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:34:39 +0300
Subject: [PATCH 26/57] feat: ThreadScreen reply image attachment (gallery
 picker)

---
 .../android/ui/screens/thread/ThreadScreen.kt | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index a1341932..104d09d6 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -16,6 +16,9 @@
  */
 package com.juick.android.ui.screens.thread
 
+import android.net.Uri
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -28,6 +31,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -56,9 +60,16 @@ fun ThreadScreen(
     var replyText by remember { mutableStateOf("") }
     var isLoading by remember { mutableStateOf(true) }
     var loadError by remember { mutableStateOf(false) }
+    var replyAttachmentUri by remember { mutableStateOf<Uri?>(null) }
+    var replyAttachmentMime by remember { mutableStateOf<String?>(null) }
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
     val colors = MaterialTheme.colorScheme
+    val context = LocalContext.current
+
+    val galleryLauncher = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
+        uri?.let { replyAttachmentUri = it; replyAttachmentMime = "image/jpeg" }
+    }
 
     LaunchedEffect(mid) {
         try { posts = App.instance.api.thread(mid) } catch (_: Exception) { loadError = true }
@@ -124,15 +135,24 @@ fun ThreadScreen(
                         modifier = Modifier.weight(1f),
                         maxLines = 3,
                     )
-                    Spacer(Modifier.width(8.dp))
+                    Spacer(Modifier.width(4.dp))
+                    IconButton(onClick = {
+                        if (replyAttachmentUri != null) { replyAttachmentUri = null; replyAttachmentMime = null }
+                        else galleryLauncher.launch("image/*")
+                    }) {
+                        Text(if (replyAttachmentUri != null) "📎✓" else "📎", style = MaterialTheme.typography.bodyMedium)
+                    }
+                    Spacer(Modifier.width(4.dp))
                     IconButton(
                         onClick = {
-                            if (replyText.isNotBlank() && App.instance.isAuthenticated) {
+                            if ((replyText.isNotBlank() || replyAttachmentUri != null) && App.instance.isAuthenticated) {
                                 scope.launch {
                                     try {
                                         val receiver = MutableStateFlow<Result<PostResponse>?>(null)
-                                        App.instance.sendMessage(scope, receiver, "#$mid $replyText")
+                                        App.instance.sendMessage(scope, receiver, "#$mid $replyText", replyAttachmentUri, replyAttachmentMime)
                                         replyText = ""
+                                        replyAttachmentUri = null
+                                        replyAttachmentMime = null
                                     } catch (_: Exception) {}
                                 }
                             }

From 387739748f81b2e1e3a44f1e3a6d8d049403f956 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:40:52 +0300
Subject: [PATCH 27/57] feat: FeedScreen new posts indicator via
 App.instance.messages flow

---
 .../android/ui/screens/feed/FeedScreen.kt     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 66025c65..10d6b1e1 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -20,11 +20,13 @@ import android.net.Uri
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
@@ -37,6 +39,7 @@ import androidx.compose.runtime.derivedStateOf
 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.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -49,6 +52,7 @@ import com.juick.api.model.Post
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.withContext
 
@@ -71,6 +75,23 @@ fun FeedScreen(
     val listState = rememberLazyListState()
     var isRefreshing by remember { mutableStateOf(false) }
     var firstPage by remember { mutableStateOf(true) }
+    var newPostsCount by remember { mutableStateOf(0) }
+    var maxMid by remember { mutableStateOf(0) }
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(allPosts) {
+        val posts = allPosts
+        if (posts.isNotEmpty()) maxMid = maxOf(maxMid, posts.maxOf { it.mid })
+    }
+
+    LaunchedEffect(Unit) {
+        App.instance.messages.collect { newMessages ->
+            if (maxMid > 0) {
+                val newCount = newMessages.count { it.mid > maxMid && it.rid == 0 }
+                if (newCount > 0) newPostsCount += newCount
+            }
+        }
+    }
 
     LaunchedEffect(initialUrl) {
         if (apiUrl == Uri.EMPTY) apiUrl = initialUrl
@@ -136,6 +157,19 @@ fun FeedScreen(
                 result.fold(
                     onSuccess = { posts ->
                         LazyColumn(state = listState) {
+                            if (newPostsCount > 0 && !firstPage) {
+                                item(key = "new_posts") {
+                                    Button(onClick = {
+                                        newPostsCount = 0
+                                        isRefreshing = true
+                                        firstPage = true
+                                        apiUrl = Utils.buildUrl(initialUrl).build().replaceUriParameter("before_mid", "").replaceUriParameter("ts", "${System.currentTimeMillis()}")
+                                        scope.launch { listState.animateScrollToItem(0) }
+                                    }, modifier = Modifier.fillMaxWidth().padding(8.dp)) {
+                                        Text("$newPostsCount new posts")
+                                    }
+                                }
+                            }
                             if (showProfileHeader) {
                                 item(key = "profile_header") {
                                     profileHeader()

From 03522891b3fbc8c3db45ea6572e27605769dfe0e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:44:35 +0300
Subject: [PATCH 28/57] fix: FeedScreen rememberSaveable for state preservation

---
 .../java/com/juick/android/ui/screens/feed/FeedScreen.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 10d6b1e1..f1780c4e 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
@@ -73,8 +74,8 @@ fun FeedScreen(
     var feedState by remember { mutableStateOf<Result<List<Post>>?>(null) }
     var allPosts by remember { mutableStateOf<List<Post>>(emptyList()) }
     val listState = rememberLazyListState()
-    var isRefreshing by remember { mutableStateOf(false) }
-    var firstPage by remember { mutableStateOf(true) }
+    var isRefreshing by rememberSaveable { mutableStateOf(false) }
+    var firstPage by rememberSaveable { mutableStateOf(true) }
     var newPostsCount by remember { mutableStateOf(0) }
     var maxMid by remember { mutableStateOf(0) }
     val scope = rememberCoroutineScope()

From 37c99b73bc21b0f0e3a7c4266a6374a3152c9616 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 21:53:13 +0300
Subject: [PATCH 29/57] feat: PostCard DropdownMenu for Share

---
 .../juick/android/ui/screens/feed/PostCard.kt    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 8e74b6dc..5458ce32 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -18,6 +18,7 @@ package com.juick.android.ui.screens.feed
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -30,6 +31,8 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -37,7 +40,10 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 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.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -70,6 +76,7 @@ fun PostCard(
     modifier: Modifier = Modifier,
 ) {
     val colors = MaterialTheme.colorScheme
+    var menuExpanded by remember { mutableStateOf(false) }
 
     Surface(
         modifier = modifier.fillMaxWidth().clickable { onPostClick() },
@@ -83,8 +90,13 @@ fun PostCard(
                 Text(post.user.uname, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold, color = colors.primary, modifier = Modifier.clickable { onUserClick() })
                 Spacer(Modifier.weight(1f))
                 Text(MessageUtils.formatMessageTimestamp(post), style = MaterialTheme.typography.labelSmall, color = colors.onSurfaceVariant)
-                IconButton(onClick = onMenuClick, modifier = Modifier.size(24.dp)) {
-                    Icon(Icons.Default.MoreVert, null, Modifier.size(16.dp), tint = colors.onSurfaceVariant)
+                Box {
+                    IconButton(onClick = { menuExpanded = true }, modifier = Modifier.size(24.dp)) {
+                        Icon(Icons.Default.MoreVert, null, Modifier.size(16.dp), tint = colors.onSurfaceVariant)
+                    }
+                    DropdownMenu(expanded = menuExpanded, onDismissRequest = { menuExpanded = false }) {
+                        DropdownMenuItem(text = { Text("Share") }, onClick = { menuExpanded = false; onMenuClick() })
+                    }
                 }
             }
 

From 17007b6457dc00277a869a1dc3cad2d0e63ee3d6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:18:00 +0300
Subject: [PATCH 30/57] fix: thread dialog fullscreen, reply-to indicator, hide
 counters on replies

---
 .../android/ui/navigation/AppNavigation.kt    |  5 ++++-
 .../juick/android/ui/screens/feed/PostCard.kt | 19 +++++++++++--------
 .../android/ui/screens/thread/ThreadScreen.kt | 19 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index e0b02ab4..c9b6d6fc 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -50,6 +50,7 @@ import com.juick.android.ui.screens.post.NewPostScreen
 import com.juick.android.ui.screens.search.SearchScreen
 import com.juick.android.ui.screens.tags.TagsScreen
 import com.juick.android.ui.screens.thread.ThreadScreen
+import androidx.compose.ui.window.DialogProperties
 import com.juick.android.ui.AppScaffold
 import com.juick.android.Uris
 import com.juick.api.model.Post
@@ -116,7 +117,9 @@ fun AppNavigation(
             }
         }
 
-        composable<Route.Thread> { entry ->
+        dialog<Route.Thread>(
+            dialogProperties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
+        ) { entry ->
             val route = entry.toRoute<Route.Thread>()
             ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() })
         }
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 5458ce32..099c9652 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -73,6 +73,7 @@ fun PostCard(
     onMenuClick: () -> Unit,
     onLikeClick: () -> Unit,
     onLinkClick: (String) -> Unit,
+    showCounters: Boolean = true,
     modifier: Modifier = Modifier,
 ) {
     val colors = MaterialTheme.colorScheme
@@ -143,14 +144,16 @@ fun PostCard(
             }
 
             Spacer(Modifier.height(12.dp))
-            HorizontalDivider(color = colors.outlineVariant, thickness = 0.5.dp)
-            Spacer(Modifier.height(8.dp))
-            Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.CenterVertically) {
-                val likeColor = if (post.liked) colors.tertiary else colors.onSurfaceVariant
-                Icon(painterResource(R.drawable.ic_ei_heart), null, Modifier.size(18.dp).clickable { onLikeClick() }, tint = likeColor)
-                Text("${post.likes}", style = MaterialTheme.typography.labelSmall, color = likeColor)
-                Icon(painterResource(R.drawable.ic_ei_comment), null, Modifier.size(18.dp), tint = colors.onSurfaceVariant)
-                Text("${post.replies}", style = MaterialTheme.typography.labelSmall, color = colors.onSurfaceVariant)
+            if (showCounters) {
+                HorizontalDivider(color = colors.outlineVariant, thickness = 0.5.dp)
+                Spacer(Modifier.height(8.dp))
+                Row(horizontalArrangement = Arrangement.spacedBy(20.dp), verticalAlignment = Alignment.CenterVertically) {
+                    val likeColor = if (post.liked) colors.tertiary else colors.onSurfaceVariant
+                    Icon(painterResource(R.drawable.ic_ei_heart), null, Modifier.size(18.dp).clickable { onLikeClick() }, tint = likeColor)
+                    Text("${post.likes}", style = MaterialTheme.typography.labelSmall, color = likeColor)
+                    Icon(painterResource(R.drawable.ic_ei_comment), null, Modifier.size(18.dp), tint = colors.onSurfaceVariant)
+                    Text("${post.replies}", style = MaterialTheme.typography.labelSmall, color = colors.onSurfaceVariant)
+                }
             }
         }
     }
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index 104d09d6..c67a5691 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -23,10 +23,14 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Send
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import coil3.compose.AsyncImage
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -58,6 +62,7 @@ fun ThreadScreen(
 ) {
     var posts by remember { mutableStateOf<List<Post>>(emptyList()) }
     var replyText by remember { mutableStateOf("") }
+    var replyToPost by remember { mutableStateOf<Post?>(null) }
     var isLoading by remember { mutableStateOf(true) }
     var loadError by remember { mutableStateOf(false) }
     var replyAttachmentUri by remember { mutableStateOf<Uri?>(null) }
@@ -112,11 +117,12 @@ fun ThreadScreen(
                     items(posts, key = { "thread_${it.mid}_${it.rid}" }) { post ->
                         PostCard(
                             post = post,
-                            onPostClick = { onPostClick(post) },
+                            onPostClick = { replyToPost = post },
                             onUserClick = { onUserClick(post.user.uname) },
                             onMenuClick = { onMenuClick(post) },
                             onLikeClick = { onLikeClick(post) },
                             onLinkClick = onLinkClick,
+                            showCounters = false,
                             modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
                         )
                     }
@@ -124,6 +130,17 @@ fun ThreadScreen(
             }
 
             Surface(color = colors.surface, shadowElevation = 2.dp) {
+                replyToPost?.let { target ->
+                    Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) {
+                        AsyncImage(model = target.user.avatar, contentDescription = null, modifier = Modifier.size(20.dp).clip(CircleShape), contentScale = ContentScale.Crop)
+                        Spacer(Modifier.width(8.dp))
+                        Text("In reply to ${target.user.uname}", style = MaterialTheme.typography.bodySmall, color = colors.onSurfaceVariant)
+                        Spacer(Modifier.weight(1f))
+                        IconButton(onClick = { replyToPost = null }, modifier = Modifier.size(20.dp)) {
+                            Icon(Icons.Default.Close, "Clear", tint = colors.onSurfaceVariant)
+                        }
+                    }
+                }
                 Row(
                     modifier = Modifier.fillMaxWidth().padding(12.dp).imePadding(),
                     verticalAlignment = Alignment.Bottom,

From 7c2dddc70f4d17c90fc0be31c2603780ba135787 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:24:14 +0300
Subject: [PATCH 31/57] fix: icon Send buttons in ChatScreen and NewPostScreen

---
 src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt | 4 +++-
 .../java/com/juick/android/ui/screens/post/NewPostScreen.kt   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index 35a5bfcd..6ef79ab1 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -21,6 +21,8 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.ClickableText
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Send
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -111,7 +113,7 @@ fun ChatScreen(
                     }
                 }
             }) {
-                Text(stringResource(R.string.Send))
+                Icon(Icons.Default.Send, stringResource(R.string.Send))
             }
         }
     }
diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
index 7e3b1d36..d330aac3 100644
--- a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -20,6 +20,8 @@ import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Send
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -160,7 +162,7 @@ fun NewPostScreen(
                     }
                 },
                 enabled = sendEnabled && !isSending,
-            ) { Text(stringResource(R.string.Send)) }
+            ) { Icon(Icons.Default.Send, stringResource(R.string.Send)) }
         }
     }
 }

From 6a7d619fc85389819d5da303a1d4517c1c207135 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:32:30 +0300
Subject: [PATCH 32/57] feat: PostCard context menu matching master - Share,
 Delete, Privacy toggle

---
 .../android/ui/navigation/AppNavigation.kt    | 10 ++---
 .../android/ui/screens/feed/FeedScreen.kt     |  3 ++
 .../juick/android/ui/screens/feed/PostCard.kt | 38 ++++++++++++++++++-
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index c9b6d6fc..9fa8f7fb 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -89,18 +89,18 @@ fun AppNavigation(
                     },
                 )
                 Box(Modifier.fillMaxSize().padding()) {
-                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
                 }
             }
         }
         composable<Route.Home> {
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
             }
         }
         composable<Route.Discover> {
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
             }
         }
         composable<Route.Chats> {
@@ -113,7 +113,7 @@ fun AppNavigation(
         }
         composable<Route.Discussions> {
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
             }
         }
 
@@ -145,7 +145,7 @@ fun AppNavigation(
         composable<Route.Search> { entry ->
             val query = entry.toRoute<Route.Search>().query
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick)
+                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
                 else SearchScreen(onSearch = { q -> navController.navigate(Route.Search(q)) { popUpTo<Route.Search> { inclusive = true } } })
             }
         }
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index f1780c4e..e6625b75 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -68,6 +68,7 @@ fun FeedScreen(
     onLinkClick: (String) -> Unit,
     showProfileHeader: Boolean = false,
     profileHeader: @Composable () -> Unit = {},
+    currentUser: com.juick.api.model.User? = null,
     modifier: Modifier = Modifier,
 ) {
     var apiUrl by remember { mutableStateOf(Uri.EMPTY) }
@@ -188,6 +189,8 @@ fun FeedScreen(
                                         onMenuClick = { onMenuClick(post) },
                                         onLikeClick = { onLikeClick(post) },
                                         onLinkClick = onLinkClick,
+                                        currentUid = currentUser?.uid ?: 0,
+                                        isPremiumOrAdmin = currentUser?.premium == true || currentUser?.admin == true,
                                         modifier = Modifier.padding(vertical = 4.dp).padding(horizontal = 12.dp),
                                     )
                                 } else {
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 099c9652..ea35bf8a 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -43,6 +43,7 @@ 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
@@ -52,13 +53,19 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import com.juick.App
 import com.juick.R
 import com.juick.api.model.Post
+import com.juick.api.model.PostResponse
 import com.juick.util.MessageUtils
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
 
 private val quoteColor = Color(0xFF666666)
 
@@ -74,10 +81,15 @@ fun PostCard(
     onLikeClick: () -> Unit,
     onLinkClick: (String) -> Unit,
     showCounters: Boolean = true,
+    currentUid: Int = 0,
+    isPremiumOrAdmin: Boolean = false,
+    onDeletePost: () -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
     val colors = MaterialTheme.colorScheme
     var menuExpanded by remember { mutableStateOf(false) }
+    val context = LocalContext.current
+    val scope = rememberCoroutineScope()
 
     Surface(
         modifier = modifier.fillMaxWidth().clickable { onPostClick() },
@@ -96,7 +108,31 @@ fun PostCard(
                         Icon(Icons.Default.MoreVert, null, Modifier.size(16.dp), tint = colors.onSurfaceVariant)
                     }
                     DropdownMenu(expanded = menuExpanded, onDismissRequest = { menuExpanded = false }) {
-                        DropdownMenuItem(text = { Text("Share") }, onClick = { menuExpanded = false; onMenuClick() })
+                        DropdownMenuItem(text = { Text(stringResource(R.string.Share)) }, onClick = {
+                            menuExpanded = false
+                            val intent = android.content.Intent(android.content.Intent.ACTION_SEND).apply {
+                                type = "text/plain"
+                                putExtra(android.content.Intent.EXTRA_TEXT, "https://juick.com/m/${post.mid}")
+                            }
+                            context.startActivity(intent)
+                        })
+                        if (post.user.uid == currentUid) {
+                            if (isPremiumOrAdmin && post.rid == 0) {
+                                val label = if (post.friendsOnly) R.string.make_public else R.string.make_private
+                                DropdownMenuItem(text = { Text(stringResource(label)) }, onClick = {
+                                    menuExpanded = false
+                                    scope.launch { App.instance.api.togglePrivacy(post.mid) }
+                                })
+                            }
+                            val deleteLabel = if (post.rid == 0) R.string.DeletePost else R.string.DeleteComment
+                            DropdownMenuItem(text = { Text(stringResource(deleteLabel)) }, onClick = {
+                                menuExpanded = false
+                                val cmd = if (post.rid == 0) "D #${post.mid}" else "D #${post.mid}/${post.rid}"
+                                val receiver = MutableStateFlow<Result<PostResponse>?>(null)
+                                App.instance.sendMessage(scope, receiver, cmd)
+                                onDeletePost()
+                            })
+                        }
                     }
                 }
             }

From 2fb3c7a89f6b0ca362fdc0783aff835e9558a610 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:40:37 +0300
Subject: [PATCH 33/57] fix: PostCard menu uid comparison for delete/privacy

---
 src/main/java/com/juick/android/ui/screens/feed/PostCard.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index ea35bf8a..57d5bc90 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -116,7 +116,7 @@ fun PostCard(
                             }
                             context.startActivity(intent)
                         })
-                        if (post.user.uid == currentUid) {
+                        if (currentUid > 0 && post.user.uid == currentUid) {
                             if (isPremiumOrAdmin && post.rid == 0) {
                                 val label = if (post.friendsOnly) R.string.make_public else R.string.make_private
                                 DropdownMenuItem(text = { Text(stringResource(label)) }, onClick = {

From 01145deb943cb3b7c23ccb096b8df1d9fee87c0b Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:53:46 +0300
Subject: [PATCH 34/57] fix: pass currentUid to ThreadScreen PostCard for
 delete menu on own replies

---
 .../java/com/juick/android/ui/navigation/AppNavigation.kt     | 4 ++--
 src/main/java/com/juick/android/ui/screens/feed/PostCard.kt   | 1 +
 .../java/com/juick/android/ui/screens/thread/ThreadScreen.kt  | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 9fa8f7fb..f5674651 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -121,13 +121,13 @@ fun AppNavigation(
             dialogProperties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
         ) { entry ->
             val route = entry.toRoute<Route.Thread>()
-            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() })
+            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() }, currentUid = currentProfile?.uid ?: 0, isPremiumOrAdmin = currentProfile?.premium == true || currentProfile?.admin == true)
         }
 
         composable<Route.Blog> { entry ->
             val uname = entry.toRoute<Route.Blog>().uname
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
+                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
             }
         }
 
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 57d5bc90..af306c17 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -83,6 +83,7 @@ fun PostCard(
     showCounters: Boolean = true,
     currentUid: Int = 0,
     isPremiumOrAdmin: Boolean = false,
+    isAuthenticated: Boolean = false,
     onDeletePost: () -> Unit = {},
     modifier: Modifier = Modifier,
 ) {
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index c67a5691..f5c0efad 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -59,6 +59,8 @@ fun ThreadScreen(
     onLikeClick: (Post) -> Unit,
     onLinkClick: (String) -> Unit,
     onDismiss: () -> Unit,
+    currentUid: Int = 0,
+    isPremiumOrAdmin: Boolean = false,
 ) {
     var posts by remember { mutableStateOf<List<Post>>(emptyList()) }
     var replyText by remember { mutableStateOf("") }
@@ -123,6 +125,8 @@ fun ThreadScreen(
                             onLikeClick = { onLikeClick(post) },
                             onLinkClick = onLinkClick,
                             showCounters = false,
+                            currentUid = currentUid,
+                            isPremiumOrAdmin = isPremiumOrAdmin,
                             modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
                         )
                     }

From ba7822781261a79fa55ae5a83aaaccb4e9f5ad62 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 22:59:33 +0300
Subject: [PATCH 35/57] fix: ChatBubble own messages use primary color

---
 src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index 6ef79ab1..a430fdbe 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -127,8 +127,8 @@ fun ChatBubble(
     modifier: Modifier = Modifier,
 ) {
     val colors = MaterialTheme.colorScheme
-    val bgColor = colors.surfaceVariant
-    val textColor = colors.onSurfaceVariant
+    val bgColor = if (isOwn) colors.primary else colors.surfaceVariant
+    val textColor = if (isOwn) colors.onPrimary else colors.onSurfaceVariant
     val alignment = if (isOwn) Alignment.End else Alignment.Start
 
     val (annotatedText, urlPositions) = remember(post) {

From c7e661d256a1df7d57dae07eeafdf821820f5eac Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 23:13:09 +0300
Subject: [PATCH 36/57] fix: chat links via Android Linkify, underlined,
 correct colors per bubble

---
 .../android/ui/screens/chat/ChatScreen.kt     | 21 ++++++++++++++++---
 .../ui/screens/feed/MessageFormatter.kt       |  9 ++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index a430fdbe..91614f99 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -16,7 +16,9 @@
  */
 package com.juick.android.ui.screens.chat
 
+import android.text.style.URLSpan
 import androidx.compose.foundation.layout.*
+import androidx.core.text.getSpans
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
@@ -32,8 +34,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.juick.App
 import com.juick.R
-import com.juick.android.ui.screens.feed.buildUrlPositions
-import com.juick.android.ui.screens.feed.formatPostText
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+import com.juick.android.ui.screens.feed.UrlPosition
 import com.juick.api.model.Post
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
@@ -132,7 +136,18 @@ fun ChatBubble(
     val alignment = if (isOwn) Alignment.End else Alignment.Start
 
     val (annotatedText, urlPositions) = remember(post) {
-        formatPostText(post, colors.primary, colors.onSurfaceVariant, textColor) to buildUrlPositions(post)
+        val body = post.getBody() ?: ""
+        val spannable = android.text.SpannableString(body)
+        android.text.util.Linkify.addLinks(spannable, android.text.util.Linkify.ALL)
+        val urls = mutableListOf<UrlPosition>()
+        for (span in spannable.getSpans<android.text.style.URLSpan>()) {
+            urls.add(UrlPosition(spannable.getSpanStart(span), spannable.getSpanEnd(span), span.url))
+        }
+        val annotString = buildAnnotatedString {
+            append(body)
+            for (url in urls) addStyle(SpanStyle(color = if (isOwn) colors.onPrimary else colors.primary, textDecoration = TextDecoration.Underline), url.start, url.end)
+        }
+        annotString to urls
     }
 
     Column(
diff --git a/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
index 9ced509c..9a90f7be 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/MessageFormatter.kt
@@ -198,11 +198,12 @@ private fun entityStyle(type: String, primary: Color, dimmed: Color, onSurface:
 fun buildUrlPositions(post: Post): List<UrlPosition> {
     val p = processBody(post)
     val sorted = post.entities.sortedBy { it.start }
-    var si = 0
+    var linkIdx = 0
     return p.entityStart.indices.mapNotNull { i ->
-        while (si < sorted.size && sorted[si].type != "a") si++
-        if (si >= sorted.size) return@mapNotNull null
-        val e = sorted[si++]
+        if (p.entityType[i] != "a") return@mapNotNull null
+        while (linkIdx < sorted.size && sorted[linkIdx].type != "a") linkIdx++
+        if (linkIdx >= sorted.size) return@mapNotNull null
+        val e = sorted[linkIdx++]
         if (e.url == null) return@mapNotNull null
         UrlPosition(p.entityStart[i], p.entityEnd[i], e.url)
     }

From e2cd49742f0e9b14c77dd6dd321ac4d999e13787 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 23:16:15 +0300
Subject: [PATCH 37/57] feat: ChatScreen TopAppBar with partner uname and back
 button

---
 .../com/juick/android/ui/navigation/AppNavigation.kt   |  2 +-
 .../com/juick/android/ui/screens/chat/ChatScreen.kt    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index f5674651..719dfc44 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -133,7 +133,7 @@ fun AppNavigation(
 
         composable<Route.Chat> { entry ->
             val route = entry.toRoute<Route.Chat>()
-            ChatScreen(route.uname, onUserClick, onLinkClick)
+            ChatScreen(route.uname, onUserClick, onLinkClick, onBack = { navController.popBackStack() })
         }
 
         composable<Route.Search> {
diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index 91614f99..8512941d 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Send
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
@@ -44,11 +45,13 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ChatScreen(
     uname: String,
     onUserClick: (String) -> Unit,
     onLinkClick: (String) -> Unit,
+    onBack: () -> Unit = {},
 ) {
     var messagesState by remember { mutableStateOf<Result<List<Post>>?>(null) }
     val messages = (messagesState?.getOrNull() ?: emptyList()).reversed()
@@ -77,6 +80,13 @@ fun ChatScreen(
     }
 
     Column(modifier = Modifier.fillMaxSize()) {
+        TopAppBar(
+            title = { Text("@$uname") },
+            navigationIcon = {
+                IconButton(onClick = onBack) { Icon(Icons.Default.ArrowBack, stringResource(R.string.Cancel)) }
+            },
+            colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface),
+        )
         LazyColumn(
             state = listState,
             modifier = Modifier.weight(1f),

From bf14a0ba2224cbcdd6da95d2fa9575f36e6532b1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 23:24:16 +0300
Subject: [PATCH 38/57] fix: address CR review - deep links, crop sheet,
 refresh race, back stack

- Profile deep link navigates to blog in-app
- CropSheet: guard null cropImageView, remove redundant try/catch
- FeedScreen: refresh waits for new URL result, not stale feedState
- AppNavigation: pop NewPost inclusively on thread navigate
---
 src/main/java/com/juick/android/MainActivity.kt   |  4 ++--
 .../juick/android/ui/navigation/AppNavigation.kt  |  2 +-
 .../juick/android/ui/screens/feed/FeedScreen.kt   |  6 +++++-
 .../java/com/juick/android/ui/widget/CropSheet.kt | 15 ++++-----------
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 08dac205..f65225e4 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -124,8 +124,8 @@ class MainActivity : ComponentActivity() {
                 // home
             }
             1 -> {
-                // user profile → open in browser
-                openUri(data)
+                // user profile → navigate in-app
+                navController?.navigate(Route.Blog(segments[0]))
                 return true
             }
             2 -> {
diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 719dfc44..4977e97b 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -163,7 +163,7 @@ fun AppNavigation(
                     pendingTag = null
                 }
             }
-            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(false); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(inclusive = true); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
         }
 
         dialog<Route.Tags> {
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index e6625b75..072b6d17 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -55,6 +55,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -112,7 +113,10 @@ fun FeedScreen(
 
     LaunchedEffect(isRefreshing) {
         if (isRefreshing) {
-            snapshotFlow { feedState }.distinctUntilChanged().collectLatest { if (it != null) isRefreshing = false }
+            val refreshUrl = apiUrl
+            snapshotFlow { apiUrl to feedState }
+                .filter { (url, _) -> url == refreshUrl }
+                .collectLatest { (_, state) -> if (state != null) isRefreshing = false }
         }
     }
 
diff --git a/src/main/java/com/juick/android/ui/widget/CropSheet.kt b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
index 276d1280..30fb7f4c 100644
--- a/src/main/java/com/juick/android/ui/widget/CropSheet.kt
+++ b/src/main/java/com/juick/android/ui/widget/CropSheet.kt
@@ -93,22 +93,15 @@ fun CropSheet(
 
                 TextButton(
                     onClick = {
+                        val view = cropImageView ?: return@TextButton
                         if (isCropping) return@TextButton
                         isCropping = true
-                        cropImageView?.setOnCropImageCompleteListener { _, result ->
+                        view.setOnCropImageCompleteListener { _, result ->
                             isCropping = false
-                            val uri = if (result.isSuccessful) {
-                                try {
-                                    saveBitmapToFile(context, result.bitmap)
-                                } catch (e: Exception) {
-                                    null
-                                }
-                            } else {
-                                null
-                            }
+                            val uri = if (result.isSuccessful) saveBitmapToFile(context, result.bitmap) else null
                             onCropResult(uri)
                         }
-                        cropImageView?.croppedImageAsync()
+                        view.croppedImageAsync()
                     },
                     modifier = Modifier.padding(start = 8.dp),
                 ) {

From ca43fb10d67d3cb3e613d644265e43bf7e570aa1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 22 Jul 2026 23:27:28 +0300
Subject: [PATCH 39/57] fix: address remaining CR findings - intent guard,
 markRead log, MIME detection

- MainActivity: only clear intent.action after navController ready
- ThreadScreen: log markRead exceptions instead of silent ignore
- ThreadScreen: derive attachment MIME from ContentResolver
---
 src/main/java/com/juick/android/MainActivity.kt              | 4 ++--
 .../java/com/juick/android/ui/screens/thread/ThreadScreen.kt | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index f65225e4..13604dba 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -247,10 +247,10 @@ class MainActivity : ComponentActivity() {
         if (Intent.ACTION_SEND == intent.action) {
             val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
             val stream = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
-            if (text.isNotEmpty() || stream != null) {
-                intent.action = null
+            if ((text.isNotEmpty() || stream != null) && navController != null) {
                 val uriParam = stream?.let { Uri.encode(it.toString()) } ?: ""
                 navController?.navigate(Route.NewPost(text = Uri.encode(text), uri = uriParam))
+                intent.action = null
             }
         }
         if (BuildConfig.INTENT_NEW_EVENT_ACTION == intent.action) {
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index f5c0efad..163d2cd7 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -17,6 +17,7 @@
 package com.juick.android.ui.screens.thread
 
 import android.net.Uri
+import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
@@ -75,14 +76,14 @@ fun ThreadScreen(
     val context = LocalContext.current
 
     val galleryLauncher = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
-        uri?.let { replyAttachmentUri = it; replyAttachmentMime = "image/jpeg" }
+        uri?.let { replyAttachmentUri = it; replyAttachmentMime = context.contentResolver.getType(it) ?: "image/jpeg" }
     }
 
     LaunchedEffect(mid) {
         try { posts = App.instance.api.thread(mid) } catch (_: Exception) { loadError = true }
         isLoading = false
         if (scrollToEnd && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
-        posts.lastOrNull()?.let { App.instance.api.markRead(it.mid, it.rid) }
+        posts.lastOrNull()?.let { try { App.instance.api.markRead(it.mid, it.rid) } catch (e: Exception) { Log.e("ThreadScreen", "markRead failed", e) } }
     }
 
     val newMessages by App.instance.messages.collectAsStateWithLifecycle()

From f0c85f3e06a4a91810bb71da0300c3a8b59afa85 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:56:51 +0300
Subject: [PATCH 40/57] refactor: remove unused JuickMessageMenuListener and
 OnItemClickListener

Both lost their last callers when the feed and thread moved to Compose;
PostCard owns its menu now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../juick/android/JuickMessageMenuListener.kt | 215 ------------------
 .../com/juick/android/OnItemClickListener.kt  |  27 ---
 2 files changed, 242 deletions(-)
 delete mode 100644 src/main/java/com/juick/android/JuickMessageMenuListener.kt
 delete mode 100644 src/main/java/com/juick/android/OnItemClickListener.kt

diff --git a/src/main/java/com/juick/android/JuickMessageMenuListener.kt b/src/main/java/com/juick/android/JuickMessageMenuListener.kt
deleted file mode 100644
index 7b745406..00000000
--- a/src/main/java/com/juick/android/JuickMessageMenuListener.kt
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android
-
-import android.app.AlertDialog
-import android.content.Context
-import android.content.Intent
-import android.view.Menu
-import android.view.View
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.lifecycleScope
-
-import com.juick.App
-import com.juick.R
-import com.juick.api.model.Post
-import com.juick.api.model.PostResponse
-import com.juick.api.model.User
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-/**
- *
- * @author Ugnich Anton
- */
-class JuickMessageMenuListener(
-    private val activity: Context,
-    private val lifecycleOwner: LifecycleOwner,
-    private val receiver: MutableStateFlow<Result<PostResponse>?>,
-    private val postReceiver: MutableStateFlow<Result<Post>?>,
-    private val me: User,
-    private val onDeletePostNavigate: () -> Unit = {},
-) : OnItemClickListener {
-
-    private fun confirmAction(context: Context, resId: Int, action: Runnable): Boolean {
-        val builder = AlertDialog.Builder(context)
-        var result = false
-        builder.setIcon(android.R.drawable.ic_dialog_alert)
-        builder.setMessage(context.resources.getString(resId))
-        builder.setPositiveButton(R.string.Yes) { _, _ -> action.run(); result = true }
-        builder.setNegativeButton(R.string.Cancel, null)
-        builder.show()
-        return result
-    }
-
-    private suspend fun likeMessage(post: Post): Result<Post>? {
-        return runCatching {
-            App.instance.api.like(post.mid)
-        }
-    }
-
-    private fun vipToggle(user: User, completion: ((Boolean) -> Unit)? = null) {
-        val scope = lifecycleOwner.lifecycleScope
-        val account = (activity as? MainActivity)?.account
-        scope.launch {
-            val result = withContext(Dispatchers.IO) { App.instance.api.toggleVIP(user.uname) }
-            completion?.invoke(result.isSuccessful)
-            account?.refresh()
-        }
-    }
-    private fun privacyToggle(post: Post, completion: ((Boolean) -> Unit)? = null) {
-        val scope = lifecycleOwner.lifecycleScope
-        scope.launch {
-            val result = withContext(Dispatchers.IO) { App.instance.api.togglePrivacy(post.mid) }
-            completion?.invoke(result.isSuccessful)
-        }
-    }
-
-    private suspend fun subscribeMessageToggle(post: Post): Result<Post> {
-        return runCatching {
-            App.instance.api.subscribe(post.mid)
-        }
-    }
-
-    override fun onItemClick(view: View?, post: Post) {
-        val context = view?.context as Context
-        val popupMenu = PopupMenu(context, view)
-        popupMenu.setForceShowIcon(true)
-        popupMenu.menu.add(
-            Menu.NONE, MENU_ACTION_SHARE, Menu.NONE,
-            context.getString(R.string.Share)
-        )
-        if (post.user.uid == me.uid) {
-            if (me.premium || me.admin) {
-                if (post.rid == 0) {
-                    val action =
-                        if (post.friendsOnly) MENU_ACTION_MAKE_PUBLIC else MENU_ACTION_MAKE_PRIVATE
-                    val title =
-                        if (post.friendsOnly) context.getString(R.string.make_public) else context.getString(
-                            R.string.make_private
-                        )
-                    val item = popupMenu.menu.add(
-                        Menu.NONE, action, Menu.NONE,
-                        title
-                    )
-                    val icon =
-                        if (post.friendsOnly) R.drawable.ic_ei_unlock else R.drawable.ic_ei_lock
-                    item.icon = ContextCompat.getDrawable(context, icon)
-                }
-            }
-            val itemText = if (post.rid == 0)
-                context.getString(R.string.DeletePost) else
-                context.getString(R.string.DeleteComment)
-            popupMenu.menu.add(
-                Menu.NONE, MENU_ACTION_DELETE_POST, Menu.NONE,
-                itemText
-            )
-        }
-        popupMenu.setOnMenuItemClickListener {
-            val mid = post.mid
-            val rid = post.rid
-            when (it.itemId) {
-                MENU_ACTION_SHARE -> {
-                    val intent = Intent(Intent.ACTION_SEND)
-                    intent.type = "text/plain"
-                    intent.putExtra(Intent.EXTRA_TEXT, "https://juick.com/m/$mid")
-                    activity.startActivity(intent)
-                    true
-                }
-                MENU_ACTION_DELETE_POST -> confirmAction(activity, R.string.Are_you_sure_delete) {
-                    processCommand("D #" +
-                            if (rid == 0) "$mid" else "$mid/$rid")
-                    onDeletePostNavigate()
-                }
-                MENU_ACTION_MAKE_PUBLIC -> {
-                    confirmAction(activity, R.string.confirm_make_public) {
-                        privacyToggle(post)
-                    }
-                }
-                MENU_ACTION_MAKE_PRIVATE -> {
-                    confirmAction(activity, R.string.confirm_make_private) {
-                        privacyToggle(post)
-                    }
-                }
-                else -> { false }
-            }
-        }
-        popupMenu.show()
-    }
-
-    private fun handleLike(post: Post) {
-        val scope = lifecycleOwner.lifecycleScope
-        scope.launch {
-            postReceiver.update {
-                likeMessage(post)
-            }
-        }
-    }
-
-    override fun onLikeClick(view: View?, post: Post) {
-        if (post.liked) {
-            handleLike(post)
-        } else {
-            confirmAction(activity, R.string.Are_you_sure_recommend) {
-                handleLike(post)
-            }
-        }
-    }
-
-    override fun onSubscribeToggleClick(post: Post) {
-        val scope = lifecycleOwner.lifecycleScope
-        scope.launch {
-            postReceiver.update {
-                subscribeMessageToggle(post)
-            }
-        }
-    }
-
-    override fun onLinkClick(url: String) {
-        val mainActivity = activity as? MainActivity
-        if (mainActivity != null) {
-            mainActivity.processUri(url.toUri())
-        } else {
-            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
-            activity.startActivity(intent)
-        }
-    }
-
-    private fun processCommand(command: String) {
-        val scope = lifecycleOwner.lifecycleScope
-        App.instance.sendMessage(scope = scope, receiver = receiver, txt = command)
-    }
-
-    companion object {
-        private const val MENU_ACTION_SUBSCRIBE = 3
-        private const val MENU_ACTION_SHARE = 5
-        private const val MENU_ACTION_DELETE_POST = 6
-        private const val MENU_ACTION_ADD_TO_VIP = 7
-        private const val MENU_ACTION_REMOVE_FROM_VIP = 8
-        private const val MENU_ACTION_ADD_TO_IGNORELIST = 9
-        private const val MENU_ACTION_REMOVE_FROM_IGNORELIST = 10
-        private const val MENU_ACTION_MAKE_PRIVATE = 11
-        private const val MENU_ACTION_MAKE_PUBLIC = 12
-    }
-}
diff --git a/src/main/java/com/juick/android/OnItemClickListener.kt b/src/main/java/com/juick/android/OnItemClickListener.kt
deleted file mode 100644
index eb8caeab..00000000
--- a/src/main/java/com/juick/android/OnItemClickListener.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2008-2026, Juick
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.android
-
-import android.view.View
-import com.juick.api.model.Post
-
-interface OnItemClickListener {
-    fun onItemClick(view: View?, post: Post)
-    fun onLikeClick(view: View?, post: Post)
-    fun onSubscribeToggleClick(post: Post)
-    fun onLinkClick(url: String)
-}

From 87a421406759148442664b976521196fd2844d57 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:56:51 +0300
Subject: [PATCH 41/57] fix: MainActivity intent handling, link routing and
 notifications

- Handle ACTION_SEND / new-event / ACTION_VIEW intents from a single
  handleIntent(), called from onResume and from the first composition.
  On cold start onResume runs before setContent composes, so navController
  was still null and shared content / notification taps were dropped.
- Clear the intent action when restoring from savedInstanceState so the
  restored back stack isn't navigated a second time.
- Pass shared text/stream to Route.NewPost without Uri.encode: type-safe
  routes encode arguments themselves, so the text showed up percent-encoded.
- Restore master's routing for notifications (discussions / PM chat /
  thread scrolled to end) and for links: juick.com links, including
  /<user>/<mid> thread URLs, open in-app; others go to Custom Tabs.
- Request notification permission and start NotificationManager only for
  authenticated users (as on master), and again after a successful login.
- Drop processUriCallback / browserSessionSupported indirection, restore
  the full GPL header.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../java/com/juick/android/MainActivity.kt    | 151 +++++++++---------
 1 file changed, 73 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/juick/android/MainActivity.kt b/src/main/java/com/juick/android/MainActivity.kt
index 13604dba..2f1973be 100644
--- a/src/main/java/com/juick/android/MainActivity.kt
+++ b/src/main/java/com/juick/android/MainActivity.kt
@@ -5,6 +5,14 @@
  * it under the terms of the GNU General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.juick.android
 
@@ -16,7 +24,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.ActivityResultLauncher
@@ -32,21 +39,20 @@ import androidx.browser.customtabs.CustomTabsSession
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.lifecycle.MutableLiveData
+import androidx.core.content.IntentCompat
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
 import com.juick.App
 import com.juick.BuildConfig
 import com.juick.R
 import com.juick.android.SignInActivity.SignInStatus
 import com.juick.android.service.isAuthenticated
-import com.juick.android.updater.Updater
-import androidx.navigation.compose.rememberNavController
 import com.juick.android.ui.AppTheme
 import com.juick.android.ui.navigation.AppNavigation
 import com.juick.android.ui.navigation.Route
+import com.juick.android.updater.Updater
 import com.juick.api.model.Post
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
@@ -67,9 +73,8 @@ class MainActivity : ComponentActivity() {
 
     private var browserClient: CustomTabsClient? = null
     private var browserSession: CustomTabsSession? = null
-    private var browserSessionSupported = MutableLiveData<Boolean?>(null)
     private var customTabsBound = false
-    private var initialUri: Uri? = null
+    private var navController: NavHostController? = null
 
     private var browserConnection = object : CustomTabsServiceConnection() {
         override fun onServiceDisconnected(name: ComponentName?) {
@@ -81,7 +86,6 @@ class MainActivity : ComponentActivity() {
             client.warmup(0)
             browserSession = client.newSession(CustomTabsCallback())
             browserClient = client
-            browserSessionSupported.value = true
         }
     }
 
@@ -116,47 +120,47 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    fun processUri(data: Uri): Boolean {
-        val path = data.path ?: return false
-        val segments = path.split("/").filter { it.isNotEmpty() }
-        when (segments.size) {
-            0 -> {
-                // home
-            }
-            1 -> {
-                // user profile → navigate in-app
-                navController?.navigate(Route.Blog(segments[0]))
-                return true
-            }
-            2 -> {
-                if (segments[0] == "m") {
-                    val mid = segments[1].toIntOrNull() ?: return false
-                    // Navigate to thread via callback
-                    processUriCallback?.invoke(mid)
-                    return true
-                }
-            }
-            else -> {
-                if (segments.size > 2 && segments[0] == "i") {
-                    openUri(data)
-                    return true
-                }
-            }
+    /**
+     * Opens juick.com links in-app when a screen exists for them, everything else in a browser.
+     */
+    fun processUri(data: Uri) {
+        val nav = navController
+        if (nav == null || data.host != "juick.com") {
+            openUri(data)
+            return
+        }
+        val segments = data.pathSegments
+        when {
+            segments.isEmpty() -> nav.navigate(Route.Home)
+            segments.size == 1 -> nav.navigate(Route.Blog(segments[0]))
+            segments.size == 2 && segments[1].toIntOrNull() != null ->
+                nav.navigate(Route.Thread(segments[1].toInt()))
+            else -> openUri(data)
         }
-        return false
     }
 
-    internal var processUriCallback: ((Int) -> Unit)? = null
-    private var navController: androidx.navigation.NavHostController? = null
+    private fun initNotifications() {
+        if (notificationManager != null || !App.instance.isAuthenticated) return
+        lifecycleScope.launch {
+            if (requestNotificationsPermission()) {
+                notificationManager = NotificationManager()
+            }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (savedInstanceState != null) {
+            // the restored back stack already reflects the launch intent
+            intent.action = null
+        }
 
         loginLauncher = registerForActivityResult(
             ActivityResultContracts.StartActivityForResult()
         ) { result ->
             if (result.resultCode == RESULT_OK) {
                 account.refresh()
+                initNotifications()
             }
         }
 
@@ -176,37 +180,31 @@ class MainActivity : ComponentActivity() {
         }
 
         account.refresh()
+        initNotifications()
 
-        lifecycleScope.launch {
-            if (BuildConfig.ENABLE_UPDATER) {
+        if (BuildConfig.ENABLE_UPDATER) {
+            lifecycleScope.launch {
                 Updater(this@MainActivity).checkUpdate()
             }
-            try {
-                requestNotificationsPermission()
-                notificationManager = NotificationManager()
-            } catch (_: Exception) { }
         }
 
-        initialUri = intent?.data
-
         setContent {
             AppTheme {
                 val navController = rememberNavController()
                 this@MainActivity.navController = navController
-                processUriCallback = { mid ->
-                    navController.navigate(Route.Thread(mid))
-                }
 
                 val profile by account.profile.observeAsState()
                 val unreadCount = profile?.unreadCount ?: 0
 
                 val onPostClick: (Post) -> Unit = { post -> navController.navigate(Route.Thread(post.mid)) }
                 val onUserClick: (String) -> Unit = { uname -> navController.navigate(Route.Blog(uname)) }
-                val onLinkClick: (String) -> Unit = { url -> openUri(Uri.parse(url)) }
+                val onLinkClick: (String) -> Unit = { url -> processUri(Uri.parse(url)) }
                 val onSignInClick: () -> Unit = { showLogin() }
                 val onLikeClick: (Post) -> Unit = { post ->
                     lifecycleScope.launch {
-                        try { App.instance.api.like(post.mid); account.refresh() } catch (_: Exception) { }
+                        try { App.instance.api.like(post.mid); account.refresh() } catch (e: Exception) {
+                            Log.e("MainActivity", "like failed", e)
+                        }
                     }
                 }
                 val onMenuClick: (Post) -> Unit = { }
@@ -216,46 +214,40 @@ class MainActivity : ComponentActivity() {
 
                 AppNavigation(navController, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onSignInClick, onFabClick, profile, unreadCount, App.instance.isAuthenticated)
 
-                LaunchedEffect(Unit) {
-                    initialUri?.let { processUri(it); initialUri = null }
-                }
+                // onResume runs before the first composition, so a cold-start intent is handled here
+                LaunchedEffect(Unit) { handleIntent() }
             }
         }
     }
 
-    private fun handleIntent(intent: Intent?) {
-        intent?.let {
-            if (Intent.ACTION_VIEW == it.action) {
-                it.data?.let { data ->
-                    processUri(data)
+    private fun handleIntent() {
+        val nav = navController ?: return
+        val intent = intent
+        when (intent.action) {
+            Intent.ACTION_VIEW -> intent.data?.let { processUri(it) }
+            Intent.ACTION_SEND -> {
+                val text = intent.getStringExtra(Intent.EXTRA_TEXT)
+                val stream = IntentCompat.getParcelableExtra(intent, Intent.EXTRA_STREAM, Uri::class.java)
+                if (!text.isNullOrEmpty() || stream != null) {
+                    nav.navigate(Route.NewPost(text = text, uri = stream?.toString()))
                 }
             }
+            BuildConfig.INTENT_NEW_EVENT_ACTION -> handleNewEventIntent(nav, intent)
+            else -> return
         }
+        intent.action = null
     }
 
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
-        handleIntent(intent)
     }
 
     override fun onResume() {
         super.onResume()
         notificationManager?.onResume()
         account.refresh()
-        val intent = intent
-        if (Intent.ACTION_SEND == intent.action) {
-            val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: ""
-            val stream = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
-            if ((text.isNotEmpty() || stream != null) && navController != null) {
-                val uriParam = stream?.let { Uri.encode(it.toString()) } ?: ""
-                navController?.navigate(Route.NewPost(text = Uri.encode(text), uri = uriParam))
-                intent.action = null
-            }
-        }
-        if (BuildConfig.INTENT_NEW_EVENT_ACTION == intent.action) {
-            handleNewEventIntent(intent)
-        }
+        handleIntent()
     }
 
     override fun onPause() {
@@ -263,15 +255,18 @@ class MainActivity : ComponentActivity() {
         super.onPause()
     }
 
-    private fun handleNewEventIntent(intent: Intent) {
-        intent.action = null
+    private fun handleNewEventIntent(nav: NavHostController, intent: Intent) {
         val msg = intent.getStringExtra(getString(R.string.notification_extra)) ?: return
         try {
             val post = App.instance.jsonMapper.decodeFromString<Post>(msg)
-            if (post.mid > 0) {
-                navController?.navigate(Route.Thread(post.mid))
+            when {
+                post.user.uid == 0 -> nav.navigate(Route.Discussions)
+                post.mid == 0 -> nav.navigate(Route.Chat(post.user.uname, post.user.uid))
+                else -> nav.navigate(Route.Thread(post.mid, scrollToEnd = true))
             }
-        } catch (_: Exception) { }
+        } catch (e: Exception) {
+            Log.d("MainActivity", "Invalid notification data", e)
+        }
     }
 
     override fun onDestroy() {

From a6ad79b4d6f058c543635ba7ff8d99faa5406118 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 42/57] fix: navigation back stack reset on recreation,
 duplicate Search route

- Only reset the back stack to Home on a signed-out -> signed-in
  transition; the effect previously fired on every activity recreation
  (e.g. dark mode switch) and discarded the user's back stack.
- Remove the duplicate Route.Search destination; the second registration
  silently replaced the first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../com/juick/android/ui/navigation/AppNavigation.kt  | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 4977e97b..6d6b0ab0 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -72,10 +73,12 @@ fun AppNavigation(
 ) {
     var pendingTag by remember { mutableStateOf<String?>(null) }
 
+    var wasAuthenticated by rememberSaveable { mutableStateOf(isAuthenticated) }
     LaunchedEffect(isAuthenticated) {
-        if (isAuthenticated) {
+        if (isAuthenticated && !wasAuthenticated) {
             navController.navigate(Route.Home) { popUpTo(0) { inclusive = true } }
         }
+        wasAuthenticated = isAuthenticated
     }
 
     NavHost(navController = navController, startDestination = if (isAuthenticated) Route.Home else Route.Public) {
@@ -136,12 +139,6 @@ fun AppNavigation(
             ChatScreen(route.uname, onUserClick, onLinkClick, onBack = { navController.popBackStack() })
         }
 
-        composable<Route.Search> {
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                SearchScreen(onSearch = { query -> navController.navigate(Route.Search(query)) { popUpTo<Route.Search> { inclusive = true } } })
-            }
-        }
-
         composable<Route.Search> { entry ->
             val query = entry.toRoute<Route.Search>().query
             AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {

From 44195bc19a9177ed3e350454ea91182d28a6dbe5 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 43/57] fix: NewPost keeps typed text on tag insert, accepts
 shared attachment

- Insert the selected tag into the current text field value instead of
  re-keying the field on a new initialText, which threw away anything
  typed before opening the tags dialog.
- Pass Route.NewPost.uri through as the initial attachment (with MIME from
  the content resolver); shared images were ignored.
- Toast on send and attachment errors instead of failing silently.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/navigation/AppNavigation.kt    | 12 ++-----
 .../android/ui/screens/post/NewPostScreen.kt  | 31 +++++++++++++++----
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 6d6b0ab0..ada63691 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -34,6 +34,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.core.net.toUri
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.juick.R
@@ -152,15 +153,8 @@ fun AppNavigation(
         }
 
         composable<Route.NewPost> { entry ->
-            val text = entry.toRoute<Route.NewPost>().text ?: ""
-            var initialText by remember { mutableStateOf(text) }
-            LaunchedEffect(pendingTag) {
-                pendingTag?.let { tag ->
-                    initialText = if (initialText.isNotEmpty()) "$initialText #$tag " else "#$tag "
-                    pendingTag = null
-                }
-            }
-            NewPostScreen(initialText = initialText, onTagsClick = { navController.navigate(Route.Tags) }, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(inclusive = true); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
+            val route = entry.toRoute<Route.NewPost>()
+            NewPostScreen(initialText = route.text, initialAttachment = route.uri?.toUri(), pendingTag = pendingTag, onTagConsumed = { pendingTag = null }, onTagsClick = { navController.navigate(Route.Tags) }, onNavigateToThread = { mid -> navController.popBackStack<Route.NewPost>(inclusive = true); navController.navigate(Route.Thread(mid)) }, onDismiss = { navController.popBackStack() })
         }
 
         dialog<Route.Tags> {
diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
index d330aac3..e40d502b 100644
--- a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -17,6 +17,7 @@
 package com.juick.android.ui.screens.post
 
 import android.net.Uri
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
@@ -37,23 +38,35 @@ import com.juick.R
 import com.juick.android.ui.widget.CropSheet
 import com.juick.api.model.PostResponse
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
 import java.io.File
+import java.io.FileNotFoundException
 
 @Composable
 fun NewPostScreen(
     initialText: String? = null,
+    initialAttachment: Uri? = null,
+    pendingTag: String? = null,
+    onTagConsumed: () -> Unit = {},
     onTagsClick: () -> Unit,
     onNavigateToThread: (Int) -> Unit,
     onDismiss: () -> Unit,
 ) {
     val context = LocalContext.current
-    var textFieldValue by remember(initialText) { mutableStateOf(TextFieldValue(initialText ?: "", TextRange((initialText?.length ?: 0)))) }
+    var textFieldValue by remember { mutableStateOf(TextFieldValue(initialText ?: "", TextRange((initialText?.length ?: 0)))) }
     val scope = rememberCoroutineScope()
     val messagePosted = remember { MutableStateFlow<Result<PostResponse>?>(null) }
     var isSending by remember { mutableStateOf(false) }
-    var attachmentUri by remember { mutableStateOf<Uri?>(null) }
-    var attachmentMime by remember { mutableStateOf<String?>(null) }
+    var attachmentUri by remember { mutableStateOf(initialAttachment) }
+    var attachmentMime by remember { mutableStateOf(initialAttachment?.let { context.contentResolver.getType(it) }) }
+
+    LaunchedEffect(pendingTag) {
+        val tag = pendingTag ?: return@LaunchedEffect
+        val text = textFieldValue.text
+        val insert = if (text.isEmpty() || text.endsWith(' ') || text.endsWith('\n')) "#$tag " else " #$tag "
+        val newText = text + insert
+        textFieldValue = TextFieldValue(newText, TextRange(newText.length))
+        onTagConsumed()
+    }
     var showSourcePicker by remember { mutableStateOf(false) }
     var showCrop by remember { mutableStateOf<Uri?>(null) }
     var cameraUri by remember { mutableStateOf<Uri?>(null) }
@@ -68,7 +81,10 @@ fun NewPostScreen(
                         isSending = false
                         postResponse.newMessage?.let { post -> onNavigateToThread(post.mid) }
                     },
-                    onFailure = { isSending = false },
+                    onFailure = {
+                        isSending = false
+                        Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show()
+                    },
                 )
                 messagePosted.value = null
             }
@@ -156,8 +172,11 @@ fun NewPostScreen(
                 onClick = {
                     if (sendEnabled && !isSending) {
                         isSending = true
-                        scope.launch {
+                        try {
                             App.instance.sendMessage(scope, messagePosted, textFieldValue.text, attachmentUri, attachmentMime)
+                        } catch (e: FileNotFoundException) {
+                            isSending = false
+                            Toast.makeText(context, "Attachment error: ${e.message}", Toast.LENGTH_SHORT).show()
                         }
                     }
                 },

From b7c739c0c759070f26eaba6a1db256a729125e37 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 44/57] fix: thread reply target, duplicate replies crash, send
 feedback

- Reply to the selected comment with #mid/rid (was always #mid).
- Deduplicate replies arriving via App.messages; the StateFlow replays its
  last value, so re-opening a thread appended an existing reply and
  crashed LazyColumn with a duplicate key.
- Observe the send result: reload the thread on success, toast on error;
  allow sending an attachment without text.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/screens/thread/ThreadScreen.kt | 60 +++++++++++++------
 1 file changed, 43 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index 163d2cd7..e987f300 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -18,6 +18,7 @@ package com.juick.android.ui.screens.thread
 
 import android.net.Uri
 import android.util.Log
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.*
@@ -46,8 +47,9 @@ import com.juick.android.service.isAuthenticated
 import com.juick.android.ui.screens.feed.PostCard
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
+import java.io.FileNotFoundException
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -79,16 +81,39 @@ fun ThreadScreen(
         uri?.let { replyAttachmentUri = it; replyAttachmentMime = context.contentResolver.getType(it) ?: "image/jpeg" }
     }
 
-    LaunchedEffect(mid) {
-        try { posts = App.instance.api.thread(mid) } catch (_: Exception) { loadError = true }
+    var reloadTrigger by remember { mutableIntStateOf(0) }
+    val messagePosted = remember { MutableStateFlow<Result<PostResponse>?>(null) }
+    var isSending by remember { mutableStateOf(false) }
+
+    LaunchedEffect(mid, reloadTrigger) {
+        try { posts = App.instance.api.thread(mid); loadError = false } catch (e: CancellationException) { throw e } catch (_: Exception) { loadError = true }
         isLoading = false
-        if (scrollToEnd && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
-        posts.lastOrNull()?.let { try { App.instance.api.markRead(it.mid, it.rid) } catch (e: Exception) { Log.e("ThreadScreen", "markRead failed", e) } }
+        if ((scrollToEnd || reloadTrigger > 0) && posts.isNotEmpty()) listState.animateScrollToItem(posts.size - 1)
+        posts.lastOrNull()?.let { try { App.instance.api.markRead(it.mid, it.rid) } catch (e: CancellationException) { throw e } catch (e: Exception) { Log.e("ThreadScreen", "markRead failed", e) } }
+    }
+
+    LaunchedEffect(messagePosted) {
+        messagePosted.collect { response ->
+            response ?: return@collect
+            isSending = false
+            response.fold(
+                onSuccess = {
+                    replyText = ""
+                    replyToPost = null
+                    replyAttachmentUri = null
+                    replyAttachmentMime = null
+                    reloadTrigger++
+                },
+                onFailure = { Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show() },
+            )
+            messagePosted.value = null
+        }
     }
 
     val newMessages by App.instance.messages.collectAsStateWithLifecycle()
     LaunchedEffect(newMessages) {
-        val relevant = newMessages.filter { it.mid == mid }
+        val known = posts.mapTo(HashSet()) { it.rid }
+        val relevant = newMessages.filter { it.mid == mid && it.rid > 0 && it.rid !in known }
         if (relevant.isNotEmpty()) posts = posts + relevant
     }
 
@@ -165,23 +190,24 @@ fun ThreadScreen(
                         Text(if (replyAttachmentUri != null) "📎✓" else "📎", style = MaterialTheme.typography.bodyMedium)
                     }
                     Spacer(Modifier.width(4.dp))
+                    val canSend = (replyText.isNotBlank() || replyAttachmentUri != null) && !isSending
                     IconButton(
                         onClick = {
-                            if ((replyText.isNotBlank() || replyAttachmentUri != null) && App.instance.isAuthenticated) {
-                                scope.launch {
-                                    try {
-                                        val receiver = MutableStateFlow<Result<PostResponse>?>(null)
-                                        App.instance.sendMessage(scope, receiver, "#$mid $replyText", replyAttachmentUri, replyAttachmentMime)
-                                        replyText = ""
-                                        replyAttachmentUri = null
-                                        replyAttachmentMime = null
-                                    } catch (_: Exception) {}
+                            if (canSend && App.instance.isAuthenticated) {
+                                val rid = replyToPost?.rid ?: 0
+                                val target = if (rid > 0) "#$mid/$rid" else "#$mid"
+                                isSending = true
+                                try {
+                                    App.instance.sendMessage(scope, messagePosted, "$target $replyText", replyAttachmentUri, replyAttachmentMime)
+                                } catch (e: FileNotFoundException) {
+                                    isSending = false
+                                    Toast.makeText(context, "Attachment error: ${e.message}", Toast.LENGTH_SHORT).show()
                                 }
                             }
                         },
-                        enabled = replyText.isNotBlank(),
+                        enabled = canSend,
                     ) {
-                        Icon(Icons.Default.Send, stringResource(R.string.Send), tint = if (replyText.isNotBlank()) colors.primary else colors.onSurfaceVariant)
+                        Icon(Icons.Default.Send, stringResource(R.string.Send), tint = if (canSend) colors.primary else colors.onSurfaceVariant)
                     }
                 }
             }

From a851554b97fbad4c606ed0a54a0bb0fdbf97cdff Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 45/57] fix: chat real-time message filtering, ordering and own
 messages

- Only take PMs (mid == 0) from App.messages, and prepend them: the list
  is newest-first before reversing, so appending put them at the top.
- Show the sent message immediately, as ChatFragment did.
- Drop timestamp keys, which collide for messages within one second.
- Toast on send failure.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/screens/chat/ChatScreen.kt     | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index 8512941d..ba90d26a 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -16,7 +16,7 @@
  */
 package com.juick.android.ui.screens.chat
 
-import android.text.style.URLSpan
+import android.widget.Toast
 import androidx.compose.foundation.layout.*
 import androidx.core.text.getSpans
 import androidx.compose.foundation.lazy.LazyColumn
@@ -30,6 +30,7 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -59,6 +60,7 @@ fun ChatScreen(
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
     val focusManager = LocalFocusManager.current
+    val context = LocalContext.current
 
     LaunchedEffect(uname) {
         try {
@@ -70,12 +72,17 @@ fun ChatScreen(
         if (messages.isNotEmpty()) listState.animateScrollToItem(messages.size - 1)
     }
 
+    fun prepend(incoming: List<Post>) {
+        val current = messagesState?.getOrNull() ?: return
+        val fresh = incoming.filter { msg ->
+            current.none { it.getTimestamp() == msg.getTimestamp() && it.getBody() == msg.getBody() }
+        }
+        if (fresh.isNotEmpty()) messagesState = Result.success(fresh.reversed() + current)
+    }
+
     LaunchedEffect(uname) {
         App.instance.messages.collect { newMessages ->
-            newMessages.filter { it.user.uname == uname || it.to?.uname == uname }.forEach { msg ->
-                val current = messagesState?.getOrNull() ?: emptyList()
-                messagesState = Result.success(current + msg)
-            }
+            prepend(newMessages.filter { it.mid == 0 && (it.user.uname == uname || it.to?.uname == uname) })
         }
     }
 
@@ -91,7 +98,7 @@ fun ChatScreen(
             state = listState,
             modifier = Modifier.weight(1f),
         ) {
-            items(messages, key = { it.getTimestamp()?.time ?: it.hashCode() }) { post ->
+            items(messages) { post ->
                 ChatBubble(
                     post = post,
                     isOwn = post.user.uname != uname,
@@ -120,10 +127,14 @@ fun ChatScreen(
                 if (inputText.isNotBlank()) {
                     scope.launch {
                         try {
-                            App.instance.api.postPm(uname, inputText)
+                            prepend(listOf(App.instance.api.postPm(uname, inputText)))
                             inputText = ""
                             focusManager.clearFocus()
-                        } catch (_: Exception) { }
+                        } catch (e: CancellationException) {
+                            throw e
+                        } catch (_: Exception) {
+                            Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show()
+                        }
                     }
                 }
             }) {

From f3774df5df56ffc7ff93e4ee21bc15e72107ed50 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 46/57] fix: feed pagination errors, duplicate posts across
 pages, stuck refresh

- A failed next-page load no longer replaces the whole feed with an error.
- De-duplicate posts across pages; discussions reorder by activity, so a
  post can reappear on the next page and crash LazyColumn keys.
- isRefreshing is no longer saveable: a restored true value waited for a
  URL that never matched and the spinner never cleared.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../com/juick/android/ui/screens/feed/FeedScreen.kt    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index 072b6d17..ac6d165d 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -17,6 +17,7 @@
 package com.juick.android.ui.screens.feed
 
 import android.net.Uri
+import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -76,7 +77,7 @@ fun FeedScreen(
     var feedState by remember { mutableStateOf<Result<List<Post>>?>(null) }
     var allPosts by remember { mutableStateOf<List<Post>>(emptyList()) }
     val listState = rememberLazyListState()
-    var isRefreshing by rememberSaveable { mutableStateOf(false) }
+    var isRefreshing by remember { mutableStateOf(false) }
     var firstPage by rememberSaveable { mutableStateOf(true) }
     var newPostsCount by remember { mutableStateOf(0) }
     var maxMid by remember { mutableStateOf(0) }
@@ -105,9 +106,12 @@ fun FeedScreen(
             try {
                 val posts = withContext(Dispatchers.IO) { App.instance.api.getPosts(apiUrl) }
                 if (firstPage) allPosts = posts
-                else allPosts = allPosts + posts
+                else allPosts = (allPosts + posts).distinctBy { it.mid to it.rid }
                 feedState = Result.success(allPosts)
-            } catch (e: CancellationException) { throw e } catch (e: Exception) { feedState = Result.failure(e) }
+            } catch (e: CancellationException) { throw e } catch (e: Exception) {
+                if (firstPage) feedState = Result.failure(e)
+                else Log.e("FeedScreen", "Failed to load next page", e)
+            }
         }
     }
 

From a33cfaf2d6e5550a27ff43a43a095b39c8b50f46 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 47/57] fix: PostCard confirms delete, handles privacy toggle
 failures

Deletion was sent immediately without the confirmation master had, and a
togglePrivacy network error crashed the composition scope.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../juick/android/ui/screens/feed/PostCard.kt | 38 ++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index af306c17..53220dee 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -31,6 +31,8 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.MoreVert
+import android.widget.Toast
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.HorizontalDivider
@@ -39,6 +41,7 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -64,6 +67,7 @@ import com.juick.R
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
 import com.juick.util.MessageUtils
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 
@@ -91,6 +95,25 @@ fun PostCard(
     var menuExpanded by remember { mutableStateOf(false) }
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
+    var confirmDelete by remember { mutableStateOf(false) }
+
+    if (confirmDelete) {
+        AlertDialog(
+            onDismissRequest = { confirmDelete = false },
+            text = { Text(stringResource(R.string.Are_you_sure_delete)) },
+            confirmButton = {
+                TextButton(onClick = {
+                    confirmDelete = false
+                    val cmd = if (post.rid == 0) "D #${post.mid}" else "D #${post.mid}/${post.rid}"
+                    App.instance.sendMessage(scope, MutableStateFlow<Result<PostResponse>?>(null), cmd)
+                    onDeletePost()
+                }) { Text(stringResource(android.R.string.ok)) }
+            },
+            dismissButton = {
+                TextButton(onClick = { confirmDelete = false }) { Text(stringResource(R.string.Cancel)) }
+            },
+        )
+    }
 
     Surface(
         modifier = modifier.fillMaxWidth().clickable { onPostClick() },
@@ -122,16 +145,21 @@ fun PostCard(
                                 val label = if (post.friendsOnly) R.string.make_public else R.string.make_private
                                 DropdownMenuItem(text = { Text(stringResource(label)) }, onClick = {
                                     menuExpanded = false
-                                    scope.launch { App.instance.api.togglePrivacy(post.mid) }
+                                    scope.launch {
+                                        try {
+                                            App.instance.api.togglePrivacy(post.mid)
+                                        } catch (e: CancellationException) {
+                                            throw e
+                                        } catch (e: Exception) {
+                                            Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show()
+                                        }
+                                    }
                                 })
                             }
                             val deleteLabel = if (post.rid == 0) R.string.DeletePost else R.string.DeleteComment
                             DropdownMenuItem(text = { Text(stringResource(deleteLabel)) }, onClick = {
                                 menuExpanded = false
-                                val cmd = if (post.rid == 0) "D #${post.mid}" else "D #${post.mid}/${post.rid}"
-                                val receiver = MutableStateFlow<Result<PostResponse>?>(null)
-                                App.instance.sendMessage(scope, receiver, cmd)
-                                onDeletePost()
+                                confirmDelete = true
                             })
                         }
                     }

From 64e5c4d0ccb2aeb0fd9460099c5e88cbef377228 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 05:57:11 +0300
Subject: [PATCH 48/57] docs: update CLAUDE.md for Compose architecture

The Fragment/XML navigation, FeedFragment/FeedViewModel and the next
build type no longer exist after the Compose migration.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CLAUDE.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 0cb156e0..e199d453 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -15,27 +15,26 @@ Build scripts are Groovy DSL (`build.gradle`), not Kotlin DSL.
 
 ## Architecture
 
-Juick microblogging Android client. Single-activity (MainActivity) + Navigation Component. minSdk 24, targetSdk 37, Java 17, Kotlin 2.4.10.
+Juick microblogging Android client. Single activity (MainActivity) with Jetpack Compose UI and Navigation Compose. minSdk 24, targetSdk 37, Java 17, Kotlin 2.4.20.
 
 **Flavors** (`notifications` dimension): `google` (FCM), `huawei` (HMS Push, hides NSFW), `free` (SSE polling).
 
-**Build types**: `debug`, `release`, `next` (Compose UI enabled), `store` (updater disabled).
+**Build types**: `debug`, `release`, `store` (updater disabled).
 
 **Key files**:
-- `App.kt` — Application subclass. OkHttp client with auth interceptor (`Authorization: Juick <token>`), Retrofit singleton. `App.instance` accessed everywhere.
+- `App.kt` — Application subclass. OkHttp client with auth interceptor (`Authorization: Juick <token>`), Retrofit singleton, Coil image loader. `App.instance` accessed everywhere. `App.instance.messages` is a StateFlow of posts received via push/SSE; screens observe it for real-time updates.
 - `api/Api.kt` — Retrofit interface for all Juick API calls. Models in `api/model/` use kotlinx.serialization.
-- `android/MainActivity.kt` — Single activity, bottom nav, handles deep links (juick.com URLs), new event intents, ACTION_SEND shares.
+- `android/MainActivity.kt` — Single `ComponentActivity`, hosts `AppNavigation`, handles deep links (juick.com URLs), new event intents, ACTION_SEND shares, Custom Tabs.
 - `android/service/AuthenticationService.kt` — Android AccountManager authenticator (runs in `:auth` process). Auth token = account "hash" stored via AccountManager.
 - `android/Account.kt` — ViewModel for current user profile. `App.isAuthenticated` / `App.accountData` are extension properties from `AccountHelpers.kt`.
-- `android/screens/FeedFragment.kt` + `FeedViewModel.kt` — Reusable paginated feed. Other screens (Home, Discover, Blog, Search, Discussions) extend FeedFragment. ViewModel uses `apiUrl: StateFlow<Uri>` to reactively fetch.
+- `android/ui/navigation/Routes.kt` + `AppNavigation.kt` — Type-safe `@Serializable` routes and the single top-level NavHost. Start: `Route.Home` (authenticated) or `Route.Public`. `Thread` and `Tags` are dialog destinations.
+- `android/ui/AppScaffold.kt` — Per-screen scaffold: top bar (search, discussions badge, avatar), bottom nav, FAB.
+- `android/ui/screens/feed/FeedScreen.kt` — Reusable paginated feed (Home, Discover, Blog, Search, Discussions). `PostCard.kt` renders a post; `MessageFormatter.kt` turns post entities into annotated text blocks.
+- `android/ui/screens/` — `thread`, `chat`, `chats`, `post` (new post), `tags`, `search`, `noauth`. Screens load data directly via `App.instance.api` in `LaunchedEffect`, no ViewModels.
 - `android/NotificationSender.kt` — Local notifications from push data. Silenced when app in foreground.
 - `android/updater/Updater.kt` — Checks GitHub Releases for APK updates, matches by flavor name.
 - `android/LinkPreviewer.kt` — Plugin interface. Google flavor registers `YouTubePreviewer`.
 
-**Auth flow**: `SignInActivity` (nick+pass or Google via `SignInProvider` interface) → `GoogleSignInProvider` in google flavor uses Credential Manager API → `SignUpActivity` for new Google accounts.
-
-**Compose**: Only in `next` build type. `NextSignInActivity` in `src/next/`. Dependencies: Compose BOM, Material 3.
+**Auth flow**: `SignInActivity` (Compose `SignInScreen`; nick+pass or Google via `SignInProvider` interface) → `GoogleSignInProvider` in google flavor uses Credential Manager API → `SignUpActivity` for new Google accounts.
 
 **Flavor-specific code** lives in `src/<flavor>/java/` and `src/<buildType>/`. Each flavor has its own `NotificationManager` and `JuickConfig`.
-
-**Navigation**: `src/main/res/navigation/navigation.xml`. Start: `home`. Key destinations: `discover`, `chats`, `PMFragment` (chat), `thread` (dialog), `blog`, `search`, `tags` (dialog), `discussions`, `new_post`.

From 42aa108114d46255b97dd726c36662de2050d864 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:02:55 +0300
Subject: [PATCH 49/57] fix: hide NSFW images when HIDE_NSFW is set, open photo
 on tap

PostCard dropped the NSFW handling FeedAdapter had, so the huawei flavor
(HIDE_NSFW=true, required for AppGallery) showed NSFW images as is.
Reproduce master's 32x32 downscale/upscale pixelation as a Coil
transformation; Modifier.blur would only work on API 31+ while minSdk
is 24.

Tapping the image opens the full-size photo again, as on master.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../ui/screens/feed/PixelateTransformation.kt | 29 +++++++++++++++++++
 .../juick/android/ui/screens/feed/PostCard.kt | 15 +++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/juick/android/ui/screens/feed/PixelateTransformation.kt

diff --git a/src/main/java/com/juick/android/ui/screens/feed/PixelateTransformation.kt b/src/main/java/com/juick/android/ui/screens/feed/PixelateTransformation.kt
new file mode 100644
index 00000000..bf40806c
--- /dev/null
+++ b/src/main/java/com/juick/android/ui/screens/feed/PixelateTransformation.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2008-2026, Juick
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.juick.android.ui.screens.feed
+
+import android.graphics.Bitmap
+import androidx.core.graphics.scale
+import coil3.size.Size
+import coil3.transform.Transformation
+
+class PixelateTransformation(private val blocks: Int = 32) : Transformation() {
+    override val cacheKey: String = "pixelate-$blocks"
+
+    override suspend fun transform(input: Bitmap, size: Size): Bitmap =
+        input.scale(blocks, blocks, false).scale(input.width, input.height, false)
+}
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 53220dee..19abb27b 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -62,7 +62,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.transformations
 import com.juick.App
+import com.juick.BuildConfig
 import com.juick.R
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
@@ -204,8 +207,18 @@ fun PostCard(
             val medium = photo?.medium
             val imageUrl = medium?.url
             if (!imageUrl.isNullOrBlank()) {
+                val hideNsfw = BuildConfig.HIDE_NSFW && MessageUtils.haveNSFWContent(post)
+                val request = remember(imageUrl, hideNsfw) {
+                    ImageRequest.Builder(context).data(imageUrl)
+                        .apply { if (hideNsfw) transformations(PixelateTransformation()) }
+                        .build()
+                }
                 Spacer(Modifier.height(12.dp))
-                AsyncImage(imageUrl, null, Modifier.fillMaxWidth().height(200.dp), contentScale = ContentScale.FillWidth)
+                AsyncImage(
+                    request, null,
+                    Modifier.fillMaxWidth().height(200.dp).clickable { onLinkClick(photo?.url ?: imageUrl) },
+                    contentScale = ContentScale.FillWidth,
+                )
             }
 
             Spacer(Modifier.height(12.dp))

From 99c6c1d5f59153effd45da269ef209c7c8ae226a Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:02:55 +0300
Subject: [PATCH 50/57] feat: show link previews (YouTube) in PostCard

The google flavor registers YouTubePreviewer, but no Compose screen used
App.previewers after the migration. Posts without a photo now show the
first matching previewer's thumbnail and title, as FeedAdapter did;
tapping it opens the source link.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../juick/android/ui/screens/feed/PostCard.kt  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 19abb27b..20cf5d34 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -45,6 +45,7 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
@@ -67,12 +68,15 @@ import coil3.request.transformations
 import com.juick.App
 import com.juick.BuildConfig
 import com.juick.R
+import com.juick.api.model.LinkPreview
 import com.juick.api.model.Post
 import com.juick.api.model.PostResponse
 import com.juick.util.MessageUtils
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlin.coroutines.resume
 
 private val quoteColor = Color(0xFF666666)
 
@@ -219,6 +223,20 @@ fun PostCard(
                     Modifier.fillMaxWidth().height(200.dp).clickable { onLinkClick(photo?.url ?: imageUrl) },
                     contentScale = ContentScale.FillWidth,
                 )
+            } else {
+                val preview by produceState<LinkPreview?>(null, post.mid, post.rid) {
+                    val text = post.getText()
+                    val previewer = App.instance.previewers.firstOrNull { it.hasViewableContent(text) }
+                        ?: return@produceState
+                    value = suspendCancellableCoroutine { cont -> previewer.getPreviewUrl(text) { cont.resume(it) } }
+                }
+                preview?.let { link ->
+                    Spacer(Modifier.height(12.dp))
+                    Column(Modifier.fillMaxWidth().clickable { onLinkClick(link.source) }) {
+                        AsyncImage(link.url, null, Modifier.fillMaxWidth().height(200.dp), contentScale = ContentScale.Crop)
+                        Text(link.description, style = MaterialTheme.typography.bodySmall, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp))
+                    }
+                }
             }
 
             Spacer(Modifier.height(12.dp))

From a413cc8a775aa460ae2304f41f653802b4427d04 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:38:30 +0300
Subject: [PATCH 51/57] fix: NewPostScreen respects system bar and IME insets

The screen is not wrapped in a Scaffold/TopAppBar, so with edge-to-edge
(enforced at targetSdk 37) the Cancel button and title were drawn under
the status bar, and the send row had no IME padding. safeDrawingPadding
covers status bar, navigation bar and keyboard in one modifier.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../java/com/juick/android/ui/screens/post/NewPostScreen.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
index e40d502b..65632e5c 100644
--- a/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/post/NewPostScreen.kt
@@ -139,7 +139,7 @@ fun NewPostScreen(
         )
     }
 
-    Column(modifier = Modifier.fillMaxSize().padding(16.dp)) {
+    Column(modifier = Modifier.fillMaxSize().safeDrawingPadding().padding(16.dp)) {
         Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
             TextButton(onClick = onDismiss) { Text(stringResource(R.string.Cancel)) }
             Text(stringResource(R.string.New_message), style = MaterialTheme.typography.titleMedium)

From 9c99835e625e7391ccc7ec925f588a47bb0b5323 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:45:19 +0300
Subject: [PATCH 52/57] fix: thread/chat input bars - reply-to overlap and
 navigation bar inset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ThreadScreen put the "In reply to" row and the input row directly in a
  Surface, which stacks children like a Box, so the indicator was drawn
  over the text field. Wrap them in a Column.
- Both input bars only applied imePadding, so with edge-to-edge the text
  field sat on the gesture navigation bar. Pad by navigationBars ∪ ime on
  the bottom edge instead: the bar clears the navigation bar normally and
  the keyboard when it is open.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/screens/chat/ChatScreen.kt     |  4 +-
 .../android/ui/screens/thread/ThreadScreen.kt | 92 ++++++++++---------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
index ba90d26a..72854286 100644
--- a/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chat/ChatScreen.kt
@@ -111,8 +111,8 @@ fun ChatScreen(
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(8.dp)
-                .imePadding(),
+                .windowInsetsPadding(WindowInsets.navigationBars.union(WindowInsets.ime).only(WindowInsetsSides.Bottom))
+                .padding(8.dp),
             verticalAlignment = Alignment.Bottom,
         ) {
             OutlinedTextField(
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index e987f300..f28e84db 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -160,54 +160,56 @@ fun ThreadScreen(
             }
 
             Surface(color = colors.surface, shadowElevation = 2.dp) {
-                replyToPost?.let { target ->
-                    Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) {
-                        AsyncImage(model = target.user.avatar, contentDescription = null, modifier = Modifier.size(20.dp).clip(CircleShape), contentScale = ContentScale.Crop)
-                        Spacer(Modifier.width(8.dp))
-                        Text("In reply to ${target.user.uname}", style = MaterialTheme.typography.bodySmall, color = colors.onSurfaceVariant)
-                        Spacer(Modifier.weight(1f))
-                        IconButton(onClick = { replyToPost = null }, modifier = Modifier.size(20.dp)) {
-                            Icon(Icons.Default.Close, "Clear", tint = colors.onSurfaceVariant)
+                Column(Modifier.windowInsetsPadding(WindowInsets.navigationBars.union(WindowInsets.ime).only(WindowInsetsSides.Bottom))) {
+                    replyToPost?.let { target ->
+                        Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) {
+                            AsyncImage(model = target.user.avatar, contentDescription = null, modifier = Modifier.size(20.dp).clip(CircleShape), contentScale = ContentScale.Crop)
+                            Spacer(Modifier.width(8.dp))
+                            Text("In reply to ${target.user.uname}", style = MaterialTheme.typography.bodySmall, color = colors.onSurfaceVariant)
+                            Spacer(Modifier.weight(1f))
+                            IconButton(onClick = { replyToPost = null }, modifier = Modifier.size(20.dp)) {
+                                Icon(Icons.Default.Close, "Clear", tint = colors.onSurfaceVariant)
+                            }
                         }
                     }
-                }
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(12.dp).imePadding(),
-                    verticalAlignment = Alignment.Bottom,
-                ) {
-                    OutlinedTextField(
-                        value = replyText,
-                        onValueChange = { replyText = it },
-                        placeholder = { Text(stringResource(R.string.reply)) },
-                        modifier = Modifier.weight(1f),
-                        maxLines = 3,
-                    )
-                    Spacer(Modifier.width(4.dp))
-                    IconButton(onClick = {
-                        if (replyAttachmentUri != null) { replyAttachmentUri = null; replyAttachmentMime = null }
-                        else galleryLauncher.launch("image/*")
-                    }) {
-                        Text(if (replyAttachmentUri != null) "📎✓" else "📎", style = MaterialTheme.typography.bodyMedium)
-                    }
-                    Spacer(Modifier.width(4.dp))
-                    val canSend = (replyText.isNotBlank() || replyAttachmentUri != null) && !isSending
-                    IconButton(
-                        onClick = {
-                            if (canSend && App.instance.isAuthenticated) {
-                                val rid = replyToPost?.rid ?: 0
-                                val target = if (rid > 0) "#$mid/$rid" else "#$mid"
-                                isSending = true
-                                try {
-                                    App.instance.sendMessage(scope, messagePosted, "$target $replyText", replyAttachmentUri, replyAttachmentMime)
-                                } catch (e: FileNotFoundException) {
-                                    isSending = false
-                                    Toast.makeText(context, "Attachment error: ${e.message}", Toast.LENGTH_SHORT).show()
-                                }
-                            }
-                        },
-                        enabled = canSend,
+                    Row(
+                        modifier = Modifier.fillMaxWidth().padding(12.dp),
+                        verticalAlignment = Alignment.Bottom,
                     ) {
-                        Icon(Icons.Default.Send, stringResource(R.string.Send), tint = if (canSend) colors.primary else colors.onSurfaceVariant)
+                        OutlinedTextField(
+                            value = replyText,
+                            onValueChange = { replyText = it },
+                            placeholder = { Text(stringResource(R.string.reply)) },
+                            modifier = Modifier.weight(1f),
+                            maxLines = 3,
+                        )
+                        Spacer(Modifier.width(4.dp))
+                        IconButton(onClick = {
+                            if (replyAttachmentUri != null) { replyAttachmentUri = null; replyAttachmentMime = null }
+                            else galleryLauncher.launch("image/*")
+                        }) {
+                            Text(if (replyAttachmentUri != null) "📎✓" else "📎", style = MaterialTheme.typography.bodyMedium)
+                        }
+                        Spacer(Modifier.width(4.dp))
+                        val canSend = (replyText.isNotBlank() || replyAttachmentUri != null) && !isSending
+                        IconButton(
+                            onClick = {
+                                if (canSend && App.instance.isAuthenticated) {
+                                    val rid = replyToPost?.rid ?: 0
+                                    val target = if (rid > 0) "#$mid/$rid" else "#$mid"
+                                    isSending = true
+                                    try {
+                                        App.instance.sendMessage(scope, messagePosted, "$target $replyText", replyAttachmentUri, replyAttachmentMime)
+                                    } catch (e: FileNotFoundException) {
+                                        isSending = false
+                                        Toast.makeText(context, "Attachment error: ${e.message}", Toast.LENGTH_SHORT).show()
+                                    }
+                                }
+                            },
+                            enabled = canSend,
+                        ) {
+                            Icon(Icons.Default.Send, stringResource(R.string.Send), tint = if (canSend) colors.primary else colors.onSurfaceVariant)
+                        }
                     }
                 }
             }

From 04086fc50412ece23a7bf61074fbf6d116a49f2f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:45:19 +0300
Subject: [PATCH 53/57] fix: chats list shows the last message preview

The API fills lastMessageText, not lastMessage, so lastMessageOrNull was
always null and the preview line was empty. Use getLastMessage(), which
falls back to lastMessageText, and drop the now-unused accessor.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../java/com/juick/android/ui/screens/chats/ChatsListScreen.kt  | 2 +-
 src/main/java/com/juick/api/model/Chat.kt                       | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
index 0b0cf071..c018e5cf 100644
--- a/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/chats/ChatsListScreen.kt
@@ -132,7 +132,7 @@ private fun ChatListItem(
                 style = MaterialTheme.typography.titleSmall,
             )
             Text(
-                text = chat.lastMessageOrNull?.getBody() ?: "",
+                text = chat.getLastMessage().getBody() ?: "",
                 style = MaterialTheme.typography.bodySmall,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                 maxLines = 1,
diff --git a/src/main/java/com/juick/api/model/Chat.kt b/src/main/java/com/juick/api/model/Chat.kt
index a507041c..4618cdff 100644
--- a/src/main/java/com/juick/api/model/Chat.kt
+++ b/src/main/java/com/juick/api/model/Chat.kt
@@ -40,8 +40,6 @@ data class Chat(val uname: String) {
 
     val dialogName: String get() = uname
 
-    val lastMessageOrNull: Post? get() = lastMessage
-
     fun getLastMessage(): Post {
         if (lastMessage != null) {
             return lastMessage as Post

From 34e23b7b1026f7aa050e4859292d6862964036d8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 06:45:19 +0300
Subject: [PATCH 54/57] fix: use string resource for Discussions title and
 badge description

It was hard-coded in English although R.string.Discussions exists and is
translated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 src/main/java/com/juick/android/ui/AppScaffold.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/AppScaffold.kt b/src/main/java/com/juick/android/ui/AppScaffold.kt
index c4fe8b8e..6ca58f9c 100644
--- a/src/main/java/com/juick/android/ui/AppScaffold.kt
+++ b/src/main/java/com/juick/android/ui/AppScaffold.kt
@@ -75,7 +75,7 @@ fun AppScaffold(
     val screenTitle = when (route) {
         Route.Discover::class.qualifiedName -> stringResource(R.string.Discover)
         Route.Chats::class.qualifiedName -> stringResource(R.string.PMs)
-        Route.Discussions::class.qualifiedName -> "Discussions"
+        Route.Discussions::class.qualifiedName -> stringResource(R.string.Discussions)
         else -> stringResource(R.string.Juick)
     }
 
@@ -91,7 +91,7 @@ fun AppScaffold(
                         }
                         IconButton(onClick = { navController.navigate(Route.Discussions) { launchSingleTop = true } }) {
                             BadgedBox(badge = { if (unreadCount > 0) Badge { Text("$unreadCount") } }) {
-                                Icon(Icons.Default.Notifications, contentDescription = "Discussions", tint = MaterialTheme.colorScheme.onSurfaceVariant)
+                                Icon(Icons.Default.Notifications, contentDescription = stringResource(R.string.Discussions), tint = MaterialTheme.colorScheme.onSurfaceVariant)
                             }
                         }
                         if (currentProfile != null) {

From bf65b8b8543b96e1223c6758925fd5ac510ccbe2 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 07:03:26 +0300
Subject: [PATCH 55/57] fix: NavHost destinations observe current profile
 instead of a captured one

onResume calls Account.refresh(), which posts null before /me returns.
A destination opened in that window (e.g. a thread opened from a
notification tap while the app is running) kept the null profile it was
created with and never picked up the loaded one, so currentUid stayed 0:
no Delete / privacy items on own posts until the screen was reopened.
Reading profile and unread count through rememberUpdatedState makes the
destinations subscribe to the value instead of capturing it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/navigation/AppNavigation.kt    | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index ada63691..888f46e9 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.core.net.toUri
@@ -74,6 +75,9 @@ fun AppNavigation(
 ) {
     var pendingTag by remember { mutableStateOf<String?>(null) }
 
+    val profile by rememberUpdatedState(currentProfile)
+    val unread by rememberUpdatedState(unreadCount)
+
     var wasAuthenticated by rememberSaveable { mutableStateOf(isAuthenticated) }
     LaunchedEffect(isAuthenticated) {
         if (isAuthenticated && !wasAuthenticated) {
@@ -93,22 +97,22 @@ fun AppNavigation(
                     },
                 )
                 Box(Modifier.fillMaxSize().padding()) {
-                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
+                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
                 }
             }
         }
         composable<Route.Home> {
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
+                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
             }
         }
         composable<Route.Discover> {
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
+                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
             }
         }
         composable<Route.Chats> {
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
                 ChatsListScreen(
                     onChatClick = { chat -> navController.navigate(Route.Chat(chat.dialogName, chat.uid)) },
                     onNavigateToAuth = { navController.navigate(Route.NoAuth) },
@@ -116,8 +120,8 @@ fun AppNavigation(
             }
         }
         composable<Route.Discussions> {
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
+                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
             }
         }
 
@@ -125,13 +129,13 @@ fun AppNavigation(
             dialogProperties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
         ) { entry ->
             val route = entry.toRoute<Route.Thread>()
-            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() }, currentUid = currentProfile?.uid ?: 0, isPremiumOrAdmin = currentProfile?.premium == true || currentProfile?.admin == true)
+            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() }, currentUid = profile?.uid ?: 0, isPremiumOrAdmin = profile?.premium == true || profile?.admin == true)
         }
 
         composable<Route.Blog> { entry ->
             val uname = entry.toRoute<Route.Blog>().uname
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
+                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
             }
         }
 
@@ -142,8 +146,8 @@ fun AppNavigation(
 
         composable<Route.Search> { entry ->
             val query = entry.toRoute<Route.Search>().query
-            AppScaffold(navController, currentProfile, unreadCount, onSignInClick, onFabClick) {
-                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = currentProfile)
+            AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
+                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
                 else SearchScreen(onSearch = { q -> navController.navigate(Route.Search(q)) { popUpTo<Route.Search> { inclusive = true } } })
             }
         }

From 658e7fd4a4c03e39962785617a98e9c9bb435d58 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 07:03:26 +0300
Subject: [PATCH 56/57] fix: update thread and feeds after deleting a post or
 reply

PostCard invoked onDeletePost right after sending the D command, before
the server answered, and no screen passed a handler, so a deleted item
stayed on screen. Master reloaded the thread after deleting a reply and
navigated home (reloading the feed) after deleting a post.

- PostCard calls onDeletePost only after the command succeeds and
  toasts on failure.
- ThreadScreen reloads after a reply is deleted and closes itself after
  the post is deleted.
- The deleted mid is handed to the previous back stack entry through
  savedStateHandle; feeds drop it, so the feed under the thread doesn't
  keep showing a post that no longer exists. Deleting from a feed card
  removes it from that feed directly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../android/ui/navigation/AppNavigation.kt    | 33 ++++++++++++-------
 .../android/ui/screens/feed/FeedScreen.kt     | 11 +++++++
 .../juick/android/ui/screens/feed/PostCard.kt | 14 ++++++--
 .../android/ui/screens/thread/ThreadScreen.kt |  2 ++
 4 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
index 888f46e9..2d6a9f2b 100644
--- a/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
+++ b/src/main/java/com/juick/android/ui/navigation/AppNavigation.kt
@@ -28,6 +28,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -39,6 +40,7 @@ import androidx.core.net.toUri
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.juick.R
+import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -58,6 +60,12 @@ import com.juick.android.ui.AppScaffold
 import com.juick.android.Uris
 import com.juick.api.model.Post
 
+private const val DELETED_MID = "deletedMid"
+
+@Composable
+private fun NavBackStackEntry.deletedMid(): Int =
+    savedStateHandle.getStateFlow(DELETED_MID, 0).collectAsState().value
+
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppNavigation(
@@ -87,7 +95,7 @@ fun AppNavigation(
     }
 
     NavHost(navController = navController, startDestination = if (isAuthenticated) Route.Home else Route.Public) {
-        composable<Route.Public> {
+        composable<Route.Public> { entry ->
             Column(Modifier.fillMaxSize()) {
                 TopAppBar(
                     title = { Text(stringResource(R.string.Juick)) },
@@ -97,18 +105,18 @@ fun AppNavigation(
                     },
                 )
                 Box(Modifier.fillMaxSize().padding()) {
-                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
+                    FeedScreen(Uris.top, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid())
                 }
             }
         }
-        composable<Route.Home> {
+        composable<Route.Home> { entry ->
             AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
-                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
+                FeedScreen(Uris.home, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid())
             }
         }
-        composable<Route.Discover> {
+        composable<Route.Discover> { entry ->
             AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
-                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
+                FeedScreen(Uris.last, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid())
             }
         }
         composable<Route.Chats> {
@@ -119,9 +127,9 @@ fun AppNavigation(
                 )
             }
         }
-        composable<Route.Discussions> {
+        composable<Route.Discussions> { entry ->
             AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
-                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
+                FeedScreen(Uris.discussions, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid())
             }
         }
 
@@ -129,13 +137,16 @@ fun AppNavigation(
             dialogProperties = DialogProperties(usePlatformDefaultWidth = false, decorFitsSystemWindows = false),
         ) { entry ->
             val route = entry.toRoute<Route.Thread>()
-            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() }, currentUid = profile?.uid ?: 0, isPremiumOrAdmin = profile?.premium == true || profile?.admin == true)
+            ThreadScreen(route.mid, route.scrollToEnd, onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, onDismiss = { navController.popBackStack() }, onPostDeleted = {
+                navController.previousBackStackEntry?.savedStateHandle?.set(DELETED_MID, route.mid)
+                navController.popBackStack()
+            }, currentUid = profile?.uid ?: 0, isPremiumOrAdmin = profile?.premium == true || profile?.admin == true)
         }
 
         composable<Route.Blog> { entry ->
             val uname = entry.toRoute<Route.Blog>().uname
             AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
-                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
+                FeedScreen(Uris.getUserPostsByName(uname), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid(), showProfileHeader = true, profileHeader = { ProfileHeader(uname = uname) })
             }
         }
 
@@ -147,7 +158,7 @@ fun AppNavigation(
         composable<Route.Search> { entry ->
             val query = entry.toRoute<Route.Search>().query
             AppScaffold(navController, profile, unread, onSignInClick, onFabClick) {
-                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile)
+                if (query != null) FeedScreen(Uris.search(query), onPostClick, onUserClick, onMenuClick, onLikeClick, onLinkClick, currentUser = profile, deletedMid = entry.deletedMid())
                 else SearchScreen(onSearch = { q -> navController.navigate(Route.Search(q)) { popUpTo<Route.Search> { inclusive = true } } })
             }
         }
diff --git a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
index ac6d165d..b014ff79 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/FeedScreen.kt
@@ -71,6 +71,7 @@ fun FeedScreen(
     showProfileHeader: Boolean = false,
     profileHeader: @Composable () -> Unit = {},
     currentUser: com.juick.api.model.User? = null,
+    deletedMid: Int = 0,
     modifier: Modifier = Modifier,
 ) {
     var apiUrl by remember { mutableStateOf(Uri.EMPTY) }
@@ -97,6 +98,15 @@ fun FeedScreen(
         }
     }
 
+    fun removePost(mid: Int, rid: Int) {
+        allPosts = allPosts.filterNot { it.mid == mid && (rid == 0 || it.rid == rid) }
+        if (feedState?.isSuccess == true) feedState = Result.success(allPosts)
+    }
+
+    LaunchedEffect(deletedMid) {
+        if (deletedMid > 0) removePost(deletedMid, 0)
+    }
+
     LaunchedEffect(initialUrl) {
         if (apiUrl == Uri.EMPTY) apiUrl = initialUrl
     }
@@ -199,6 +209,7 @@ fun FeedScreen(
                                         onLinkClick = onLinkClick,
                                         currentUid = currentUser?.uid ?: 0,
                                         isPremiumOrAdmin = currentUser?.premium == true || currentUser?.admin == true,
+                                        onDeletePost = { removePost(post.mid, post.rid) },
                                         modifier = Modifier.padding(vertical = 4.dp).padding(horizontal = 12.dp),
                                     )
                                 } else {
diff --git a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
index 20cf5d34..e4ae0ddb 100644
--- a/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
+++ b/src/main/java/com/juick/android/ui/screens/feed/PostCard.kt
@@ -47,6 +47,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
@@ -74,6 +75,8 @@ import com.juick.api.model.PostResponse
 import com.juick.util.MessageUtils
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
@@ -103,6 +106,7 @@ fun PostCard(
     val context = LocalContext.current
     val scope = rememberCoroutineScope()
     var confirmDelete by remember { mutableStateOf(false) }
+    val currentOnDeletePost by rememberUpdatedState(onDeletePost)
 
     if (confirmDelete) {
         AlertDialog(
@@ -112,8 +116,14 @@ fun PostCard(
                 TextButton(onClick = {
                     confirmDelete = false
                     val cmd = if (post.rid == 0) "D #${post.mid}" else "D #${post.mid}/${post.rid}"
-                    App.instance.sendMessage(scope, MutableStateFlow<Result<PostResponse>?>(null), cmd)
-                    onDeletePost()
+                    val result = MutableStateFlow<Result<PostResponse>?>(null)
+                    App.instance.sendMessage(scope, result, cmd)
+                    scope.launch {
+                        result.filterNotNull().first().fold(
+                            onSuccess = { currentOnDeletePost() },
+                            onFailure = { Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show() },
+                        )
+                    }
                 }) { Text(stringResource(android.R.string.ok)) }
             },
             dismissButton = {
diff --git a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
index f28e84db..7af5e7be 100644
--- a/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
+++ b/src/main/java/com/juick/android/ui/screens/thread/ThreadScreen.kt
@@ -62,6 +62,7 @@ fun ThreadScreen(
     onLikeClick: (Post) -> Unit,
     onLinkClick: (String) -> Unit,
     onDismiss: () -> Unit,
+    onPostDeleted: () -> Unit = onDismiss,
     currentUid: Int = 0,
     isPremiumOrAdmin: Boolean = false,
 ) {
@@ -153,6 +154,7 @@ fun ThreadScreen(
                             showCounters = false,
                             currentUid = currentUid,
                             isPremiumOrAdmin = isPremiumOrAdmin,
+                            onDeletePost = { if (post.rid == 0) onPostDeleted() else reloadTrigger++ },
                             modifier = Modifier.padding(horizontal = 12.dp, vertical = 4.dp),
                         )
                     }

From 74c7b6e0482488f5174a73ca2717c1b337111fef Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Sun, 27 Sep 2026 07:03:26 +0300
Subject: [PATCH 57/57] test: don't remove the device's real account in
 instrumentation tests

AuthenticatedMainScreenTest removed every account of the app's type in
@AfterClass, so running the suite on a device where someone is signed in
logged them out. It now adds its test account only when none exists and
removes only that one. MainScreenTest.showsLoginButton assumes a
signed-out device instead of relying on the other test having wiped the
account first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../testing/AuthenticatedMainScreenTest.kt        | 15 ++++++++-------
 .../com/juick/android/testing/MainScreenTest.kt   |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt
index c53d59ed..4d93627c 100644
--- a/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/AuthenticatedMainScreenTest.kt
@@ -33,15 +33,17 @@ import org.junit.Test
 class AuthenticatedMainScreenTest {
 
     companion object {
+        private var testAccount: Account? = null
+
         @JvmStatic
         @BeforeClass
         fun setupAccount() {
             val ctx = InstrumentationRegistry.getInstrumentation().targetContext
             val am = AccountManager.get(ctx)
-            am.addAccountExplicitly(
-                Account("test", ctx.getString(R.string.applicationId)),
-                "test_hash", null
-            )
+            if (am.getAccountsByType(ctx.getString(R.string.applicationId)).isEmpty()) {
+                testAccount = Account("test", ctx.getString(R.string.applicationId))
+                am.addAccountExplicitly(testAccount, "test_hash", null)
+            }
             InstrumentationRegistry.getInstrumentation().uiAutomation.executeShellCommand(
                 "pm grant ${ctx.packageName} android.permission.POST_NOTIFICATIONS"
             )
@@ -51,9 +53,8 @@ class AuthenticatedMainScreenTest {
         @AfterClass
         fun cleanup() {
             val ctx = InstrumentationRegistry.getInstrumentation().targetContext
-            AccountManager.get(ctx).getAccountsByType(ctx.getString(R.string.applicationId)).forEach {
-                AccountManager.get(ctx).removeAccountExplicitly(it)
-            }
+            testAccount?.let { AccountManager.get(ctx).removeAccountExplicitly(it) }
+            testAccount = null
         }
     }
 
diff --git a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
index f109164d..30dfa6e7 100644
--- a/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
+++ b/src/androidTest/java/com/juick/android/testing/MainScreenTest.kt
@@ -16,7 +16,6 @@
  */
 package com.juick.android.testing
 
-import android.accounts.Account
 import android.accounts.AccountManager
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
@@ -25,7 +24,7 @@ import androidx.compose.ui.test.onNodeWithText
 import androidx.test.platform.app.InstrumentationRegistry
 import com.juick.R
 import com.juick.android.MainActivity
-import org.junit.After
+import org.junit.Assume.assumeTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -49,6 +48,8 @@ class MainScreenTest {
 
     @Test
     fun showsLoginButton() {
+        val ctx = composeTestRule.activity
+        assumeTrue(AccountManager.get(ctx).getAccountsByType(ctx.getString(R.string.applicationId)).isEmpty())
         composeTestRule.onNodeWithText(composeTestRule.activity.getString(R.string.login)).assertIsDisplayed()
     }
 }