Release 1.7.0

- Added search history
- The search bar can be placed at the top or bottom of the screen
- Fixed headwords with stress marks displaying truncated in search results
- Improved download, indexing and navigation stability
- The About screen opens faster
- Updated build tooling and code cleanup

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">ReSearch</h1>
 
-<h4 align="center">A fast Android dictionary reader for DSL-format dictionaries.</h4>
+<h4 align="center">An Android dictionary reader for DSL-format dictionaries.</h4>
 
 <p align="center">
   <a href="#screenshots">Screenshots</a> &bull;
@@ -15,20 +15,26 @@ The app stores dictionaries as DictZip files and builds compact binary indexes f
 
 ## Screenshots
 
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="160" alt="ReSearch search screen">](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
-[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="160" alt="ReSearch article screen">](fastlane/metadata/android/en-US/images/phoneScreenshots/2.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="160" alt="ReSearch settings screen">](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="160" alt="ReSearch search results screen">](fastlane/metadata/android/en-US/images/phoneScreenshots/2.png)
+[<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="160" alt="ReSearch about screen">](fastlane/metadata/android/en-US/images/phoneScreenshots/3.png)
 
 ## Features
 
 - Fast headword search across multiple DSL dictionaries.
+- Search history in a bottom sheet: recent queries with per-entry removal and clear-all.
+- Look up selected text from other apps via the selection menu.
 - Import local `.dsl`, `.dsl.gz`, and `.dsl.dz` dictionary files.
 - Download dictionaries from configured URLs, with an optional `{DATE}` placeholder for dated releases.
+- Multiple dictionary source URLs can be added in one list.
 - 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; 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.
+- Search bar placement at the top or bottom of the screen.
+- Adaptive two-pane layout for tablets and large screens.
 - Material 3 interface with dynamic color, light, dark, and system themes.
 - English and Russian localization.
 - About screen with open source license information.

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 = 9
-        versionName = "1.6.0"
+        versionCode = 10
+        versionName = "1.7.0"
 
         vectorDrawables {
             useSupportLibrary = true

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

@@ -26,13 +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 {
@@ -47,13 +46,11 @@ class MainActivity : ComponentActivity() {
         val app = application as ReSearchApplication
         viewModelFactory {
             initializer {
-                SearchViewModel(application, app.localDictionaryRepository, createSavedStateHandle())
+                SearchViewModel(application, app.localDictionaryRepository, app.preferencesManager, createSavedStateHandle())
             }
         }
     }
 
-    private var initialSectionExpansion: SectionExpansionStates? = null
-
     private val settingsViewModel: SettingsViewModel by viewModels {
         val app = application as ReSearchApplication
         val versionName = try {
@@ -72,11 +69,8 @@ class MainActivity : ComponentActivity() {
                     app.dictionaryImportManager,
                     app.dictionaryProgressStateHolder,
                     versionName,
-                    initialSectionExpansion ?: SectionExpansionStates(
-                        isThemeExpanded = false,
-                        isLanguageExpanded = false,
-                        isDictionariesExpanded = true,
-                    ),
+                    app.initialLaunch.value?.sectionExpansion ?: SectionExpansionStates(),
+                    app.initialLaunch.value?.searchBarPosition ?: SearchBarPosition.TOP,
                 )
             }
         }
@@ -87,19 +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)
-        val initialHadNoDictionaries = loadInitialHadNoDictionaries(app)
-        initialSectionExpansion = loadInitialSectionExpansion(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
@@ -115,7 +106,7 @@ class MainActivity : ComponentActivity() {
                             AppNavigation(
                                 searchViewModel = searchViewModel,
                                 settingsViewModel = settingsViewModel,
-                                seedNoDictionaries = initialHadNoDictionaries
+                                seedNoDictionaries = launch.seedNoDictionaries
                             )
                         }
                     }
@@ -138,69 +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"
-        }
-    }
-
-    private fun loadInitialHadNoDictionaries(app: ReSearchApplication): Boolean {
-        return try {
-            runBlocking {
-                app.preferencesManager.hadNoDictionaries.first()
-            }
-        } catch (e: Exception) {
-            true
-        }
-    }
-
-    private fun loadInitialSectionExpansion(app: ReSearchApplication): SectionExpansionStates {
-        return try {
-            runBlocking {
-                app.preferencesManager.sectionExpansionStates()
-            }
-        } catch (e: Exception) {
-            android.util.Log.e("MainActivity", "Failed to load section expansion states: ${e.message}")
-            SectionExpansionStates(
-                isThemeExpanded = false,
-                isLanguageExpanded = false,
-                isDictionariesExpanded = true,
-            )
-        }
-    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         handleIntent(intent)
@@ -216,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

@@ -3,7 +3,10 @@ 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
@@ -12,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
@@ -43,6 +62,9 @@ class ReSearchApplication : Application() {
         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()
 
@@ -53,6 +75,9 @@ class ReSearchApplication : Application() {
         applicationScope.launch(Dispatchers.IO) {
             preferencesManager.sanitizeDictionarySources()
         }
+        applicationScope.launch(Dispatchers.IO) {
+            _initialLaunch.value = loadInitialLaunch()
+        }
         localDictionaryRepository = LocalDictionaryRepository(this, preferencesManager = preferencesManager)
 
         okHttpClient = OkHttpClient.Builder()
@@ -121,6 +146,20 @@ class ReSearchApplication : Application() {
         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) {
         super.onTrimMemory(level)
         if (::localDictionaryRepository.isInitialized) {

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

@@ -62,7 +62,7 @@ class DictionaryPipelineCoordinator(
         pipelineJob?.cancel()
         pipelineJob = scope.launch(launchDispatcher) {
             val dir = File(dictionaryPath())
-            val filesBeforeReindex = dir?.listFiles()?.map { it.name }?.toSet() ?: emptySet()
+            val filesBeforeReindex = dir.listFiles()?.map { it.name }?.toSet() ?: emptySet()
             try {
                 triggerReindexing(isImport)
                 if (isImport) {
@@ -85,7 +85,7 @@ class DictionaryPipelineCoordinator(
                 }
                 cleanupOrphanedFiles(dir)
                 throw e
-            } catch (e: Exception) {
+            } catch (_: Exception) {
                 ui.showError()
             } finally {
                 finishService()

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

@@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
 class DictionaryProgressPresenter(
-    private val scope: CoroutineScope,
+    scope: CoroutineScope,
     private val progressSnapshot: StateFlow<DictionaryProgressModel.Snapshot?>,
     private val notifications: NotificationPort,
     mainDispatcher: CoroutineDispatcher = Dispatchers.Main,

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

@@ -59,13 +59,12 @@ class NotificationHelper(private val context: Context) : NotificationPort {
         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),

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

@@ -106,7 +106,7 @@ data class DictionarySource(
             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)
                 !lowerTemplate.endsWith(".gz") &&
                     !lowerTemplate.endsWith(".dsl") &&

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/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,7 +9,9 @@ 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
@@ -18,9 +20,10 @@ import java.io.File
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
 
 data class SectionExpansionStates(
-    val isThemeExpanded: Boolean,
-    val isLanguageExpanded: Boolean,
-    val isDictionariesExpanded: Boolean,
+    val isThemeExpanded: Boolean = false,
+    val isLanguageExpanded: Boolean = false,
+    val isSearchBarExpanded: Boolean = false,
+    val isDictionariesExpanded: Boolean = true,
 )
 
 class PreferencesManager(private val context: Context) {
@@ -28,12 +31,19 @@ class PreferencesManager(private val context: Context) {
         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 }
@@ -57,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]
@@ -101,6 +122,7 @@ class PreferencesManager(private val context: Context) {
             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,
             )
         }
@@ -143,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
@@ -153,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
             }
         }
@@ -199,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/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(
@@ -117,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)
         }
     }
 
@@ -145,21 +148,6 @@ object DslHeadwordParser {
         }
     }
 
-    private fun firstFormattingTagIndex(value: String): Int {
-        var index = 0
-        while (index < value.length) {
-            if (value[index] == '\\' && index + 1 < value.length) {
-                index += 2
-                continue
-            }
-            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) {
@@ -346,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

@@ -454,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)
     }
 
@@ -472,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

@@ -538,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/repository/DictionaryChecker.kt

@@ -7,6 +7,7 @@ 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
@@ -101,9 +102,11 @@ class DictionaryChecker(
             }
 
             return@withContext !serverCanOfferNewer
+        } catch (e: CancellationException) {
+            throw e
         } catch (e: Exception) {
             Log.e(TAG, "Error checking currency: ${e.message}", e)
-            false
+            true
         }
     }
 

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/DictionaryExtractor.kt

@@ -46,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
                 }
@@ -65,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
                         }
@@ -92,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)
@@ -100,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
                 }
@@ -113,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()
             }
@@ -130,11 +128,10 @@ 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)
                 }
             }
 
@@ -152,18 +149,18 @@ class DictionaryExtractor(
         try {
             withContext(Dispatchers.IO + NonCancellable) {
                 val files = fileStorageManager.listFilesInFolder(folderUri)
-                for (file in files) {
-                    val n = file.name.lowercase()
+                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, file.uri)
+                        isBareDz -> ArchiveUtils.deleteFile(context, uri)
                         isRawDsl -> {
-                            val pair = fileStorageManager.findFile(folderUri, file.name + ".dz")
+                            val pair = fileStorageManager.findFile(folderUri, "$name.dz")
                             if (pair == null || !pair.exists()) {
-                                ArchiveUtils.deleteFile(context, file.uri)
+                                ArchiveUtils.deleteFile(context, uri)
                             }
                         }
                     }

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

@@ -144,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/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 {
@@ -126,11 +136,11 @@ class SearchViewModel(
             }
             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)
         }
     }
 
@@ -159,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
     }
@@ -281,6 +312,7 @@ class SearchViewModel(
                 }
                 entry?.let {
                     currentArticle?.let(articleHistory::addLast)
+                    recordSearchHistory(sanitizedWord)
                     loadArticle(it)
                 }
             }.onError { message, exception ->
@@ -289,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,8 +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()) }
+            .use { stream -> json.decodeFromStream(stream) }
 }

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

@@ -5,7 +5,6 @@ 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
@@ -21,8 +20,6 @@ import androidx.compose.foundation.verticalScroll
 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
@@ -41,24 +38,25 @@ 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.LocalConfiguration
 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
@@ -93,12 +91,10 @@ fun AboutScreen(
             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
@@ -160,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()
             )
         }
 
@@ -185,7 +182,6 @@ private fun AboutHeader(versionName: String) {
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun AboutLibraryRow(
     modifier: Modifier = Modifier,
@@ -351,7 +347,9 @@ private fun LicenseDialog(
             this.alpha = alpha
         }
     ) {
-        val maxHeight = LocalConfiguration.current.screenHeightDp.dp - 96.dp
+        val maxHeight = with(LocalDensity.current) {
+            LocalWindowInfo.current.containerSize.height.toDp()
+        } - 96.dp
         Surface(
             shape = AlertDialogDefaults.shape,
             color = AlertDialogDefaults.containerColor,

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

@@ -2,75 +2,64 @@ package com.example.research.ui.article
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.selection.SelectionContainer
+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.SpanStyle
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.style.BaselineShift
+import androidx.compose.ui.text.style.LineHeightStyle
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.isUnspecified
 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
-
-@Composable
-fun ArticleRoute(
-    searchViewModel: SearchViewModel,
-    onNavigateBack: () -> Unit
-) {
-    val articleState by searchViewModel.selectedArticle.collectAsStateWithLifecycle()
-
-    ArticleScreen(
-        articleState = articleState,
-        onNavigateBack = onNavigateBack,
-        onRefClick = { word ->
-            searchViewModel.onAction(SearchAction.SearchAndLoadArticle(word))
-        },
-        onScrollPositionChanged = { index, offset ->
-            searchViewModel.updateArticleScrollPosition(index, offset)
-        },
-    )
-}
+import com.example.research.ui.theme.Spacing
 
 private const val MERGED_BLOCK_MAX_CHARS = 1500
 private const val MERGED_BLOCK_MAX_ITEMS = 12
 
-private fun mergeDslBlocks(
-    blocks: List<DslBlock>,
-    density: Density,
-    baseStyle: TextStyle,
-): List<DslBlock> {
+private fun mergeDslBlocks(blocks: List<DslBlock>): List<DslBlock> {
     if (blocks.size <= MERGED_BLOCK_MAX_ITEMS) return blocks
-    val gapShift = with(density) {
-        val fontPx =
-            if (baseStyle.fontSize.isUnspecified) 0f else baseStyle.fontSize.toPx()
-        if (fontPx > 0f) 8.dp.toPx() / (0.534f * fontPx) else 0.94f
-    }
     val merged = ArrayList<DslBlock>(blocks.size / 4)
     var i = 0
     while (i < blocks.size) {
@@ -93,15 +82,6 @@ private fun mergeDslBlocks(
             val more = j + 1 < blocks.size &&
                 (j + 1 - i) < MERGED_BLOCK_MAX_ITEMS &&
                 builder.length < MERGED_BLOCK_MAX_CHARS
-            if (more && !blocks[j + 1].continuesPrevious) {
-                val shiftPos = builder.length
-                builder.append('​')
-                builder.addStyle(
-                    SpanStyle(baselineShift = BaselineShift(-gapShift)),
-                    shiftPos,
-                    shiftPos + 1
-                )
-            }
             if (more) {
                 builder.append('\n')
             }
@@ -137,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)
@@ -198,16 +186,14 @@ fun ArticleContent(
             val isHeavyArticle =
                 articleState.dslContent.size > HEAVY_ARTICLE_BLOCK_COUNT
 
-            val density = LocalDensity.current
             val darkTheme = MaterialTheme.colorScheme.background.luminance() < 0.5f
             val displayBlocks = remember(
                 articleState.dslContent,
-                density,
                 baseTextStyle,
                 darkTheme
             ) {
                 val merged =
-                    mergeDslBlocks(articleState.dslContent, density, baseTextStyle)
+                    mergeDslBlocks(articleState.dslContent)
                 if (darkTheme) {
                     merged.map {
                         it.copy(text = DslAnnotatedParser.remapForDarkTheme(it.text))
@@ -233,32 +219,24 @@ fun ArticleContent(
                         },
                         contentType = { _, _ -> "article_block" }
                     ) { index, block ->
-                        val followedByContinuation =
-                            displayBlocks.getOrNull(index + 1)?.continuesPrevious == true
-                        val textContent = @Composable {
-                            Box(
+                        Box(
+                            modifier = Modifier
+                                .padding(start = Spacing.contentStart + indentStep * block.indent)
+                        ) {
+                            ArticleLinkText(
+                                block = block,
+                                linksEnabled = true,
+                                preferDirectHitTesting = isHeavyArticle,
+                                style = baseTextStyle,
+                                onRefClick = refClickHandler,
+                                onTextLayout = {},
                                 modifier = Modifier
-                                    .padding(
-                                        start = Spacing.contentStart + indentStep * block.indent
-                                    )
-                                    .padding(bottom = if (followedByContinuation) 0.dp else 8.dp)
-                            ) {
-                                ArticleLinkText(
-                                    block = block,
-                                    linksEnabled = true,
-                                    preferDirectHitTesting = isHeavyArticle,
-                                    style = baseTextStyle,
-                                    onRefClick = refClickHandler,
-                                    onTextLayout = {},
-                                    modifier = Modifier
-                                        .testTag("article_block_$index")
-                                        .semantics {
-                                            testTagsAsResourceId = true
-                                        }
-                                )
-                            }
+                                    .testTag("article_block_$index")
+                                    .semantics {
+                                        testTagsAsResourceId = true
+                                    }
+                            )
                         }
-                        textContent()
                     }
                 }
             }
@@ -314,7 +292,14 @@ fun ArticleTitleBar(
         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 + 3.dp)
+    } else {
+        Modifier
+    }
 
     Surface(
         color = MaterialTheme.colorScheme.surface,
@@ -333,22 +318,15 @@ fun ArticleTitleBar(
                             .height(Spacing.topBarHeight)
                     }
                 ),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = if (compact) Alignment.Top else Alignment.CenterVertically
         ) {
             if (showBackButton) {
-                Box(
+                AppBackButton(
+                    onClick = onNavigateBack,
                     modifier = Modifier
-                        .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) {
@@ -360,7 +338,7 @@ fun ArticleTitleBar(
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
                         modifier = Modifier
-                            .padding(start = if (showBackButton) Spacing.searchTextStart - Spacing.iconStart - 24.dp else 16.dp)
+                            .padding(start = if (showBackButton) 0.dp else 16.dp)
                             .testTag("article_title")
                             .semantics { testTagsAsResourceId = true }
                     )
@@ -370,7 +348,6 @@ fun ArticleTitleBar(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun ArticleScreen(
     articleState: ArticleState?,

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

@@ -14,7 +14,7 @@ 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)
@@ -23,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,
@@ -46,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(
@@ -120,26 +138,21 @@ fun AdaptiveMainScreen(
                 }
             },
         )
+
+        if (isSearchBarAtBottom) {
+            searchBar()
+        }
     }
 
-    LaunchedEffect(articleState, isQueryEmpty, isLandscape) {
-        val targetValue = when {
-            isLandscape -> ThreePaneScaffoldValue(
-                primary = PaneAdaptedValue.Expanded,
-                secondary = PaneAdaptedValue.Expanded,
-                tertiary = PaneAdaptedValue.Hidden,
-            )
-            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
@@ -20,6 +22,7 @@ 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
@@ -37,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
@@ -47,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) {
@@ -79,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)
         }
     }
 
@@ -93,14 +83,38 @@ 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.onSearchQueryChanged(action.query)
+                            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,
@@ -121,9 +135,11 @@ fun MainRoute(
             MainScreen(
                 searchState = searchState,
                 canSearch = canSearch,
+                isSearchBarAtBottom = isSearchBarAtBottom,
                 results = results,
                 errorMessage = errorMessage,
                 showDictionaryName = showDictionaryName,
+                searchHistory = searchHistory,
                 scrollPosition = scrollPosition,
                 onAction = onMainAction,
                 onArticleClick = onArticleClick,
@@ -133,28 +149,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(

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

@@ -80,8 +80,8 @@ internal fun SearchResultsPane(
             }
     }
 
-    val loaded = results.itemSnapshotList.items.filterNotNull()
     SideEffect {
+        val loaded = results.itemSnapshotList.items
         if (results.loadState.refresh is LoadState.NotLoading && loaded.isNotEmpty()) {
             staleEntries = loaded
         }

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

@@ -1,6 +1,5 @@
 package com.example.research.ui.main.components
 
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
@@ -56,20 +55,12 @@ fun SearchResultsList(
             val entry = if (showStale) staleEntries.getOrNull(index)
             else if (index in 0 until results.itemCount) results.peek(index) else null
             if (entry != null) {
-                Box(
-                    modifier = Modifier.animateItem(
-                        fadeInSpec = if (index < 8) tween(150) else null,
-                        placementSpec = null,
-                        fadeOutSpec = null
-                    )
-                ) {
-                    SearchResultItem(
-                        entry = entry,
-                        resultIndex = index,
-                        onArticleClick = onArticleClick,
-                        showDictionaryName = showDictionaryName
-                    )
-                }
+                SearchResultItem(
+                    entry = entry,
+                    resultIndex = index,
+                    onArticleClick = onArticleClick,
+                    showDictionaryName = showDictionaryName
+                )
             }
         }
 

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

@@ -2,22 +2,28 @@ package com.example.research.ui.navigation
 
 import androidx.activity.compose.BackHandler
 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.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+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.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.SettingsRoute
 import com.example.research.ui.settings.SettingsViewModel
@@ -32,7 +38,6 @@ enum class Screen {
     Home, Settings, Article, About
 }
 
-@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun AppNavigation(
     searchViewModel: SearchViewModel,
@@ -98,13 +103,18 @@ 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
     }
+    Box {
     AnimatedContent(
         targetState = effectiveScreen,
         transitionSpec = {
@@ -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,6 +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/SettingsScreen.kt

@@ -21,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
@@ -46,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,
@@ -126,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(
@@ -240,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))
             }

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

@@ -3,6 +3,7 @@ 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
@@ -13,8 +14,10 @@ import com.example.research.feature.download.model.DownloadState
 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,
@@ -30,6 +33,7 @@ data class SettingsUiState(
 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

@@ -9,6 +9,7 @@ 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
@@ -46,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,
 )
 
@@ -64,6 +67,7 @@ class SettingsViewModel(
     progressStateHolder: DictionaryProgressStateHolder,
     appVersion: String,
     initialSectionExpansion: SectionExpansionStates,
+    initialSearchBarPosition: SearchBarPosition,
 ) : AndroidViewModel(application) {
 
     private val manageDictionarySourcesUseCase = ManageDictionarySourcesUseCase(
@@ -76,7 +80,9 @@ class SettingsViewModel(
             appVersion = appVersion,
             isThemeExpanded = initialSectionExpansion.isThemeExpanded,
             isLanguageExpanded = initialSectionExpansion.isLanguageExpanded,
+            isSearchBarExpanded = initialSectionExpansion.isSearchBarExpanded,
             isDictionariesExpanded = initialSectionExpansion.isDictionariesExpanded,
+            searchBarPosition = initialSearchBarPosition,
         )
     )
     val uiState: StateFlow<SettingsUiState> = _uiState.asStateFlow()
@@ -96,6 +102,7 @@ class SettingsViewModel(
 
     private var cancelRefreshPending = false
     private var errorStateHandled = false
+    private var successStateHandled = false
     private var statusBeforeDownload: DictionaryStatus = DictionaryStatus.Unknown
 
     init {
@@ -133,8 +140,6 @@ class SettingsViewModel(
 
     private fun setupStateObservation() {
         viewModelScope.launch {
-            var wasIndexing = false
-
             val dictionaryStateInputs = combine(
                 preferencesManager.themeMode.map { mode ->
                     try { AppTheme.valueOf(mode) } catch (_: Exception) { AppTheme.SYSTEM }
@@ -153,47 +158,48 @@ 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 = withContext(Dispatchers.IO) {
-                            evaluateDictionaryStatus()
-                        }
-                    }
-                }
-                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
@@ -242,7 +248,6 @@ class SettingsViewModel(
                             refreshDictionaryStatus()
                         }
                     }
-                    else -> {}
                 }
 
                 SettingsUiState(
@@ -252,6 +257,7 @@ class SettingsViewModel(
                     indexingProgress = IndexingProgress(isIndexing = isIndexing),
                     downloadState = operationState.downloadState,
                     language = operationState.language,
+                    searchBarPosition = operationState.searchBarPosition,
                     importState = operationState.importState,
                     dictionaryStatus = operationState.dictionaryStatus,
                     hasCompletedStartupScan = operationState.hasCompletedStartupScan,
@@ -260,6 +266,7 @@ class SettingsViewModel(
                         !operationState.importState.isActive,
                     isThemeExpanded = operationState.isThemeExpanded,
                     isLanguageExpanded = operationState.isLanguageExpanded,
+                    isSearchBarExpanded = operationState.isSearchBarExpanded,
                     isDictionariesExpanded = operationState.isDictionariesExpanded,
                     appVersion = _uiState.value.appVersion,
                 )
@@ -270,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()) {
@@ -289,9 +302,11 @@ class SettingsViewModel(
                     android.util.Log.w("SettingsViewModel", "Failed to load language preference: ${e.message}")
                 }
                 hasCompletedStartupScan.value = true
-                preferencesManager.setHadNoDictionaries(
-                    localDictionaryRepository.dictionaries.value.isEmpty()
-                )
+                if (scanCompleted) {
+                    preferencesManager.setHadNoDictionaries(
+                        localDictionaryRepository.dictionaries.value.isEmpty()
+                    )
+                }
             }
         }
     }
@@ -300,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)
@@ -372,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)
@@ -529,6 +551,25 @@ class SettingsViewModel(
     ): 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) }
+        }
+    }
+
     private fun cancelDownload() {
         // Cancel the ViewModel-side scan job so no further status recomputes
         localDictionaryRepository.cancelIndexing()
@@ -589,7 +630,10 @@ class SettingsViewModel(
                         "NeedsUpdate" -> DictionaryStatus.NeedsUpdate
                         else -> null
                     }
-                    if (restoredStatus != null && savedStatusDate == DateUtils.getCurrentDateString()) {
+                    if (restoredStatus != null &&
+                        savedStatusDate == DateUtils.getCurrentDateString() &&
+                        withContext(Dispatchers.IO) { installedDictionariesAreCurrent() }
+                    ) {
                         dictionaryStatus.value = restoredStatus
                     } else {
                         dictionaryStatus.value = DictionaryStatus.Checking

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

@@ -10,6 +10,8 @@ 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
@@ -33,7 +35,7 @@ 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.invisibleToUser
+import androidx.compose.ui.semantics.hideFromAccessibility
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -88,12 +90,11 @@ fun DictionaryManagement(
         derivedStateOf { importState is ImportState.Importing || importState is ImportState.Extracting }
     }
     val hasEnabledSources by remember(sources) { derivedStateOf { sources.any { it.isEnabled } } }
-    val isBlockingMutations = isInProgress
 
     // 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(isBlockingMutations)
+    val isMutationsBlockedState = rememberUpdatedState(isInProgress)
     val isDeleteBlocked = remember { { isMutationsBlockedState.value } }
 
     SectionCard(
@@ -149,13 +150,13 @@ fun DictionaryManagement(
 
                     // Disable accessibility on background content during import to improve performance.
                     // The progress dialog remains accessible for cancellation.
-                    val backgroundModifier = if (isBlockingMutations) {
-                        Modifier.semantics { invisibleToUser() }
+                    val backgroundModifier = if (isInProgress) {
+                        Modifier.semantics { hideFromAccessibility() }
                     } else {
                         Modifier
                     }
 
-                    if (dictionaries.isEmpty() && !isBlockingMutations) {
+                    if (dictionaries.isEmpty() && !isInProgress) {
                         Column(
                             modifier = backgroundModifier
                                 .fillMaxWidth()
@@ -177,7 +178,7 @@ fun DictionaryManagement(
                             )
                         }
                     } else {
-                        if (dictionaryStatus is DictionaryStatus.NeedsUpdate && !isBlockingMutations && hasEnabledSources) {
+                        if (dictionaryStatus is DictionaryStatus.NeedsUpdate && !isInProgress && hasEnabledSources) {
                             DictionaryUpdateCard(
                                 onStartDownload = onStartDownload,
                                 modifier = backgroundModifier
@@ -194,7 +195,7 @@ fun DictionaryManagement(
                             isDeleteBlocked = isDeleteBlocked
                         )
 
-                        if (!isBlockingMutations) {
+                        if (!isInProgress) {
                             DictionaryActionButtons(
                                 onAddSource = {
                                     haptic.performHapticFeedback(HapticFeedbackType.TextHandleMove)
@@ -219,7 +220,8 @@ fun DictionaryManagement(
                 focusManager.clearFocus(force = true)
                 setShowUrlBottomSheet(false)
             },
-            sheetState = sheetState
+            sheetState = sheetState,
+            contentWindowInsets = { WindowInsets.statusBars }
         ) {
             DictionaryUrlInputContent(
                 existingSources = sources,

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,8 +6,6 @@ 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,7 +11,13 @@
     <string name="language_english">Английский</string>
     <string name="language_russian">Русский</string>
     <string name="language_system">Системный</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="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>
@@ -76,7 +81,7 @@
     <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_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>

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,7 +11,13 @@
     <string name="language_english">English</string>
     <string name="language_russian">Russian</string>
     <string name="language_system">System</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="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>
@@ -74,7 +79,7 @@
     <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_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>

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

@@ -1 +1 @@
-- Initial F-Droid release
+- Initial release

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

@@ -0,0 +1,6 @@
+- Added search history
+- The search bar can be placed at the top or bottom of the screen
+- Fixed headwords with stress marks displaying truncated in search results
+- Improved download, indexing and navigation stability
+- The About screen opens faster
+- Updated build tooling and code cleanup

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

@@ -1,4 +1,6 @@
 - The app starts faster
+- Faster dictionary indexing
+- Improved app stability
 - 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
@@ -8,9 +10,7 @@
 - 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
+- Updated build tooling and documentation

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

@@ -1,4 +1,4 @@
-ReSearch is a fast Android dictionary reader for DSL-format dictionaries. Download, import, and search multiple dictionaries with instant article retrieval via DictZip random-access compression.
+ReSearch is an Android dictionary reader for DSL-format dictionaries. Download, import, and search multiple dictionaries with instant article retrieval via DictZip random-access compression.
 
 Features:
 
@@ -8,7 +8,7 @@ Features:
 - Import .dsl and .dsl.dz files from device storage
 - 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
+- Adaptive two-pane layout for tablets and large screens
 - 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/1.txt

@@ -1 +1 @@
-- Первый релиз для F-Droid
+- Первый релиз

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

@@ -0,0 +1,6 @@
+- Добавлена история поиска
+- Поисковую строку можно расположить сверху или снизу экрана
+- Исправлено усечение заголовков со знаками ударения в результатах поиска
+- Повышена стабильность загрузки, индексации и навигации
+- Экран «О приложении» открывается быстрее
+- Обновлён инструментарий сборки, проведена чистка кода

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

@@ -1,4 +1,6 @@
 - Приложение запускается быстрее
+- Ускорена индексация словарей
+- Повышена стабильность приложения
 - Плавные анимации переходов между экранами
 - Статьи корректно отображают переносы строк, отступы и цвета из DSL-разметки
 - Табуляции и лишние пробелы в статьях больше не ломают вёрстку
@@ -8,9 +10,7 @@
 - Уведомления о прогрессе загрузки стали надёжнее
 - Результаты поиска очищаются мгновенно при стирании запроса
 - Остаточные файлы после отменённых загрузок удаляются автоматически
-- Повышена стабильность приложения
-- Ускорена индексация словарей
-- Обновлены тулинг сборки и документация
 - Длинные статьи со ссылками больше не подвисают при прокрутке
 - Большие списки результатов поиска отображаются быстрее
 - Тёмные цвета статей читаемы в тёмной теме
+- Обновлены инструменты сборки и документация

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

@@ -1,4 +1,4 @@
-ReSearch — быстрое приложение для чтения словарей в формате DSL. Скачивайте, импортируйте и ищите в нескольких словарях с мгновенным получением статей благодаря сжатию DictZip.
+ReSearch — приложение для чтения словарей в формате DSL. Скачивайте, импортируйте и ищите в нескольких словарях с мгновенным получением статей благодаря сжатию DictZip.
 
 Возможности:
 
@@ -8,7 +8,7 @@ ReSearch — быстрое приложение для чтения слова
 - Импорт файлов .dsl и .dsl.dz из хранилища устройства
 - Автоматическая индексация с бинарными индексными файлами для мгновенного поиска
 - Поддержка нескольких кодировок — автоопределение UTF-8, UTF-16 LE/BE
-- Адаптивный трёхпанельный интерфейс для планшетов и больших экранов
+- Адаптивный двухпанельный интерфейс для планшетов и больших экранов
 - Material 3 с динамическими цветами, светлая, тёмная и системная темы
 - Локализация на английский и русский языки
 - Без трекеров, без рекламы, полностью открытый исходный код

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ aboutlibraries = "15.2.0"
 activity_compose = "1.13.0"
 agp = "9.4.1"
 compose_bom = "2026.09.00"
-core = "1.19.0"
+core = "1.19.1"
 datastore_preferences = "1.2.1"
 documentfile = "1.1.0"
 kotlin = "2.4.20"

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