fix(parser): keep the full headword in the display text

The display form was truncated at the first formatting tag, so headwords
with a mid-word stress mark displayed as their prefix only. Build the
display from the full text with tags stripped and render stress marks as
a combining acute accent. Bump the index version so existing indexes
rebuild.

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 OneWay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -5,7 +5,6 @@
 <p align="center">
   <a href="#screenshots">Screenshots</a> &bull;
   <a href="#features">Features</a> &bull;
-  <a href="#architecture">Architecture</a> &bull;
   <a href="#dictionary-pipeline">Pipeline</a> &bull;
   <a href="#build">Build</a>
 </p>
@@ -22,32 +21,19 @@ The app stores dictionaries as DictZip files and builds compact binary indexes f
 ## Features
 
 - Fast headword search across multiple DSL dictionaries.
+- Search history in the empty search state: recent queries with per-entry removal and clear-all.
 - Import local `.dsl`, `.dsl.gz`, and `.dsl.dz` dictionary files.
-- Download dictionaries from configured URLs.
+- Download dictionaries from configured URLs, with an optional `{DATE}` placeholder for dated releases.
 - Automatic extraction, DictZip compression, and indexing.
+- Faithful article rendering with DSL indentation, margins, and named colors.
 - Offline search after dictionaries are indexed.
 - Random-access article loading from DictZip dictionaries.
-- Background processing with progress shown in Settings and notifications.
-- Dictionary management with enable, disable, update, and delete actions.
-- Material 3 interface with light, dark, and system themes.
+- Background processing with progress shown in Settings and notifications; downloads are cancelled with a button on the progress notification.
+- Dictionary management with enable, disable, and update actions; deleting a dictionary is done with a swipe.
+- Material 3 interface with dynamic color, light, dark, and system themes.
 - English and Russian localization.
 - About screen with open source license information.
 
-## Architecture
-
-ReSearch is an Android app written in Kotlin and Jetpack Compose.
-
-```text
-com.example.research/
-├── common/   # shared progress, UI, file, archive, notification utilities
-├── core/     # domain models, source validation, operation results
-├── data/     # DictZip, DSL parsing, indexing, paging, repositories
-├── feature/  # search, dictionary download, local import workflows
-└── ui/       # Compose screens, article view, settings, navigation
-```
-
-State is exposed through Kotlin Flow and collected by Compose screens. Long-running work uses coroutines and foreground services where Android requires visible progress.
-
 ## Dictionary Pipeline
 
 ReSearch supports both downloaded and locally imported dictionaries.
@@ -94,16 +80,16 @@ The main search screen remains usable as long as at least one indexed dictionary
 
 ## Tech Stack
 
-- Kotlin 2.4.10
-- Jetpack Compose (BOM 2026.06.01)
+- Kotlin 2.4.20
+- Jetpack Compose (BOM 2026.09.00)
 - Material 3
 - Coroutines and Flow 1.11.0
 - DataStore Preferences 1.2.1
-- Paging 3.5.0
-- OkHttp 5.4.0
+- Paging 3.5.1
+- OkHttp 5.5.0
 - kotlinx.serialization 1.11.0
-- AboutLibraries 15.0.4 metadata generation
-- Android Gradle Plugin 9.3.0
+- AboutLibraries 15.2.0 metadata generation
+- Android Gradle Plugin 9.4.1
 
 ## Build
 
@@ -111,8 +97,8 @@ The main search screen remains usable as long as at least one indexed dictionary
 ./gradlew :app:assembleRelease
 ```
 
-The release APK targets `arm64-v8a`. English and Russian resources are packaged together.
+The release APK targets `arm64-v8a`.
 
 ## License
 
-MIT
+[MIT](LICENSE)

app/build.gradle.kts

@@ -92,8 +92,8 @@ android {
         applicationId = "com.example.research"
         minSdk = project.property("minSdk").toString().toInt()
         targetSdk = project.property("targetSdk").toString().toInt()
-        versionCode = 6
-        versionName = "1.3.0"
+        versionCode = 9
+        versionName = "1.6.0"
 
         vectorDrawables {
             useSupportLibrary = true

app/src/main/java/com/example/research/DictionaryStatus.kt

@@ -1,5 +1,8 @@
 package com.example.research
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed interface DictionaryStatus {
     data object Unknown : DictionaryStatus
     data object Checking : DictionaryStatus

app/src/main/java/com/example/research/MainActivity.kt

@@ -26,12 +26,12 @@ import com.example.research.common.ui.AppLocaleProvider
 import com.example.research.common.ui.BackgroundTextMeasurementProvider
 import com.example.research.common.ui.theme.ReSearchTheme
 import com.example.research.core.domain.model.AppTheme
+import com.example.research.core.domain.model.SearchBarPosition
+import com.example.research.data.local.preferences.SectionExpansionStates
 import com.example.research.feature.search.SearchAction
 import com.example.research.feature.search.SearchViewModel
 import com.example.research.ui.navigation.AppNavigation
 import com.example.research.ui.settings.SettingsViewModel
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 
 class MainActivity : ComponentActivity() {
     companion object {
@@ -46,7 +46,7 @@ class MainActivity : ComponentActivity() {
         val app = application as ReSearchApplication
         viewModelFactory {
             initializer {
-                SearchViewModel(application, app.localDictionaryRepository, createSavedStateHandle())
+                SearchViewModel(application, app.localDictionaryRepository, app.preferencesManager, createSavedStateHandle())
             }
         }
     }
@@ -69,6 +69,8 @@ class MainActivity : ComponentActivity() {
                     app.dictionaryImportManager,
                     app.dictionaryProgressStateHolder,
                     versionName,
+                    app.initialLaunch.value?.sectionExpansion ?: SectionExpansionStates(),
+                    app.initialLaunch.value?.searchBarPosition ?: SearchBarPosition.TOP,
                 )
             }
         }
@@ -79,17 +81,16 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         requestNotificationPermissionIfNeeded()
 
-        // Load theme and language synchronously before setContent to prevent flashing
         val app = application as ReSearchApplication
-        val initialTheme = loadInitialTheme(app)
-        val initialLanguage = loadInitialLanguage(app)
-
         handleIntent(intent)
         setContent {
+            val initialLaunch by app.initialLaunch.collectAsStateWithLifecycle()
+            val launch = initialLaunch ?: return@setContent
+
             val settingsState by settingsViewModel.uiState.collectAsStateWithLifecycle()
             // Use loaded values initially, then switch to state values when ready
-            val theme = settingsState.theme.takeIf { it != AppTheme.SYSTEM } ?: initialTheme
-            val language = settingsState.language.takeIf { it != "system" } ?: initialLanguage
+            val theme = settingsState.theme.takeIf { it != AppTheme.SYSTEM } ?: launch.theme
+            val language = settingsState.language.takeIf { it != "system" } ?: launch.language
             val darkTheme = when (theme) {
                 AppTheme.LIGHT -> false
                 AppTheme.DARK -> true
@@ -104,7 +105,8 @@ class MainActivity : ComponentActivity() {
                         ) {
                             AppNavigation(
                                 searchViewModel = searchViewModel,
-                                settingsViewModel = settingsViewModel
+                                settingsViewModel = settingsViewModel,
+                                seedNoDictionaries = launch.seedNoDictionaries
                             )
                         }
                     }
@@ -127,44 +129,6 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    /**
-     * Load initial theme synchronously from DataStore to prevent theme flashing.
-     * This is called before setContent to ensure the correct theme is applied immediately.
-     * Uses runBlocking to synchronously read from DataStore.
-     */
-    private fun loadInitialTheme(app: ReSearchApplication): AppTheme {
-        return try {
-            runBlocking {
-                val themeString = app.preferencesManager.themeMode.first()
-                try {
-                    AppTheme.valueOf(themeString)
-                } catch (_: Exception) {
-                    android.util.Log.w("MainActivity", "Invalid theme value: $themeString, using SYSTEM")
-                    AppTheme.SYSTEM
-                }
-            }
-        } catch (e: Exception) {
-            android.util.Log.e("MainActivity", "Failed to load theme preference: ${e.message}")
-            AppTheme.SYSTEM
-        }
-    }
-
-    /**
-     * Load initial language synchronously from DataStore to prevent language flashing.
-     * This is called before setContent to ensure the correct language is applied immediately.
-     * Uses runBlocking to synchronously read from DataStore.
-     */
-    private fun loadInitialLanguage(app: ReSearchApplication): String {
-        return try {
-            runBlocking {
-                app.preferencesManager.language.first()
-            }
-        } catch (e: Exception) {
-            android.util.Log.e("MainActivity", "Failed to load language preference: ${e.message}")
-            "system"
-        }
-    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         handleIntent(intent)
@@ -180,7 +144,7 @@ class MainActivity : ComponentActivity() {
             val text = intent.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT)
                 ?: intent.getCharSequenceExtra(Intent.EXTRA_PROCESS_TEXT_READONLY)
             text?.toString()?.let {
-                searchViewModel.onAction(SearchAction.HandleExternalSearch(it))
+                searchViewModel.onAction(SearchAction.QueryChanged(it))
             }
         }
     }

app/src/main/java/com/example/research/ReSearchApplication.kt

@@ -2,7 +2,11 @@ package com.example.research
 
 import android.app.Application
 import com.example.research.common.progress.DictionaryProgressStateHolder
+import com.example.research.common.util.NotificationHelper
+import com.example.research.core.domain.model.AppTheme
+import com.example.research.core.domain.model.SearchBarPosition
 import com.example.research.data.local.preferences.PreferencesManager
+import com.example.research.data.local.preferences.SectionExpansionStates
 import com.example.research.data.repository.LocalDictionaryRepository
 import com.example.research.feature.download.DownloadManager
 import com.example.research.feature.download.repository.DictionaryRepository
@@ -11,10 +15,26 @@ import com.example.research.feature.import.DictionaryImportManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import okhttp3.Protocol
 
+/**
+ * Values a cold start needs before the first composed frame: the initial
+ * theme, locale, empty-library navigation seed, and settings expansion state.
+ */
+data class InitialLaunch(
+    val theme: AppTheme,
+    val language: String,
+    val searchBarPosition: SearchBarPosition,
+    val seedNoDictionaries: Boolean,
+    val sectionExpansion: SectionExpansionStates,
+)
+
 class ReSearchApplication : Application() {
 
     lateinit var preferencesManager: PreferencesManager
@@ -36,15 +56,28 @@ class ReSearchApplication : Application() {
         private set
     lateinit var dictionaryProgressStateHolder: DictionaryProgressStateHolder
         private set
+    lateinit var dictionaryProgressPresenter: com.example.research.common.progress.DictionaryProgressPresenter
+        private set
+    lateinit var dictionaryPipelineCoordinator: com.example.research.common.progress.DictionaryPipelineCoordinator
+        private set
     private val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 
+    private val _initialLaunch = MutableStateFlow<InitialLaunch?>(null)
+    val initialLaunch: StateFlow<InitialLaunch?> = _initialLaunch.asStateFlow()
+
     override fun onCreate() {
         super.onCreate()
 
+        val notificationHelper = NotificationHelper(this)
+        notificationHelper.cancelProgressNotification()
+
         preferencesManager = PreferencesManager(this)
         applicationScope.launch(Dispatchers.IO) {
             preferencesManager.sanitizeDictionarySources()
         }
+        applicationScope.launch(Dispatchers.IO) {
+            _initialLaunch.value = loadInitialLaunch()
+        }
         localDictionaryRepository = LocalDictionaryRepository(this, preferencesManager = preferencesManager)
 
         okHttpClient = OkHttpClient.Builder()
@@ -62,7 +95,8 @@ class ReSearchApplication : Application() {
 
         downloadManager = DownloadManager(
             dictionaryRepository = downloadDictionaryRepository,
-            unknownErrorMessage = getString(R.string.unknown_error)
+            unknownErrorMessage = getString(R.string.unknown_error),
+            sourceUnavailableMessage = getString(R.string.download_file_not_found)
         )
 
         dictionaryImportManager = DictionaryImportManager(
@@ -76,6 +110,54 @@ class ReSearchApplication : Application() {
             localDictionaryRepository = localDictionaryRepository,
         )
 
+        dictionaryProgressPresenter = com.example.research.common.progress.DictionaryProgressPresenter(
+            scope = applicationScope,
+            progressSnapshot = dictionaryProgressStateHolder.progressSnapshot,
+            notifications = notificationHelper,
+        )
+
+        dictionaryPipelineCoordinator = com.example.research.common.progress.DictionaryPipelineCoordinator(
+            scope = applicationScope,
+            steps = com.example.research.common.progress.DefaultReindexingSteps(
+                localDictionaryRepository = localDictionaryRepository,
+                downloadDictionaryRepository = downloadDictionaryRepository,
+            ),
+            importOperations = dictionaryImportManager,
+            ui = dictionaryProgressPresenter,
+            dictionaryPath = { preferencesManager.dictionaryPath },
+            finishService = {
+                val intent = android.content.Intent(
+                    this,
+                    com.example.research.feature.download.service.DictionaryForegroundService::class.java
+                ).apply {
+                    action = com.example.research.feature.download.service.DictionaryForegroundService.ACTION_FINISH
+                }
+                try {
+                    startService(intent)
+                } catch (_: Exception) {
+                }
+            },
+        )
+
+        dictionaryImportManager.onFlowStarted = { dictionaryProgressPresenter.beginFlow() }
+        dictionaryImportManager.onTerminal = dictionaryPipelineCoordinator::onImportTerminal
+        downloadManager.onFlowStarted = { dictionaryProgressPresenter.beginFlow() }
+        downloadManager.onDownloadSuccess = dictionaryPipelineCoordinator::onDownloadSuccess
+        downloadManager.onTerminal = dictionaryPipelineCoordinator::onDownloadTerminal
+    }
+
+    private suspend fun loadInitialLaunch(): InitialLaunch {
+        return InitialLaunch(
+            theme = runCatching { AppTheme.valueOf(preferencesManager.themeMode.first()) }
+                .getOrDefault(AppTheme.SYSTEM),
+            language = runCatching { preferencesManager.language.first() }.getOrDefault("system"),
+            searchBarPosition = runCatching { preferencesManager.searchBarPosition.first() }
+                .getOrDefault(SearchBarPosition.TOP),
+            seedNoDictionaries = runCatching { preferencesManager.hadNoDictionaries.first() }
+                .getOrDefault(true),
+            sectionExpansion = runCatching { preferencesManager.sectionExpansionStates() }
+                .getOrDefault(SectionExpansionStates()),
+        )
     }
 
     override fun onTrimMemory(level: Int) {

app/src/main/java/com/example/research/common/progress/DictionaryPipelineCoordinator.kt

@@ -0,0 +1,151 @@
+package com.example.research.common.progress
+
+import com.example.research.core.util.OperationResult
+import com.example.research.feature.download.model.DownloadState
+import com.example.research.ui.settings.ImportState
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+import kotlin.time.Duration.Companion.seconds
+
+class DictionaryPipelineCoordinator(
+    private val scope: CoroutineScope,
+    private val steps: ReindexingSteps,
+    private val importOperations: ImportFlowOperations,
+    private val ui: PipelineTerminalUi,
+    private val dictionaryPath: () -> String,
+    private val finishService: () -> Unit,
+    private val launchDispatcher: CoroutineDispatcher = Dispatchers.Main,
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
+) {
+    private var pipelineJob: Job? = null
+
+    fun onImportTerminal(state: ImportState) {
+        when (state) {
+            is ImportState.Success -> runPipeline(isImport = true)
+            is ImportState.Error -> {
+                ui.showError()
+                finishService()
+            }
+            else -> {}
+        }
+    }
+
+    fun onDownloadSuccess() = runPipeline(isImport = false)
+
+    fun onDownloadTerminal(state: DownloadState) {
+        when (state) {
+            is DownloadState.Error -> {
+                ui.showError()
+                finishService()
+            }
+            is DownloadState.Cancelled -> {
+                ui.cancelProgress()
+                finishService()
+            }
+            else -> {}
+        }
+    }
+
+    fun cancelPipeline() {
+        pipelineJob?.cancel()
+        pipelineJob = null
+    }
+
+    private fun runPipeline(isImport: Boolean) {
+        pipelineJob?.cancel()
+        pipelineJob = scope.launch(launchDispatcher) {
+            val dir = File(dictionaryPath())
+            val filesBeforeReindex = dir.listFiles()?.map { it.name }?.toSet() ?: emptySet()
+            try {
+                triggerReindexing(isImport)
+                if (isImport) {
+                    importOperations.getAndClearImportedFiles()
+                    importOperations.clearImportState()
+                    ui.showImportSuccess()
+                } else {
+                    ui.showDownloadSuccess()
+                }
+            } catch (e: CancellationException) {
+                if (isImport) {
+                    val filesToCleanup = importOperations.getAndClearImportedFiles()
+                    filesToCleanup.forEach { file ->
+                        try {
+                            if (file.exists()) file.delete()
+                        } catch (_: Exception) {
+                        }
+                    }
+                    cleanupNewFiles(dir, filesBeforeReindex)
+                }
+                cleanupOrphanedFiles(dir)
+                throw e
+            } catch (_: Exception) {
+                ui.showError()
+            } finally {
+                finishService()
+            }
+        }
+    }
+
+    private suspend fun triggerReindexing(isImport: Boolean) = withContext(ioDispatcher) {
+        steps.waitForIndexingCompletion()
+        delay(1.seconds)
+
+        val path = dictionaryPath()
+        if (isImport) {
+            importOperations.updateExtractionProgress(0f)
+        }
+        steps.extractArchives(onProgress = { progress ->
+            if (isImport) {
+                importOperations.updateExtractionProgress(progress)
+            }
+        })
+        val result = steps.scanDirectory(path)
+        if (result is OperationResult.Success && result.data > 0) {
+            steps.warmupIndexes()
+            steps.performAllCleanup()
+        }
+        if (isImport) {
+            importOperations.markImportPipelineSuccess()
+        }
+    }
+
+    private fun cleanupOrphanedFiles(dir: File?) {
+        try {
+            dir?.listFiles()?.forEach { file ->
+                val n = file.name.lowercase()
+                val isRawDsl = n.endsWith(".dsl") && !n.endsWith(".dsl.dz") && !n.endsWith(".dsl.gz")
+                val isBareDz = n.endsWith(".dz") && !n.endsWith(".dsl.dz")
+                val orphaned = when {
+                    isBareDz -> true
+                    isRawDsl -> !File(file.parent, file.name + ".dz").exists()
+                    else -> false
+                }
+                if (orphaned) {
+                    try { file.delete() } catch (_: Exception) {}
+                }
+            }
+        } catch (_: Exception) {
+        }
+    }
+
+    private fun cleanupNewFiles(dir: File?, filesBeforeSnapshot: Set<String>) {
+        try {
+            dir?.listFiles()?.forEach { file ->
+                if (file.name !in filesBeforeSnapshot) {
+                    try {
+                        file.delete()
+                    } catch (_: Exception) {
+                    }
+                }
+            }
+        } catch (_: Exception) {
+        }
+    }
+}

app/src/main/java/com/example/research/common/progress/DictionaryProgressModel.kt

@@ -109,7 +109,7 @@ object DictionaryProgressModel {
         return Snapshot(
             progress = p,
             percent = (p * 100f).toInt().coerceIn(0, 100),
-            titleRes = R.string.notification_indexing_title,
+            titleRes = R.string.notification_preparing_indexing_title,
         )
     }
 
@@ -120,7 +120,7 @@ object DictionaryProgressModel {
         } else {
             DOWNLOAD_WEIGHT + EXTRACT_WEIGHT + idx * INDEX_WEIGHT
         }
-        val pct = (p * 100f).toInt().coerceIn(0, 100)
+        val pct = (p * 100f).toInt().coerceIn(0, 99)
 
         return Snapshot(
             progress = p,

app/src/main/java/com/example/research/common/progress/DictionaryProgressPresenter.kt

@@ -0,0 +1,57 @@
+package com.example.research.common.progress
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class DictionaryProgressPresenter(
+    scope: CoroutineScope,
+    private val progressSnapshot: StateFlow<DictionaryProgressModel.Snapshot?>,
+    private val notifications: NotificationPort,
+    mainDispatcher: CoroutineDispatcher = Dispatchers.Main,
+) : PipelineTerminalUi {
+    @Volatile
+    private var terminalActive = false
+
+    init {
+        scope.launch(mainDispatcher) {
+            progressSnapshot.collect { snapshot ->
+                when {
+                    snapshot == null -> {
+                        if (!terminalActive && notifications.hasActiveProgressNotification()) {
+                            notifications.cancelProgressNotification()
+                        }
+                    }
+                    !terminalActive -> notifications.showProgress(snapshot.percent, snapshot.titleRes)
+                }
+            }
+        }
+    }
+
+    fun beginFlow() {
+        terminalActive = false
+        notifications.cancelTerminalNotification()
+    }
+
+    override fun showImportSuccess() {
+        notifications.showImportSuccess()
+        terminalActive = true
+    }
+
+    override fun showDownloadSuccess() {
+        notifications.showDownloadSuccess()
+        terminalActive = true
+    }
+
+    override fun showError() {
+        notifications.showError()
+        terminalActive = true
+    }
+
+    override fun cancelProgress() {
+        terminalActive = false
+        notifications.cancelProgressNotification()
+    }
+}

app/src/main/java/com/example/research/common/progress/NotificationPort.kt

@@ -0,0 +1,11 @@
+package com.example.research.common.progress
+
+interface NotificationPort {
+    fun showProgress(percent: Int, titleRes: Int)
+    fun showImportSuccess()
+    fun showDownloadSuccess()
+    fun showError()
+    fun cancelProgressNotification()
+    fun cancelTerminalNotification()
+    fun hasActiveProgressNotification(): Boolean
+}

app/src/main/java/com/example/research/common/progress/PipelineContracts.kt

@@ -0,0 +1,65 @@
+package com.example.research.common.progress
+
+import com.example.research.core.util.OperationResult
+import com.example.research.data.repository.LocalDictionaryRepository
+import com.example.research.feature.download.repository.DictionaryRepository
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.first
+import java.io.File
+import kotlin.time.Duration.Companion.milliseconds
+
+interface PipelineTerminalUi {
+    fun showImportSuccess()
+    fun showDownloadSuccess()
+    fun showError()
+    fun cancelProgress()
+}
+
+interface ImportFlowOperations {
+    fun updateExtractionProgress(progress: Float)
+    fun markImportPipelineSuccess()
+    fun clearImportState()
+    fun getAndClearImportedFiles(): List<File>
+}
+
+interface ReindexingSteps {
+    suspend fun waitForIndexingCompletion(): Boolean
+    suspend fun extractArchives(onProgress: (Float) -> Unit)
+    suspend fun scanDirectory(path: String): OperationResult<Int>
+    suspend fun warmupIndexes()
+    suspend fun performAllCleanup()
+}
+
+class DefaultReindexingSteps(
+    private val localDictionaryRepository: LocalDictionaryRepository,
+    private val downloadDictionaryRepository: DictionaryRepository,
+) : ReindexingSteps {
+
+    override suspend fun waitForIndexingCompletion(): Boolean {
+        if (!localDictionaryRepository.indexingProgress.first().isIndexing) return true
+        var waitCount = 0
+        while (localDictionaryRepository.indexingProgress.first().isIndexing && waitCount < MAX_POLL) {
+            delay(POLL_INTERVAL)
+            waitCount++
+        }
+        return waitCount < MAX_POLL
+    }
+
+    override suspend fun extractArchives(onProgress: (Float) -> Unit) {
+        downloadDictionaryRepository.extractArchives(onProgress = onProgress)
+    }
+
+    override suspend fun scanDirectory(path: String): OperationResult<Int> =
+        localDictionaryRepository.scanDirectory(path)
+
+    override suspend fun warmupIndexes() = localDictionaryRepository.warmupIndexes()
+
+    override suspend fun performAllCleanup() {
+        downloadDictionaryRepository.performAllCleanup()
+    }
+
+    private companion object {
+        const val MAX_POLL = 100
+        val POLL_INTERVAL = 200.milliseconds
+    }
+}

app/src/main/java/com/example/research/common/ui/AppBackButton.kt

@@ -0,0 +1,25 @@
+package com.example.research.common.ui
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.example.research.R
+
+@Composable
+fun AppBackButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    IconButton(onClick = onClick, modifier = modifier.size(48.dp)) {
+        Icon(
+            painter = painterResource(R.drawable.ic_arrow_back),
+            contentDescription = stringResource(R.string.action_back),
+            modifier = Modifier.size(28.dp)
+        )
+    }
+}

app/src/main/java/com/example/research/common/ui/ModifierExtensions.kt

@@ -1,13 +1,17 @@
 package com.example.research.common.ui
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.compose.ui.unit.dp
 
 fun Modifier.appTestTag(tag: String): Modifier = this
     .testTag(tag)
@@ -24,3 +28,14 @@ fun Modifier.clickableWithHaptics(
         onClick()
     }
 }
+
+@Composable
+fun Modifier.iconClickable(
+    enabled: Boolean = true,
+    onClick: () -> Unit
+): Modifier = this.clickable(
+    interactionSource = remember { MutableInteractionSource() },
+    indication = ripple(bounded = false, radius = 20.dp),
+    enabled = enabled,
+    onClick = onClick
+)

app/src/main/java/com/example/research/common/util/FileStorageManager.kt

@@ -19,6 +19,8 @@ class FileStorageManager {
         private const val DELETE_WAIT_INTERVAL = 50L
         private const val MAX_DELETE_WAIT_COUNT = 10
         private const val DEFAULT_MAX_RETRIES = 5
+        private const val CREATE_RETRY_DELAY = 100L
+        private const val MAX_CREATE_RETRIES = 3
         private const val TAG = "FileStorageManager"
     }
 
@@ -87,6 +89,7 @@ class FileStorageManager {
                         Log.e(TAG, "Could not delete existing file: $fileName")
                         return@withContext null
                     }
+                    awaitGone(targetFile::exists)
                 } else {
                     return@withContext Uri.fromFile(targetFile)
                 }
@@ -95,7 +98,18 @@ class FileStorageManager {
             if (tempBinFile.exists()) {
                 tempBinFile.delete()
             }
-            if (targetFile.createNewFile()) {
+            var created = targetFile.createNewFile()
+            var createAttempt = 0
+            while (!created && createAttempt < MAX_CREATE_RETRIES) {
+                delay(CREATE_RETRY_DELAY.milliseconds)
+                if (targetFile.exists()) {
+                    targetFile.delete()
+                    awaitGone(targetFile::exists)
+                }
+                created = targetFile.createNewFile()
+                createAttempt++
+            }
+            if (created) {
                 Uri.fromFile(targetFile)
             } else {
                 Log.e(TAG, "Failed to create file: $fileName")
@@ -116,7 +130,7 @@ class FileStorageManager {
         for (attempt in 1..maxRetries) {
             try {
                 if (file.delete()) {
-                    waitForFileDeletion(file)
+                    awaitGone(file::exists)
                     if (!file.exists()) {
                         return@withContext true
                     }
@@ -141,9 +155,10 @@ class FileStorageManager {
         }
     }
 
-    private suspend fun waitForFileDeletion(file: DocumentFile) {
+    // FUSE-backed storage keeps a just-deleted file visible to stat/open for a short window
+    private suspend fun awaitGone(exists: () -> Boolean) {
         var waitCount = 0
-        while (file.exists() && waitCount < MAX_DELETE_WAIT_COUNT) {
+        while (exists() && waitCount < MAX_DELETE_WAIT_COUNT) {
             delay(DELETE_WAIT_INTERVAL.milliseconds)
             waitCount++
         }

app/src/main/java/com/example/research/common/util/NotificationHelper.kt

@@ -7,11 +7,13 @@ import androidx.core.app.*
 import androidx.core.content.ContextCompat
 import com.example.research.MainActivity
 import com.example.research.R
+import com.example.research.common.progress.NotificationPort
 import com.example.research.feature.download.receiver.DownloadCancelReceiver
-class NotificationHelper(private val context: Context) {
+class NotificationHelper(private val context: Context) : NotificationPort {
     companion object {
         const val CHANNEL_ID = "download_progress_channel"
         const val NOTIFICATION_ID = 1
+        const val TERMINAL_NOTIFICATION_ID = 2
     }
     private val notificationManager = NotificationManagerCompat.from(context)
     private var lastNotificationKey: Int = 0
@@ -57,13 +59,28 @@ class NotificationHelper(private val context: Context) {
         val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as? NotificationManager
         manager?.createNotificationChannel(channel)
     }
-    private fun canShowNotification(): Boolean {
-        if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) return true
-        return ContextCompat.checkSelfPermission(
-            context,
-            android.Manifest.permission.POST_NOTIFICATIONS
-        ) == android.content.pm.PackageManager.PERMISSION_GRANTED
+    private fun canShowNotification(): Boolean =
+        android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU ||
+            ContextCompat.checkSelfPermission(
+                context,
+                android.Manifest.permission.POST_NOTIFICATIONS
+            ) == android.content.pm.PackageManager.PERMISSION_GRANTED
+    override fun showProgress(percent: Int, titleRes: Int) {
+        showUnifiedProgressNotification(
+            title = context.getString(titleRes),
+            contentText = "$percent%",
+            progressPercent = percent,
+        )
     }
+
+    override fun showDownloadSuccess() = showSuccessNotification()
+
+    override fun showImportSuccess() = showImportSuccessNotification()
+
+    override fun showError() = showErrorNotification()
+
+    override fun cancelProgressNotification() = cancelNotification()
+
     fun showSuccessNotification() {
         if (!canShowNotification()) return
         lastNotificationKey = 0
@@ -74,7 +91,7 @@ class NotificationHelper(private val context: Context) {
             .setContentIntent(mainActivityPendingIntent)
             .setAutoCancel(true)
             .build()
-        safeNotify(notification)
+        safeNotifyTerminal(notification)
     }
     fun showErrorNotification() {
         if (!canShowNotification()) return
@@ -86,13 +103,19 @@ class NotificationHelper(private val context: Context) {
             .setContentIntent(mainActivityPendingIntent)
             .setAutoCancel(true)
             .build()
-        safeNotify(notification)
+        safeNotifyTerminal(notification)
     }
     fun cancelNotification() {
         lastNotificationKey = 0
         notificationManager.cancel(NOTIFICATION_ID)
     }
 
+    override fun cancelTerminalNotification() {
+        notificationManager.cancel(TERMINAL_NOTIFICATION_ID)
+    }
+
+    override fun hasActiveProgressNotification(): Boolean = lastNotificationKey != 0
+
     fun showUnifiedProgressNotification(
         title: String,
         contentText: String,
@@ -142,6 +165,14 @@ class NotificationHelper(private val context: Context) {
             // Notification permission denied or security policy blocked
         }
     }
+
+    @SuppressLint("MissingPermission")
+    private fun safeNotifyTerminal(notification: Notification) {
+        try {
+            notificationManager.notify(TERMINAL_NOTIFICATION_ID, notification)
+        } catch (_: SecurityException) {
+        }
+    }
     fun showImportSuccessNotification() {
         if (!canShowNotification()) return
         lastNotificationKey = 0
@@ -152,7 +183,7 @@ class NotificationHelper(private val context: Context) {
             .setContentIntent(mainActivityPendingIntent)
             .setAutoCancel(true)
             .build()
-        safeNotify(notification)
+        safeNotifyTerminal(notification)
     }
     fun createForegroundNotification(): Notification {
         val notification = NotificationCompat.Builder(context, CHANNEL_ID)

app/src/main/java/com/example/research/core/domain/model/DictionarySource.kt

@@ -102,12 +102,15 @@ data class DictionarySource(
 
         fun validateTemplate(template: String): ValidationResult {
             val trimmed = template.trim()
+            val lowerTemplate = trimmed.lowercase()
             return when {
                 trimmed.isBlank() -> ValidationResult.Error(ValidationError.EMPTY)
                 trimmed.length > 2048 -> ValidationResult.Error(ValidationError.TOO_LONG)
-                !trimmed.startsWith("http://") && !trimmed.startsWith("https://") ->
+                !trimmed.startsWith("https://") ->
                     ValidationResult.Error(ValidationError.INVALID_PROTOCOL)
-                !trimmed.endsWith(".gz") && !trimmed.endsWith(".dsl") && !trimmed.endsWith(".dz") ->
+                !lowerTemplate.endsWith(".gz") &&
+                    !lowerTemplate.endsWith(".dsl") &&
+                    !lowerTemplate.endsWith(".dsl.dz") ->
                     ValidationResult.Error(ValidationError.INVALID_EXTENSION)
                 !isValidUrlStructure(trimmed) ->
                     ValidationResult.Error(ValidationError.INVALID_URL_STRUCTURE)
@@ -132,8 +135,15 @@ data class DictionarySource(
                 val parts = afterProtocol.split("/")
                 if (parts.size < 2) return false
                 
-                val domain = parts[0]
-                if (domain.isEmpty()) return false
+                val hostWithPort = parts[0]
+                if (hostWithPort.isEmpty()) return false
+
+                val colonIndex = hostWithPort.lastIndexOf(':')
+                if (colonIndex >= 0) {
+                    val port = hostWithPort.substring(colonIndex + 1).toIntOrNull()
+                    if (port == null || port !in 1..65535) return false
+                }
+                val domain = if (colonIndex >= 0) hostWithPort.substring(0, colonIndex) else hostWithPort
                 if (domain != "localhost" && !domain.contains(".")) return false
                 
                 val filename = parts.last()

app/src/main/java/com/example/research/core/domain/model/IndexingProgress.kt

@@ -1,42 +1,16 @@
 package com.example.research.core.domain.model
-import kotlin.math.roundToInt
+
+import androidx.compose.runtime.Immutable
 
 /**
  * Snapshot of an ongoing indexing operation.
  *
- * [progress] is the authoritative [0f, 1f] completion value and is O(1) to
- * compute: the repository's internal `ProgressTracker` maintains a running
- * sum across files incrementally and stores it in [aggregateSum], avoiding
- * an O(n) walk over [perFileProgress] on every read.
- * [perFileProgress] is kept for diagnostics; callers should prefer
- * [progress] / [progressPercent].
+ * [progress] is the authoritative [0f, 1f] completion value: the repository
+ * aggregates a file-size-weighted sum across files incrementally while
+ * indexing, so reading it is O(1).
  */
+@Immutable
 data class IndexingProgress(
-    val currentFile: String = "",
-    val currentIndex: Int = 0,
-    val totalFiles: Int = 0,
     val isIndexing: Boolean = false,
-    val currentFileProgress: Float = 0f,
-    val label: String = "",
-    val perFileProgress: Map<String, Float> = emptyMap(),
-    /** Pre-aggregated sum in [0f, totalFiles] supplied by the producer; -1f = unknown. */
-    val aggregateSum: Float = -1f,
-) {
-    val progress: Float
-        get() = if (totalFiles > 0) {
-            when {
-                aggregateSum >= 0f -> (aggregateSum / totalFiles).coerceIn(0f, 1f)
-                perFileProgress.isNotEmpty() -> {
-                    val totalProgress = perFileProgress.values.sum()
-                    (totalProgress / totalFiles).coerceIn(0f, 1f)
-                }
-                else -> {
-                    val completedFiles = (currentIndex - 1).coerceAtLeast(0)
-                    ((completedFiles + currentFileProgress) / totalFiles).coerceIn(0f, 1f)
-                }
-            }
-        } else 0f
-
-    val progressPercent: Int
-        get() = (progress * 100).roundToInt().coerceIn(0, 100)
-}
+    val progress: Float = 0f,
+)

app/src/main/java/com/example/research/core/domain/model/SearchBarPosition.kt

@@ -0,0 +1,11 @@
+package com.example.research.core.domain.model
+
+enum class SearchBarPosition {
+    TOP,
+    BOTTOM;
+
+    companion object {
+        fun fromStorage(value: String?): SearchBarPosition =
+            entries.firstOrNull { it.name == value } ?: TOP
+    }
+}

app/src/main/java/com/example/research/core/domain/usecase/DictionarySourceFileMatcher.kt

@@ -0,0 +1,27 @@
+package com.example.research.core.domain.usecase
+
+import com.example.research.core.domain.model.Dictionary
+import com.example.research.core.domain.model.DictionarySource
+import java.io.File
+
+object DictionarySourceFileMatcher {
+    fun matches(source: DictionarySource, fileName: String): Boolean =
+        DictionarySource.matchesDictionaryFile(source.urlTemplate, fileName)
+
+    fun matches(source: DictionarySource, dictionary: Dictionary): Boolean =
+        matches(source, File(dictionary.path).name)
+
+    fun installedSources(
+        sources: List<DictionarySource>,
+        dictionaries: List<Dictionary>,
+    ): List<DictionarySource> = sources.filter { source ->
+        dictionaries.any { dictionary -> matches(source, dictionary) }
+    }
+
+    fun installedSourcesForFileNames(
+        sources: List<DictionarySource>,
+        fileNames: Collection<String>,
+    ): List<DictionarySource> = sources.filter { source ->
+        fileNames.any { fileName -> matches(source, fileName) }
+    }
+}

app/src/main/java/com/example/research/core/domain/usecase/DictionarySourceValidator.kt

@@ -43,12 +43,4 @@ class DictionarySourceValidator {
         return ValidationResult.Valid
     }
 
-    fun findMatchingSourceWithPrecomputedPrefixes(
-        dictionaryPrefix: String,
-        sourcesWithPrefixes: List<Pair<DictionarySource, String?>>
-    ): DictionarySource? {
-        return sourcesWithPrefixes.find { (_, sourcePrefix) ->
-            sourcePrefix != null && dictionaryPrefix.equals(sourcePrefix, ignoreCase = true)
-        }?.first
-    }
 }

app/src/main/java/com/example/research/core/domain/usecase/ManageDictionarySourcesUseCase.kt

@@ -30,17 +30,23 @@ class ManageDictionarySourcesUseCase(
         preferencesManager.removeDictionarySource(sourceId)
     }
 
-    suspend fun removeSourceForDictionary(dictionary: Dictionary) {
-        val dictionaryPrefix = dictionary.name
-        val sources = preferencesManager.dictionarySources.first()
-        val sourcesWithPrefixes = sources.map { source ->
-            source to DictionarySource.extractPrefix(source.urlTemplate)
-        }
+    suspend fun removeSourceForDictionary(
+        dictionary: Dictionary,
+        remainingDictionaryFileNames: Collection<String>?,
+    ) {
+        if (remainingDictionaryFileNames == null) return
 
-        val matchingSource = validator.findMatchingSourceWithPrecomputedPrefixes(dictionaryPrefix, sourcesWithPrefixes)
-        if (matchingSource != null) {
-            preferencesManager.removeDictionarySource(matchingSource.id)
-        }
+        val sources = preferencesManager.dictionarySources.first()
+        val sourceIdsToRemove = sources
+            .filter { source ->
+                DictionarySourceFileMatcher.matches(source, dictionary) &&
+                    remainingDictionaryFileNames.none { fileName ->
+                        DictionarySourceFileMatcher.matches(source, fileName)
+                    }
+            }
+            .map(DictionarySource::id)
+
+        preferencesManager.removeDictionarySources(sourceIdsToRemove)
     }
 
     sealed class AddSourceResult {

app/src/main/java/com/example/research/core/util/NetworkErrorExtensions.kt

@@ -40,6 +40,10 @@ fun Throwable.isNetworkError(): Boolean {
     if (isSslHandshakeError()) return true
 
     return when (this) {
+        is java.net.UnknownHostException,
+        is java.net.ConnectException,
+        is java.net.NoRouteToHostException,
+        is java.net.BindException -> true
         is java.io.IOException -> {
             val message = message ?: ""
             message.contains("connection", ignoreCase = true) ||
@@ -49,9 +53,14 @@ fun Throwable.isNetworkError(): Boolean {
             message.contains("unreachable", ignoreCase = true) ||
             message.contains("no route", ignoreCase = true) ||
             message.contains("broken pipe", ignoreCase = true) ||
+            message.contains("resolve host", ignoreCase = true) ||
+            message.contains("unexpected end of stream", ignoreCase = true) ||
+            message.contains("socket closed", ignoreCase = true) ||
             message.contains("ECONNRESET", ignoreCase = true) ||
             message.contains("ECONNREFUSED", ignoreCase = true) ||
-            message.contains("ENETUNREACH", ignoreCase = true)
+            message.contains("ECONNABORTED", ignoreCase = true) ||
+            message.contains("ENETUNREACH", ignoreCase = true) ||
+            message.contains("EHOSTUNREACH", ignoreCase = true)
         }
         else -> false
     }

app/src/main/java/com/example/research/core/util/StringExtensions.kt

@@ -60,7 +60,10 @@ fun String.extractDictionaryPrefix(): String {
 }
 
 
-fun String.removeAccentTagsForIndexing(): String {
+fun String.removeAccentTagsForIndexing(): String =
+    rewriteAccentTags { builder, from, to -> builder.append(this, from, to) }
+
+internal inline fun String.rewriteAccentTags(appendInner: (StringBuilder, Int, Int) -> Unit): String {
     val firstOpen = indexOf("[']")
     if (firstOpen < 0) return this
 
@@ -80,7 +83,7 @@ fun String.removeAccentTagsForIndexing(): String {
                     builder = StringBuilder(length)
                 }
                 builder.append(this, appendStart, index)
-                builder.append(this, index + 3, scan)
+                appendInner(builder, index + 3, scan)
                 index = scan + 4
                 appendStart = index
                 continue
@@ -94,7 +97,7 @@ fun String.removeAccentTagsForIndexing(): String {
     }?.toString() ?: this
 }
 
-private fun String.startsWithAt(start: Int, literal: String): Boolean {
+internal fun String.startsWithAt(start: Int, literal: String): Boolean {
     if (start < 0 || start + literal.length > length) return false
     for (i in literal.indices) {
         if (this[start + i] != literal[i]) return false

app/src/main/java/com/example/research/data/local/preferences/PreferencesManager.kt

@@ -9,22 +9,41 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.core.stringSetPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.example.research.core.domain.model.DictionarySource
+import com.example.research.core.domain.model.SearchBarPosition
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.serialization.json.Json
 import java.io.File
 
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
 
+data class SectionExpansionStates(
+    val isThemeExpanded: Boolean = false,
+    val isLanguageExpanded: Boolean = false,
+    val isSearchBarExpanded: Boolean = false,
+    val isDictionariesExpanded: Boolean = true,
+)
+
 class PreferencesManager(private val context: Context) {
     private object PreferencesKeys {
         val THEME_MODE = stringPreferencesKey("theme_mode")
         val DICTIONARY_SOURCES = stringPreferencesKey("dictionary_sources")
         val LANGUAGE = stringPreferencesKey("language")
+        val SEARCH_BAR_POSITION = stringPreferencesKey("search_bar_position")
         val IS_THEME_EXPANDED = booleanPreferencesKey("is_theme_expanded")
         val IS_LANGUAGE_EXPANDED = booleanPreferencesKey("is_language_expanded")
+        val IS_SEARCH_BAR_EXPANDED = booleanPreferencesKey("is_search_bar_expanded")
         val IS_DICTIONARIES_EXPANDED = booleanPreferencesKey("is_dictionaries_expanded")
         val DISABLED_DICTIONARY_PATHS = stringSetPreferencesKey("disabled_dictionary_paths")
+        val HAD_NO_DICTIONARIES = booleanPreferencesKey("had_no_dictionaries")
+        val DICTIONARY_STATUS = stringPreferencesKey("dictionary_status")
+        val SEARCH_HISTORY = stringPreferencesKey("search_history")
+    }
+
+    private companion object {
+        const val MAX_SEARCH_HISTORY_ENTRIES = 100
     }
 
     private val json = Json { ignoreUnknownKeys = true }
@@ -48,6 +67,17 @@ class PreferencesManager(private val context: Context) {
         }
     }
 
+    val searchBarPosition: Flow<SearchBarPosition> = context.dataStore.data
+        .map { preferences ->
+            SearchBarPosition.fromStorage(preferences[PreferencesKeys.SEARCH_BAR_POSITION])
+        }
+
+    suspend fun saveSearchBarPosition(position: SearchBarPosition) {
+        context.dataStore.edit { preferences ->
+            preferences[PreferencesKeys.SEARCH_BAR_POSITION] = position.name
+        }
+    }
+
     val dictionarySources: Flow<List<DictionarySource>> = context.dataStore.data
         .map { preferences ->
             val sourcesJson = preferences[PreferencesKeys.DICTIONARY_SOURCES]
@@ -67,6 +97,36 @@ class PreferencesManager(private val context: Context) {
             preferences[PreferencesKeys.DISABLED_DICTIONARY_PATHS] ?: emptySet()
         }
 
+    val hadNoDictionaries: Flow<Boolean> = context.dataStore.data
+        .map { preferences ->
+            preferences[PreferencesKeys.HAD_NO_DICTIONARIES] ?: true
+        }
+
+    suspend fun setHadNoDictionaries(value: Boolean) {
+        context.dataStore.edit { preferences ->
+            preferences[PreferencesKeys.HAD_NO_DICTIONARIES] = value
+        }
+    }
+
+    suspend fun dictionaryStatus(): String? =
+        context.dataStore.data.first()[PreferencesKeys.DICTIONARY_STATUS]
+
+    suspend fun saveDictionaryStatus(status: String) {
+        context.dataStore.edit { preferences ->
+            preferences[PreferencesKeys.DICTIONARY_STATUS] = status
+        }
+    }
+
+    suspend fun sectionExpansionStates(): SectionExpansionStates =
+        context.dataStore.data.first().let { preferences ->
+            SectionExpansionStates(
+                isThemeExpanded = preferences[PreferencesKeys.IS_THEME_EXPANDED] ?: false,
+                isLanguageExpanded = preferences[PreferencesKeys.IS_LANGUAGE_EXPANDED] ?: false,
+                isSearchBarExpanded = preferences[PreferencesKeys.IS_SEARCH_BAR_EXPANDED] ?: false,
+                isDictionariesExpanded = preferences[PreferencesKeys.IS_DICTIONARIES_EXPANDED] ?: true,
+            )
+        }
+
     suspend fun setDictionaryActive(path: String, isActive: Boolean) {
         context.dataStore.edit { preferences ->
             val disabledPaths = preferences[PreferencesKeys.DISABLED_DICTIONARY_PATHS]
@@ -105,6 +165,11 @@ class PreferencesManager(private val context: Context) {
             preferences[PreferencesKeys.IS_LANGUAGE_EXPANDED] ?: false
         }
 
+    val isSearchBarExpanded: Flow<Boolean> = context.dataStore.data
+        .map { preferences ->
+            preferences[PreferencesKeys.IS_SEARCH_BAR_EXPANDED] ?: false
+        }
+
     val isDictionariesExpanded: Flow<Boolean> = context.dataStore.data
         .map { preferences ->
             preferences[PreferencesKeys.IS_DICTIONARIES_EXPANDED] ?: true
@@ -115,6 +180,7 @@ class PreferencesManager(private val context: Context) {
             when (key) {
                 "theme" -> preferences[PreferencesKeys.IS_THEME_EXPANDED] = isExpanded
                 "language" -> preferences[PreferencesKeys.IS_LANGUAGE_EXPANDED] = isExpanded
+                "search_bar" -> preferences[PreferencesKeys.IS_SEARCH_BAR_EXPANDED] = isExpanded
                 "dictionaries" -> preferences[PreferencesKeys.IS_DICTIONARIES_EXPANDED] = isExpanded
             }
         }
@@ -161,6 +227,51 @@ class PreferencesManager(private val context: Context) {
         }
     }
 
+    val searchHistory: Flow<List<String>> = context.dataStore.data
+        .map { preferences -> preferences[PreferencesKeys.SEARCH_HISTORY] }
+        .distinctUntilChanged()
+        .map(::decodeSearchHistory)
+
+    suspend fun addSearchHistoryEntry(query: String) {
+        context.dataStore.edit { preferences ->
+            val current = decodeSearchHistory(preferences[PreferencesKeys.SEARCH_HISTORY])
+                .toMutableList()
+            current.removeAll { it.equals(query, ignoreCase = true) }
+            current.add(0, query)
+            preferences[PreferencesKeys.SEARCH_HISTORY] =
+                json.encodeToString(current.take(MAX_SEARCH_HISTORY_ENTRIES))
+        }
+    }
+
+    suspend fun removeSearchHistoryEntry(query: String) {
+        context.dataStore.edit { preferences ->
+            val current = decodeSearchHistory(preferences[PreferencesKeys.SEARCH_HISTORY])
+                .toMutableList()
+            if (current.removeAll { it == query }) {
+                if (current.isEmpty()) {
+                    preferences.remove(PreferencesKeys.SEARCH_HISTORY)
+                } else {
+                    preferences[PreferencesKeys.SEARCH_HISTORY] = json.encodeToString(current)
+                }
+            }
+        }
+    }
+
+    suspend fun clearSearchHistory() {
+        context.dataStore.edit { preferences ->
+            preferences.remove(PreferencesKeys.SEARCH_HISTORY)
+        }
+    }
+
+    private fun decodeSearchHistory(value: String?): List<String> {
+        if (value == null) return emptyList()
+        return try {
+            json.decodeFromString<List<String>>(value)
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+
     suspend fun sanitizeDictionarySources() {
         context.dataStore.edit { preferences ->
             val currentSources = decodeSources(

app/src/main/java/com/example/research/data/paging/IndexEntryPagingSource.kt

@@ -46,9 +46,8 @@ class IndexEntryPagingSource(
 
     private data class EmittedKey(
         val dictPosition: Int,
-        val originalWord: String,
-        val offset: Long,
-        val length: Int
+        val word: String,
+        val offset: Long
     )
 
     private val emittedArticles = HashSet<EmittedKey>()
@@ -103,6 +102,7 @@ class IndexEntryPagingSource(
                 val normalizedQuery = query.sanitizeQuery().lowercase().trim()
                 val ranked = rawResults.map { it.second }
                     .rankBySearchRelevance(SearchRankingContext(normalizedQuery))
+                    .distinctBy { Triple(it.dictionaryPath, it.word, it.offset.value) }
 
                 rawResults.forEach { (position, entry) -> emittedArticles.add(entry.emittedKey(position)) }
 
@@ -184,7 +184,7 @@ class IndexEntryPagingSource(
     }
 
     private fun IndexEntry.emittedKey(dictPosition: Int) =
-        EmittedKey(dictPosition, originalWord, offset.value, length.value)
+        EmittedKey(dictPosition, word, offset.value)
 
     override fun getRefreshKey(state: PagingState<TailKey, IndexEntry>): TailKey? {
         return null

app/src/main/java/com/example/research/data/parser/DslArticleReader.kt

@@ -180,14 +180,19 @@ internal fun parseDslArticleContent(rawContent: String): String {
 
     while (i < len) {
         val lineStart = i
-        while (i < len && rawContent[i] != '\n') i++
+        while (i < len && rawContent[i] != '\n' && rawContent[i] != '\r') i++
         val lineEnd = i
-        if (i < len && rawContent[i] == '\n') i++
+        if (i < len && rawContent[i] == '\r') {
+            i++
+            if (i < len && rawContent[i] == '\n') i++
+        } else if (i < len && rawContent[i] == '\n') {
+            i++
+        }
 
         if (lineStart == lineEnd && i >= len) break
 
         val line = rawContent.substring(lineStart, lineEnd)
-        val trimmed = line.trimEnd()
+        val trimmed = line.trim()
         if (trimmed.isEmpty()) continue
 
         if (skippingHeadwords) {

app/src/main/java/com/example/research/data/parser/DslHeadwordParser.kt

@@ -1,5 +1,8 @@
 package com.example.research.data.parser
 
+import com.example.research.core.util.rewriteAccentTags
+import com.example.research.core.util.startsWithAt
+
 object DslHeadwordParser {
 
     private val FORMATTING_LITERAL_TAGS = arrayOf(
@@ -24,10 +27,11 @@ object DslHeadwordParser {
         }
 
         if (trimmed.indexOf('{') == -1 && trimmed.indexOf('[') == -1) {
+            val unescaped = unescape(trimmed)
             return ParsedHeadword(
-                simplified = trimmed,
-                displayText = trimmed,
-                searchableText = trimmed.lowercase()
+                simplified = unescaped,
+                displayText = unescaped,
+                searchableText = unescaped.lowercase()
             )
         }
 
@@ -60,9 +64,9 @@ object DslHeadwordParser {
         val searchableText = createSearchableText(trimmed)
 
         return ParsedHeadword(
-            simplified = simplified,
-            displayText = displayText,
-            searchableText = searchableText
+            simplified = unescape(simplified),
+            displayText = unescape(displayText),
+            searchableText = unescape(searchableText)
         )
     }
 
@@ -116,12 +120,12 @@ object DslHeadwordParser {
     }
 
     private fun reconstructDisplayPrefix(value: String): String {
-        val reconstructed = removeCurlyBraceDelimiters(value)
-        val formattingTagIndex = firstFormattingTagIndex(reconstructed)
-        return if (formattingTagIndex >= 0) {
-            reconstructed.substring(0, formattingTagIndex).trim()
-        } else {
-            reconstructed.trim()
+        return removeFormattingTags(removeCurlyBraceDelimiters(value).applyAccentMarks()).trim()
+    }
+
+    private fun String.applyAccentMarks(): String = rewriteAccentTags { builder, from, to ->
+        if (to > from) {
+            builder.append(this[from]).append('\u0301').append(this, from + 1, to)
         }
     }
 
@@ -129,28 +133,30 @@ object DslHeadwordParser {
         if (value.indexOf('{') == -1 && value.indexOf('}') == -1) return value
 
         return buildString(value.length) {
-            value.forEach { char ->
-                if (char != '{' && char != '}') append(char)
+            var index = 0
+            while (index < value.length) {
+                val char = value[index]
+                if (char == '\\' && index + 1 < value.length) {
+                    append(char)
+                    append(value[index + 1])
+                    index += 2
+                } else {
+                    if (char != '{' && char != '}') append(char)
+                    index++
+                }
             }
         }
     }
 
-    private fun firstFormattingTagIndex(value: String): Int {
-        var index = 0
-        while (index < value.length) {
-            if (value[index] == '[' && formattingTagEnd(value, index) > index) {
-                return index
-            }
-            index++
-        }
-        return -1
-    }
-
     private fun firstCurlyContent(value: String): String? {
         var index = 0
         while (index < value.length) {
+            if (value[index] == '\\' && index + 1 < value.length) {
+                index += 2
+                continue
+            }
             if (value[index] == '{') {
-                val end = value.indexOf('}', startIndex = index + 1)
+                val end = matchingCurlyEnd(value, index + 1)
                 if (end > index + 1) {
                     return value.substring(index + 1, end)
                 }
@@ -161,7 +167,7 @@ object DslHeadwordParser {
     }
 
     private fun substringBeforeFirstBracket(value: String): String {
-        val bracketIndex = value.indexOf('[')
+        val bracketIndex = indexOfUnescaped(value, '[')
         return if (bracketIndex >= 0) value.substring(0, bracketIndex) else value
     }
 
@@ -171,8 +177,12 @@ object DslHeadwordParser {
         var index = 0
 
         while (index < value.length) {
+            if (value[index] == '\\' && index + 1 < value.length) {
+                index += 2
+                continue
+            }
             if (value[index] == '{') {
-                val end = value.indexOf('}', startIndex = index + 1)
+                val end = matchingCurlyEnd(value, index + 1)
                 if (end >= 0 && (removeEmpty || end > index + 1)) {
                     if (builder == null) {
                         builder = StringBuilder(value.length)
@@ -197,6 +207,10 @@ object DslHeadwordParser {
         var index = 0
 
         while (index < value.length) {
+            if (value[index] == '\\' && index + 1 < value.length) {
+                index += 2
+                continue
+            }
             if (value[index] == '[') {
                 val tagEnd = formattingTagEnd(value, index)
                 if (tagEnd > index) {
@@ -217,6 +231,56 @@ object DslHeadwordParser {
         }?.toString() ?: value
     }
 
+    private fun matchingCurlyEnd(value: String, startIndex: Int): Int {
+        var index = startIndex
+        while (index < value.length) {
+            when {
+                value[index] == '\\' && index + 1 < value.length -> index += 2
+                value[index] == '{' -> return -1
+                value[index] == '}' -> return index
+                else -> index++
+            }
+        }
+        return -1
+    }
+
+    private fun indexOfUnescaped(
+        value: String,
+        target: Char,
+        startIndex: Int = 0,
+    ): Int {
+        var index = startIndex.coerceAtLeast(0)
+        while (index < value.length) {
+            if (value[index] == '\\' && index + 1 < value.length) {
+                index += 2
+            } else if (value[index] == target) {
+                return index
+            } else {
+                index++
+            }
+        }
+        return -1
+    }
+
+    private fun unescape(value: String): String {
+        val firstEscape = value.indexOf('\\')
+        if (firstEscape < 0) return value
+
+        return buildString(value.length) {
+            append(value, 0, firstEscape)
+            var index = firstEscape
+            while (index < value.length) {
+                if (value[index] == '\\' && index + 1 < value.length) {
+                    append(value[index + 1])
+                    index += 2
+                } else {
+                    append(value[index])
+                    index++
+                }
+            }
+        }
+    }
+
     private fun formattingTagEnd(value: String, openBracketIndex: Int): Int {
         val tokenStart = openBracketIndex + 1
         if (tokenStart >= value.length) return -1
@@ -270,14 +334,6 @@ object DslHeadwordParser {
         return if (index < value.length && value[index] == ']') index + 1 else -1
     }
 
-    private fun String.startsWithAt(start: Int, literal: String): Boolean {
-        if (start < 0 || start + literal.length > length) return false
-        for (i in literal.indices) {
-            if (this[start + i] != literal[i]) return false
-        }
-        return true
-    }
-
     private fun Char.isTagWhitespace(): Boolean {
         return this == ' ' ||
             this == '\t' ||

app/src/main/java/com/example/research/data/parser/DslIndexer.kt

@@ -24,7 +24,7 @@ class DslIndexer(context: Context? = null) {
 
     companion object {
         private const val TAG = "DslIndexer"
-        const val INDEX_VERSION = 6
+        const val INDEX_VERSION = 7
         const val BUFFER_SIZE = 1048576
         const val BATCH_BUFFER_SIZE = 524288
         private const val INDEX_SORT_PARALLELISM = 1

app/src/main/java/com/example/research/data/parser/IndexSearcher.kt

@@ -45,12 +45,6 @@ class IndexSearcher(private val context: Context) {
         val dataStartOffset: Long
     )
 
-    data class IndexComparisonSummary(
-        val expectedCount: Int,
-        val actualCount: Int,
-        val comparedCount: Int
-    )
-
     data class RangeCursor(
         val rangeQuery: String,
         val absoluteIndex: Int,
@@ -72,8 +66,6 @@ class IndexSearcher(private val context: Context) {
         val cursorAfter: RangeCursor?
     )
 
-    class IndexComparisonException(message: String) : IllegalStateException(message)
-
     suspend fun findFirstEntry(pathOrUri: String, query: String): IndexEntry? = withContext(Dispatchers.Default) {
         val normalizedQuery = query.sanitizeQuery().lowercase().trim()
         try {
@@ -244,99 +236,6 @@ class IndexSearcher(private val context: Context) {
         }
     }
 
-    suspend fun compareEntryGroups(
-        expectedIndexPath: String,
-        actualIndexPath: String,
-        onGroup: suspend (word: String, expected: List<IndexEntry>, actual: List<IndexEntry>) -> Unit
-    ): IndexComparisonSummary = withContext(Dispatchers.IO) {
-        val expectedMetadata = loadMetadata(expectedIndexPath)
-        val actualMetadata = loadMetadata(actualIndexPath)
-
-        if (expectedMetadata.totalCount != actualMetadata.totalCount) {
-            throw IndexComparisonException(
-                "Index entry count differs: expected=${expectedMetadata.totalCount}, " +
-                    "actual=${actualMetadata.totalCount}"
-            )
-        }
-
-        openSource(expectedIndexPath).use { expectedSource ->
-            openSource(actualIndexPath).use { actualSource ->
-                expectedSource.seek(expectedMetadata.dataStartOffset)
-                actualSource.seek(actualMetadata.dataStartOffset)
-
-                var expectedNext = readEntryOrNull(expectedSource, expectedMetadata, expectedMetadata.totalCount > 0)
-                var actualNext = readEntryOrNull(actualSource, actualMetadata, actualMetadata.totalCount > 0)
-                var comparedCount = 0
-
-                while (expectedNext != null && actualNext != null) {
-                    if (expectedNext.word != actualNext.word) {
-                        throw IndexComparisonException(
-                            "Index words differ at entry $comparedCount: " +
-                                "expected=${expectedNext.word}, actual=${actualNext.word}"
-                        )
-                    }
-
-                    val word = expectedNext.word
-                    val expectedGroup = mutableListOf<IndexEntry>()
-                    val actualGroup = mutableListOf<IndexEntry>()
-
-                    while (true) {
-                        val current = expectedNext ?: break
-                        if (current.word != word) break
-                        expectedGroup.add(current)
-                        comparedCount++
-                        expectedNext = readEntryOrNull(
-                            expectedSource,
-                            expectedMetadata,
-                            comparedCount < expectedMetadata.totalCount
-                        )
-                    }
-
-                    var actualReadCount = comparedCount - expectedGroup.size
-                    while (true) {
-                        val current = actualNext ?: break
-                        if (current.word != word) break
-                        actualGroup.add(current)
-                        actualReadCount++
-                        actualNext = readEntryOrNull(
-                            actualSource,
-                            actualMetadata,
-                            actualReadCount < actualMetadata.totalCount
-                        )
-                    }
-
-                    if (expectedGroup.size != actualGroup.size) {
-                        throw IndexComparisonException(
-                            "Headword multiplicity differs for '$word': " +
-                                "expected=${expectedGroup.size}, actual=${actualGroup.size}"
-                        )
-                    }
-
-                    onGroup(word, expectedGroup, actualGroup)
-                    if (comparedCount % 10_000 == 0) yield()
-                }
-
-                if (expectedNext != null || actualNext != null) {
-                    throw IndexComparisonException(
-                        "One index ended before the other at entry $comparedCount"
-                    )
-                }
-
-                IndexComparisonSummary(
-                    expectedCount = expectedMetadata.totalCount,
-                    actualCount = actualMetadata.totalCount,
-                    comparedCount = comparedCount
-                )
-            }
-        }
-    }
-
-    private fun readEntryOrNull(
-        source: RandomAccessSource,
-        metadata: IndexMetadata,
-        shouldRead: Boolean
-    ): IndexEntry? = if (shouldRead) readEntry(source, metadata) else null
-
     fun trimMemory(level: Int) {
         metadataCache.trim(level)
         resultsCache.trim(level)
@@ -555,11 +454,7 @@ class IndexSearcher(private val context: Context) {
         val originalWord = readPooledString(source, source.readUnsignedShort())
         val offset = ArticleOffset(source.readLong())
         val length = ArticleLength(source.readInt())
-        val isAlias = if (metadata.version >= 6) {
-            source.readUnsignedByte() and ENTRY_FLAG_ALIAS != 0
-        } else {
-            false
-        }
+        val isAlias = metadata.version >= 6 && source.readUnsignedByte() and ENTRY_FLAG_ALIAS != 0
         return IndexEntry(word, originalWord, offset, length, isAlias = isAlias)
     }
 
@@ -573,8 +468,11 @@ class IndexSearcher(private val context: Context) {
 
     private fun openSource(pathOrUri: String): RandomAccessSource {
         val file = File(pathOrUri)
-        if (!file.exists()) throw DictionaryError.FileSystemError.NotFound(pathOrUri)
-        return FileSource(file)
+        return if (file.exists()) {
+            FileSource(file)
+        } else {
+            throw DictionaryError.FileSystemError.NotFound(pathOrUri)
+        }
     }
     private fun openInputStream(pathOrUri: String): java.io.InputStream {
         val file = File(pathOrUri)

app/src/main/java/com/example/research/data/repository/KotlinDictionaryEngine.kt

@@ -112,20 +112,20 @@ class KotlinDictionaryEngine(private val context: Context) : ProgressIndexingEng
         maxResults: Int
     ): List<IndexEntry> = withContext(Dispatchers.IO) {
         val allResults = mutableListOf<IndexEntry>()
-        for (dict in dictionaries) {
+        for ((name, path, indexPath, _, _, metadata) in dictionaries) {
             try {
-                val indexPath = resolveIndexPath(dict.indexPath)
-                val entry = indexSearcher.findFirstEntry(indexPath, query)
+                val resolvedIndexPath = resolveIndexPath(indexPath)
+                val entry = indexSearcher.findFirstEntry(resolvedIndexPath, query)
                 if (entry != null) {
-                    allResults.add(entry.withDictionary(dict.metadata.name.ifBlank { dict.name }, dict.path))
+                    allResults.add(entry.withDictionary(metadata.name.ifBlank { name }, path))
                 }
                 if (allResults.size >= maxResults) break
             } catch (e: OutOfMemoryError) {
-                Log.e(TAG, "search() - OOM for ${dict.indexPath}", e)
+                Log.e(TAG, "search() - OOM for $indexPath", e)
                 trimMemory(80)
                 break
             } catch (e: Exception) {
-                Log.w(TAG, "search() - error for ${dict.indexPath}: ${e.message}")
+                Log.w(TAG, "search() - error for $indexPath: ${e.message}")
             }
         }
         allResults

app/src/main/java/com/example/research/data/repository/LocalDictionaryRepository.kt

@@ -27,9 +27,9 @@ import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
@@ -70,13 +70,9 @@ private class ProgressTracker(files: List<LocalDictionaryRepository.DiscoveredFi
         aggregateWeightedMicros.addAndGet(newMicros - prevMicros)
     }
 
-    /**
-     * Current weighted sum mapped back to [0f, totalFiles] so the existing
-     * IndexingProgress model can keep deriving progress as aggregate/total.
-     */
-    fun aggregateSum(): Float {
+    fun progress(): Float {
         val weightedProgress = aggregateWeightedMicros.get().toDouble() / (totalWeight.toDouble() * 1_000_000.0)
-        return (weightedProgress.coerceIn(0.0, 1.0) * totalFiles).toFloat()
+        return weightedProgress.coerceIn(0.0, 1.0).toFloat()
     }
 
     fun reset() {
@@ -95,12 +91,10 @@ class LocalDictionaryRepository(
     override val coroutineContext = Job() + ioDispatcher
 
     private val mutableDictionaries = MutableStateFlow<List<Dictionary>>(emptyList())
-    val dictionaries: StateFlow<List<Dictionary>>
-        get() = mutableDictionaries
+    val dictionaries: StateFlow<List<Dictionary>> = mutableDictionaries.asStateFlow()
 
     private val mutableIndexingProgress = MutableStateFlow(IndexingProgress())
-    val indexingProgress: StateFlow<IndexingProgress>
-        get() = mutableIndexingProgress
+    val indexingProgress: StateFlow<IndexingProgress> = mutableIndexingProgress.asStateFlow()
 
     private val indexingMutex = Mutex()
     private val indexingSemaphore = Semaphore(1)
@@ -123,6 +117,24 @@ class LocalDictionaryRepository(
 
     fun isIndexingInProgress(): Boolean = currentIndexingJob?.isActive == true
 
+    suspend fun listDictionaryPayloadFileNames(path: String): List<String>? =
+        withContext(ioDispatcher) {
+            try {
+                val directory = File(path)
+                when {
+                    !directory.exists() -> {
+                        if (directory.parentFile?.isDirectory == true) emptyList() else null
+                    }
+                    !directory.isDirectory -> null
+                    else -> directory.listFiles { file -> isDictionaryPayloadFile(file) }
+                        ?.map(File::getName)
+                }
+            } catch (e: SecurityException) {
+                Log.w(TAG, "Failed to list dictionary files: ${e.message}")
+                null
+            }
+        }
+
     suspend fun scanDirectory(pathOrUri: String): OperationResult<Int> = withContext(ioDispatcher) {
         if (isIndexingInProgress()) {
             return@withContext OperationResult.Error(
@@ -170,67 +182,65 @@ class LocalDictionaryRepository(
                 progressTracker = ProgressTracker(filesToScan)
 
                 existingDictionaries.forEach { dict ->
-                    progressTracker?.updateFileProgress(dict.name, 1.0f)
+                    progressTracker?.updateFileProgress(File(dict.path).name, 1.0f)
                 }
 
                 mutableIndexingProgress.emit(
                     IndexingProgress(
                         isIndexing = true,
-                        currentFile = context.getString(R.string.indexing_label),
-                        totalFiles = filesToScan.size,
-                        currentIndex = filesToScan.size - filesToIndex.size,
-                        aggregateSum = progressTracker?.aggregateSum() ?: -1f,
+                        progress = progressTracker?.progress() ?: 0f,
                     )
                 )
 
                 val lastEmittedPercent = AtomicInteger(-1)
                 val lastProgressEmitMs = AtomicLong(0L)
 
+                val publishCurrentProgress = {
+                    val tracker = progressTracker
+                    if (tracker != null) {
+                        val progress = tracker.progress()
+                        lastEmittedPercent.set((progress * 100f).toInt().coerceIn(0, 100))
+                        lastProgressEmitMs.set(SystemClock.elapsedRealtime())
+                        mutableIndexingProgress.update { p ->
+                            p.copy(progress = progress)
+                        }
+                    }
+                }
+
                 supervisorScope {
-                    filesToIndex.mapIndexed { index, file ->
+                    filesToIndex.map { file ->
                         async {
                             indexingSemaphore.withPermit {
                                 coroutineContext.ensureActive()
                                 yield()
 
-                                val res = indexDictionary(file) { _, op, prog ->
+                                val res = indexDictionary(file) { _, _, prog ->
                                     if (prog >= 0f) {
                                         progressTracker?.updateFileProgress(file.name, prog)
                                     }
 
-                                    val tracker = progressTracker
-                                    val aggregate = tracker?.aggregateSum() ?: -1f
-                                    val newPercent = if (filesToScan.isNotEmpty() && aggregate >= 0f) {
-                                        ((aggregate / filesToScan.size) * 100f).toInt().coerceIn(0, 100)
-                                    } else -1
+                                    val progress = progressTracker?.progress() ?: 0f
+                                    val newPercent = (progress * 100f).toInt().coerceIn(0, 100)
 
-                                    val currentIdx = filesToScan.size - filesToIndex.size + index + 1
-                                    val previous = mutableIndexingProgress.value
                                     val now = SystemClock.elapsedRealtime()
-                                    val percentChanged = newPercent >= 0 && newPercent != lastEmittedPercent.get()
-                                    val fileChanged = previous.currentFile != file.name
+                                    val percentChanged = newPercent != lastEmittedPercent.get()
                                     val completed = newPercent >= 100 || prog >= 1f
                                     val intervalElapsed =
                                         now - lastProgressEmitMs.get() >= MIN_PROGRESS_EMIT_INTERVAL_MS
-                                    val shouldEmit = fileChanged || completed || (percentChanged && intervalElapsed)
+                                    val shouldEmit = completed || (percentChanged && intervalElapsed)
 
                                     if (shouldEmit) {
-                                        if (newPercent >= 0) lastEmittedPercent.set(newPercent)
+                                        lastEmittedPercent.set(newPercent)
                                         lastProgressEmitMs.set(now)
                                         mutableIndexingProgress.update { p ->
-                                            p.copy(
-                                                currentFile = file.name,
-                                                currentIndex = currentIdx,
-                                                currentFileProgress = prog,
-                                                label = op.ifEmpty { p.label },
-                                                aggregateSum = aggregate,
-                                            )
+                                            p.copy(progress = progress)
                                         }
                                     }
                                 }
 
                                 if (res is OperationResult.Success) {
                                     progressTracker?.updateFileProgress(file.name, 1.0f)
+                                    publishCurrentProgress()
                                     totalArticlesIndexed.addAndGet(res.data.articleCount)
                                     val dictionary = res.data
                                     addDictionary(dictionary)
@@ -371,9 +381,7 @@ class LocalDictionaryRepository(
         val dir = File(path)
         if (!dir.exists() || !dir.isDirectory) return emptyList()
 
-        return dir.listFiles { f ->
-            f.isFile && (f.name.endsWith(".dsl") || f.name.endsWith(".dsl.dz") || f.name.endsWith(".dsl.gz"))
-        }?.map { file ->
+        return dir.listFiles { file -> isDictionaryPayloadFile(file) }?.map { file ->
              DiscoveredFile(
                  name = file.name,
                  localPath = file.absolutePath,
@@ -382,6 +390,16 @@ class LocalDictionaryRepository(
         } ?: emptyList()
     }
 
+    private fun isDictionaryPayloadFile(file: File): Boolean {
+        if (!file.isFile) return false
+        val n = file.name.lowercase()
+        if (n.endsWith(".dsl.dz") || n.endsWith(".dsl.gz")) return true
+        if (n.endsWith(".dsl")) {
+            return File(file.parent, file.name + ".dz").exists()
+        }
+        return false
+    }
+
     suspend fun search(query: String): OperationResult<List<IndexEntry>> = withContext(defaultDispatcher) {
         if (query.isBlank()) return@withContext OperationResult.Success(emptyList())
 
@@ -460,53 +478,56 @@ class LocalDictionaryRepository(
     }
 
     suspend fun deleteDictionary(dictionary: Dictionary): OperationResult<Unit> {
-        try {
-            dictionaryStateMutex.withLock { removeDictionaryFromState(dictionary.path) }
-
-            launch(ioDispatcher) {
-                try {
-                    val deleteErrors = mutableListOf<String>()
-
-                    val dictFile = File(dictionary.path)
-                    if (dictFile.exists()) {
-                        if (!dictFile.delete()) {
-                            deleteErrors.add("Failed to delete dictionary file: ${dictFile.absolutePath}")
-                        }
-                    }
-
-                    val indexFile = if (dictionary.indexPath.endsWith(".idx", ignoreCase = true)) {
-                        File(dictionary.indexPath)
-                    } else {
-                        File("${dictionary.indexPath}.idx")
-                    }
-
-                    deleteIndexFiles(indexFile, deleteErrors)
-
-                    if (!dictFile.exists()) {
-                        dictionaryStateMutex.withLock {
-                            preferencesManager.removeDictionaryActiveState(dictionary.path)
-                            removeDictionaryFromState(dictionary.path)
-                        }
-                    }
-
-                    try {
-                        engine.getIndexSearcher().trimMemory(80)
-                    } catch (e: Exception) {
-                        Log.w(TAG, "Failed to trim memory after deletion: ${e.message}")
-                    }
-
-                    if (deleteErrors.isNotEmpty()) {
-                        val message = deleteErrors.joinToString("; ")
-                        Log.w(TAG, "Dictionary deletion completed with errors: $message")
-                    }
-                } catch (e: Exception) {
-                    Log.e(TAG, "Background deletion failed: ${e.message}", e)
+        return try {
+            val (failure, cleanupErrors) = withContext(ioDispatcher) {
+                val dictFile = File(dictionary.path)
+                if (dictFile.exists() && !dictFile.delete()) {
+                    return@withContext Pair(
+                        "Failed to delete dictionary file: ${dictFile.absolutePath}",
+                        emptyList(),
+                    )
                 }
+
+                val deleteErrors = mutableListOf<String>()
+                val indexFile = if (dictionary.indexPath.endsWith(".idx", ignoreCase = true)) {
+                    File(dictionary.indexPath)
+                } else {
+                    File("${dictionary.indexPath}.idx")
+                }
+
+                deleteIndexFiles(indexFile, deleteErrors)
+                Pair<String?, List<String>>(null, deleteErrors)
             }
 
-            return OperationResult.Success(Unit)
+            if (failure != null) {
+                return OperationResult.Error(failure)
+            }
+
+            dictionaryStateMutex.withLock {
+                try {
+                    preferencesManager.removeDictionaryActiveState(dictionary.path)
+                } catch (e: Exception) {
+                    Log.w(TAG, "Failed to clear dictionary active state: ${e.message}")
+                }
+                removeDictionaryFromState(dictionary.path)
+            }
+
+            try {
+                engine.getIndexSearcher().trimMemory(80)
+            } catch (e: Exception) {
+                Log.w(TAG, "Failed to trim memory after deletion: ${e.message}")
+            }
+
+            if (cleanupErrors.isNotEmpty()) {
+                Log.w(
+                    TAG,
+                    "Dictionary deletion completed with errors: ${cleanupErrors.joinToString("; ")}"
+                )
+            }
+
+            OperationResult.Success(Unit)
         } catch (e: Exception) {
-            return OperationResult.Error("Failed to delete dictionary", e)
+            OperationResult.Error("Failed to delete dictionary", e)
         }
     }
 
@@ -517,12 +538,12 @@ class LocalDictionaryRepository(
             val dictionaries = mutableDictionaries.value
             if (dictionaries.isEmpty()) return@withContext
 
-            for (dict in dictionaries) {
+            for ((_, _, indexPath) in dictionaries) {
                 try {
-                    val indexPath = resolveIndexPath(dict.indexPath)
+                    val resolvedIndexPath = resolveIndexPath(indexPath)
                     val indexSearcher = engine.getIndexSearcher()
-                    if (!indexSearcher.isMetadataLoaded(indexPath)) {
-                        engine.preloadIndexMetadata(indexPath)
+                    if (!indexSearcher.isMetadataLoaded(resolvedIndexPath)) {
+                        engine.preloadIndexMetadata(resolvedIndexPath)
                     }
                     yield()
                 } catch (_: Exception) { /* Ignore preload failure */ }

app/src/main/java/com/example/research/feature/download/DownloadManager.kt

@@ -12,6 +12,7 @@ import kotlin.time.Duration.Companion.seconds
 class DownloadManager(
     private val dictionaryRepository: DictionaryRepository,
     private val unknownErrorMessage: String,
+    private val sourceUnavailableMessage: String,
     dispatcher: CoroutineDispatcher = Dispatchers.IO,
     externalScope: CoroutineScope? = null
 ) {
@@ -40,31 +41,51 @@ class DownloadManager(
         val clampedProgress = progress.coerceIn(0f, 1f)
         mutableDownloadProgressState.value = DownloadProgressState(state, clampedProgress)
         mutableDownloadState.value = state
+        if (state is DownloadState.Success) {
+            onDownloadSuccess?.invoke()
+        } else if (state is DownloadState.Error || state is DownloadState.Cancelled) {
+            onTerminal?.invoke(state)
+        }
     }
 
+    var onFlowStarted: (() -> Unit)? = null
+    var onDownloadSuccess: (() -> Unit)? = null
+    var onTerminal: ((DownloadState) -> Unit)? = null
+
     fun startDownload() {
         if (downloadState.value is DownloadState.Loading) return
         if (!downloadScope.isActive) return
+        onFlowStarted?.invoke()
         cancelCleanupJob = null
         downloadJob = downloadScope.launch {
             mutex.withLock {
                 try {
-                    updateDownloadProgressState(DownloadState.Loading, 0f)
-
-                    val hasEnabledSources = try {
-                        dictionaryRepository.hasEnabledSources()
+                    val enabledSources = try {
+                        dictionaryRepository.getEnabledSources()
                     } catch (_: Exception) {
-                        false
+                        emptyList()
                     }
 
-                    if (!hasEnabledSources) {
+                    if (enabledSources.isEmpty()) {
                         dictionaryRepository.performAllCleanup()
-                        updateDownloadProgressState(DownloadState.Success, 1f)
+                        updateDownloadProgressState(DownloadState.Idle, 0f)
                         return@withLock
                     }
+
+                    val downloadableSources =
+                        dictionaryRepository.filterServerAvailableSources(enabledSources)
+                    if (downloadableSources.isEmpty()) {
+                        updateDownloadProgressState(
+                            DownloadState.Error(sourceUnavailableMessage), 0f
+                        )
+                        return@withLock
+                    }
+
+                    updateDownloadProgressState(DownloadState.Loading, 0f)
+
                     var lastReportedProgressBucket = -1
                     val result = ReSearchTrace.asyncSection(ReSearchTrace.DICTIONARY_DOWNLOAD) {
-                        dictionaryRepository.downloadDictionaries { progress ->
+                        dictionaryRepository.downloadSources(downloadableSources) { progress ->
                             val progressBucket = progressBucket(progress, DOWNLOAD_PROGRESS_STEP_PERCENT)
                             if (progressBucket != lastReportedProgressBucket) {
                                 lastReportedProgressBucket = progressBucket
@@ -126,20 +147,41 @@ class DownloadManager(
     fun startDownloadForSources(sourceUrls: List<String>) {
         if (downloadState.value is DownloadState.Loading) return
         if (!downloadScope.isActive) return
+        onFlowStarted?.invoke()
         cancelCleanupJob = null
         downloadJob = downloadScope.launch {
             mutex.withLock {
                 try {
-                    updateDownloadProgressState(DownloadState.Loading, 0f)
-
                     if (sourceUrls.isEmpty()) {
-                        updateDownloadProgressState(DownloadState.Success, 1f)
+                        updateDownloadProgressState(DownloadState.Idle, 0f)
                         return@withLock
                     }
 
+                    val sources = try {
+                        dictionaryRepository.getEnabledSources(sourceUrls)
+                    } catch (_: Exception) {
+                        emptyList()
+                    }
+
+                    if (sources.isEmpty()) {
+                        updateDownloadProgressState(DownloadState.Idle, 0f)
+                        return@withLock
+                    }
+
+                    val downloadableSources =
+                        dictionaryRepository.filterServerAvailableSources(sources)
+                    if (downloadableSources.isEmpty()) {
+                        updateDownloadProgressState(
+                            DownloadState.Error(sourceUnavailableMessage), 0f
+                        )
+                        return@withLock
+                    }
+
+                    updateDownloadProgressState(DownloadState.Loading, 0f)
+
                     var lastReportedProgressBucket = -1
                     val result = ReSearchTrace.asyncSection(ReSearchTrace.DICTIONARY_DOWNLOAD) {
-                        dictionaryRepository.downloadSpecificSources(sourceUrls) { progress ->
+                        dictionaryRepository.downloadSources(downloadableSources) { progress ->
                             val progressBucket = progressBucket(progress, DOWNLOAD_PROGRESS_STEP_PERCENT)
                             if (progressBucket != lastReportedProgressBucket) {
                                 lastReportedProgressBucket = progressBucket

app/src/main/java/com/example/research/feature/download/model/DownloadState.kt

@@ -1,4 +1,8 @@
 package com.example.research.feature.download.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed class DownloadState {
     data object Idle : DownloadState()
     data object Loading : DownloadState()
@@ -7,3 +11,6 @@ sealed class DownloadState {
     data class Error(val message: String) : DownloadState()
     data object Cancelled : DownloadState()
 }
+
+val DownloadState.isActive: Boolean
+    get() = this is DownloadState.Loading || this is DownloadState.Extracting || this is DownloadState.Success

app/src/main/java/com/example/research/feature/download/repository/DictionaryChecker.kt

@@ -7,11 +7,18 @@ import com.example.research.common.util.FileStorageManager
 import com.example.research.common.util.DocumentFileInfo
 import com.example.research.core.domain.model.DictionarySource
 import com.example.research.feature.download.config.DictionaryConfig
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
+enum class SourceAvailability {
+    AVAILABLE,
+    NOT_FOUND,
+    UNKNOWN
+}
+
 class DictionaryChecker(
     private val fileStorageManager: FileStorageManager,
     private val client: OkHttpClient
@@ -58,7 +65,14 @@ class DictionaryChecker(
             val previousDate = DateUtils.getPreviousDateString()
             val dictFiles = getDictFiles(folderUri, files)
 
-            val allHaveToday = enabledSources.all { source ->
+            val datedSources = enabledSources.filter { source ->
+                DictionarySource.hasDatePlaceholder(source.urlTemplate)
+            }
+            if (datedSources.isEmpty()) {
+                return@withContext true
+            }
+
+            val allHaveToday = datedSources.all { source ->
                 dictFiles.hasFileForSource(source, currentDate)
             }
 
@@ -66,26 +80,56 @@ class DictionaryChecker(
                 return@withContext true
             }
 
-            val allHaveYesterday = enabledSources.all { source ->
+            val allHaveYesterday = datedSources.all { source ->
                 dictFiles.hasFileForSource(source, previousDate)
             }
 
             if (allHaveYesterday) {
-                val serverHasToday = enabledSources.any { source ->
+                val serverHasToday = datedSources.any { source ->
                     isSourceAvailableOnServer(source, currentDate)
                 }
 
                 return@withContext !serverHasToday
             }
 
-            false
+            val serverCanOfferNewer = datedSources.any { source ->
+                when (probeSource(source, currentDate)) {
+                    SourceAvailability.AVAILABLE -> true
+                    SourceAvailability.NOT_FOUND ->
+                        probeSource(source, previousDate) == SourceAvailability.AVAILABLE
+                    SourceAvailability.UNKNOWN -> false
+                }
+            }
+
+            return@withContext !serverCanOfferNewer
+        } catch (e: CancellationException) {
+            throw e
         } catch (e: Exception) {
             Log.e(TAG, "Error checking currency: ${e.message}", e)
-            false
+            true
         }
     }
 
-    private fun isSourceAvailableOnServer(source: DictionarySource, date: String): Boolean {
+    suspend fun checkSourceAvailability(source: DictionarySource): SourceAvailability =
+        withContext(Dispatchers.IO) {
+            val currentDate = DateUtils.getCurrentDateString()
+            when (probeSource(source, currentDate)) {
+                SourceAvailability.AVAILABLE -> SourceAvailability.AVAILABLE
+                SourceAvailability.UNKNOWN -> SourceAvailability.UNKNOWN
+                SourceAvailability.NOT_FOUND -> {
+                    if (DictionarySource.hasDatePlaceholder(source.urlTemplate)) {
+                        probeSource(source, DateUtils.getPreviousDateString())
+                    } else {
+                        SourceAvailability.NOT_FOUND
+                    }
+                }
+            }
+        }
+
+    private fun isSourceAvailableOnServer(source: DictionarySource, date: String): Boolean =
+        probeSource(source, date) == SourceAvailability.AVAILABLE
+
+    private fun probeSource(source: DictionarySource, date: String): SourceAvailability {
         return try {
             val url = DictionarySource.buildUrl(source.urlTemplate, date)
             val request = Request.Builder()
@@ -94,12 +138,17 @@ class DictionaryChecker(
                 .build()
 
             client.newCall(request).execute().use { response ->
-                response.isSuccessful &&
+                if (response.isSuccessful &&
                     response.header("Content-Type")?.startsWith("text/html") != true
+                ) {
+                    SourceAvailability.AVAILABLE
+                } else {
+                    SourceAvailability.NOT_FOUND
+                }
             }
         } catch (e: Exception) {
             Log.w(TAG, "Failed to check source availability for ${source.urlTemplate}: ${e.message}")
-            false
+            SourceAvailability.UNKNOWN
         }
     }
 

app/src/main/java/com/example/research/feature/download/repository/DictionaryCleaner.kt

@@ -54,17 +54,17 @@ class DictionaryCleaner(
         for ((prefix, items) in parsedByPrefix) {
             val latestDsl = latestDslDateByPrefix[prefix] ?: continue
             val dslDates = dslDatesByPrefix[prefix].orEmpty()
-            for (item in items) {
-                if (DateUtils.isDateBefore(item.date, latestDsl)) {
-                    toDelete.add(item.name)
+            for ((name, _, date, ext) in items) {
+                if (DateUtils.isDateBefore(date, latestDsl)) {
+                    toDelete.add(name)
                     continue
                 }
-                if (item.ext in indexExtensions && item.date != latestDsl) {
-                    toDelete.add(item.name)
+                if (ext in indexExtensions && date != latestDsl) {
+                    toDelete.add(name)
                     continue
                 }
-                if (item.ext in indexExtensions && item.date !in dslDates) {
-                    toDelete.add(item.name)
+                if (ext in indexExtensions && date !in dslDates) {
+                    toDelete.add(name)
                 }
             }
         }

app/src/main/java/com/example/research/feature/download/repository/DictionaryDownloader.kt

@@ -15,8 +15,11 @@ import com.example.research.feature.download.config.DictionaryConfig
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
@@ -58,20 +61,22 @@ class DictionaryDownloader(
     ) {
         if (fileUri == null) return
 
-        runCatching {
-            val fileToDelete = fileStorageManager.getDocumentFile(fileUri)
-            if (fileToDelete != null && fileToDelete.exists()) {
-                val deleted = fileStorageManager.forceDeleteFile(fileToDelete, fileName)
-                if (!deleted) {
-                    fileStorageManager.forceDeleteFileByName(folderUri, fileName)
-                }
-            }
-        }.onFailure { e ->
-            Log.e(TAG, "Failed to delete partial file: $fileUri", e)
+        withContext(NonCancellable) {
             runCatching {
-                fileStorageManager.forceDeleteFileByName(folderUri, fileName)
-            }.onFailure { deleteError ->
-                Log.e(TAG, "Failed to delete file by name: $fileName", deleteError)
+                val fileToDelete = fileStorageManager.getDocumentFile(fileUri)
+                if (fileToDelete != null && fileToDelete.exists()) {
+                    val deleted = fileStorageManager.forceDeleteFile(fileToDelete, fileName)
+                    if (!deleted) {
+                        fileStorageManager.forceDeleteFileByName(folderUri, fileName)
+                    }
+                }
+            }.onFailure { e ->
+                Log.e(TAG, "Failed to delete partial file: $fileUri", e)
+                runCatching {
+                    fileStorageManager.forceDeleteFileByName(folderUri, fileName)
+                }.onFailure { deleteError ->
+                    Log.e(TAG, "Failed to delete file by name: $fileName", deleteError)
+                }
             }
         }
     }
@@ -169,7 +174,7 @@ class DictionaryDownloader(
     }
 
     private suspend fun deletePartialFileIfExists(folderUri: Uri, fileName: String) {
-        withContext(Dispatchers.IO) {
+        withContext(Dispatchers.IO + NonCancellable) {
             runCatching {
                 val existingFile = fileStorageManager.findFile(folderUri, fileName)
                 if (existingFile != null && existingFile.exists()) {
@@ -313,7 +318,7 @@ class DictionaryDownloader(
             call?.cancel()
             response?.close()
             outputStream?.close()
-            if (e is CancellationException) {
+            if (e is CancellationException || !currentCoroutineContext().isActive) {
                 deletePartialFileIfExists(folderUri, fileName)
                 deletePartialFileSafely(fileUri, folderUri, fileName)
                 throw e

app/src/main/java/com/example/research/feature/download/repository/DictionaryExtractor.kt

@@ -9,7 +9,9 @@ import com.example.research.common.util.FileStorageManager
 import com.example.research.data.dictzip.DictZipRandomAccessFile
 import com.example.research.data.dictzip.DictZipWriter
 import com.example.research.feature.download.config.DictionaryConfig
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.withContext
 
 class DictionaryExtractor(
@@ -44,14 +46,13 @@ class DictionaryExtractor(
                 reportProgress(processedIndex.toFloat() / totalFiles)
             }
 
-            for (file in gzFiles) {
-                val fileName = file.name
+            for ((fileName, uri) in gzFiles) {
                 val baseName = fileName.dropLast(DictionaryConfig.GZ_EXTENSION.length)
                 val lowerBaseName = baseName.lowercase()
                 if (baseName.isBlank() ||
                     lowerBaseName.endsWith(DictionaryConfig.GZ_EXTENSION) ||
                     lowerBaseName.endsWith(".txt")) {
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                     markFileProcessed()
                     continue
                 }
@@ -63,19 +64,19 @@ class DictionaryExtractor(
                 val dslFileName = "$dslBaseName${DictionaryConfig.DSL_EXTENSION}"
                 val existingDslFile = fileStorageManager.findFile(folderUri, dslFileName)
                 if (existingDslFile != null && existingDslFile.exists()) {
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                     markFileProcessed()
                     continue
                 }
                 val dslUri = fileStorageManager.createFileInFolder(folderUri, dslFileName, overwrite = false)
                     ?: continue
-                val extractResult = ArchiveUtils.extractGzWithBom(context, file.uri, dslUri)
+                val extractResult = ArchiveUtils.extractGzWithBom(context, uri, dslUri)
                 if (extractResult.isSuccess) {
                     val extractedFile = fileStorageManager.getDocumentFile(dslUri)
                     if (extractedFile != null && extractedFile.exists()) {
                         if (extractedFile.length() == 0L) {
                             ArchiveUtils.deleteFile(context, dslUri)
-                            ArchiveUtils.deleteFile(context, file.uri)
+                            ArchiveUtils.deleteFile(context, uri)
                             markFileProcessed()
                             continue
                         }
@@ -90,7 +91,7 @@ class DictionaryExtractor(
                             ArchiveUtils.deleteFile(context, dslUri)
                         }
                     }
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                 } else {
                     Log.e("DictionaryExtractor", "File extraction error: $fileName")
                     ArchiveUtils.deleteFile(context, dslUri)
@@ -98,12 +99,11 @@ class DictionaryExtractor(
                 markFileProcessed()
             }
 
-            for (file in rawDslFiles) {
-                val dslFileName = file.name
+            for ((dslFileName, uri) in rawDslFiles) {
                 val dzFileName = "$dslFileName.dz"
                 val existingDz = fileStorageManager.findFile(folderUri, dzFileName)
                 if (existingDz != null && existingDz.exists()) {
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                     markFileProcessed()
                     continue
                 }
@@ -111,11 +111,11 @@ class DictionaryExtractor(
                 val fileBaseProgress = processedIndex.toFloat() / totalFiles
                 val fileProgressWeight = 1f / totalFiles
                 reportProgress(fileBaseProgress)
-                val compressResult = ensureDslDictZip(file.uri, dslFileName, folderUri) { compressProgress ->
+                val compressResult = ensureDslDictZip(uri, dslFileName, folderUri) { compressProgress ->
                     reportProgress(fileBaseProgress + (compressProgress * fileProgressWeight))
                 }
                 if (compressResult.isSuccess) {
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                 }
                 markFileProcessed()
             }
@@ -128,21 +128,48 @@ class DictionaryExtractor(
                     !lowerName.endsWith(DictionaryConfig.DICTZIP_EXTENSION) &&
                     !lowerName.endsWith(".dsl.gz")
             }
-            for (file in remainingRawDslFiles) {
-                val dslFileName = file.name
-                val compressResult = ensureDslDictZip(file.uri, dslFileName, folderUri, onProgress = null)
+            for ((dslFileName, uri) in remainingRawDslFiles) {
+                val compressResult = ensureDslDictZip(uri, dslFileName, folderUri, onProgress = null)
                 if (compressResult.isSuccess) {
-                    ArchiveUtils.deleteFile(context, file.uri)
+                    ArchiveUtils.deleteFile(context, uri)
                 }
             }
 
             onProgress?.invoke(1f)
             Result.success(Unit)
+        } catch (e: CancellationException) {
+            deleteOrphanedFiles(folderUri)
+            throw e
         } catch (e: Exception) {
             Result.failure(e)
         }
     }
 
+    private suspend fun deleteOrphanedFiles(folderUri: Uri) {
+        try {
+            withContext(Dispatchers.IO + NonCancellable) {
+                val files = fileStorageManager.listFilesInFolder(folderUri)
+                for ((name, uri) in files) {
+                    val n = name.lowercase()
+                    val isRawDsl = n.endsWith(DictionaryConfig.DSL_EXTENSION) &&
+                        !n.endsWith(DictionaryConfig.DICTZIP_EXTENSION) &&
+                        !n.endsWith(".dsl.gz")
+                    val isBareDz = n.endsWith(".dz") && !n.endsWith(DictionaryConfig.DICTZIP_EXTENSION)
+                    when {
+                        isBareDz -> ArchiveUtils.deleteFile(context, uri)
+                        isRawDsl -> {
+                            val pair = fileStorageManager.findFile(folderUri, "$name.dz")
+                            if (pair == null || !pair.exists()) {
+                                ArchiveUtils.deleteFile(context, uri)
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (_: Exception) {
+        }
+    }
+
     private suspend fun ensureDslDictZip(
         dslUri: Uri,
         dslFileName: String,

app/src/main/java/com/example/research/feature/download/repository/DictionaryRepository.kt

@@ -8,6 +8,8 @@ import com.example.research.core.domain.model.DictionarySource
 import com.example.research.data.local.preferences.PreferencesManager
 import com.example.research.common.util.FileStorageManager
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -40,74 +42,58 @@ class DictionaryRepository(
         checker.areDictionariesUpToDate(uri, sourcesToCheck, files)
     }
 
-    suspend fun hasEnabledSources(): Boolean = withContext(Dispatchers.IO) {
-        preferencesManager.dictionarySources.first().any { it.isEnabled }
-    }
-
-    suspend fun downloadDictionaries(
-        onProgress: (Float) -> Unit
-    ): Result<Unit> = withContext(Dispatchers.IO) {
-        val folderUri = preferencesManager.dictionaryPath
-        val uri = Uri.fromFile(File(folderUri))
-        val files = fileStorageManager.listFilesInFolder(uri)
-        cleaner.deleteCorruptedArchives(uri, files)
-
-        synchronized(filesBeforeDownload) {
-            filesBeforeDownload = files.map { it.name }.toMutableSet()
-        }
-
-        val sources = preferencesManager.dictionarySources.first()
-        val enabledSources = sources.filter { it.isEnabled }
-
-        synchronized(downloadedPrefixes) {
-            downloadedPrefixes = enabledSources.mapNotNull {
-                DictionarySource.extractPrefix(it.urlTemplate)
-            }.toMutableSet()
-        }
-
-        downloader.downloadDictionaries(
-            folderUri = uri,
-            sources = enabledSources,
-            onProgress = onProgress
-        )
-    }
-
-    suspend fun downloadSpecificSources(
-        sourceUrls: List<String>,
-        onProgress: (Float) -> Unit
-    ): Result<Unit> = withContext(Dispatchers.IO) {
-        val folderUri = preferencesManager.dictionaryPath
-        val uri = Uri.fromFile(File(folderUri))
-        val files = fileStorageManager.listFilesInFolder(uri)
-        cleaner.deleteCorruptedArchives(uri, files)
-
-        synchronized(filesBeforeDownload) {
-            filesBeforeDownload = files.map { it.name }.toMutableSet()
-        }
-
-        val allSources = preferencesManager.dictionarySources.first()
-        val sourceKeys = sourceUrls.mapTo(mutableSetOf(), DictionarySource::identityKey)
-        val sourcesToDownload = allSources.mapNotNull { source ->
-            if (!source.isEnabled || DictionarySource.identityKey(source.urlTemplate) !in sourceKeys) {
-                null
-            } else {
-                source.copy(urlTemplate = DictionarySource.normalizeTemplate(source.urlTemplate))
+    suspend fun getEnabledSources(sourceUrls: List<String>? = null): List<DictionarySource> =
+        withContext(Dispatchers.IO) {
+            val enabledSources = preferencesManager.dictionarySources.first()
+                .filter { it.isEnabled }
+            if (sourceUrls == null) {
+                return@withContext enabledSources
+            }
+            val sourceKeys = sourceUrls.mapTo(mutableSetOf(), DictionarySource::identityKey)
+            enabledSources.mapNotNull { source ->
+                if (DictionarySource.identityKey(source.urlTemplate) !in sourceKeys) {
+                    null
+                } else {
+                    source.copy(urlTemplate = DictionarySource.normalizeTemplate(source.urlTemplate))
+                }
             }
         }
 
-        if (sourcesToDownload.isEmpty()) {
-            return@withContext Result.success(Unit)
+    suspend fun filterServerAvailableSources(
+        sources: List<DictionarySource>
+    ): List<DictionarySource> = withContext(Dispatchers.IO) {
+        if (sources.isEmpty()) {
+            return@withContext emptyList()
+        }
+        sources
+            .map { source -> async { source to checker.checkSourceAvailability(source) } }
+            .awaitAll()
+            .filter { (_, availability) -> availability != SourceAvailability.NOT_FOUND }
+            .map { (source, _) -> source }
+    }
+
+    suspend fun downloadSources(
+        sources: List<DictionarySource>,
+        onProgress: (Float) -> Unit
+    ): Result<Unit> = withContext(Dispatchers.IO) {
+        val folderUri = preferencesManager.dictionaryPath
+        val uri = Uri.fromFile(File(folderUri))
+        val files = fileStorageManager.listFilesInFolder(uri)
+        cleaner.deleteCorruptedArchives(uri, files)
+
+        synchronized(filesBeforeDownload) {
+            filesBeforeDownload = files.map { it.name }.toMutableSet()
         }
 
         synchronized(downloadedPrefixes) {
-            downloadedPrefixes = sourcesToDownload.mapNotNull {
+            downloadedPrefixes = sources.mapNotNull {
                 DictionarySource.extractPrefix(it.urlTemplate)
             }.toMutableSet()
         }
 
         downloader.downloadDictionaries(
             folderUri = uri,
-            sources = sourcesToDownload,
+            sources = sources,
             onProgress = onProgress
         )
     }
@@ -158,9 +144,8 @@ class DictionaryRepository(
         if (filesToDelete.isNotEmpty()) {
             var deletedCount = 0
 
-            for (file in filesToDelete) {
-                val fileName = file.name
-                val docFile = fileStorageManager.getDocumentFile(file.uri)
+            for ((fileName, uri) in filesToDelete) {
+                val docFile = fileStorageManager.getDocumentFile(uri)
                 if (docFile != null && docFile.exists()) {
                     val deleted = docFile.delete()
                     if (deleted) {

app/src/main/java/com/example/research/feature/download/service/DictionaryForegroundService.kt

@@ -3,19 +3,19 @@ package com.example.research.feature.download.service
 import android.app.Service
 import android.content.Intent
 import android.os.IBinder
-import android.util.Log
 import androidx.core.app.ServiceCompat
 import com.example.research.ReSearchApplication
-import com.example.research.common.progress.renderTitle
+import com.example.research.common.progress.DictionaryPipelineCoordinator
+import com.example.research.common.progress.DictionaryProgressPresenter
 import com.example.research.common.util.NotificationHelper
-import com.example.research.core.util.OperationResult
 import com.example.research.data.repository.LocalDictionaryRepository
 import com.example.research.feature.download.DownloadManager
-import com.example.research.feature.download.model.DownloadState
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import kotlin.time.Duration.Companion.milliseconds
-import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.cancelChildren
+import kotlinx.coroutines.Job
 
 class DictionaryForegroundService : Service() {
 
@@ -23,21 +23,21 @@ class DictionaryForegroundService : Service() {
         const val ACTION_START = "com.example.research.START_DOWNLOAD"
         const val ACTION_STOP = "com.example.research.STOP_DOWNLOAD"
         const val ACTION_IMPORT = "com.example.research.START_IMPORT"
+        const val ACTION_FINISH = "com.example.research.FINISH_PIPELINE"
         private const val NOTIFICATION_ID = NotificationHelper.NOTIFICATION_ID
     }
 
     private lateinit var downloadManager: DownloadManager
     private lateinit var localDictionaryRepository: LocalDictionaryRepository
     private lateinit var dictionaryImportManager: com.example.research.feature.import.DictionaryImportManager
-    private lateinit var progressStateHolder: com.example.research.common.progress.DictionaryProgressStateHolder
+    private lateinit var pipelineCoordinator: DictionaryPipelineCoordinator
+    private lateinit var presenter: DictionaryProgressPresenter
     private val notificationHelper by lazy {
         NotificationHelper(this)
     }
 
     private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     @Volatile
-    private var isHandlingSuccess = false
-    @Volatile
     private var latestStartId = 0
 
     override fun onCreate() {
@@ -47,164 +47,8 @@ class DictionaryForegroundService : Service() {
         downloadManager = app.downloadManager
         localDictionaryRepository = app.localDictionaryRepository
         dictionaryImportManager = app.dictionaryImportManager
-        progressStateHolder = app.dictionaryProgressStateHolder
-        observeDownloadState()
-        observeImportState()
-        observeUnifiedProgress()
-    }
-
-    private fun observeDownloadState() {
-        serviceScope.launch {
-            downloadManager.downloadState.collect { state ->
-                when (state) {
-                    is DownloadState.Success -> handleSuccess()
-                    is DownloadState.Error -> {
-                        notificationHelper.showErrorNotification()
-                        stopForegroundService(removeNotification = false)
-                    }
-                    is DownloadState.Cancelled -> {
-                        notificationHelper.cancelNotification()
-                        stopForegroundService()
-                    }
-                    else -> {}
-                }
-            }
-        }
-    }
-
-    private fun observeImportState() {
-        serviceScope.launch {
-            dictionaryImportManager.importState.collect { state ->
-                when (state) {
-                    is com.example.research.ui.settings.ImportState.Success -> handleSuccess()
-                    is com.example.research.ui.settings.ImportState.Error -> {
-                        notificationHelper.showErrorNotification()
-                        stopForegroundService(removeNotification = false)
-                    }
-                    else -> {}
-                }
-            }
-        }
-    }
-
-    private fun observeUnifiedProgress() {
-        serviceScope.launch {
-            progressStateHolder.progressSnapshot
-                .collect { snapshot ->
-                    if (snapshot != null) {
-                        notificationHelper.showUnifiedProgressNotification(
-                            title = snapshot.renderTitle(this@DictionaryForegroundService),
-                            contentText = "${snapshot.percent}%",
-                            progressPercent = snapshot.percent,
-                        )
-                    }
-                }
-        }
-    }
-
-    private suspend fun triggerReindexing(isImportFlow: Boolean) = withContext(Dispatchers.IO) {
-        try {
-            waitForIndexingCompletion()
-            delay(1.seconds)
-
-            val app = application as? ReSearchApplication
-                ?: return@withContext
-            val path = app.preferencesManager.dictionaryPath
-            if (isImportFlow) {
-                dictionaryImportManager.updateExtractionProgress(0f)
-            }
-            app.downloadDictionaryRepository.extractArchives(onProgress = { progress ->
-                if (isImportFlow) {
-                    dictionaryImportManager.updateExtractionProgress(progress)
-                }
-            })
-            val result = localDictionaryRepository.scanDirectory(path)
-            if (result is OperationResult.Success && result.data > 0) {
-                localDictionaryRepository.warmupIndexes()
-                app.downloadDictionaryRepository.performAllCleanup()
-            }
-            if (isImportFlow) {
-                dictionaryImportManager.markImportPipelineSuccess()
-            }
-        } catch (e: CancellationException) {
-            throw e
-        } catch (e: Exception) {
-            Log.e("DictionaryForegroundService", "triggerReindexing() failed: ${e.message}", e)
-        }
-    }
-
-    private suspend fun waitForIndexingCompletion(): Boolean {
-        val isIndexing = localDictionaryRepository.indexingProgress.first().isIndexing
-
-        if (!isIndexing) {
-            return true
-        }
-
-        var waitCount = 0
-        while (localDictionaryRepository.indexingProgress.first().isIndexing && waitCount < 100) {
-            delay(200.milliseconds)
-            waitCount++
-        }
-
-        return waitCount < 100
-    }
-
-    private fun handleSuccess() {
-        if (isHandlingSuccess) return
-        isHandlingSuccess = true
-        serviceScope.launch {
-            try {
-                val isImportFlow = dictionaryImportManager.importState.value !is com.example.research.ui.settings.ImportState.Idle
-
-                if (isImportFlow) {
-                    val app = application as? ReSearchApplication
-                    val path = app?.preferencesManager?.dictionaryPath
-                    val dictionariesDir = path?.let { java.io.File(it) }
-                    val filesBeforeReindex = dictionariesDir?.listFiles()?.map { it.name }?.toSet() ?: emptySet()
-
-                    try {
-                        triggerReindexing(true)
-                        dictionaryImportManager.getAndClearImportedFiles()
-                    } catch (e: CancellationException) {
-                        val filesToCleanup = dictionaryImportManager.getAndClearImportedFiles()
-                        filesToCleanup.forEach { file ->
-                            try { if (file.exists()) file.delete() } catch (_: Exception) { /* Ignore cleanup failure */ }
-                        }
-                        if (dictionariesDir != null) {
-                            cleanupNewFiles(dictionariesDir, filesBeforeReindex)
-                        }
-                        throw e
-                    }
-                } else {
-                    triggerReindexing(false)
-                }
-
-                if (isImportFlow) {
-                    notificationHelper.showImportSuccessNotification()
-                    dictionaryImportManager.clearImportState()
-                } else {
-                    notificationHelper.showSuccessNotification()
-                }
-            } catch (e: Exception) {
-                if (e !is CancellationException) {
-                    Log.e("DownloadForegroundService", "handleSuccess() failed: ${e.message}", e)
-                    notificationHelper.showErrorNotification()
-                }
-            } finally {
-                isHandlingSuccess = false
-                stopForegroundService(removeNotification = false)
-            }
-        }
-    }
-
-    private fun cleanupNewFiles(dir: java.io.File, filesBeforeSnapshot: Set<String>) {
-        try {
-            dir.listFiles()?.forEach { file ->
-                if (file.name !in filesBeforeSnapshot) {
-                    try { file.delete() } catch (_: Exception) { /* Ignore delete failure */ }
-                }
-            }
-        } catch (_: Exception) { /* Ignore directory listing failure */ }
+        pipelineCoordinator = app.dictionaryPipelineCoordinator
+        presenter = app.dictionaryProgressPresenter
     }
 
     private fun startForegroundService() {
@@ -244,20 +88,31 @@ class DictionaryForegroundService : Service() {
         stopForTimeout(startId)
     }
 
+    override fun onTaskRemoved(rootIntent: Intent?) {
+        cancelAllWork()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
     override fun onTimeout(startId: Int, fgsType: Int) {
         stopForTimeout(startId)
     }
 
     private fun stopForTimeout(startId: Int) {
+        cancelAllWork()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelfResult(startId)
+    }
+
+    private fun cancelAllWork() {
         serviceScope.coroutineContext[Job]?.cancelChildren()
+        pipelineCoordinator.cancelPipeline()
         if (localDictionaryRepository.isIndexingInProgress()) {
             localDictionaryRepository.cancelIndexing()
         }
         downloadManager.cancelDownload()
         dictionaryImportManager.cancelImport()
-        notificationHelper.cancelNotification()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelfResult(startId)
+        presenter.cancelProgress()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
@@ -275,21 +130,16 @@ class DictionaryForegroundService : Service() {
             ACTION_IMPORT -> {
                 startForegroundService()
             }
+            ACTION_FINISH -> {
+                stopForegroundService(removeNotification = true)
+            }
             ACTION_STOP -> {
                 try {
                     startForegroundService()
                 } catch (_: Exception) {
                     // Service may already be stopped
                 }
-                serviceScope.coroutineContext[Job]?.cancelChildren()
-
-                if (localDictionaryRepository.isIndexingInProgress()) {
-                    localDictionaryRepository.cancelIndexing()
-                }
-
-                downloadManager.cancelDownload()
-                dictionaryImportManager.cancelImport()
-                notificationHelper.cancelNotification()
+                cancelAllWork()
                 stopForegroundService()
             }
         }

app/src/main/java/com/example/research/feature/import/DictionaryImportManager.kt

@@ -3,6 +3,7 @@ package com.example.research.feature.import
 import android.app.Application
 import android.net.Uri
 import com.example.research.R
+import com.example.research.common.progress.ImportFlowOperations
 import com.example.research.common.util.SafeFileName
 import com.example.research.core.performance.ReSearchTrace
 import com.example.research.ui.settings.ImportState
@@ -14,16 +15,19 @@ import java.util.Collections
 
 class DictionaryImportManager(
     private val application: Application
-) {
+) : ImportFlowOperations {
     private val mutableImportState = MutableStateFlow<ImportState>(ImportState.Idle)
     val importState: StateFlow<ImportState> = mutableImportState.asStateFlow()
 
     private val managerScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private var importJob: Job? = null
     private val importedFiles = Collections.synchronizedList(mutableListOf<File>())
+    var onFlowStarted: (() -> Unit)? = null
+    var onTerminal: ((ImportState) -> Unit)? = null
 
     fun importDictionaries(uris: List<Uri>) {
         importJob?.cancel()
+        onFlowStarted?.invoke()
         importJob = managerScope.launch {
             mutableImportState.value = ImportState.Idle
             performImport(uris)
@@ -36,6 +40,8 @@ class DictionaryImportManager(
         val dictionariesDir = File(context.getExternalFilesDir(null), "dictionaries")
         val totalFiles = uris.size.coerceAtLeast(1)
         importedFiles.clear()
+        val skippedNames = mutableListOf<String>()
+        val deferredErrors = mutableListOf<String>()
 
         if (!dictionariesDir.exists()) {
             dictionariesDir.mkdirs()
@@ -46,9 +52,7 @@ class DictionaryImportManager(
                 currentCoroutineContext().ensureActive()
                 val fileName = getFileName(uri) ?: continue
                 if (SafeFileName.validate(fileName) == null) {
-                    mutableImportState.value = ImportState.Error(
-                        context.getString(R.string.import_invalid_file_name, fileName)
-                    )
+                    deferredErrors += context.getString(R.string.import_invalid_file_name, fileName)
                     continue
                 }
                 val lowerFileName = fileName.lowercase()
@@ -65,9 +69,7 @@ class DictionaryImportManager(
                 val destFile = File(dictionariesDir, fileName)
 
                 if (destFile.exists()) {
-                    mutableImportState.value = ImportState.Error(
-                        context.getString(R.string.import_file_exists, fileName)
-                    )
+                    skippedNames += fileName
                     continue
                 }
 
@@ -115,16 +117,30 @@ class DictionaryImportManager(
 
             currentCoroutineContext().ensureActive()
 
-            mutableImportState.value = ImportState.Success
+            val terminalState = resolveImportOutcome(
+                importedCount = importedFiles.size,
+                skippedNames = skippedNames,
+                deferredErrors = deferredErrors,
+            ).toImportState(
+                existsMessage = { names ->
+                    context.getString(R.string.import_file_exists, names.joinToString(separator = ", "))
+                },
+                invalidMessage = { message -> message },
+                nothingImportedMessage = { context.getString(R.string.import_nothing_imported) },
+            )
+            mutableImportState.value = terminalState
+            onTerminal?.invoke(terminalState)
 
         } catch (e: CancellationException) {
             cleanupImportedFiles()
             mutableImportState.value = ImportState.Idle
             throw e
         } catch (e: Exception) {
-            mutableImportState.value = ImportState.Error(
+            val errorState = ImportState.Error(
                 context.getString(R.string.import_error, e.message ?: "Unknown error")
             )
+            mutableImportState.value = errorState
+            onTerminal?.invoke(errorState)
         }
         }
 
@@ -154,18 +170,18 @@ class DictionaryImportManager(
         return size
     }
 
-    fun clearImportState() {
+    override fun clearImportState() {
         mutableImportState.value = ImportState.Idle
     }
 
-    fun updateExtractionProgress(progress: Float) {
+    override fun updateExtractionProgress(progress: Float) {
         mutableImportState.update { current ->
             if (current is ImportState.Idle || current is ImportState.Error) current
             else ImportState.Extracting(progress.coerceIn(0f, 1f))
         }
     }
 
-    fun markImportPipelineSuccess() {
+    override fun markImportPipelineSuccess() {
         mutableImportState.update { current ->
             if (current is ImportState.Idle || current is ImportState.Error) current
             else ImportState.Success
@@ -179,7 +195,7 @@ class DictionaryImportManager(
         mutableImportState.value = ImportState.Idle
     }
 
-    fun getAndClearImportedFiles(): List<File> {
+    override fun getAndClearImportedFiles(): List<File> {
         val files = importedFiles.toList()
         importedFiles.clear()
         return files

app/src/main/java/com/example/research/feature/import/ImportOutcome.kt

@@ -0,0 +1,32 @@
+package com.example.research.feature.import
+
+import com.example.research.ui.settings.ImportState
+
+internal sealed interface ImportOutcome {
+    data object Imported : ImportOutcome
+    data class AlreadyExists(val names: List<String>) : ImportOutcome
+    data class InvalidFile(val message: String) : ImportOutcome
+    data object NothingImported : ImportOutcome
+}
+
+internal fun resolveImportOutcome(
+    importedCount: Int,
+    skippedNames: List<String>,
+    deferredErrors: List<String>,
+): ImportOutcome = when {
+    importedCount > 0 -> ImportOutcome.Imported
+    skippedNames.isNotEmpty() -> ImportOutcome.AlreadyExists(skippedNames)
+    deferredErrors.isNotEmpty() -> ImportOutcome.InvalidFile(deferredErrors.first())
+    else -> ImportOutcome.NothingImported
+}
+
+internal fun ImportOutcome.toImportState(
+    existsMessage: (List<String>) -> String,
+    invalidMessage: (String) -> String,
+    nothingImportedMessage: () -> String,
+): ImportState = when (this) {
+    ImportOutcome.Imported -> ImportState.Success
+    is ImportOutcome.AlreadyExists -> ImportState.Error(existsMessage(names))
+    is ImportOutcome.InvalidFile -> ImportState.Error(invalidMessage(message))
+    ImportOutcome.NothingImported -> ImportState.Error(nothingImportedMessage())
+}

app/src/main/java/com/example/research/feature/search/SearchViewModel.kt

@@ -10,6 +10,7 @@ import com.example.research.core.util.onError
 import com.example.research.core.util.onSuccess
 import com.example.research.core.util.sanitizeQuery
 import com.example.research.data.paging.IndexEntryPagingSource
+import com.example.research.data.local.preferences.PreferencesManager
 import com.example.research.data.repository.LocalDictionaryRepository
 import com.example.research.ui.article.ArticleState
 import com.example.research.ui.article.ArticleTextWarmUp
@@ -28,12 +29,12 @@ sealed interface SearchAction {
     data class ArticleClicked(val entry: IndexEntry) : SearchAction
     data object ClearArticle : SearchAction
     data class SearchAndLoadArticle(val word: String) : SearchAction
-    data class HandleExternalSearch(val text: String) : SearchAction
 }
 
 class SearchViewModel(
     application: Application,
     private val repository: LocalDictionaryRepository,
+    private val preferencesManager: PreferencesManager,
     private val savedStateHandle: SavedStateHandle
 ) : AndroidViewModel(application) {
 
@@ -51,6 +52,13 @@ class SearchViewModel(
     private val mutableErrorMessage = MutableStateFlow<String?>(null)
     val errorMessage: StateFlow<String?> = mutableErrorMessage.asStateFlow()
 
+    val searchHistory: StateFlow<List<String>> = preferencesManager.searchHistory
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5000),
+            initialValue = emptyList()
+        )
+
     private val indexSearcher by lazy { repository.getIndexSearcher() }
     private var indexWarmupJob: Job? = null
     private var debounceSaveQueryJob: Job? = null
@@ -61,10 +69,12 @@ class SearchViewModel(
     private val activeDictionaries: StateFlow<List<com.example.research.core.domain.model.Dictionary>> =
         repository.dictionaries.map { dictList ->
             dictList.filter { it.isActive }
+        }.distinctUntilChanged { previous, current ->
+            previous.map { it.indexPath } == current.map { it.indexPath }
         }.stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5000),
-            initialValue = emptyList()
+            initialValue = repository.dictionaries.value.filter { it.isActive }
         )
 
     init {
@@ -85,7 +95,12 @@ class SearchViewModel(
 
     @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
     val searchResults: Flow<PagingData<IndexEntry>> = combine(
-        searchQuery.debounce(300.milliseconds).distinctUntilChanged(),
+        searchQuery
+            .map { it to it.isBlank() }
+            .distinctUntilChangedBy { it.first }
+            .flatMapLatest { (query, isBlank) ->
+                if (isBlank) flowOf(query) else flowOf(query).debounce(300.milliseconds)
+            },
         activeDictionaries
     ) { query, dictionaries ->
         query to dictionaries
@@ -117,20 +132,24 @@ class SearchViewModel(
             SearchAction.ClearQuery -> {
                 mutableSearchQuery.value = ""
                 savedStateHandle[KEY_SEARCH_QUERY] = ""
+                clearArticle()
             }
             is SearchAction.ArticleClicked -> {
                 articleHistory.clear()
+                recordSearchHistory(action.entry.originalWord)
                 loadArticle(action.entry)
             }
             SearchAction.ClearArticle -> clearArticle()
             is SearchAction.SearchAndLoadArticle -> searchAndLoadArticle(action.word)
-            is SearchAction.HandleExternalSearch -> handleExternalSearch(action.text)
         }
     }
 
     fun onSearchQueryChanged(query: String) {
         val sanitized = query.sanitizeQuery().trim()
         mutableSearchQuery.value = sanitized
+        if (sanitized.isBlank()) {
+            clearArticle()
+        }
         // Debounce SavedStateHandle writes to reduce disk I/O
         debounceSaveQueryJob?.cancel()
         debounceSaveQueryJob = viewModelScope.launch {
@@ -150,6 +169,27 @@ class SearchViewModel(
         mutableErrorMessage.value = null
     }
 
+    fun removeSearchHistoryEntry(query: String) {
+        viewModelScope.launch {
+            preferencesManager.removeSearchHistoryEntry(query)
+        }
+    }
+
+    fun clearSearchHistory() {
+        viewModelScope.launch {
+            preferencesManager.clearSearchHistory()
+        }
+    }
+
+    private fun recordSearchHistory(query: String) {
+        val trimmed = query.trim()
+        if (trimmed.isBlank()) return
+        if (searchHistory.value.firstOrNull() == trimmed) return
+        viewModelScope.launch {
+            preferencesManager.addSearchHistoryEntry(trimmed)
+        }
+    }
+
     fun saveScrollPosition(index: Int, offset: Int) {
         mutableScrollPosition.value = index to offset
     }
@@ -272,6 +312,7 @@ class SearchViewModel(
                 }
                 entry?.let {
                     currentArticle?.let(articleHistory::addLast)
+                    recordSearchHistory(sanitizedWord)
                     loadArticle(it)
                 }
             }.onError { message, exception ->
@@ -280,14 +321,6 @@ class SearchViewModel(
         }
     }
 
-    fun handleExternalSearch(text: String) {
-        viewModelScope.launch {
-            val sanitizedText = text.sanitizeQuery()
-            mutableSearchQuery.value = sanitizedText
-            searchAndLoadArticle(sanitizedText)
-        }
-    }
-
     companion object {
         private const val TAG = "SearchViewModel"
 

app/src/main/java/com/example/research/ui/about/AboutLibrariesData.kt

@@ -2,9 +2,11 @@ package com.example.research.ui.about
 
 import android.content.Context
 import androidx.annotation.RawRes
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
 
 @Serializable
 internal data class AboutLibrariesData(
@@ -74,10 +76,8 @@ internal object AboutLibrariesParser {
         ignoreUnknownKeys = true
     }
 
+    @OptIn(ExperimentalSerializationApi::class)
     fun read(context: Context, @RawRes resourceId: Int): AboutLibrariesData =
         context.resources.openRawResource(resourceId)
-            .bufferedReader()
-            .use { reader -> json.decodeFromString(reader.readText()) }
-
-    fun decode(source: String): AboutLibrariesData = json.decodeFromString(source)
+            .use { stream -> json.decodeFromStream(stream) }
 }

app/src/main/java/com/example/research/ui/about/AboutScreen.kt

@@ -1,22 +1,25 @@
 package com.example.research.ui.about
 
-import androidx.compose.animation.animateContentSize
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.AlertDialogDefaults
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
@@ -25,26 +28,35 @@ 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
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.LocalWindowInfo
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.example.research.R
+import com.example.research.common.ui.AppBackButton
 import com.example.research.common.ui.components.OutlinedChoiceButton
 import com.example.research.ui.theme.AppWindowInsets
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AboutScreen(
     onNavigateBack: () -> Unit
@@ -57,23 +69,32 @@ fun AboutScreen(
     }
     val versionName = packageInfo?.versionName ?: stringResource(R.string.version_unknown)
     val uriHandler = LocalUriHandler.current
-    val librariesData = remember(context) {
-        AboutLibrariesParser.read(context, R.raw.aboutlibraries)
+    val librariesData by produceState<AboutLibrariesData?>(initialValue = null, context) {
+        value = withContext(Dispatchers.IO) {
+            AboutLibrariesParser.read(context, R.raw.aboutlibraries)
+        }
     }
     var expandedLibraryId by remember { mutableStateOf<String?>(null) }
     var dialogLicense by remember { mutableStateOf<AboutLicense?>(null) }
+    val onToggleLibrary = remember {
+        { uniqueId: String ->
+            expandedLibraryId = if (expandedLibraryId == uniqueId) {
+                null
+            } else {
+                uniqueId
+            }
+        }
+    }
 
     Scaffold(
         topBar = {
             TopAppBar(
                 title = { Text(stringResource(R.string.about_app_title)) },
                 navigationIcon = {
-                    IconButton(onClick = onNavigateBack) {
-                        Icon(
-                            painter = painterResource(R.drawable.ic_arrow_back),
-                            contentDescription = stringResource(R.string.action_back)
-                        )
-                    }
+                    AppBackButton(
+                        onClick = onNavigateBack,
+                        modifier = Modifier.padding(start = 6.dp)
+                    )
                 },
                 colors = TopAppBarDefaults.topAppBarColors(
                     containerColor = MaterialTheme.colorScheme.surface
@@ -89,24 +110,20 @@ fun AboutScreen(
                 .semantics { testTagsAsResourceId = true }
                 .padding(padding)
         ) {
-            item(key = "about_header") {
+            item(key = "about_header", contentType = "about_header") {
                 AboutHeader(versionName = versionName)
             }
             items(
-                items = librariesData.libraries,
+                items = librariesData?.libraries.orEmpty(),
                 key = AboutLibrary::uniqueId,
+                contentType = { "about_library" },
             ) { library ->
                 AboutLibraryRow(
+                    modifier = Modifier.animateItem(fadeInSpec = tween(150)),
                     library = library,
-                    licenses = librariesData.licenses,
+                    licenses = librariesData?.licenses.orEmpty(),
                     expanded = expandedLibraryId == library.uniqueId,
-                    onToggle = {
-                        expandedLibraryId = if (expandedLibraryId == library.uniqueId) {
-                            null
-                        } else {
-                            library.uniqueId
-                        }
-                    },
+                    onToggle = onToggleLibrary,
                     onLicenseClick = { dialogLicense = it },
                 )
             }
@@ -139,13 +156,14 @@ private fun AboutHeader(versionName: String) {
             Text(
                 text = stringResource(R.string.app_name),
                 style = MaterialTheme.typography.headlineMedium,
-                color = MaterialTheme.colorScheme.onSurface
+                color = MaterialTheme.colorScheme.onSurface,
+                modifier = Modifier.alignByBaseline()
             )
             Text(
-                text = stringResource(R.string.version_format, versionName),
+                text = versionName,
                 style = MaterialTheme.typography.titleMedium,
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
-                modifier = Modifier.padding(bottom = 2.dp)
+                modifier = Modifier.alignByBaseline()
             )
         }
 
@@ -164,35 +182,39 @@ private fun AboutHeader(versionName: String) {
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun AboutLibraryRow(
+    modifier: Modifier = Modifier,
     library: AboutLibrary,
     licenses: Map<String, AboutLicense>,
     expanded: Boolean,
-    onToggle: () -> Unit,
+    onToggle: (String) -> Unit,
     onLicenseClick: (AboutLicense) -> Unit,
 ) {
     val uriHandler = LocalUriHandler.current
     val website = library.website?.takeIf(String::isNotBlank)
     val source = library.scm?.url?.takeIf(String::isNotBlank)
 
-    Surface(
-        modifier = Modifier
-            .fillMaxWidth()
-            .testTag("about_library_row")
-            .semantics { testTagsAsResourceId = true },
-        color = if (expanded) {
+    val background by animateColorAsState(
+        targetValue = if (expanded) {
             MaterialTheme.colorScheme.surfaceContainerHighest
         } else {
             MaterialTheme.colorScheme.surface
         },
-        onClick = onToggle
+        label = "aboutLibraryRowBackground",
+    )
+
+    Surface(
+        modifier = modifier
+            .fillMaxWidth()
+            .testTag("about_library_row")
+            .semantics { testTagsAsResourceId = true },
+        color = background,
+        onClick = { onToggle(library.uniqueId) }
     ) {
         Column(
             modifier = Modifier
-                .padding(horizontal = 16.dp, vertical = 12.dp)
-                .animateContentSize(),
+                .padding(horizontal = 16.dp, vertical = 12.dp),
             verticalArrangement = Arrangement.spacedBy(5.dp)
         ) {
             Row(
@@ -288,32 +310,81 @@ private fun AboutLibraryRow(
     }
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun LicenseDialog(
     license: AboutLicense,
     onDismiss: () -> Unit,
     onOpenWebsite: (String) -> Unit,
 ) {
-    AlertDialog(
-        onDismissRequest = onDismiss,
-        title = { Text(license.name) },
-        text = {
-            Text(
-                text = license.content ?: stringResource(R.string.license_text_unavailable),
-                modifier = Modifier.verticalScroll(rememberScrollState())
-            )
-        },
-        confirmButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.action_close))
-            }
-        },
-        dismissButton = {
-            license.url?.takeIf(String::isNotBlank)?.let { url ->
-                TextButton(onClick = { onOpenWebsite(url) }) {
-                    Text(stringResource(R.string.website))
+    var open by remember { mutableStateOf(false) }
+    var wasOpen by remember { mutableStateOf(false) }
+    LaunchedEffect(Unit) { open = true }
+    val scale by animateFloatAsState(
+        targetValue = if (open) 1f else 0.92f,
+        animationSpec = tween(180),
+        label = "licenseDialogScale",
+    )
+    val alpha by animateFloatAsState(
+        targetValue = if (open) 1f else 0f,
+        animationSpec = tween(180),
+        label = "licenseDialogAlpha",
+    )
+    LaunchedEffect(open) {
+        if (open) {
+            wasOpen = true
+        } else if (wasOpen) {
+            snapshotFlow { alpha }.first { it == 0f }
+            onDismiss()
+        }
+    }
+
+    BasicAlertDialog(
+        onDismissRequest = { open = false },
+        modifier = Modifier.graphicsLayer {
+            scaleX = scale
+            scaleY = scale
+            this.alpha = alpha
+        }
+    ) {
+        val maxHeight = with(LocalDensity.current) {
+            LocalWindowInfo.current.containerSize.height.toDp()
+        } - 96.dp
+        Surface(
+            shape = AlertDialogDefaults.shape,
+            color = AlertDialogDefaults.containerColor,
+            tonalElevation = AlertDialogDefaults.TonalElevation,
+        ) {
+            Column(modifier = Modifier.padding(24.dp).heightIn(max = maxHeight)) {
+                Text(
+                    text = license.name,
+                    style = MaterialTheme.typography.headlineSmall,
+                    color = MaterialTheme.colorScheme.onSurface
+                )
+                Spacer(modifier = Modifier.height(16.dp))
+                Text(
+                    text = license.content ?: stringResource(R.string.license_text_unavailable),
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier
+                        .weight(1f, fill = false)
+                        .verticalScroll(rememberScrollState())
+                )
+                Spacer(modifier = Modifier.height(24.dp))
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End)
+                ) {
+                    license.url?.takeIf(String::isNotBlank)?.let { url ->
+                        TextButton(onClick = { onOpenWebsite(url) }) {
+                            Text(stringResource(R.string.website))
+                        }
+                    }
+                    TextButton(onClick = { open = false }) {
+                        Text(stringResource(R.string.action_close))
+                    }
                 }
             }
         }
-    )
+    }
 }

app/src/main/java/com/example/research/ui/article/ArticleLinkText.kt

@@ -196,9 +196,7 @@ private suspend fun PointerInputScope.detectReferenceTaps(
             if (change == null) {
                 break
             }
-            if (change.isConsumed ||
-                (change.position - downPosition).getDistance() > viewConfiguration.touchSlop
-            ) {
+            if ((change.position - downPosition).getDistance() > viewConfiguration.touchSlop) {
                 canceled = true
             }
             if (!change.pressed) {

app/src/main/java/com/example/research/ui/article/ArticleScreen.kt

@@ -1,51 +1,106 @@
 package com.example.research.ui.article
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+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.key
+import androidx.compose.runtime.mutableIntStateOf
+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.compose.runtime.snapshotFlow
+import androidx.compose.runtime.withFrameNanos
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.luminance
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.IntSize
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.compose.ui.unit.dp
 import com.example.research.R
+import com.example.research.common.ui.AppBackButton
 import com.example.research.common.ui.theme.dictionaryTitleLarge
-import com.example.research.feature.search.SearchAction
-import com.example.research.ui.theme.Spacing
 import com.example.research.ui.theme.AppWindowInsets
-import com.example.research.feature.search.SearchViewModel
-import androidx.compose.runtime.getValue
+import com.example.research.ui.theme.Spacing
 
-@Composable
-fun ArticleRoute(
-    searchViewModel: SearchViewModel,
-    onNavigateBack: () -> Unit
-) {
-    val articleState by searchViewModel.selectedArticle.collectAsStateWithLifecycle()
+private const val MERGED_BLOCK_MAX_CHARS = 1500
+private const val MERGED_BLOCK_MAX_ITEMS = 12
 
-    ArticleScreen(
-        articleState = articleState,
-        onNavigateBack = onNavigateBack,
-        onRefClick = { word ->
-            searchViewModel.onAction(SearchAction.SearchAndLoadArticle(word))
-        },
-        onScrollPositionChanged = { index, offset ->
-            searchViewModel.updateArticleScrollPosition(index, offset)
-        },
-    )
+private fun mergeDslBlocks(blocks: List<DslBlock>): List<DslBlock> {
+    if (blocks.size <= MERGED_BLOCK_MAX_ITEMS) return blocks
+    val merged = ArrayList<DslBlock>(blocks.size / 4)
+    var i = 0
+    while (i < blocks.size) {
+        val builder = AnnotatedString.Builder()
+        val refs = ArrayList<DslAnnotatedParser.LazyRef>()
+        var j = i
+        while (j < blocks.size) {
+            val block = blocks[j]
+            repeat(block.indent) { builder.append(' ') }
+            val paraStart = builder.length
+            builder.append(block.text)
+            block.lazyRefs.forEach { ref ->
+                refs.add(
+                    ref.copy(
+                        startIndex = ref.startIndex + paraStart,
+                        endIndex = ref.endIndex + paraStart
+                    )
+                )
+            }
+            val more = j + 1 < blocks.size &&
+                (j + 1 - i) < MERGED_BLOCK_MAX_ITEMS &&
+                builder.length < MERGED_BLOCK_MAX_CHARS
+            if (more) {
+                builder.append('\n')
+            }
+            j++
+            if (!more) {
+                break
+            }
+        }
+        merged.add(
+            DslBlock(
+                text = builder.toAnnotatedString(),
+                indent = 0,
+                lazyRefs = refs,
+                continuesPrevious = blocks[i].continuesPrevious
+            )
+        )
+        i = j
+    }
+    return merged
 }
 
 @Composable
@@ -62,9 +117,17 @@ fun ArticleContent(
         }
         is ArticleState.Success -> {
             val articleSaveKey = "${articleState.dictionaryPath}:${articleState.title}"
-            val baseTextStyle = MaterialTheme.typography.bodyLarge.copy(
-                color = MaterialTheme.colorScheme.onSurface
-            )
+            val colorScheme = MaterialTheme.colorScheme
+            val typography = MaterialTheme.typography
+            val baseTextStyle = remember(colorScheme, typography) {
+                typography.bodyLarge.copy(
+                    color = colorScheme.onSurface,
+                    lineHeightStyle = LineHeightStyle(
+                        alignment = LineHeightStyle.Alignment.Proportional,
+                        trim = LineHeightStyle.Trim.Both,
+                    ),
+                )
+            }
             val indentStep = 16.dp
 
             // Use scroll position from ArticleState if available (for back navigation)
@@ -123,35 +186,42 @@ fun ArticleContent(
             val isHeavyArticle =
                 articleState.dslContent.size > HEAVY_ARTICLE_BLOCK_COUNT
 
-            LazyColumn(
-                state = listState,
-                modifier = modifier
-                    .fillMaxSize()
-                    .onSizeChanged { viewportSize = it }
-                    .windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
-                    .padding(end = 16.dp)
-                    .testTag("article_content")
-                    .semantics {
-                        testTagsAsResourceId = true
-                    }
+            val darkTheme = MaterialTheme.colorScheme.background.luminance() < 0.5f
+            val displayBlocks = remember(
+                articleState.dslContent,
+                baseTextStyle,
+                darkTheme
             ) {
-                itemsIndexed(
-                    items = articleState.dslContent,
-                    key = { index, _ ->
-                        // Use stable key combining article save key and index
-                        "$articleSaveKey:$index"
-                    },
-                    contentType = { _, _ -> "article_block" }
-                ) { index, block ->
-                    val followedByContinuation =
-                        articleState.dslContent.getOrNull(index + 1)?.continuesPrevious == true
-                    val textContent = @Composable {
+                val merged =
+                    mergeDslBlocks(articleState.dslContent)
+                if (darkTheme) {
+                    merged.map {
+                        it.copy(text = DslAnnotatedParser.remapForDarkTheme(it.text))
+                    }
+                } else {
+                    merged
+                }
+            }
+            val articleList: @Composable (Modifier) -> Unit = { listModifier ->
+                LazyColumn(
+                    state = listState,
+                    contentPadding = PaddingValues(top = Spacing.listItemVertical),
+                    modifier = listModifier
+                        .testTag("article_content")
+                        .semantics {
+                            testTagsAsResourceId = true
+                        }
+                ) {
+                    itemsIndexed(
+                        items = displayBlocks,
+                        key = { index, _ ->
+                            "$articleSaveKey:$index"
+                        },
+                        contentType = { _, _ -> "article_block" }
+                    ) { index, block ->
                         Box(
                             modifier = Modifier
-                                .padding(
-                                    start = Spacing.iconStart + indentStep * block.indent
-                                )
-                                .padding(bottom = if (followedByContinuation) 0.dp else 8.dp)
+                                .padding(start = Spacing.contentStart + indentStep * block.indent)
                         ) {
                             ArticleLinkText(
                                 block = block,
@@ -168,13 +238,18 @@ fun ArticleContent(
                             )
                         }
                     }
-                    if (isHeavyArticle) {
-                        textContent()
-                    } else {
-                        SelectionContainer { textContent() }
-                    }
                 }
             }
+            val articleListModifier = modifier
+                .fillMaxSize()
+                .onSizeChanged { viewportSize = it }
+                .windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
+                .padding(end = 16.dp)
+            if (isHeavyArticle) {
+                articleList(articleListModifier)
+            } else {
+                SelectionContainer { articleList(articleListModifier) }
+            }
         }
         is ArticleState.Error -> {
             Column(
@@ -196,16 +271,7 @@ fun ArticleContent(
             }
         }
         null -> {
-            Column(
-                modifier = modifier.fillMaxSize(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center
-            ) {
-                Text(
-                    text = stringResource(R.string.article_no_selected),
-                    style = MaterialTheme.typography.bodyLarge
-                )
-            }
+            Box(modifier = modifier.fillMaxSize())
         }
     }
 }
@@ -215,65 +281,73 @@ fun ArticleTitleBar(
     articleState: ArticleState?,
     showBackButton: Boolean,
     onNavigateBack: () -> Unit,
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    compact: Boolean = false,
+    selectionReset: Int = 0,
 ) {
     val title = when (articleState) {
         is ArticleState.Loading -> articleState.title
         is ArticleState.Success -> articleState.title
         is ArticleState.Error -> articleState.title
-        null -> stringResource(R.string.article_no_selected)
+        null -> ""
     }
 
-    val backIcon = painterResource(R.drawable.ic_arrow_back)
+    val backButtonOffset = if (compact) {
+        val titleLineHeight = with(LocalDensity.current) {
+            MaterialTheme.typography.dictionaryTitleLarge.lineHeight.toDp()
+        }
+        Modifier.offset(y = (titleLineHeight - 48.dp) / 2)
+    } else {
+        Modifier
+    }
 
     Surface(
         color = MaterialTheme.colorScheme.surface,
         modifier = modifier.fillMaxWidth()
     ) {
-        Box(
+        Row(
             modifier = Modifier
                 .fillMaxWidth()
                 .windowInsetsPadding(AppWindowInsets.topAndHorizontalSafeDrawing)
-                .padding(
-                    top = Spacing.topBarPadding,
-                    bottom = Spacing.topBarPadding
-                )
-                .height(Spacing.topBarHeight)
+                .then(
+                    if (compact) {
+                        Modifier.padding(vertical = Spacing.listItemVertical)
+                    } else {
+                        Modifier
+                            .padding(top = Spacing.topBarPadding, bottom = Spacing.topBarPadding)
+                            .height(Spacing.topBarHeight)
+                    }
+                ),
+            verticalAlignment = if (compact) Alignment.Top else Alignment.CenterVertically
         ) {
             if (showBackButton) {
-                Box(
+                AppBackButton(
+                    onClick = onNavigateBack,
                     modifier = Modifier
-                        .align(Alignment.CenterStart)
-                        .padding(start = Spacing.iconStart)
-                        .size(24.dp)
-                        .clickable(onClick = onNavigateBack),
-                    contentAlignment = Alignment.Center
-                ) {
-                    Icon(
-                        painter = backIcon,
-                        contentDescription = stringResource(R.string.action_back),
-                        modifier = Modifier.size(24.dp)
+                        .padding(start = 10.dp)
+                        .then(backButtonOffset)
+                )
+            }
+
+            key(selectionReset) {
+                SelectionContainer {
+                    Text(
+                        text = title,
+                        style = MaterialTheme.typography.dictionaryTitleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier
+                            .padding(start = if (showBackButton) 0.dp else 16.dp)
+                            .testTag("article_title")
+                            .semantics { testTagsAsResourceId = true }
                     )
                 }
             }
-
-            Text(
-                text = title,
-                style = MaterialTheme.typography.dictionaryTitleLarge,
-                color = MaterialTheme.colorScheme.onSurface,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier
-                    .align(Alignment.CenterStart)
-                    .padding(start = if (showBackButton) Spacing.searchTextStart else 16.dp)
-                    .testTag("article_title")
-                    .semantics { testTagsAsResourceId = true }
-            )
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun ArticleScreen(
     articleState: ArticleState?,
@@ -281,22 +355,31 @@ internal fun ArticleScreen(
     onRefClick: ((String) -> Unit)? = null,
     onScrollPositionChanged: ((Int, Int) -> Unit)? = null,
 ) {
-    Scaffold(
-        topBar = {
-            ArticleTitleBar(
+    val titleSelectionReset = remember { mutableIntStateOf(0) }
+    Box(
+        modifier = Modifier.clickable(
+            interactionSource = remember { MutableInteractionSource() },
+            indication = null
+        ) { titleSelectionReset.intValue++ }
+    ) {
+        Scaffold(
+            topBar = {
+                ArticleTitleBar(
+                    articleState = articleState,
+                    showBackButton = true,
+                    onNavigateBack = onNavigateBack,
+                    selectionReset = titleSelectionReset.intValue
+                )
+            },
+            contentWindowInsets = AppWindowInsets.contentWithNavigation
+        ) { padding ->
+            ArticleContent(
                 articleState = articleState,
-                showBackButton = true,
-                onNavigateBack = onNavigateBack
+                onNavigateBack = onNavigateBack,
+                onRefClick = onRefClick,
+                onScrollPositionChanged = onScrollPositionChanged,
+                modifier = Modifier.padding(padding)
             )
-        },
-        contentWindowInsets = AppWindowInsets.contentWithNavigation
-    ) { padding ->
-        ArticleContent(
-            articleState = articleState,
-            onNavigateBack = onNavigateBack,
-            onRefClick = onRefClick,
-            onScrollPositionChanged = onScrollPositionChanged,
-            modifier = Modifier.padding(padding)
-        )
+        }
     }
 }

app/src/main/java/com/example/research/ui/article/DslAnnotatedParser.kt

@@ -23,7 +23,40 @@ object DslAnnotatedParser {
         "br", "p", "b", "i", "c", "t", "m", "m0", "m1", "m2", "m3", "m4", "m5",
         "ref", "ex", "e", "trn", "com", "lang", "sup", "'"
     )
-    private val ESCAPED_CHARS = setOf('[', ']', '(', ')')
+
+    private val DSL_NAMED_COLORS = mapOf(
+        "black" to Color(0xFF000000),
+        "silver" to Color(0xFFC0C0C0),
+        "gray" to Color(0xFF808080),
+        "grey" to Color(0xFF808080),
+        "lightgray" to Color(0xFFD3D3D3),
+        "lightgrey" to Color(0xFFD3D3D3),
+        "darkgray" to Color(0xFFA9A9A9),
+        "darkgrey" to Color(0xFFA9A9A9),
+        "white" to Color(0xFFFFFFFF),
+        "maroon" to Color(0xFF800000),
+        "red" to Color(0xFFFF0000),
+        "darkred" to Color(0xFF8B0000),
+        "crimson" to Color(0xFFDC143C),
+        "brown" to Color(0xFFA52A2A),
+        "orange" to Color(0xFFFFA500),
+        "pink" to Color(0xFFFFC0CB),
+        "purple" to Color(0xFF800080),
+        "violet" to Color(0xFFEE82EE),
+        "fuchsia" to Color(0xFFFF00FF),
+        "magenta" to Color(0xFFFF00FF),
+        "olive" to Color(0xFF808000),
+        "yellow" to Color(0xFFFFFF00),
+        "green" to Color(0xFF008000),
+        "darkgreen" to Color(0xFF006400),
+        "lime" to Color(0xFF00FF00),
+        "teal" to Color(0xFF008080),
+        "aqua" to Color(0xFF00FFFF),
+        "cyan" to Color(0xFF00FFFF),
+        "navy" to Color(0xFF000080),
+        "blue" to Color(0xFF0000FF),
+        "darkblue" to Color(0xFF00008B),
+    )
 
     data class ColorScheme(
         val secondaryText: Color,
@@ -37,11 +70,6 @@ object DslAnnotatedParser {
         val endIndex: Int
     )
 
-    // Cache for applyLazyRefs results to avoid recreating AnnotatedString with links
-    // Size: 32 blocks - covers typical visible + prefetch range in LazyColumn
-    // Memory estimate: ~20KB per block average (AnnotatedString with LinkAnnotations)
-    // Total: ~640KB worst case
-    // LRU eviction automatic via LruCache
     private val refCache = object : androidx.collection.LruCache<Pair<DslBlock, Int>, AnnotatedString>(32) {
         override fun sizeOf(key: Pair<DslBlock, Int>, value: AnnotatedString): Int = 1
     }
@@ -55,9 +83,9 @@ object DslAnnotatedParser {
         val stack = ArrayDeque<SpanStyle>()
         val refStack = ArrayDeque<Pair<Int, StringBuilder>>()
         val lazyRefs = mutableListOf<LazyRef>()
-        var lastChar: Char? = null
         var accentNext = false
         var currentIndent = 0
+        var lastAppended: Char? = null
         val exampleStyle = SpanStyle(color = colorScheme.secondaryText)
         val labelStyle = SpanStyle(color = colorScheme.labelText)
         val linkStyle = SpanStyle(color = colorScheme.linkText, textDecoration = TextDecoration.Underline)
@@ -75,16 +103,38 @@ object DslAnnotatedParser {
         }
 
         fun flushBlock() {
-            if (builder.length > 0) {
+            val text = builder.toAnnotatedString()
+            if (text.any { !it.isWhitespace() }) {
                 result.add(DslBlock(
-                    text = builder.toAnnotatedString(),
+                    text = text,
                     indent = currentIndent,
                     lazyRefs = lazyRefs.toList()
                 ))
-                builder = AnnotatedString.Builder()
-                stack.forEach { builder.pushStyle(it) }
-                lazyRefs.clear()
             }
+            builder = AnnotatedString.Builder()
+            stack.forEach { builder.pushStyle(it) }
+            lazyRefs.clear()
+            lastAppended = null
+        }
+
+        fun appendChar(char: Char, hard: Boolean = false) {
+            if (char == ' ' && !hard) {
+                if (lastAppended == null || lastAppended == ' ') return
+            }
+            lastAppended = char
+            builder.append(char)
+            if (refStack.isNotEmpty()) {
+                refStack.last().second.append(char)
+            }
+        }
+
+        fun appendText(value: String) {
+            if (value.isEmpty()) return
+            builder.append(value)
+            if (refStack.isNotEmpty()) {
+                refStack.last().second.append(value)
+            }
+            lastAppended = value.last()
         }
 
         fun marginIndent(tagName: String): Int {
@@ -100,26 +150,15 @@ object DslAnnotatedParser {
             when (val char = dsl[i]) {
                 '\\' -> {
                     if (i + 1 < length) {
-                        val next = dsl[i + 1]
-                        if (next in ESCAPED_CHARS) {
-                            builder.append(next)
-                            if (refStack.isNotEmpty()) {
-                                refStack.last().second.append(next)
-                            }
-                            lastChar = next
-                            i += 2
-                            continue
-                        }
+                        appendChar(dsl[i + 1], hard = true)
+                        i += 2
+                        continue
                     }
-                    builder.append(char)
-                    if (refStack.isNotEmpty()) {
-                        refStack.last().second.append(char)
-                    }
-                    lastChar = char
+                    appendChar(char)
                     i++
                 }
                 '[' -> {
-                    val end = dsl.indexOf(']', i + 1)
+                    val end = tagCloseIndex(dsl, i + 1)
                     if (end != -1) {
                         val tagStart = i + 1
                         var tagEnd = end
@@ -152,6 +191,10 @@ object DslAnnotatedParser {
                                     accentNext = false
                                 }
                                 pop()
+                                if (tagName.startsWith("m")) {
+                                    flushBlock()
+                                    currentIndent = 0
+                                }
                             } else {
                                 when (tagName) {
                                     "'" -> {
@@ -164,17 +207,15 @@ object DslAnnotatedParser {
                                         } else {
                                             builder.append("\n")
                                         }
-                                        lastChar = '\n'
                                     }
                                     "p" -> {
-                                        push(labelStyle)
+                                        push(labelStyle.copy(fontStyle = FontStyle.Italic))
                                     }
                                     "b" -> push(SpanStyle(fontWeight = FontWeight.Bold))
                                     "m", "m0", "m1", "m2", "m3", "m4", "m5" -> {
-                                        if (lastChar != '\n' && lastChar != null) {
-                                            if (refStack.isEmpty()) flushBlock() else builder.append("\n")
+                                        if (lastAppended != null && !lastAppended!!.isWhitespace()) {
+                                            flushBlock()
                                         }
-                                        lastChar = '\n'
                                         currentIndent = marginIndent(tagName)
                                         push(exampleStyle)
                                     }
@@ -184,7 +225,18 @@ object DslAnnotatedParser {
                                         refStack.addLast(builder.length to StringBuilder())
                                     }
                                     "ex", "e" -> push(exampleStyle)
-                                    "c", "t", "trn", "lang", "sup" -> push(SpanStyle())
+                                    "c" -> {
+                                        val colorName = if (spaceIdx >= 0) {
+                                            tagWithParams.substring(spaceIdx + 1).trim().lowercase()
+                                        } else {
+                                            null
+                                        }
+                                        push(when {
+                                            colorName == null -> labelStyle
+                                            else -> DSL_NAMED_COLORS[colorName]?.let { SpanStyle(color = it) } ?: SpanStyle()
+                                        })
+                                    }
+                                    "t", "trn", "lang", "sup" -> push(SpanStyle())
                                     "com" -> push(SpanStyle(fontStyle = FontStyle.Italic, color = colorScheme.labelText))
                                 }
                             }
@@ -192,18 +244,23 @@ object DslAnnotatedParser {
                             continue
                         }
                     }
-                    builder.append(char)
-                    if (refStack.isNotEmpty()) {
-                        refStack.last().second.append(char)
+                    appendChar(char)
+                    i++
+                }
+                '\n' -> {
+                    if (refStack.isEmpty()) {
+                        flushBlock()
+                    } else {
+                        appendChar(char)
                     }
-                    lastChar = char
+                    i++
+                }
+                '\t' -> {
+                    appendText("\u2002")
                     i++
                 }
                 else -> {
-                    builder.append(char)
-                    if (refStack.isNotEmpty()) {
-                        refStack.last().second.append(char)
-                    }
+                    appendChar(char)
 
                     if (accentNext) {
                         builder.append('\u0301')
@@ -213,7 +270,6 @@ object DslAnnotatedParser {
                         accentNext = false
                     }
 
-                    lastChar = char
                     i++
                 }
             }
@@ -228,6 +284,19 @@ object DslAnnotatedParser {
         splitOversizedBlocks(result)
     }
 
+    private fun tagCloseIndex(value: String, startIndex: Int): Int {
+        var index = startIndex
+        while (index < value.length) {
+            when {
+                value[index] == '\\' && index + 1 < value.length -> index += 2
+                value[index] == '[' -> return -1
+                value[index] == ']' -> return index
+                else -> index++
+            }
+        }
+        return -1
+    }
+
     private fun splitOversizedBlocks(blocks: List<DslBlock>): List<DslBlock> {
         if (blocks.none { it.text.length > MAX_BLOCK_TEXT_LENGTH }) return blocks
         return blocks.flatMap { block ->
@@ -342,6 +411,35 @@ object DslAnnotatedParser {
         linkText = Color(0xFF1E88E5),
     )
 
+    private val DARK_THEME_COLORS: Map<Color, Color> = mapOf(
+        Color(0xFF000000) to Color(0xFFE8E6E3),
+        Color(0xFF000080) to Color(0xFF8FA8E0),
+        Color(0xFF00008B) to Color(0xFF8FA8E0),
+        Color(0xFF0000FF) to Color(0xFF7C9CE8),
+        Color(0xFF006400) to Color(0xFF66BB6A),
+        Color(0xFF008000) to Color(0xFF66BB6A),
+        Color(0xFF8B0000) to Color(0xFFE57373),
+        Color(0xFF800000) to Color(0xFFE57373),
+        Color(0xFF800080) to Color(0xFFBA68C8),
+        Color(0xFFA52A2A) to Color(0xFFBCAAA4),
+        Color(0xFF008080) to Color(0xFF4DB6AC),
+        Color(0xFF808000) to Color(0xFFC0CA33),
+    )
+
+    fun remapForDarkTheme(text: AnnotatedString): AnnotatedString {
+        if (text.spanStyles.none { it.item.color in DARK_THEME_COLORS }) return text
+        val builder = AnnotatedString.Builder(text.text)
+        text.spanStyles.forEach { range ->
+            val style = DARK_THEME_COLORS[range.item.color]
+                ?.let { range.item.copy(color = it) } ?: range.item
+            builder.addStyle(style, range.start, range.end)
+        }
+        text.paragraphStyles.forEach { range ->
+            builder.addStyle(range.item, range.start, range.end)
+        }
+        return builder.toAnnotatedString()
+    }
+
     // Allow external cache clearing (e.g., when dictionaries change)
     fun clearRefCache() {
         refCache.evictAll()

app/src/main/java/com/example/research/ui/main/AdaptiveMainScreen.kt

@@ -1,5 +1,7 @@
 package com.example.research.ui.main
 
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -12,7 +14,8 @@ import com.example.research.core.domain.model.IndexEntry
 import com.example.research.ui.article.ArticleContent
 import com.example.research.ui.article.ArticleTitleBar
 import com.example.research.ui.article.ArticleState
-import com.example.research.ui.main.components.MainTopBar
+import com.example.research.ui.theme.AppWindowInsets
+import com.example.research.ui.theme.Spacing
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
@@ -20,9 +23,11 @@ fun AdaptiveMainScreen(
     searchState: TextFieldState,
     canSearch: Boolean,
     isLandscape: Boolean,
+    isSearchBarAtBottom: Boolean,
     results: LazyPagingItems<IndexEntry>,
     errorMessage: String?,
     showDictionaryName: Boolean,
+    searchHistory: List<String>,
     articleState: ArticleState?,
     scrollPosition: Pair<Int, Int>,
     onAction: (MainAction) -> Unit,
@@ -43,21 +48,37 @@ fun AdaptiveMainScreen(
         )
     }
 
-    val isQueryEmpty = searchState.text.isEmpty()
     val isShowingDetail = scaffoldState.targetState.primary == PaneAdaptedValue.Expanded
     val isTwoPane =
         scaffoldState.targetState.primary == PaneAdaptedValue.Expanded &&
             scaffoldState.targetState.secondary == PaneAdaptedValue.Expanded
     val listEndPadding = if (isTwoPane) 8.dp else 16.dp
 
-    Column(modifier = Modifier.fillMaxSize()) {
-        MainTopBar(
+    val searchBar: @Composable () -> Unit = {
+        MainSearchBar(
             searchState = searchState,
-            enabled = canSearch,
-            onQueryChange = { onAction(MainAction.QueryChanged(it)) },
-            onClearQuery = { onAction(MainAction.ClearQuery) },
-            onNavigateToSettings = onNavigateToSettings
+            canSearch = canSearch,
+            isSearchBarAtBottom = isSearchBarAtBottom,
+            searchHistory = searchHistory,
+            onAction = onAction,
+            onNavigateToSettings = onNavigateToSettings,
         )
+    }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .then(
+                if (isSearchBarAtBottom) {
+                    Modifier.windowInsetsPadding(AppWindowInsets.statusBarsAndIme)
+                } else {
+                    Modifier
+                }
+            )
+    ) {
+        if (!isSearchBarAtBottom) {
+            searchBar()
+        }
 
         ListDetailPaneScaffold(
             directive = PaneScaffoldDirective.Default.copy(
@@ -84,20 +105,27 @@ fun AdaptiveMainScreen(
                         .windowInsetsPadding(
                             WindowInsets.safeDrawing.only(WindowInsetsSides.Horizontal)
                         )
-                        .padding(start = 32.dp, end = listEndPadding),
+                        .padding(start = Spacing.contentStart, end = listEndPadding),
                     listModifier = Modifier.windowInsetsPadding(WindowInsets.navigationBars),
                 )
             },
             detailPane = {
+                val titleSelectionReset = remember { mutableIntStateOf(0) }
                 Column(
                     modifier = Modifier
                         .fillMaxSize()
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null
+                        ) { titleSelectionReset.intValue++ }
                         .padding(bottom = 16.dp)
                 ) {
                     ArticleTitleBar(
                         articleState = articleState,
-                        showBackButton = isShowingDetail,
+                        showBackButton = isShowingDetail && articleState != null,
                         onNavigateBack = onNavigateBackFromArticle,
+                        compact = true,
+                        selectionReset = titleSelectionReset.intValue,
                         modifier = Modifier.windowInsetsPadding(
                             WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
                         )
@@ -110,21 +138,21 @@ fun AdaptiveMainScreen(
                 }
             },
         )
+
+        if (isSearchBarAtBottom) {
+            searchBar()
+        }
     }
 
-    LaunchedEffect(articleState, isQueryEmpty) {
-        val targetValue = when {
-            articleState == null -> ThreePaneScaffoldValue(
+    LaunchedEffect(articleState) {
+        val targetValue = if (articleState == null) {
+            ThreePaneScaffoldValue(
                 primary = PaneAdaptedValue.Hidden,
                 secondary = PaneAdaptedValue.Expanded,
                 tertiary = PaneAdaptedValue.Hidden,
             )
-            isQueryEmpty -> ThreePaneScaffoldValue(
-                primary = PaneAdaptedValue.Expanded,
-                secondary = PaneAdaptedValue.Hidden,
-                tertiary = PaneAdaptedValue.Hidden,
-            )
-            else -> ThreePaneScaffoldValue(
+        } else {
+            ThreePaneScaffoldValue(
                 primary = PaneAdaptedValue.Expanded,
                 secondary = PaneAdaptedValue.Expanded,
                 tertiary = PaneAdaptedValue.Hidden,

app/src/main/java/com/example/research/ui/main/MainAction.kt

@@ -5,4 +5,7 @@ sealed interface MainAction {
     data object ClearQuery : MainAction
     data object ClearError : MainAction
     data class SaveScrollPosition(val index: Int, val offset: Int) : MainAction
+    data class HistoryEntryClicked(val query: String) : MainAction
+    data class RemoveHistoryEntry(val query: String) : MainAction
+    data object ClearHistory : MainAction
 }

app/src/main/java/com/example/research/ui/main/MainScreen.kt

@@ -1,7 +1,9 @@
 package com.example.research.ui.main
 
 import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -14,11 +16,13 @@ import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.example.research.ui.theme.AppWindowInsets
+import com.example.research.ui.theme.Spacing
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.example.research.core.domain.model.IndexEntry
 import com.example.research.feature.download.config.DictionaryConfig
+import com.example.research.core.domain.model.SearchBarPosition
 import com.example.research.feature.download.model.DownloadState
 import com.example.research.feature.search.SearchAction
 import com.example.research.feature.search.SearchViewModel
@@ -36,9 +40,11 @@ fun MainRoute(
     val results = searchViewModel.searchResults.collectAsLazyPagingItems()
     val errorMessage by searchViewModel.errorMessage.collectAsStateWithLifecycle()
     val articleState by searchViewModel.selectedArticle.collectAsStateWithLifecycle()
+    val searchHistory by searchViewModel.searchHistory.collectAsStateWithLifecycle()
 
     val settingsState by settingsViewModel.uiState.collectAsStateWithLifecycle()
     val searchQuery by searchViewModel.searchQuery.collectAsStateWithLifecycle()
+    val isSearchBarAtBottom = settingsState.searchBarPosition == SearchBarPosition.BOTTOM
 
     val scrollPosition = remember(searchViewModel) {
         searchViewModel.scrollPosition.value
@@ -46,17 +52,6 @@ fun MainRoute(
     val searchState = remember(searchViewModel) {
         TextFieldState(initialText = searchViewModel.searchQuery.value)
     }
-    val onMainAction = remember(searchViewModel) {
-        { action: MainAction ->
-            when (action) {
-                is MainAction.QueryChanged -> searchViewModel.onSearchQueryChanged(action.query)
-                MainAction.ClearQuery -> searchViewModel.onAction(SearchAction.ClearQuery)
-                MainAction.ClearError -> searchViewModel.clearError()
-                is MainAction.SaveScrollPosition ->
-                    searchViewModel.saveScrollPosition(action.index, action.offset)
-            }
-        }
-    }
 
     LaunchedEffect(searchState, searchQuery) {
         if (searchState.text.toString() != searchQuery) {
@@ -78,13 +73,9 @@ fun MainRoute(
 
     val showDictionaryName = remember(settingsState) {
         val activeDictionaries = settingsState.dictionaries.filter { it.isActive }
-        if (activeDictionaries.isEmpty()) {
-            false
-        } else {
-            activeDictionaries.any { dict ->
-                val fileName = dict.path.substringAfterLast("/")
-                !DictionaryConfig.isDabkrsDictionary(fileName)
-            }
+        activeDictionaries.any { dict ->
+            val fileName = dict.path.substringAfterLast("/")
+            !DictionaryConfig.isDabkrsDictionary(fileName)
         }
     }
 
@@ -92,14 +83,37 @@ fun MainRoute(
         val isWide = maxWidth >= 600.dp
         val isLandscape = maxWidth > maxHeight
 
+        val onMainAction = remember(searchViewModel, isWide) {
+            { action: MainAction ->
+                when (action) {
+                    is MainAction.QueryChanged -> searchViewModel.onSearchQueryChanged(action.query)
+                    MainAction.ClearQuery -> searchViewModel.onAction(SearchAction.ClearQuery)
+                    MainAction.ClearError -> searchViewModel.clearError()
+                    is MainAction.SaveScrollPosition ->
+                        searchViewModel.saveScrollPosition(action.index, action.offset)
+                    is MainAction.HistoryEntryClicked ->
+                        if (isWide) {
+                            searchViewModel.onAction(SearchAction.SearchAndLoadArticle(action.query))
+                        } else {
+                            searchViewModel.onSearchQueryChanged(action.query)
+                        }
+                    is MainAction.RemoveHistoryEntry ->
+                        searchViewModel.removeSearchHistoryEntry(action.query)
+                    MainAction.ClearHistory -> searchViewModel.clearSearchHistory()
+                }
+            }
+        }
+
         if (isWide) {
             AdaptiveMainScreen(
                 searchState = searchState,
                 canSearch = canSearch,
                 isLandscape = isLandscape,
+                isSearchBarAtBottom = isSearchBarAtBottom,
                 results = results,
                 errorMessage = errorMessage,
                 showDictionaryName = showDictionaryName,
+                searchHistory = searchHistory,
                 articleState = articleState,
                 scrollPosition = scrollPosition,
                 onAction = onMainAction,
@@ -120,9 +134,11 @@ fun MainRoute(
             MainScreen(
                 searchState = searchState,
                 canSearch = canSearch,
+                isSearchBarAtBottom = isSearchBarAtBottom,
                 results = results,
                 errorMessage = errorMessage,
                 showDictionaryName = showDictionaryName,
+                searchHistory = searchHistory,
                 scrollPosition = scrollPosition,
                 onAction = onMainAction,
                 onArticleClick = onArticleClick,
@@ -132,28 +148,81 @@ fun MainRoute(
     }
 }
 
+@Composable
+internal fun MainSearchBar(
+    searchState: TextFieldState,
+    canSearch: Boolean,
+    isSearchBarAtBottom: Boolean,
+    searchHistory: List<String>,
+    onAction: (MainAction) -> Unit,
+    onNavigateToSettings: () -> Unit,
+) {
+    MainTopBar(
+        searchState = searchState,
+        enabled = canSearch,
+        isSearchBarAtBottom = isSearchBarAtBottom,
+        onQueryChange = { onAction(MainAction.QueryChanged(it)) },
+        onClearQuery = { onAction(MainAction.ClearQuery) },
+        searchHistory = searchHistory,
+        onHistoryEntryClick = { onAction(MainAction.HistoryEntryClicked(it)) },
+        onHistoryEntryRemove = { onAction(MainAction.RemoveHistoryEntry(it)) },
+        onClearHistory = { onAction(MainAction.ClearHistory) },
+        onNavigateToSettings = onNavigateToSettings
+    )
+}
+
 @Composable
 internal fun MainScreen(
     searchState: TextFieldState,
     canSearch: Boolean,
+    isSearchBarAtBottom: Boolean,
     results: LazyPagingItems<IndexEntry>,
     errorMessage: String?,
     showDictionaryName: Boolean,
+    searchHistory: List<String>,
     scrollPosition: Pair<Int, Int>,
     onAction: (MainAction) -> Unit,
     onArticleClick: (IndexEntry) -> Unit,
     onNavigateToSettings: () -> Unit
 ) {
-    Scaffold(
-        topBar = {
-            MainTopBar(
+    val searchBar: @Composable () -> Unit = {
+        MainSearchBar(
+            searchState = searchState,
+            canSearch = canSearch,
+            isSearchBarAtBottom = isSearchBarAtBottom,
+            searchHistory = searchHistory,
+            onAction = onAction,
+            onNavigateToSettings = onNavigateToSettings,
+        )
+    }
+
+    if (isSearchBarAtBottom) {
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .windowInsetsPadding(AppWindowInsets.statusBarsAndIme)
+        ) {
+            SearchResultsPane(
                 searchState = searchState,
-                enabled = canSearch,
-                onQueryChange = { onAction(MainAction.QueryChanged(it)) },
-                onClearQuery = { onAction(MainAction.ClearQuery) },
-                onNavigateToSettings = onNavigateToSettings
+                results = results,
+                errorMessage = errorMessage,
+                showDictionaryName = showDictionaryName,
+                scrollPosition = scrollPosition,
+                onAction = onAction,
+                onArticleClick = onArticleClick,
+                modifier = Modifier
+                    .weight(1f)
+                    .fillMaxWidth()
+                    .windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
+                    .padding(start = Spacing.contentStart, end = 16.dp),
             )
-        },
+            searchBar()
+        }
+        return
+    }
+
+    Scaffold(
+        topBar = { searchBar() },
         contentWindowInsets = AppWindowInsets.navigationOnly
     ) { paddingValues ->
         SearchResultsPane(
@@ -169,7 +238,7 @@ internal fun MainScreen(
                 .padding(paddingValues)
                 .consumeWindowInsets(paddingValues)
                 .windowInsetsPadding(AppWindowInsets.horizontalSafeDrawing)
-                .padding(start = 32.dp, end = 16.dp),
+                .padding(start = Spacing.contentStart, end = 16.dp),
         )
     }
 }

app/src/main/java/com/example/research/ui/main/SearchResultsPane.kt

@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.ime
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -50,6 +51,7 @@ internal fun SearchResultsPane(
     var restoredScrollPosition by remember { mutableStateOf(false) }
     var pendingScrollToTop by remember { mutableStateOf(false) }
     var sawRefreshForPendingScroll by remember { mutableStateOf(false) }
+    var staleEntries by remember { mutableStateOf(emptyList<IndexEntry>()) }
     val imeBottomPadding = with(LocalDensity.current) {
         WindowInsets.ime.getBottom(this).toDp()
     }
@@ -72,9 +74,22 @@ internal fun SearchResultsPane(
                 restoredScrollPosition = true
                 pendingScrollToTop = query.isNotBlank()
                 sawRefreshForPendingScroll = false
+                if (query.isBlank()) {
+                    staleEntries = emptyList()
+                }
             }
     }
 
+    SideEffect {
+        val loaded = results.itemSnapshotList.items
+        if (results.loadState.refresh is LoadState.NotLoading && loaded.isNotEmpty()) {
+            staleEntries = loaded
+        }
+    }
+    val pendingReload = results.itemCount == 0 &&
+        results.loadState.refresh is LoadState.Loading
+    val shownStale = if (pendingReload && searchState.text.isNotBlank()) staleEntries else emptyList()
+
     LaunchedEffect(results.loadState.refresh, pendingScrollToTop) {
         if (pendingScrollToTop && results.loadState.refresh is LoadState.Loading) {
             sawRefreshForPendingScroll = true
@@ -125,6 +140,7 @@ internal fun SearchResultsPane(
             listState = listState,
             showDictionaryName = showDictionaryName,
             contentPadding = PaddingValues(bottom = imeBottomPadding),
+            staleEntries = shownStale,
         )
     }
 }

app/src/main/java/com/example/research/ui/main/components/MainTopBar.kt

@@ -1,9 +1,14 @@
 package com.example.research.ui.main.components
 
+
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -17,55 +22,106 @@ import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Surface
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
-import com.example.research.ui.theme.AppWindowInsets
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.boundsInWindow
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import com.example.research.R
+import com.example.research.common.ui.appTestTag
+import com.example.research.common.ui.iconClickable
 import com.example.research.common.ui.theme.dictionaryTitleLarge
-import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withTimeoutOrNull
+import com.example.research.ui.theme.AppWindowInsets
 import com.example.research.ui.theme.Spacing
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
+import kotlin.math.roundToInt
+import kotlin.time.Duration.Companion.milliseconds
 
 private val TopBarHeight = Spacing.topBarHeight
 private val TopBarShape = RoundedCornerShape(28.dp)
+private val HistorySheetChrome = 64.dp
+private val HistorySheetMinHeight = 300.dp
 
 @Composable
 fun MainTopBar(
     searchState: TextFieldState,
     enabled: Boolean,
+    isSearchBarAtBottom: Boolean = false,
     onQueryChange: (String) -> Unit,
     onClearQuery: () -> Unit,
+    searchHistory: List<String>,
+    onHistoryEntryClick: (String) -> Unit,
+    onHistoryEntryRemove: (String) -> Unit,
+    onClearHistory: () -> Unit,
     onNavigateToSettings: () -> Unit
 ) {
-    val searchIcon = painterResource(R.drawable.ic_search)
     val closeIcon = painterResource(R.drawable.ic_close)
+    val historyIcon = painterResource(R.drawable.ic_manage_search)
     val settingsIcon = painterResource(R.drawable.ic_settings)
     val clearLabel = stringResource(R.string.clear_search)
+    val historyLabel = stringResource(R.string.recent_searches)
+    val focusManager = LocalFocusManager.current
+
+    var showHistorySheet by remember { mutableStateOf(false) }
+    var topBarBottomPx by remember { mutableIntStateOf(0) }
+    val coroutineScope = rememberCoroutineScope()
+    val density = LocalDensity.current
+    val imeInsets = WindowInsets.ime
 
     Surface(
         color = MaterialTheme.colorScheme.surface,
-        modifier = Modifier.fillMaxWidth()
+        modifier = Modifier
+            .fillMaxWidth()
+            .onGloballyPositioned { topBarBottomPx = it.boundsInWindow().bottom.roundToInt() }
     ) {
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .windowInsetsPadding(AppWindowInsets.topAndHorizontalSafeDrawing)
+                .windowInsetsPadding(
+                    if (isSearchBarAtBottom) {
+                        AppWindowInsets.horizontalSafeDrawing
+                    } else {
+                        AppWindowInsets.topAndHorizontalSafeDrawing
+                    }
+                )
+                .then(
+                    if (isSearchBarAtBottom) {
+                        Modifier.windowInsetsPadding(AppWindowInsets.bottomNavigation)
+                    } else {
+                        Modifier
+                    }
+                )
                 .padding(start = 16.dp, top = 8.dp, bottom = 8.dp, end = 16.dp),
             horizontalArrangement = Arrangement.spacedBy(8.dp),
             verticalAlignment = Alignment.CenterVertically
@@ -75,9 +131,21 @@ fun MainTopBar(
                 enabled = enabled,
                 onQueryChange = onQueryChange,
                 onClearQuery = onClearQuery,
-                searchIcon = searchIcon,
                 closeIcon = closeIcon,
                 clearLabel = clearLabel,
+                historyIcon = historyIcon,
+                historyLabel = historyLabel,
+                historyEnabled = searchHistory.isNotEmpty(),
+                onShowHistory = {
+                    focusManager.clearFocus(force = true)
+                    coroutineScope.launch {
+                        withTimeoutOrNull(350.milliseconds) {
+                            snapshotFlow { imeInsets.getBottom(density) > 0 }
+                                .first { visible -> !visible }
+                        }
+                        showHistorySheet = !showHistorySheet
+                    }
+                },
                 modifier = Modifier.weight(1f)
             )
 
@@ -100,18 +168,39 @@ fun MainTopBar(
             }
         }
     }
+
+    if (showHistorySheet && searchHistory.isNotEmpty()) {
+        SearchHistorySheet(
+            history = searchHistory,
+            isSearchBarAtBottom = isSearchBarAtBottom,
+            topBarBottomPx = topBarBottomPx,
+            onDismiss = { showHistorySheet = false },
+            onEntryClick = { entry ->
+                focusManager.clearFocus(force = true)
+                showHistorySheet = false
+                onHistoryEntryClick(entry)
+            },
+            onEntryRemove = onHistoryEntryRemove,
+            onClearAll = {
+                showHistorySheet = false
+                onClearHistory()
+            }
+        )
+    }
 }
 
 @Composable
-@OptIn(ExperimentalMaterial3Api::class)
 private fun SearchField(
     searchState: TextFieldState,
     enabled: Boolean,
     onQueryChange: (String) -> Unit,
     onClearQuery: () -> Unit,
-    searchIcon: androidx.compose.ui.graphics.painter.Painter,
-    closeIcon: androidx.compose.ui.graphics.painter.Painter,
+    closeIcon: Painter,
     clearLabel: String,
+    historyIcon: Painter,
+    historyLabel: String,
+    historyEnabled: Boolean,
+    onShowHistory: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     val containerColor = MaterialTheme.colorScheme.surfaceContainerHighest
@@ -134,11 +223,16 @@ private fun SearchField(
         lineLimits = TextFieldLineLimits.SingleLine,
         leadingIcon = {
             Icon(
-                painter = searchIcon,
-                contentDescription = null,
+                painter = historyIcon,
+                contentDescription = historyLabel,
+                tint = LocalContentColor.current.copy(
+                    alpha = if (historyEnabled) 1f else 0.38f
+                ),
                 modifier = Modifier
                     .offset(x = 4.dp)
-                    .size(24.dp)
+                    .size(28.dp)
+                    .appTestTag("history_button")
+                    .iconClickable(enabled = historyEnabled, onClick = onShowHistory)
             )
         },
         trailingIcon = if (searchState.text.isNotEmpty()) {
@@ -183,3 +277,47 @@ private fun SearchField(
             .semantics { testTagsAsResourceId = true }
     )
 }
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun SearchHistorySheet(
+    history: List<String>,
+    isSearchBarAtBottom: Boolean,
+    topBarBottomPx: Int,
+    onDismiss: () -> Unit,
+    onEntryClick: (String) -> Unit,
+    onEntryRemove: (String) -> Unit,
+    onClearAll: () -> Unit
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val density = LocalDensity.current
+    val screenHeight = LocalConfiguration.current.screenHeightDp.dp
+    val navigationBarsBottom = WindowInsets.navigationBars.getBottom(density)
+    val maxContentHeight = remember {
+        with(density) {
+            if (isSearchBarAtBottom) {
+                screenHeight - HistorySheetChrome - navigationBarsBottom.toDp()
+            } else {
+                screenHeight - topBarBottomPx.toDp()
+            }
+        }
+    }
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        contentWindowInsets = { WindowInsets(0, 0, 0, 0) },
+        modifier = Modifier.testTag("search_history_sheet")
+    ) {
+        SearchHistoryList(
+            history = history,
+            onEntryClick = onEntryClick,
+            onEntryRemove = onEntryRemove,
+            onClearAll = onClearAll,
+            modifier = Modifier
+                .fillMaxWidth()
+                .heightIn(min = HistorySheetMinHeight, max = maxContentHeight)
+                .padding(horizontal = 24.dp)
+        )
+    }
+}

app/src/main/java/com/example/research/ui/main/components/SearchHistoryList.kt

@@ -0,0 +1,138 @@
+package com.example.research.ui.main.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+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.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+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.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import com.example.research.R
+import com.example.research.common.ui.appTestTag
+import com.example.research.common.ui.iconClickable
+import com.example.research.common.ui.theme.dictionaryTitleLarge
+import com.example.research.ui.theme.Spacing
+
+@Composable
+fun SearchHistoryList(
+    history: List<String>,
+    onEntryClick: (String) -> Unit,
+    onEntryRemove: (String) -> Unit,
+    onClearAll: () -> Unit,
+    modifier: Modifier = Modifier,
+    listState: LazyListState = rememberLazyListState(),
+    contentPadding: PaddingValues = PaddingValues(),
+) {
+    LazyColumn(
+        modifier = modifier
+            .appTestTag("search_history"),
+        state = listState,
+        contentPadding = contentPadding,
+        verticalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+        item(key = "history_header", contentType = "history_header") {
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = Spacing.listItemVertical),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = stringResource(R.string.recent_searches),
+                    style = MaterialTheme.typography.titleSmall,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.weight(1f)
+                )
+                Text(
+                    text = stringResource(R.string.clear_search_history),
+                    style = MaterialTheme.typography.titleSmall,
+                    color = MaterialTheme.colorScheme.primary,
+                    softWrap = false,
+                    modifier = Modifier
+                        .padding(end = 18.dp)
+                        .clip(CircleShape)
+                        .background(MaterialTheme.colorScheme.surfaceContainerHighest)
+                        .appTestTag("clear_history")
+                        .clickable { onClearAll() }
+                        .padding(horizontal = 12.dp, vertical = 6.dp)
+                )
+            }
+        }
+        items(
+            items = history,
+            key = { it },
+            contentType = { "history_entry" }
+        ) { entry ->
+            SearchHistoryItem(
+                entry = entry,
+                onEntryClick = onEntryClick,
+                onEntryRemove = onEntryRemove
+            )
+        }
+    }
+}
+
+@Composable
+private fun SearchHistoryItem(
+    entry: String,
+    onEntryClick: (String) -> Unit,
+    onEntryRemove: (String) -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .appTestTag("search_history_entry")
+            .clickable { onEntryClick(entry) }
+            .padding(vertical = Spacing.listItemVertical),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            painter = painterResource(R.drawable.ic_history),
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.onSurfaceVariant,
+            modifier = Modifier
+                .padding(end = 16.dp)
+                .size(20.dp)
+        )
+        Text(
+            text = entry,
+            style = MaterialTheme.typography.dictionaryTitleLarge,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier.weight(1f)
+        )
+        Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier.width(Spacing.topBarHeight)
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.ic_close),
+                contentDescription = stringResource(R.string.remove_search_history_entry),
+                tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                modifier = Modifier
+                    .appTestTag("remove_history_entry")
+                    .iconClickable { onEntryRemove(entry) }
+                    .size(20.dp)
+            )
+        }
+    }
+}

app/src/main/java/com/example/research/ui/main/components/SearchResultsList.kt

@@ -29,8 +29,11 @@ fun SearchResultsList(
     modifier: Modifier = Modifier,
     listState: LazyListState = rememberLazyListState(),
     showDictionaryName: Boolean = true,
-    contentPadding: PaddingValues = PaddingValues()
+    contentPadding: PaddingValues = PaddingValues(),
+    staleEntries: List<IndexEntry> = emptyList(),
 ) {
+    val showStale = staleEntries.isNotEmpty() && results.itemCount == 0
+    val rowCount = if (showStale) staleEntries.size else results.itemCount
     LazyColumn(
         modifier = modifier
             .testTag("search_results")
@@ -40,10 +43,18 @@ fun SearchResultsList(
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
         items(
-            count = results.itemCount,
-            contentType = results.itemContentType { "search_result" }
+            count = rowCount,
+            key = { index ->
+                val entry = if (showStale) staleEntries.getOrNull(index)
+                else if (index in 0 until results.itemCount) results.peek(index) else null
+                entry?.let { "${it.dictionaryPath}:${it.offset.value}:${it.word}" }
+                    ?: "search_result_$index"
+            },
+            contentType = { "search_result" }
         ) { index ->
-            results[index]?.let { entry ->
+            val entry = if (showStale) staleEntries.getOrNull(index)
+            else if (index in 0 until results.itemCount) results.peek(index) else null
+            if (entry != null) {
                 SearchResultItem(
                     entry = entry,
                     resultIndex = index,

app/src/main/java/com/example/research/ui/navigation/AppNavigation.kt

@@ -1,23 +1,32 @@
 package com.example.research.ui.navigation
 
 import androidx.activity.compose.BackHandler
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.animation.core.tween
+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.adaptive.currentWindowAdaptiveInfoV2
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.*
+import androidx.compose.ui.Modifier
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import com.example.research.feature.search.SearchAction
 import com.example.research.feature.search.SearchViewModel
-import com.example.research.feature.download.model.DownloadState
 import com.example.research.ui.about.AboutScreen
-import com.example.research.ui.article.ArticleRoute
+import com.example.research.ui.article.ArticleScreen
+import com.example.research.ui.article.ArticleState
 import com.example.research.ui.main.MainRoute
-import com.example.research.ui.settings.ImportState
 import com.example.research.ui.settings.SettingsRoute
 import com.example.research.ui.settings.SettingsViewModel
-import kotlinx.coroutines.delay
-import kotlin.time.Duration.Companion.milliseconds
 
 private data class NavigationState(
     val shouldShowSettings: Boolean,
@@ -29,11 +38,11 @@ enum class Screen {
     Home, Settings, Article, About
 }
 
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun AppNavigation(
     searchViewModel: SearchViewModel,
-    settingsViewModel: SettingsViewModel
+    settingsViewModel: SettingsViewModel,
+    seedNoDictionaries: Boolean = false
 ) {
     val screenStack = rememberSaveable(
         saver = listSaver(
@@ -53,39 +62,15 @@ fun AppNavigation(
     val currentScreen = screenStack.lastOrNull() ?: Screen.Home
 
     val settingsState by settingsViewModel.uiState.collectAsStateWithLifecycle()
-    val progressSnapshot by settingsViewModel.progressSnapshot.collectAsStateWithLifecycle()
-    val isPipelineActiveByState = remember(
-        progressSnapshot,
-        settingsState.indexingProgress.isIndexing,
-        settingsState.downloadState,
-        settingsState.importState,
-    ) {
-        progressSnapshot != null ||
-            settingsState.indexingProgress.isIndexing ||
-            settingsState.downloadState is DownloadState.Loading ||
-            settingsState.downloadState is DownloadState.Extracting ||
-            settingsState.downloadState is DownloadState.Success ||
-            settingsState.importState is ImportState.Importing ||
-            settingsState.importState is ImportState.Extracting ||
-            settingsState.importState is ImportState.Success
-    }
-    var stickyPipelineActive by rememberSaveable { mutableStateOf(false) }
-    LaunchedEffect(isPipelineActiveByState) {
-        if (isPipelineActiveByState) {
-            stickyPipelineActive = true
-        } else {
-            delay(1500.milliseconds)
-            stickyPipelineActive = false
-        }
-    }
 
     val navState by remember {
         derivedStateOf {
-            val isOperationActive = stickyPipelineActive
+            val isOperationActive = !settingsState.pipelineIdle
             val hasConfirmedNoDictionaries =
                 settingsState.hasCompletedStartupScan && settingsState.dictionaries.isEmpty()
+            val hasSeededNoDictionaries = seedNoDictionaries && !settingsState.hasCompletedStartupScan
             NavigationState(
-                shouldShowSettings = hasConfirmedNoDictionaries || isOperationActive,
+                shouldShowSettings = hasConfirmedNoDictionaries || hasSeededNoDictionaries || isOperationActive,
                 showBackButtonInSettings = settingsState.dictionaries.isNotEmpty() && !isOperationActive,
                 isOperationActive = isOperationActive,
             )
@@ -95,10 +80,16 @@ fun AppNavigation(
     val shouldShowSettings = navState.shouldShowSettings
     val showBackButtonInSettings = navState.showBackButtonInSettings
     val isOperationActive = navState.isOperationActive
-    val isWideScreen = currentWindowAdaptiveInfo()
+    val isWideScreen = currentWindowAdaptiveInfoV2()
         .windowSizeClass
         .isWidthAtLeastBreakpoint(WIDTH_DP_MEDIUM_LOWER_BOUND)
 
+    LaunchedEffect(isWideScreen) {
+        if (isWideScreen) {
+            screenStack.removeAll { it == Screen.Article }
+        }
+    }
+
     BackHandler(enabled = screenStack.size > 1 && !(currentScreen == Screen.Settings && isOperationActive)) {
         if (currentScreen == Screen.Article) {
             if (searchViewModel.navigateBackFromArticle()) {
@@ -112,14 +103,33 @@ fun AppNavigation(
     }
 
     val articleState by searchViewModel.selectedArticle.collectAsStateWithLifecycle()
+    var lastShownArticle by remember { mutableStateOf<ArticleState?>(null) }
+    LaunchedEffect(articleState) {
+        if (articleState != null) lastShownArticle = articleState
+    }
 
     val effectiveScreen = when {
         currentScreen == Screen.About -> Screen.About
-        currentScreen == Screen.Article && articleState == null -> if (shouldShowSettings) Screen.Settings else Screen.Home
         shouldShowSettings -> Screen.Settings
-        else -> currentScreen
+        currentScreen == Screen.Settings -> Screen.Settings
+        else -> Screen.Home
     }
-    when (effectiveScreen) {
+    Box {
+    AnimatedContent(
+        targetState = effectiveScreen,
+        transitionSpec = {
+            val forward = initialState.ordinal < targetState.ordinal
+            (
+                fadeIn(tween(180)) +
+                    slideInHorizontally(tween(180)) { if (forward) it / 3 else -it / 3 }
+                ).togetherWith(
+                fadeOut(tween(180)) +
+                    slideOutHorizontally(tween(180)) { if (forward) -it / 3 else it / 3 }
+            )
+        },
+        label = "screenTransition",
+    ) { screen ->
+        when (screen) {
         Screen.Home -> {
             MainRoute(
                 searchViewModel = searchViewModel,
@@ -150,18 +160,6 @@ fun AppNavigation(
                 onNavigateToAbout = { screenStack.add(Screen.About) }
             )
         }
-        Screen.Article -> {
-            ArticleRoute(
-                searchViewModel = searchViewModel,
-                onNavigateBack = {
-                    if (searchViewModel.navigateBackFromArticle()) {
-                        return@ArticleRoute
-                    }
-                    searchViewModel.onAction(SearchAction.ClearArticle)
-                    if (screenStack.size > 1) screenStack.removeAt(screenStack.lastIndex)
-                }
-            )
-        }
         Screen.About -> {
             AboutScreen(
                 onNavigateBack = {
@@ -169,5 +167,36 @@ fun AppNavigation(
                 }
             )
         }
+        Screen.Article -> {}
+        }
+    }
+
+    AnimatedVisibility(
+        visible = currentScreen == Screen.Article && articleState != null,
+        enter = fadeIn(tween(180)) + slideInHorizontally(tween(180)) { it / 3 },
+        exit = fadeOut(tween(180)) + slideOutHorizontally(tween(180)) { it / 3 },
+        label = "articleOverlay",
+    ) {
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            color = MaterialTheme.colorScheme.surface
+        ) {
+            ArticleScreen(
+                articleState = articleState ?: lastShownArticle,
+                onNavigateBack = {
+                    if (!searchViewModel.navigateBackFromArticle()) {
+                        searchViewModel.onAction(SearchAction.ClearArticle)
+                        if (screenStack.size > 1) screenStack.removeAt(screenStack.lastIndex)
+                    }
+                },
+                onRefClick = { word ->
+                    searchViewModel.onAction(SearchAction.SearchAndLoadArticle(word))
+                },
+                onScrollPositionChanged = { index, offset ->
+                    searchViewModel.updateArticleScrollPosition(index, offset)
+                },
+            )
+        }
+    }
     }
 }

app/src/main/java/com/example/research/ui/settings/ImportState.kt

@@ -1,5 +1,8 @@
 package com.example.research.ui.settings
 
+import androidx.compose.runtime.Immutable
+
+@Immutable
 sealed interface ImportState {
     data object Idle : ImportState
     data class Importing(val progress: Float) : ImportState
@@ -7,3 +10,6 @@ sealed interface ImportState {
     data object Success : ImportState
     data class Error(val message: String) : ImportState
 }
+
+val ImportState.isActive: Boolean
+    get() = this is ImportState.Importing || this is ImportState.Extracting || this is ImportState.Success

app/src/main/java/com/example/research/ui/settings/SettingsScreen.kt

@@ -3,6 +3,11 @@ package com.example.research.ui.settings
 import android.net.Uri
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,7 +21,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
@@ -41,17 +45,18 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.repeatOnLifecycle
 import com.example.research.R
+import com.example.research.common.ui.AppBackButton
 import com.example.research.common.ui.appTestTag
 import com.example.research.common.ui.components.CollapsibleHeader
 import com.example.research.common.ui.components.SectionCard
 import com.example.research.ui.settings.components.DictionaryManagement
 import com.example.research.ui.settings.components.LanguageSelectionSection
+import com.example.research.ui.settings.components.SearchBarPositionSection
 import com.example.research.ui.settings.components.ThemeSelectionSection
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SettingsRoute(
     viewModel: SettingsViewModel,
@@ -121,12 +126,10 @@ fun SettingsScreen(
                 title = { Text(stringResource(R.string.settings_title)) },
                 navigationIcon = {
                     if (showBackButton) {
-                        IconButton(onClick = onNavigateBack) {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_arrow_back),
-                                contentDescription = stringResource(R.string.action_back)
-                            )
-                        }
+                        AppBackButton(
+                            onClick = onNavigateBack,
+                            modifier = Modifier.padding(start = 6.dp)
+                        )
                     }
                 },
                 colors = TopAppBarDefaults.topAppBarColors(
@@ -235,6 +238,24 @@ fun SettingsScreen(
             }
             }
 
+            item(key = "search_bar", contentType = "settings-section") {
+                CollapsibleSettingsSection(
+                title = stringResource(R.string.search_bar_position),
+                iconRes = R.drawable.ic_search,
+                testTag = "search_bar_section",
+                isExpanded = uiState.isSearchBarExpanded,
+                onToggleExpanded = { onEvent(SettingsUiEvent.SectionToggled("search_bar", !uiState.isSearchBarExpanded)) },
+            ) {
+                SearchBarPositionSection(
+                    currentPosition = uiState.searchBarPosition,
+                    onPositionChanged = { position ->
+                        haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
+                        onEvent(SettingsUiEvent.SearchBarPositionChanged(position))
+                    }
+                )
+            }
+            }
+
             item(key = "bottom-spacer", contentType = "spacer") {
                 Spacer(modifier = Modifier.height(32.dp))
             }
@@ -266,7 +287,11 @@ private fun CollapsibleSettingsSection(
                 testTag = testTag
             )
 
-            if (isExpanded) {
+            AnimatedVisibility(
+                visible = isExpanded,
+                enter = expandVertically() + fadeIn(),
+                exit = shrinkVertically() + fadeOut(),
+            ) {
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()

app/src/main/java/com/example/research/ui/settings/SettingsUiState.kt

@@ -1,18 +1,23 @@
 package com.example.research.ui.settings
 
 import android.net.Uri
+import androidx.compose.runtime.Immutable
 import com.example.research.core.domain.model.AppTheme
+import com.example.research.core.domain.model.SearchBarPosition
 import com.example.research.core.domain.model.Dictionary
 import com.example.research.core.domain.model.DictionarySource
 import com.example.research.core.domain.model.IndexingProgress
 import com.example.research.DictionaryStatus
 import com.example.research.feature.download.model.DownloadState
 
+@Immutable
 data class SettingsUiState(
     val theme: AppTheme = AppTheme.SYSTEM,
     val language: String = "system",
+    val searchBarPosition: SearchBarPosition = SearchBarPosition.TOP,
     val isThemeExpanded: Boolean = false,
     val isLanguageExpanded: Boolean = false,
+    val isSearchBarExpanded: Boolean = false,
     val isDictionariesExpanded: Boolean = true,
     val dictionaries: List<Dictionary> = emptyList(),
     val dictionaryStatus: DictionaryStatus = DictionaryStatus.Unknown,
@@ -21,12 +26,14 @@ data class SettingsUiState(
     val importState: ImportState = ImportState.Idle,
     val dictionarySources: List<DictionarySource> = emptyList(),
     val hasCompletedStartupScan: Boolean = false,
+    val pipelineIdle: Boolean = true,
     val appVersion: String = "1.0",
 )
 
 sealed interface SettingsUiEvent {
     data class ThemeChanged(val theme: AppTheme) : SettingsUiEvent
     data class LanguageChanged(val language: String) : SettingsUiEvent
+    data class SearchBarPositionChanged(val position: SearchBarPosition) : SettingsUiEvent
     data class SectionToggled(val key: String, val isExpanded: Boolean) : SettingsUiEvent
     data class DictionaryToggled(val path: String) : SettingsUiEvent
     data class DictionaryDeleted(val dictionary: Dictionary) : SettingsUiEvent

app/src/main/java/com/example/research/ui/settings/SettingsViewModel.kt

@@ -7,17 +7,22 @@ import androidx.lifecycle.viewModelScope
 import com.example.research.DictionaryStatus
 import com.example.research.R
 import com.example.research.common.progress.DictionaryProgressStateHolder
+import com.example.research.common.util.DateUtils
 import com.example.research.core.domain.model.AppTheme
+import com.example.research.core.domain.model.SearchBarPosition
 import com.example.research.core.domain.model.Dictionary
 import com.example.research.core.domain.model.DictionarySource
 import com.example.research.core.domain.model.IndexingProgress
+import com.example.research.core.domain.usecase.DictionarySourceFileMatcher
 import com.example.research.core.domain.usecase.DictionarySourceValidator
 import com.example.research.core.domain.usecase.ManageDictionarySourcesUseCase
 import com.example.research.core.util.OperationResult
 import com.example.research.data.local.preferences.PreferencesManager
+import com.example.research.data.local.preferences.SectionExpansionStates
 import com.example.research.data.repository.LocalDictionaryRepository
 import com.example.research.feature.download.DownloadManager
 import com.example.research.feature.download.model.DownloadState
+import com.example.research.feature.download.model.isActive
 import com.example.research.feature.download.repository.DictionaryRepository
 import com.example.research.feature.import.DictionaryImportManager
 import kotlinx.coroutines.Dispatchers
@@ -30,7 +35,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.io.File
+import java.util.concurrent.ConcurrentHashMap
 
 private data class DictionaryStateInputs(
     val theme: AppTheme,
@@ -42,11 +47,13 @@ private data class DictionaryStateInputs(
 private data class OperationStateInputs(
     val downloadState: DownloadState,
     val language: String,
+    val searchBarPosition: SearchBarPosition,
     val importState: ImportState,
     val dictionaryStatus: DictionaryStatus,
     val hasCompletedStartupScan: Boolean,
     val isThemeExpanded: Boolean,
     val isLanguageExpanded: Boolean,
+    val isSearchBarExpanded: Boolean,
     val isDictionariesExpanded: Boolean,
 )
 
@@ -59,6 +66,8 @@ class SettingsViewModel(
     private val dictionaryImportManager: DictionaryImportManager,
     progressStateHolder: DictionaryProgressStateHolder,
     appVersion: String,
+    initialSectionExpansion: SectionExpansionStates,
+    initialSearchBarPosition: SearchBarPosition,
 ) : AndroidViewModel(application) {
 
     private val manageDictionarySourcesUseCase = ManageDictionarySourcesUseCase(
@@ -66,7 +75,16 @@ class SettingsViewModel(
         validator = DictionarySourceValidator(),
     )
 
-    private val _uiState = MutableStateFlow(SettingsUiState(appVersion = appVersion))
+    private val _uiState = MutableStateFlow(
+        SettingsUiState(
+            appVersion = appVersion,
+            isThemeExpanded = initialSectionExpansion.isThemeExpanded,
+            isLanguageExpanded = initialSectionExpansion.isLanguageExpanded,
+            isSearchBarExpanded = initialSectionExpansion.isSearchBarExpanded,
+            isDictionariesExpanded = initialSectionExpansion.isDictionariesExpanded,
+            searchBarPosition = initialSearchBarPosition,
+        )
+    )
     val uiState: StateFlow<SettingsUiState> = _uiState.asStateFlow()
 
     val progressSnapshot = progressStateHolder.progressSnapshot
@@ -79,20 +97,49 @@ class SettingsViewModel(
     private val language = MutableStateFlow("system")
     private val hasCompletedStartupScan = MutableStateFlow(false)
 
-    private val pendingSourceUrls = mutableSetOf<String>()
+    private val pendingSourceUrls = ConcurrentHashMap.newKeySet<String>()
     private var isDownloadInProgress = false
 
     private var cancelRefreshPending = false
+    private var errorStateHandled = false
+    private var successStateHandled = false
+    private var statusBeforeDownload: DictionaryStatus = DictionaryStatus.Unknown
 
     init {
         setupStateObservation()
+        observeDictionariesForSeedFlag()
+        persistDictionaryStatus()
         initialize()
     }
 
+    private fun persistDictionaryStatus() {
+        viewModelScope.launch {
+            dictionaryStatus.collect { status ->
+                val persistedName = when (status) {
+                    DictionaryStatus.UpToDate -> "UpToDate"
+                    DictionaryStatus.NeedsUpdate -> "NeedsUpdate"
+                    DictionaryStatus.Empty -> "Empty"
+                    else -> null
+                }
+                if (persistedName != null) {
+                    preferencesManager.saveDictionaryStatus("$persistedName|${DateUtils.getCurrentDateString()}")
+                }
+            }
+        }
+    }
+
+    private fun observeDictionariesForSeedFlag() {
+        viewModelScope.launch {
+            localDictionaryRepository.dictionaries.collect { dictionaries ->
+                if (hasCompletedStartupScan.value) {
+                    preferencesManager.setHadNoDictionaries(dictionaries.isEmpty())
+                }
+            }
+        }
+    }
+
     private fun setupStateObservation() {
         viewModelScope.launch {
-            var wasIndexing = false
-
             val dictionaryStateInputs = combine(
                 preferencesManager.themeMode.map { mode ->
                     try { AppTheme.valueOf(mode) } catch (_: Exception) { AppTheme.SYSTEM }
@@ -111,72 +158,75 @@ class SettingsViewModel(
             val operationStateInputs = combine(
                 downloadManager.downloadState,
                 language,
+                preferencesManager.searchBarPosition,
                 dictionaryImportManager.importState,
                 dictionaryStatus,
                 hasCompletedStartupScan,
                 preferencesManager.isThemeExpanded,
                 preferencesManager.isLanguageExpanded,
+                preferencesManager.isSearchBarExpanded,
                 preferencesManager.isDictionariesExpanded,
             ) { params: Array<Any> ->
                 @Suppress("UNCHECKED_CAST")
                 OperationStateInputs(
                     downloadState = params[0] as DownloadState,
                     language = params[1] as String,
-                    importState = params[2] as ImportState,
-                    dictionaryStatus = params[3] as DictionaryStatus,
-                    hasCompletedStartupScan = params[4] as Boolean,
-                    isThemeExpanded = params[5] as Boolean,
-                    isLanguageExpanded = params[6] as Boolean,
-                    isDictionariesExpanded = params[7] as Boolean,
+                    searchBarPosition = params[2] as SearchBarPosition,
+                    importState = params[3] as ImportState,
+                    dictionaryStatus = params[4] as DictionaryStatus,
+                    hasCompletedStartupScan = params[5] as Boolean,
+                    isThemeExpanded = params[6] as Boolean,
+                    isLanguageExpanded = params[7] as Boolean,
+                    isSearchBarExpanded = params[8] as Boolean,
+                    isDictionariesExpanded = params[9] as Boolean,
                 )
             }
 
             combine(dictionaryStateInputs, operationStateInputs) { dictionaryState, operationState ->
-                // Handle indexing completion side effect
                 val isIndexing = dictionaryState.indexingProgress.isIndexing
-                if (wasIndexing && !isIndexing) {
-                    if (isDownloadInProgress) {
-                        isDownloadInProgress = false
-                        dictionaryStatus.value = DictionaryStatus.UpToDate
-                    }
-                }
-                wasIndexing = isIndexing
-
                 when (operationState.downloadState) {
                     is DownloadState.Loading, is DownloadState.Extracting -> {
                         isDownloadInProgress = true
                         cancelRefreshPending = false
+                        errorStateHandled = false
+                        successStateHandled = false
                     }
                     is DownloadState.Success -> {
                         pendingSourceUrls.clear()
+                        isDownloadInProgress = false
+                        if (!successStateHandled) {
+                            successStateHandled = true
+                            dictionaryStatus.value = withContext(Dispatchers.IO) {
+                                evaluateDictionaryStatus()
+                            }
+                        }
                     }
                     is DownloadState.Error -> {
                         isDownloadInProgress = false
-                        dictionaryStatus.value = if (dictionaryState.dictionaries.isEmpty()) {
-                            DictionaryStatus.Empty
-                        } else {
-                            DictionaryStatus.UpToDate
-                        }
-                        if (pendingSourceUrls.isNotEmpty()) {
-
-                            pendingSourceUrls.forEach { urlTemplate ->
-                                val source = dictionaryState.dictionarySources.find {
-                                    it.urlTemplate == urlTemplate
-                                }
-                                if (source != null) {
-                                    val hasDictionary = dictionaryState.dictionaries.any { dict ->
-                                        DictionarySource.matchesDictionaryFile(
-                                            urlTemplate,
-                                            File(dict.path).name
-                                        )
+                        if (!errorStateHandled) {
+                            errorStateHandled = true
+                            dictionaryStatus.value = if (dictionaryState.dictionaries.isEmpty()) {
+                                DictionaryStatus.Empty
+                            } else when (statusBeforeDownload) {
+                                DictionaryStatus.Unknown, DictionaryStatus.Checking -> DictionaryStatus.UpToDate
+                                else -> statusBeforeDownload
+                            }
+                            if (pendingSourceUrls.isNotEmpty()) {
+                                pendingSourceUrls.forEach { urlTemplate ->
+                                    val source = dictionaryState.dictionarySources.find {
+                                        it.urlTemplate == urlTemplate
                                     }
-
-                                    if (!hasDictionary) {
-                                        manageDictionarySourcesUseCase.removeSource(source.id)
+                                    if (source != null) {
+                                        val hasDictionary = dictionaryState.dictionaries.any { dictionary ->
+                                            DictionarySourceFileMatcher.matches(source, dictionary)
+                                        }
+                                        if (!hasDictionary) {
+                                            manageDictionarySourcesUseCase.removeSource(source.id)
+                                        }
                                     }
                                 }
+                                pendingSourceUrls.clear()
                             }
-                            pendingSourceUrls.clear()
                         }
                     }
                     is DownloadState.Cancelled -> {
@@ -198,7 +248,6 @@ class SettingsViewModel(
                             refreshDictionaryStatus()
                         }
                     }
-                    else -> {}
                 }
 
                 SettingsUiState(
@@ -208,11 +257,16 @@ class SettingsViewModel(
                     indexingProgress = IndexingProgress(isIndexing = isIndexing),
                     downloadState = operationState.downloadState,
                     language = operationState.language,
+                    searchBarPosition = operationState.searchBarPosition,
                     importState = operationState.importState,
                     dictionaryStatus = operationState.dictionaryStatus,
                     hasCompletedStartupScan = operationState.hasCompletedStartupScan,
+                    pipelineIdle = !isIndexing &&
+                        !operationState.downloadState.isActive &&
+                        !operationState.importState.isActive,
                     isThemeExpanded = operationState.isThemeExpanded,
                     isLanguageExpanded = operationState.isLanguageExpanded,
+                    isSearchBarExpanded = operationState.isSearchBarExpanded,
                     isDictionariesExpanded = operationState.isDictionariesExpanded,
                     appVersion = _uiState.value.appVersion,
                 )
@@ -223,9 +277,15 @@ class SettingsViewModel(
     }
 
     private fun initialize() {
+        var scanCompleted = false
         viewModelScope.launch {
             try {
-                scanDirectoryInternal(preferencesManager.dictionaryPath)
+                scanCompleted = if (localDictionaryRepository.dictionaries.value.isEmpty()) {
+                    scanDirectoryInternal(preferencesManager.dictionaryPath) is OperationResult.Success
+                } else {
+                    dictionaryStatus.value = DictionaryStatus.UpToDate
+                    false
+                }
             } catch (e: Exception) {
                 android.util.Log.e("SettingsViewModel", "Initial scan failed", e)
                 dictionaryStatus.value = if (localDictionaryRepository.dictionaries.value.isEmpty()) {
@@ -242,6 +302,11 @@ class SettingsViewModel(
                     android.util.Log.w("SettingsViewModel", "Failed to load language preference: ${e.message}")
                 }
                 hasCompletedStartupScan.value = true
+                if (scanCompleted) {
+                    preferencesManager.setHadNoDictionaries(
+                        localDictionaryRepository.dictionaries.value.isEmpty()
+                    )
+                }
             }
         }
     }
@@ -250,6 +315,7 @@ class SettingsViewModel(
         when (event) {
             is SettingsUiEvent.ThemeChanged -> setTheme(event.theme)
             is SettingsUiEvent.LanguageChanged -> saveLanguage(event.language)
+            is SettingsUiEvent.SearchBarPositionChanged -> saveSearchBarPosition(event.position)
             is SettingsUiEvent.SectionToggled -> saveSectionExpanded(event.key, event.isExpanded)
             is SettingsUiEvent.DictionaryToggled -> toggleDictionaryActive(event.path)
             is SettingsUiEvent.DictionaryDeleted -> deleteDictionary(event.dictionary)
@@ -264,26 +330,35 @@ class SettingsViewModel(
     private suspend fun evaluateDictionaryStatus(): DictionaryStatus {
         return try {
             val actualDictionaries = localDictionaryRepository.dictionaries.first()
-            val hasDictionaries = actualDictionaries.isNotEmpty()
+            var sources = preferencesManager.dictionarySources.first()
+            if (pendingSourceUrls.isEmpty() &&
+                downloadManager.downloadState.value !is DownloadState.Loading &&
+                downloadManager.downloadState.value !is DownloadState.Extracting
+            ) {
+                val dictionaryFileNames = localDictionaryRepository.listDictionaryPayloadFileNames(
+                    preferencesManager.dictionaryPath
+                )
+                if (dictionaryFileNames != null) {
+                    val installedSources = DictionarySourceFileMatcher.installedSourcesForFileNames(
+                        sources,
+                        dictionaryFileNames,
+                    )
+                    val installedSourceIds = installedSources
+                        .mapTo(mutableSetOf(), DictionarySource::id)
+                    val staleSourceIds = sources
+                        .filterNot { it.id in installedSourceIds }
+                        .map(DictionarySource::id)
+                    if (staleSourceIds.isNotEmpty()) {
+                        preferencesManager.removeDictionarySources(staleSourceIds)
+                        sources = installedSources
+                    }
+                }
+            }
 
-            if (!hasDictionaries) {
+            if (actualDictionaries.isEmpty()) {
                 return DictionaryStatus.Empty
             }
 
-            var sources = preferencesManager.dictionarySources.first()
-            if (downloadManager.downloadState.value !is DownloadState.Loading &&
-                downloadManager.downloadState.value !is DownloadState.Extracting
-            ) {
-                val installedSources = installedSources(sources, actualDictionaries)
-                val installedSourceIds = installedSources.mapTo(mutableSetOf(), DictionarySource::id)
-                val staleSourceIds = sources
-                    .filterNot { it.id in installedSourceIds }
-                    .map(DictionarySource::id)
-                if (staleSourceIds.isNotEmpty()) {
-                    preferencesManager.removeDictionarySources(staleSourceIds)
-                    sources = installedSources
-                }
-            }
             val enabledSources = installedEnabledSources(sources, actualDictionaries)
 
             if (enabledSources.isEmpty()) {
@@ -313,6 +388,12 @@ class SettingsViewModel(
         }
     }
 
+    private fun saveSearchBarPosition(position: SearchBarPosition) {
+        viewModelScope.launch {
+            preferencesManager.saveSearchBarPosition(position)
+        }
+    }
+
     private fun saveLanguage(languageCode: String) {
         viewModelScope.launch {
             preferencesManager.saveLanguage(languageCode)
@@ -338,45 +419,62 @@ class SettingsViewModel(
 
     private fun deleteDictionary(dictionary: Dictionary) {
         viewModelScope.launch {
-            localDictionaryRepository.deleteDictionary(dictionary)
-
-            manageDictionarySourcesUseCase.removeSourceForDictionary(dictionary)
-
-            val remainingDictionaries = localDictionaryRepository.dictionaries.first()
-
-            if (remainingDictionaries.isEmpty()) {
-                dictionaryStatus.value = DictionaryStatus.Empty
+            when (localDictionaryRepository.deleteDictionary(dictionary)) {
+                is OperationResult.Success -> {
+                    val remainingDictionaryFileNames =
+                        localDictionaryRepository.listDictionaryPayloadFileNames(
+                            preferencesManager.dictionaryPath
+                        )
+                    manageDictionarySourcesUseCase.removeSourceForDictionary(
+                        dictionary = dictionary,
+                        remainingDictionaryFileNames = remainingDictionaryFileNames,
+                    )
+                    dictionaryStatus.value = withContext(Dispatchers.IO) {
+                        evaluateDictionaryStatus()
+                    }
+                }
+                is OperationResult.Error -> {
+                    effectChannel.send(
+                        getApplication<Application>().getString(R.string.error_delete_dictionary)
+                    )
+                }
             }
         }
     }
 
     private fun addDictionarySources(urlTemplates: List<String>) {
         viewModelScope.launch {
-            try {
-                val validUrls = mutableListOf<String>()
+            val validUrls = mutableListOf<String>()
 
-                urlTemplates.forEach { urlTemplate ->
-                    val trimmed = urlTemplate.trim()
-                    if (trimmed.isEmpty() || trimmed.length > 2048) {
-                        return@forEach
-                    }
+            urlTemplates.forEach { urlTemplate ->
+                val trimmed = urlTemplate.trim()
+                if (trimmed.isEmpty() || trimmed.length > 2048) {
+                    return@forEach
+                }
 
+                val normalizedUrl = DictionarySource.normalizeTemplate(trimmed)
+                if (!pendingSourceUrls.add(normalizedUrl)) {
+                    return@forEach
+                }
+
+                try {
                     when (manageDictionarySourcesUseCase.addSource(trimmed)) {
                         is ManageDictionarySourcesUseCase.AddSourceResult.Success -> {
-                            pendingSourceUrls.add(DictionarySource.normalizeTemplate(trimmed))
                             validUrls.add(trimmed)
                         }
                         is ManageDictionarySourcesUseCase.AddSourceResult.ValidationFailed -> {
+                            pendingSourceUrls.remove(normalizedUrl)
                             // Validation failed, skip this source
                         }
                     }
+                } catch (e: Exception) {
+                    pendingSourceUrls.remove(normalizedUrl)
+                    android.util.Log.e("SettingsViewModel", "Error adding dictionary source", e)
                 }
+            }
 
-                if (validUrls.isNotEmpty()) {
-                    startDownloadForSources(validUrls)
-                }
-            } catch (e: Exception) {
-                android.util.Log.e("SettingsViewModel", "Error adding dictionary sources", e)
+            if (validUrls.isNotEmpty()) {
+                startDownloadForSources(validUrls)
             }
         }
     }
@@ -390,6 +488,7 @@ class SettingsViewModel(
                 return@launch
             }
 
+            statusBeforeDownload = dictionaryStatus.value
             dictionaryStatus.value = DictionaryStatus.Checking
             isDownloadInProgress = true
 
@@ -413,6 +512,7 @@ class SettingsViewModel(
                 return@launch
             }
 
+            statusBeforeDownload = dictionaryStatus.value
             dictionaryStatus.value = DictionaryStatus.Checking
 
             val installedSources = installedEnabledSources(
@@ -448,12 +548,25 @@ class SettingsViewModel(
     private fun installedSources(
         sources: List<DictionarySource>,
         dictionaries: List<Dictionary>
-    ): List<DictionarySource> {
-        val installedFileNames = dictionaries.map { File(it.path).name }
-        return sources.filter { source ->
-            installedFileNames.any { fileName ->
-                DictionarySource.matchesDictionaryFile(source.urlTemplate, fileName)
-            }
+    ): List<DictionarySource> =
+        DictionarySourceFileMatcher.installedSources(sources, dictionaries)
+
+    private suspend fun installedDictionariesAreCurrent(): Boolean {
+        val sources = preferencesManager.dictionarySources.first()
+        val dictionaries = localDictionaryRepository.dictionaries.first()
+        val datedEnabledSources = installedEnabledSources(sources, dictionaries)
+            .filter { DictionarySource.hasDatePlaceholder(it.urlTemplate) }
+        if (datedEnabledSources.isEmpty()) return true
+        val fileNames = localDictionaryRepository.listDictionaryPayloadFileNames(
+            preferencesManager.dictionaryPath
+        ) ?: return true
+        val today = DateUtils.getCurrentDateString()
+        return datedEnabledSources.all { source ->
+            val baseName = DictionarySource.extractFileName(source.urlTemplate, today)
+                .removeSuffix(".gz")
+                .removeSuffix(".dsl")
+                .removeSuffix(".dz")
+            fileNames.any { it.startsWith(baseName) }
         }
     }
 
@@ -501,12 +614,27 @@ class SettingsViewModel(
             is OperationResult.Success -> {
                 val dictionaries = localDictionaryRepository.dictionaries.first()
                 if (dictionaries.isEmpty()) {
-                    dictionaryStatus.value = DictionaryStatus.Empty
+                    dictionaryStatus.value = withContext(Dispatchers.IO) {
+                        evaluateDictionaryStatus()
+                    }
+                    isDownloadInProgress = false
+                } else if (isDownloadInProgress) {
+                    dictionaryStatus.value = DictionaryStatus.UpToDate
                     isDownloadInProgress = false
                 } else {
-                    if (isDownloadInProgress) {
-                        dictionaryStatus.value = DictionaryStatus.UpToDate
-                        isDownloadInProgress = false
+                    val savedStatus = preferencesManager.dictionaryStatus()
+                    val savedStatusName = savedStatus?.substringBefore('|')
+                    val savedStatusDate = savedStatus?.substringAfter('|', "")
+                    val restoredStatus = when (savedStatusName) {
+                        "UpToDate" -> DictionaryStatus.UpToDate
+                        "NeedsUpdate" -> DictionaryStatus.NeedsUpdate
+                        else -> null
+                    }
+                    if (restoredStatus != null &&
+                        savedStatusDate == DateUtils.getCurrentDateString() &&
+                        withContext(Dispatchers.IO) { installedDictionariesAreCurrent() }
+                    ) {
+                        dictionaryStatus.value = restoredStatus
                     } else {
                         dictionaryStatus.value = DictionaryStatus.Checking
                         val status = withContext(Dispatchers.IO) { evaluateDictionaryStatus() }

app/src/main/java/com/example/research/ui/settings/components/DictionaryListItem.kt

@@ -28,6 +28,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
@@ -83,7 +84,7 @@ fun DictionaryListItem(
     onToggle: () -> Unit,
     onDelete: () -> Unit,
     modifier: Modifier = Modifier,
-    canDelete: Boolean = true
+    isDeleteBlocked: () -> Boolean = { false }
 ) {
     val haptic = LocalHapticFeedback.current
     val density = LocalDensity.current
@@ -95,8 +96,9 @@ fun DictionaryListItem(
     val offsetAnim = remember { Animatable(0f) }
 
     var rawOffset by remember { mutableFloatStateOf(0f) }
-    val isDeleteRevealed by remember(canDelete) {
-        derivedStateOf { canDelete && rawOffset <= -swipeThresholdPx }
+    val isDeleteBlockedCurrent by rememberUpdatedState(isDeleteBlocked)
+    val isDeleteRevealed by remember {
+        derivedStateOf { !isDeleteBlockedCurrent() && rawOffset <= -swipeThresholdPx }
     }
 
     LaunchedEffect(isDeleteRevealed) {
@@ -105,11 +107,14 @@ fun DictionaryListItem(
         }
     }
 
-    LaunchedEffect(canDelete) {
-        if (!canDelete) {
-            rawOffset = 0f
-            offsetAnim.snapTo(0f)
-        }
+    LaunchedEffect(Unit) {
+        snapshotFlow { isDeleteBlockedCurrent() }
+            .collect { blocked ->
+                if (blocked) {
+                    offsetAnim.snapTo(0f)
+                    rawOffset = 0f
+                }
+            }
     }
 
     val currentOnDelete by rememberUpdatedState(onDelete)
@@ -142,16 +147,18 @@ fun DictionaryListItem(
                 .height(DictionaryItemHeight)
                 .background(MaterialTheme.colorScheme.surfaceVariant)
                 .graphicsLayer { translationX = offsetAnim.value }
-                .pointerInput(canDelete, maxSwipePx, swipeThresholdPx) {
-                    if (!canDelete) return@pointerInput
+                .pointerInput(maxSwipePx, swipeThresholdPx) {
                     detectHorizontalDragGestures(
                         onDragStart = {
+                            if (isDeleteBlockedCurrent()) return@detectHorizontalDragGestures
                             haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
                         },
                         onDragEnd = {
+                            if (isDeleteBlockedCurrent()) return@detectHorizontalDragGestures
                             val target = if (rawOffset <= -swipeThresholdPx) -maxSwipePx else 0f
                             rawOffset = target
                             scope.launch {
+                                if (isDeleteBlockedCurrent()) return@launch
                                 offsetAnim.animateTo(
                                     target,
                                     animationSpec = spring(stiffness = Spring.StiffnessMedium)
@@ -159,9 +166,11 @@ fun DictionaryListItem(
                             }
                         },
                         onDragCancel = {
+                            if (isDeleteBlockedCurrent()) return@detectHorizontalDragGestures
                             val target = if (rawOffset <= -swipeThresholdPx) -maxSwipePx else 0f
                             rawOffset = target
                             scope.launch {
+                                if (isDeleteBlockedCurrent()) return@launch
                                 offsetAnim.animateTo(
                                     target,
                                     animationSpec = spring(stiffness = Spring.StiffnessMedium)
@@ -169,9 +178,13 @@ fun DictionaryListItem(
                             }
                         },
                         onHorizontalDrag = { _, dragAmount ->
+                            if (isDeleteBlockedCurrent()) return@detectHorizontalDragGestures
                             val newOffset = (rawOffset + dragAmount).coerceIn(-maxSwipePx, 0f)
                             rawOffset = newOffset
-                            scope.launch { offsetAnim.snapTo(newOffset) }
+                            scope.launch {
+                                if (isDeleteBlockedCurrent()) return@launch
+                                offsetAnim.snapTo(newOffset)
+                            }
                         }
                     )
                 },
@@ -263,8 +276,10 @@ fun DictionaryListItem(
                 onClick = {
                     haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
                     currentOnDelete()
-                    scope.launch { offsetAnim.snapTo(0f) }
-                    rawOffset = 0f
+                    scope.launch {
+                        offsetAnim.snapTo(0f)
+                        rawOffset = 0f
+                    }
                 },
                 modifier = Modifier
                     .align(Alignment.CenterEnd)

app/src/main/java/com/example/research/ui/settings/components/DictionaryManagement.kt

@@ -1,7 +1,17 @@
 package com.example.research.ui.settings.components
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.shrinkVertically
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -11,16 +21,21 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -76,6 +91,12 @@ fun DictionaryManagement(
     }
     val hasEnabledSources by remember(sources) { derivedStateOf { sources.any { it.isEnabled } } }
 
+    // Invariant: the mutation-block flag is read only at state-read/gesture time (derivedStateOf,
+    // snapshotFlow, pointerInput callbacks), never at row composition time. A composition-time read
+    // (e.g. Modifier.alpha(if (isDeleteBlocked()) ...)) would invalidate every row on each flip.
+    val isMutationsBlockedState = rememberUpdatedState(isInProgress)
+    val isDeleteBlocked = remember { { isMutationsBlockedState.value } }
+
     SectionCard(
         modifier = modifier
     ) {
@@ -100,7 +121,11 @@ fun DictionaryManagement(
                 testTag = "dictionary_header"
             )
 
-            if (isExpanded) {
+            AnimatedVisibility(
+                visible = isExpanded,
+                enter = expandVertically(animationSpec = tween(250)) + fadeIn(tween(250)),
+                exit = shrinkVertically(animationSpec = tween(200)) + fadeOut(tween(200)),
+            ) {
                  Column(
                     modifier = Modifier
                         .fillMaxWidth()
@@ -126,7 +151,7 @@ fun DictionaryManagement(
                     // Disable accessibility on background content during import to improve performance.
                     // The progress dialog remains accessible for cancellation.
                     val backgroundModifier = if (isInProgress) {
-                        Modifier.semantics(mergeDescendants = true) { }
+                        Modifier.semantics { hideFromAccessibility() }
                     } else {
                         Modifier
                     }
@@ -167,7 +192,7 @@ fun DictionaryManagement(
                             modifier = Modifier
                                 .fillMaxWidth()
                                 .then(backgroundModifier),
-                            canDelete = !isInProgress
+                            isDeleteBlocked = isDeleteBlocked
                         )
 
                         if (!isInProgress) {
@@ -195,7 +220,8 @@ fun DictionaryManagement(
                 focusManager.clearFocus(force = true)
                 setShowUrlBottomSheet(false)
             },
-            sheetState = sheetState
+            sheetState = sheetState,
+            contentWindowInsets = { WindowInsets.statusBars }
         ) {
             DictionaryUrlInputContent(
                 existingSources = sources,
@@ -248,19 +274,37 @@ private fun DictionaryListSection(
     onToggleDictionary: (String) -> Unit,
     onDeleteDictionary: (Dictionary) -> Unit,
     modifier: Modifier = Modifier,
-    canDelete: Boolean = true
+    isDeleteBlocked: () -> Boolean = { false }
 ) {
+    var appearedPaths by remember { mutableStateOf(emptySet<String>()) }
+    LaunchedEffect(dictionaries) {
+        val visiblePaths = dictionaries.mapTo(mutableSetOf(), Dictionary::path)
+        appearedPaths = appearedPaths intersect visiblePaths
+    }
     Column(
         modifier = modifier,
         verticalArrangement = Arrangement.spacedBy(4.dp)
     ) {
         dictionaries.forEach { dictionary ->
-            DictionaryListItem(
-                dictionary = dictionary,
-                onToggle = { onToggleDictionary(dictionary.path) },
-                onDelete = { onDeleteDictionary(dictionary) },
-                canDelete = canDelete
-            )
+            key(dictionary.path) {
+                val hasAppeared = dictionary.path in appearedPaths
+                val rowAlpha by animateFloatAsState(
+                    targetValue = if (hasAppeared) 1f else 0f,
+                    animationSpec = tween(150),
+                    label = "dictionaryRowAppear",
+                )
+                LaunchedEffect(dictionary.path) {
+                    appearedPaths = appearedPaths + dictionary.path
+                }
+                Box(modifier = Modifier.alpha(rowAlpha)) {
+                    DictionaryListItem(
+                        dictionary = dictionary,
+                        onToggle = { onToggleDictionary(dictionary.path) },
+                        onDelete = { onDeleteDictionary(dictionary) },
+                        isDeleteBlocked = isDeleteBlocked
+                    )
+                }
+            }
         }
     }
 }

app/src/main/java/com/example/research/ui/settings/components/DictionaryProgressSection.kt

@@ -1,8 +1,8 @@
 package com.example.research.ui.settings.components
 
 import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.LinearEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
@@ -19,6 +19,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.research.R
 
+private const val MILLIS_PER_PROGRESS_UNIT = 10_000
+private const val MIN_PROGRESS_MOTION_MS = 50
+private const val MAX_PROGRESS_MOTION_MS = 650
+
 @Composable
 fun DictionaryProgressSection(
     visible: Boolean,
@@ -41,6 +45,11 @@ fun DictionaryProgressSection(
         var displayedPercent by remember { mutableIntStateOf(percent) }
         var displayedTestTag by remember { mutableStateOf(testTag) }
 
+        LaunchedEffect(visible) {
+            if (visible) {
+                monotonicTargetProgress = targetProgress
+            }
+        }
         LaunchedEffect(visible, targetProgress) {
             if (visible) {
                 monotonicTargetProgress = maxOf(monotonicTargetProgress, targetProgress)
@@ -53,11 +62,21 @@ fun DictionaryProgressSection(
                 displayedTestTag = testTag
             }
         }
-        val animatedProgress by animateFloatAsState(
-            targetValue = monotonicTargetProgress,
-            animationSpec = tween(durationMillis = 650, easing = FastOutSlowInEasing),
-            label = "dictionary-progress"
-        )
+        val animatedState = remember { Animatable(0f) }
+        LaunchedEffect(monotonicTargetProgress) {
+            val delta = monotonicTargetProgress - animatedState.value
+            if (delta > 0f) {
+                animatedState.animateTo(
+                    targetValue = monotonicTargetProgress,
+                    animationSpec = tween(
+                        durationMillis = (delta * MILLIS_PER_PROGRESS_UNIT).toInt()
+                            .coerceIn(MIN_PROGRESS_MOTION_MS, MAX_PROGRESS_MOTION_MS),
+                        easing = LinearEasing,
+                    ),
+                )
+            }
+        }
+        val animatedProgress = animatedState.value
 
         Column(modifier = Modifier.testTag(displayedTestTag)) {
             Row(

app/src/main/java/com/example/research/ui/settings/components/DictionaryUrlInputContent.kt

@@ -3,6 +3,9 @@ package com.example.research.ui.settings.components
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.text.input.InputTransformation
+import androidx.compose.foundation.text.input.TextFieldLineLimits
+import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.ui.res.painterResource
 import androidx.compose.material3.*
@@ -16,7 +19,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.unit.dp
 import com.example.research.R
 import com.example.research.core.domain.model.DictionarySource
@@ -64,6 +66,29 @@ private fun validateDictionaryUrl(context: UrlValidationContext): String? {
     }
 }
 
+private val urlSplitRegex = Regex("[\\s,;]+")
+
+private fun splitPastedUrls(text: String): List<String>? =
+    text.split(urlSplitRegex).filter { it.isNotEmpty() }.takeIf { tokens ->
+        tokens.size > 1 && tokens.all {
+            DictionarySource.validateTemplate(it) is DictionarySource.ValidationResult.Valid
+        }
+    }
+
+private val urlInputTransformation = InputTransformation {
+    val text = toString()
+    val filtered = text
+        .take(2048)
+        .filter { char ->
+            !char.isISOControl() &&
+                char != '\u0000' &&
+                char.code !in 128..<160
+        }
+    if (filtered != text) {
+        replace(0, length, filtered)
+    }
+}
+
 @Composable
 fun DictionaryUrlInputContent(
     existingSources: List<DictionarySource>,
@@ -71,11 +96,22 @@ fun DictionaryUrlInputContent(
     onCancel: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val urls = remember { mutableStateListOf(TextFieldValue("")) }
+    val urls = remember { mutableStateListOf(TextFieldState("")) }
     val validationErrors = remember { mutableStateMapOf<Int, String>() }
     val scrollState = rememberScrollState()
     val focusManager = LocalFocusManager.current
 
+    LaunchedEffect(Unit) {
+        snapshotFlow { urls.map { it.text.toString() } }.collect { texts ->
+            val (index, tokens) = texts.withIndex().firstNotNullOfOrNull { (i, text) ->
+                splitPastedUrls(text)?.let { i to it }
+            } ?: return@collect
+            urls[index].edit { replace(0, length, tokens.first()) }
+            urls.addAll(index + 1, tokens.subList(1, tokens.size).map { TextFieldState(it) })
+            validationErrors.clear()
+        }
+    }
+
     val errorMessages = ErrorMessages(
         empty = stringResource(R.string.dictionary_source_url_empty),
         duplicateInForm = stringResource(R.string.dictionary_source_duplicate_in_form),
@@ -96,8 +132,8 @@ fun DictionaryUrlInputContent(
     // Cache prefixes for all input URLs to avoid repeated extraction during recomposition
     val inputUrlPrefixes = remember {
         derivedStateOf {
-            urls.associate { urlValue ->
-                val urlString = urlValue.text.trim()
+            urls.associate { urlState ->
+                val urlString = urlState.trimmedText()
                 urlString to if (urlString.isNotEmpty()) {
                     DictionarySource.extractPrefix(urlString)
                 } else null
@@ -119,10 +155,10 @@ fun DictionaryUrlInputContent(
             style = MaterialTheme.typography.headlineSmall
         )
 
-        urls.forEachIndexed { index, urlValue ->
+        urls.forEachIndexed { index, urlState ->
             val isLastItem = index == urls.lastIndex
 
-            val urlString = urlValue.text.trim()
+            val urlString = urlState.trimmedText()
             val cachedPrefix = inputUrlPrefixes.value[urlString]
             val realtimeError = remember(urlString, existingPrefixes, urls.size, cachedPrefix) {
                 validateDictionaryUrl(
@@ -130,7 +166,7 @@ fun DictionaryUrlInputContent(
                         url = urlString,
                         existingSources = existingSources,
                         existingPrefixes = existingPrefixes,
-                        urlsInForm = urls.map { it.text.trim() },
+                        urlsInForm = urls.map { it.trimmedText() },
                         urlPrefix = cachedPrefix,
                         errorMessages = errorMessages
                     )
@@ -140,20 +176,8 @@ fun DictionaryUrlInputContent(
             val displayError = validationErrors[index] ?: realtimeError
 
             OutlinedTextField(
-                value = urlValue,
-                onValueChange = { newValue ->
-                    val filtered = newValue.copy(
-                        text = newValue.text
-                            .take(2048)
-                            .filter { char -> 
-                                !char.isISOControl() && 
-                                char != '\u0000' &&
-                                        char.code !in 128..<160
-                            }
-                    )
-                    urls[index] = filtered
-                    validationErrors.remove(index)
-                },
+                state = urlState,
+                inputTransformation = urlInputTransformation,
                 label = { Text(if (index == 0) stringResource(R.string.dictionary_source_url_hint) else "URL ${index + 1}") },
                 isError = displayError != null,
                 supportingText = displayError?.let { { Text(it) } },
@@ -168,7 +192,7 @@ fun DictionaryUrlInputContent(
                             Modifier
                         }
                     ),
-                singleLine = true,
+                lineLimits = TextFieldLineLimits.SingleLine,
                 keyboardOptions = KeyboardOptions(
                     keyboardType = KeyboardType.Uri,
                     imeAction = if (isLastItem) ImeAction.Done else ImeAction.Next
@@ -188,7 +212,7 @@ fun DictionaryUrlInputContent(
 
         TextButton(
             onClick = {
-                urls.add(TextFieldValue(""))
+                urls.add(TextFieldState(""))
             },
             modifier = Modifier
                 .align(Alignment.Start)
@@ -224,8 +248,8 @@ fun DictionaryUrlInputContent(
                     val validUrls = mutableListOf<String>()
                     val seenUrls = mutableSetOf<String>()
 
-                    urls.forEachIndexed { index, urlValue ->
-                        val urlString = urlValue.text.trim()
+                    urls.forEachIndexed { index, urlState ->
+                        val urlString = urlState.trimmedText()
                         if (urlString.isBlank()) {
                             if (urls.size == 1) {
                                 validationErrors[index] = errorMessages.empty
@@ -263,9 +287,9 @@ fun DictionaryUrlInputContent(
                     .weight(1f)
                     .testTag("add_confirm_button")
                     .semantics { testTagsAsResourceId = true },
-                enabled = urls.any { it.text.trim().isNotBlank() } &&
-                         urls.none { urlValue ->
-                             val urlString = urlValue.text.trim()
+                enabled = urls.any { it.trimmedText().isNotBlank() } &&
+                         urls.none { urlState ->
+                             val urlString = urlState.trimmedText()
                              if (urlString.isEmpty()) {
                                  false
                              } else {
@@ -275,7 +299,7 @@ fun DictionaryUrlInputContent(
                                          url = urlString,
                                          existingSources = existingSources,
                                          existingPrefixes = existingPrefixes,
-                                         urlsInForm = urls.map { it.text.trim() },
+                                         urlsInForm = urls.map { it.trimmedText() },
                                          urlPrefix = urlPrefix,
                                          errorMessages = errorMessages
                                      )
@@ -289,3 +313,5 @@ fun DictionaryUrlInputContent(
         Spacer(modifier = Modifier.height(8.dp))
     }
 }
+
+private fun TextFieldState.trimmedText(): String = text.trim().toString()

app/src/main/java/com/example/research/ui/settings/components/SearchBarPositionSection.kt

@@ -0,0 +1,40 @@
+package com.example.research.ui.settings.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.dp
+import com.example.research.R
+import com.example.research.common.ui.components.OutlinedChoiceButton
+import com.example.research.core.domain.model.SearchBarPosition
+
+@Composable
+fun SearchBarPositionSection(
+    currentPosition: SearchBarPosition,
+    onPositionChanged: (SearchBarPosition) -> Unit,
+    modifier: Modifier = Modifier
+) {
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+        SearchBarPosition.entries.forEach { position ->
+            val isSelected = currentPosition == position
+            OutlinedChoiceButton(
+                text = when (position) {
+                    SearchBarPosition.TOP -> stringResource(R.string.search_bar_position_top)
+                    SearchBarPosition.BOTTOM -> stringResource(R.string.search_bar_position_bottom)
+                },
+                onClick = { onPositionChanged(position) },
+                modifier = Modifier
+                    .weight(1f)
+                    .testTag("search_bar_${position.name}"),
+                selected = isSelected
+            )
+        }
+    }
+}

app/src/main/java/com/example/research/ui/theme/Spacing.kt

@@ -6,7 +6,7 @@ object Spacing {
     // Semantic spacing constants for specific UI elements
     val topBarPadding = 8.dp
     val topBarHeight = 56.dp
-    val iconStart = 32.dp
-    val searchTextStart = 68.dp
     val listItemVertical = 8.dp
+
+    val contentStart = 32.dp
 }

app/src/main/java/com/example/research/ui/theme/WindowInsetsExtensions.kt

@@ -24,12 +24,20 @@ object AppWindowInsets {
         @Composable
         get() = WindowInsets.navigationBars.union(WindowInsets.ime)
 
+    val statusBarsAndIme: WindowInsets
+        @Composable
+        get() = WindowInsets.statusBars.union(WindowInsets.ime)
+
     val fullScreen: WindowInsets
         @Composable
         get() = WindowInsets.statusBars
             .union(WindowInsets.navigationBars)
             .union(WindowInsets.displayCutout)
 
+    val bottomNavigation: WindowInsets
+        @Composable
+        get() = WindowInsets.navigationBars.only(WindowInsetsSides.Bottom)
+
     val navigationOnly: WindowInsets
         @Composable
         get() = WindowInsets.navigationBars

app/src/main/res/drawable/ic_history.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M13,3A9,9 0 0,0 4,12H1L4.89,15.89L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,19.99 10.51,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3M12,8V13L16.28,15.54L17,14.33L13.5,12.25V8H12Z" />
+</vector>

app/src/main/res/drawable/ic_manage_search.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,9H2V7h5v2zM7,12H2v2h5v-2zM20.59,19l-3.83,-3.83c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L22,17.59 20.59,19zM17,11c0,-1.65 -1.35,-3 -3,-3s-3,1.35 -3,3 1.35,3 3,3 3,-1.35 3,-3zM2,19h10v-2H2v2z" />
+</vector>

app/src/main/res/values-ru/strings.xml

@@ -2,7 +2,6 @@
     <string name="app_name">ReSearch</string>
     <string name="settings_title">Настройки</string>
     <string name="action_back">Назад</string>
-    <string name="version_format">v%1$s</string>
     <string name="version_unknown">неизвестно</string>
     <string name="button_cancel_download">Отмена</string>
     <string name="action_ok">ОК</string>
@@ -12,9 +11,13 @@
     <string name="language_english">Английский</string>
     <string name="language_russian">Русский</string>
     <string name="language_system">Системный</string>
-    <string name="indexing_label">Индексация словарей</string>
+    <string name="search_bar_position">Строка поиска</string>
+    <string name="search_bar_position_top">Наверху</string>
+    <string name="search_bar_position_bottom">Внизу</string>
     <string name="clear_search">Очистить поиск</string>
-    <string name="article_no_selected">Статья не выбрана</string>
+    <string name="recent_searches">История поиска</string>
+    <string name="clear_search_history">Очистить</string>
+    <string name="remove_search_history_entry">Удалить из истории</string>
     <string name="article_return_to_search">Вернуться к поиску</string>
     <string name="error_checking_dictionaries">Не удалось проверить статус словарей</string>
     <string name="error_loading_article">Ошибка загрузки: %1$s</string>
@@ -49,6 +52,7 @@
     <string name="notification_download_error_title">Ошибка загрузки</string>
     <string name="notification_download_error_text">Не удалось скачать словари</string>
     <string name="notification_indexing_title">Индексация словарей</string>
+    <string name="notification_preparing_indexing_title">Подготовка словарей к индексации</string>
     <string name="archive_failed_open_source_file">Не удалось открыть исходный файл</string>
     <string name="archive_failed_create_output_file">Не удалось создать выходной файл</string>
     <string name="archive_failed_delete_file">Не удалось удалить файл: %1$s</string>
@@ -68,16 +72,17 @@
     <string name="dictionary_management_title">Словари</string>
     <string name="import_dictionary_button">Выбрать файлы</string>
     <string name="import_error">Не удалось импортировать словарь: %1$s</string>
-    <string name="import_file_exists">Файл уже существует: %1$s</string>
+    <string name="import_file_exists">Словарь уже добавлен: %1$s</string>
     <string name="import_invalid_file_name">Недопустимое имя файла: %1$s</string>
+    <string name="import_nothing_imported">В выбранном нет поддерживаемых файлов словарей</string>
     <string name="dictionary_source_url_hint">URL</string>
     <string name="dictionary_source_add_button">Добавить источник</string>
     <string name="dictionary_source_duplicate">Этот URL уже существует</string>
     <string name="dictionary_source_duplicate_in_form">Дублирующийся URL в форме</string>
     <string name="dictionary_source_duplicate_prefix">Этот словарь уже существует (одинаковый префикс)</string>
     <string name="dictionary_source_url_empty">URL не может быть пустым</string>
-    <string name="dictionary_source_invalid_protocol">Должен начинаться с http:// или https://</string>
-    <string name="dictionary_source_invalid_extension">Должен заканчиваться на .gz, .dsl или .dz</string>
+    <string name="dictionary_source_invalid_protocol">Должен начинаться с https://</string>
+    <string name="dictionary_source_invalid_extension">Должен заканчиваться на .gz, .dsl или .dsl.dz</string>
     <string name="dictionary_source_too_long">URL слишком длинный (максимум 2048 символов)</string>
     <string name="dictionary_source_invalid_url">Неверный формат URL</string>
     <string name="dictionary_source_suspicious_characters">URL содержит недопустимые символы</string>
@@ -96,6 +101,7 @@
     </plurals>
     <string name="dictionary_not_indexed">• Не индексирован</string>
     <string name="dictionary_delete">Удалить словарь</string>
+    <string name="error_delete_dictionary">Не удалось удалить словарь</string>
     <string name="dictionaries_tap_to_update">Нажмите для обновления</string>
     <string name="notification_import_title">Импорт словарей</string>
     <string name="notification_import_success_title">Импорт завершён</string>

app/src/main/res/values/strings.xml

@@ -2,7 +2,6 @@
     <string name="app_name">ReSearch</string>
     <string name="settings_title">Settings</string>
     <string name="action_back">Back</string>
-    <string name="version_format">v%1$s</string>
     <string name="version_unknown">unknown</string>
     <string name="button_cancel_download">Cancel</string>
     <string name="action_ok">OK</string>
@@ -12,9 +11,13 @@
     <string name="language_english">English</string>
     <string name="language_russian">Russian</string>
     <string name="language_system">System</string>
-    <string name="indexing_label">Indexing dictionaries</string>
+    <string name="search_bar_position">Search bar</string>
+    <string name="search_bar_position_top">Top</string>
+    <string name="search_bar_position_bottom">Bottom</string>
     <string name="clear_search">Clear search</string>
-    <string name="article_no_selected">No article selected</string>
+    <string name="recent_searches">Search history</string>
+    <string name="clear_search_history">Clear</string>
+    <string name="remove_search_history_entry">Remove from history</string>
     <string name="article_return_to_search">Return to search</string>
     <string name="error_checking_dictionaries">Failed to check dictionary status</string>
     <string name="error_loading_article">Loading error: %1$s</string>
@@ -49,6 +52,7 @@
     <string name="notification_download_error_title">Download error</string>
     <string name="notification_download_error_text">Failed to download dictionaries</string>
     <string name="notification_indexing_title">Indexing dictionaries</string>
+    <string name="notification_preparing_indexing_title">Preparing dictionaries for indexing</string>
     <string name="archive_failed_open_source_file">Failed to open source file</string>
     <string name="archive_failed_create_output_file">Failed to create output file</string>
     <string name="archive_failed_delete_file">Failed to delete file: %1$s</string>
@@ -66,16 +70,17 @@
     <string name="dictionary_management_title">Dictionaries</string>
     <string name="import_dictionary_button">Select files</string>
     <string name="import_error">Failed to import dictionary: %1$s</string>
-    <string name="import_file_exists">File already exists: %1$s</string>
+    <string name="import_file_exists">Dictionary already added: %1$s</string>
     <string name="import_invalid_file_name">Invalid file name: %1$s</string>
+    <string name="import_nothing_imported">No supported dictionary files were found in the selection</string>
     <string name="dictionary_source_url_hint">URL</string>
     <string name="dictionary_source_add_button">Add source</string>
     <string name="dictionary_source_duplicate">This URL already exists</string>
     <string name="dictionary_source_duplicate_in_form">Duplicate URL in the form</string>
     <string name="dictionary_source_duplicate_prefix">This dictionary already exists</string>
     <string name="dictionary_source_url_empty">URL cannot be empty</string>
-    <string name="dictionary_source_invalid_protocol">Must start with http:// or https://</string>
-    <string name="dictionary_source_invalid_extension">Must end with .gz, .dsl, or .dz</string>
+    <string name="dictionary_source_invalid_protocol">Must start with https://</string>
+    <string name="dictionary_source_invalid_extension">Must end with .gz, .dsl, or .dsl.dz</string>
     <string name="dictionary_source_too_long">URL is too long (max 2048 characters)</string>
     <string name="dictionary_source_invalid_url">Invalid URL format</string>
     <string name="dictionary_source_suspicious_characters">URL contains invalid characters</string>
@@ -92,6 +97,7 @@
     </plurals>
     <string name="dictionary_not_indexed">• Not indexed</string>
     <string name="dictionary_delete">Delete dictionary</string>
+    <string name="error_delete_dictionary">Failed to delete dictionary</string>
     <string name="dictionaries_tap_to_update">Tap to update all dictionaries</string>
     <string name="notification_import_title">Importing dictionaries</string>
     <string name="notification_import_success_title">Import completed</string>

app/src/release/keepRules/strip-logs.keep

@@ -0,0 +1,9 @@
+# Strip android.util.Log warnings/errors from release builds.
+# Debug builds keep full logging for diagnostics.
+-assumenosideeffects class android.util.Log {
+    public static int w(java.lang.String, java.lang.String);
+    public static int w(java.lang.String, java.lang.String, java.lang.Throwable);
+    public static int w(java.lang.String, java.lang.Throwable);
+    public static int e(java.lang.String, java.lang.String);
+    public static int e(java.lang.String, java.lang.String, java.lang.Throwable);
+}

fastlane/metadata/android/en-US/changelogs/7.txt

@@ -0,0 +1 @@
+- Fixed matching source URLs to installed dictionary files, so deleted dictionaries can be downloaded again from the same URL

fastlane/metadata/android/en-US/changelogs/8.txt

@@ -0,0 +1,3 @@
+- The dictionary update card now returns after a failed download
+- Fixed headwords and articles with escaped characters being displayed incorrectly
+- Fixed slow rendering of articles containing many bracket characters

fastlane/metadata/android/en-US/changelogs/9.txt

@@ -0,0 +1,16 @@
+- The app starts faster
+- Smooth screen transition animations
+- Articles render DSL line breaks, indentation and named colors correctly
+- Tabs and extra spaces inside articles no longer break the layout
+- The article title can be copied, tapping the article clears the selection
+- Source URLs accept host:port addresses
+- Dictionary downloads retry automatically when the network switches
+- Download progress notifications are more reliable
+- Search results clear instantly when the query is erased
+- Leftover files from cancelled downloads are now removed automatically
+- Improved app stability
+- Faster dictionary indexing
+- Updated build tooling and documentation
+- Long link-heavy articles no longer freeze while scrolling
+- Large search result lists render faster
+- Dark article colors are readable in the dark theme

fastlane/metadata/android/en-US/full_description.txt

@@ -9,6 +9,6 @@ Features:
 - Automatic indexing with binary index files for instant search
 - Multi-charset support — UTF-8, UTF-16 LE/BE auto-detection
 - Adaptive three-pane layout for tablets and large screens
-- Light, dark, and system-follow themes
+- Material 3 UI with dynamic color, plus light, dark, and system-follow themes
 - English and Russian localization
 - No tracking, no ads, fully open source

fastlane/metadata/android/ru-RU/changelogs/7.txt

@@ -0,0 +1 @@
+- Исправлено сопоставление URL-источников с установленными файлами — удалённый словарь теперь можно повторно скачать по тому же URL

fastlane/metadata/android/ru-RU/changelogs/8.txt

@@ -0,0 +1,3 @@
+- Карточка обновления словарей теперь появляется снова после неудачной загрузки
+- Исправлено отображение заголовков и статей с экранированными символами
+- Исправлено медленное отображение статей с большим количеством скобок

fastlane/metadata/android/ru-RU/changelogs/9.txt

@@ -0,0 +1,16 @@
+- Приложение запускается быстрее
+- Плавные анимации переходов между экранами
+- Статьи корректно отображают переносы строк, отступы и цвета из DSL-разметки
+- Табуляции и лишние пробелы в статьях больше не ломают вёрстку
+- Заголовок статьи можно скопировать, тап по статье сбрасывает выделение
+- Адреса источников принимают формат host:port
+- Загрузка словарей автоматически повторяется при переключении сети
+- Уведомления о прогрессе загрузки стали надёжнее
+- Результаты поиска очищаются мгновенно при стирании запроса
+- Остаточные файлы после отменённых загрузок удаляются автоматически
+- Повышена стабильность приложения
+- Ускорена индексация словарей
+- Обновлены тулинг сборки и документация
+- Длинные статьи со ссылками больше не подвисают при прокрутке
+- Большие списки результатов поиска отображаются быстрее
+- Тёмные цвета статей читаемы в тёмной теме

fastlane/metadata/android/ru-RU/full_description.txt

@@ -9,6 +9,6 @@ ReSearch — быстрое приложение для чтения слова
 - Автоматическая индексация с бинарными индексными файлами для мгновенного поиска
 - Поддержка нескольких кодировок — автоопределение UTF-8, UTF-16 LE/BE
 - Адаптивный трёхпанельный интерфейс для планшетов и больших экранов
-- Светлая, тёмная и системная темы
+- Material 3 с динамическими цветами, светлая, тёмная и системная темы
 - Локализация на английский и русский языки
 - Без трекеров, без рекламы, полностью открытый исходный код

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-aboutlibraries = "15.0.4"
+aboutlibraries = "15.2.0"
 activity_compose = "1.13.0"
-agp = "9.3.1"
-compose_bom = "2026.06.01"
-core = "1.19.0"
+agp = "9.4.1"
+compose_bom = "2026.09.00"
+core = "1.19.1"
 datastore_preferences = "1.2.1"
 documentfile = "1.1.0"
-kotlin = "2.4.10"
+kotlin = "2.4.20"
 lifecycle_runtime_ktx = "2.11.0"
-okhttp = "5.4.0"
-paging = "3.5.0"
+okhttp = "5.5.0"
+paging = "3.5.1"
 profileinstaller = "1.4.1"
 kotlinx_coroutines = "1.11.0"
 kotlinx_serialization = "1.11.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:

gradlew.bat

@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
 endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel