Merge pull request #232 from Taewan-P/fix/select-mode

Taewan-P · web-flow · commit bc21311c9229 · 2026-01-14T00:33:10.000+09:00
Fix selection mode behavior
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "dev.chungjungsoo.gptmobile"
         minSdk = 31
         targetSdk = 36
-        versionCode = 16
-        versionName = "0.7.0"
+        versionCode = 17
+        versionName = "0.7.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/database/entity/PlatformV2.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/database/entity/PlatformV2.kt
@@ -4,7 +4,7 @@ import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import dev.chungjungsoo.gptmobile.data.model.ClientType
-import java.util.UUID
+import java.util.*
 
 @Entity(tableName = "platform_v2")
 data class PlatformV2(
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/dto/anthropic/request/MessageRequest.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/dto/anthropic/request/MessageRequest.kt
@@ -6,7 +6,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 /**
- When certain value is used in the future, use @EncodeDefault or remove default values
+When certain value is used in the future, use @EncodeDefault or remove default values
  */
 
 @OptIn(ExperimentalSerializationApi::class)
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/dto/openai/request/ResponsesRequest.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/dto/openai/request/ResponsesRequest.kt
@@ -116,8 +116,7 @@ object ResponseInputContentSerializer : KSerializer<ResponseInputContent> {
 
     override fun deserialize(decoder: Decoder): ResponseInputContent {
         val jsonDecoder = decoder as JsonDecoder
-        val element = jsonDecoder.decodeJsonElement()
-        return when (element) {
+        return when (val element = jsonDecoder.decodeJsonElement()) {
             is JsonPrimitive -> ResponseInputContent.Text(element.jsonPrimitive.content)
 
             is JsonArray -> {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/network/OpenAIAPIImpl.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/data/network/OpenAIAPIImpl.kt
@@ -1,6 +1,5 @@
 package dev.chungjungsoo.gptmobile.data.network
 
-import android.util.Log
 import dev.chungjungsoo.gptmobile.data.ModelConstants
 import dev.chungjungsoo.gptmobile.data.dto.openai.request.ChatCompletionRequest
 import dev.chungjungsoo.gptmobile.data.dto.openai.request.ResponsesRequest
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatBubble.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatBubble.kt
@@ -41,7 +41,6 @@ import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatViewModel.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/chat/ChatViewModel.kt
@@ -364,8 +364,8 @@ class ChatViewModel @Inject constructor(
         val sortedAssistantMessages = assistantMessages.map { assistantMessage ->
             assistantMessage.sortedWith(
                 compareBy(
-                    { it -> platformOrderMap[it.platformType] ?: Int.MAX_VALUE },
-                    { it -> it.platformType }
+                    { platformOrderMap[it.platformType] ?: Int.MAX_VALUE },
+                    { it.platformType }
                 )
             )
         }
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/home/HomeScreen.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/home/HomeScreen.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBarsPadding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
@@ -142,15 +141,17 @@ fun HomeScreen(
             )
         },
         floatingActionButton = {
-            NewChatButton(expanded = listState.isScrollingUp(), onClick = {
-                val enabledApiTypes = platformState.filter { it.enabled }.map { it.uid }
-                if (enabledApiTypes.size == 1) {
-                    // Navigate to new chat directly if only one platform is enabled
-                    navigateToNewChat(enabledApiTypes)
-                } else {
-                    homeViewModel.openSelectModelDialog()
-                }
-            })
+            if (!chatListState.isSelectionMode && !chatListState.isSearchMode) {
+                NewChatButton(expanded = listState.isScrollingUp(), onClick = {
+                    val enabledApiTypes = platformState.filter { it.enabled }.map { it.uid }
+                    if (enabledApiTypes.size == 1) {
+                        // Navigate to new chat directly if only one platform is enabled
+                        navigateToNewChat(enabledApiTypes)
+                    } else {
+                        homeViewModel.openSelectModelDialog()
+                    }
+                })
+            }
         }
     ) { innerPadding ->
         LazyColumn(
@@ -180,8 +181,10 @@ fun HomeScreen(
                         .fillMaxWidth()
                         .combinedClickable(
                             onLongClick = {
-                                homeViewModel.enableSelectionMode()
-                                homeViewModel.selectChat(idx)
+                                if (!chatListState.isSearchMode) {
+                                    homeViewModel.enableSelectionMode()
+                                    homeViewModel.selectChat(idx)
+                                }
                             },
                             onClick = {
                                 if (chatListState.isSelectionMode) {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/home/HomeViewModel.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/home/HomeViewModel.kt
@@ -138,7 +138,6 @@ class HomeViewModel @Inject constructor(
     fun disableSearchMode() {
         _chatListState.update { it.copy(isSearchMode = false) }
         _searchQuery.update { "" }
-        fetchChats()
     }
 
     fun enableSelectionMode() {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setting/SettingViewModelV2.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setting/SettingViewModelV2.kt
@@ -4,7 +4,6 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dev.chungjungsoo.gptmobile.data.database.entity.PlatformV2
-import dev.chungjungsoo.gptmobile.data.model.ClientType
 import dev.chungjungsoo.gptmobile.data.repository.SettingRepository
 import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setup/SetupPlatformWizardScreen.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/presentation/ui/setup/SetupPlatformWizardScreen.kt
@@ -68,10 +68,10 @@ fun SetupPlatformWizardScreen(
     // Extract values for use in composables
     val wizardStep = wizardStepState.value
     val selectedClientType = selectedClientTypeState.value
-    val platformName = platformNameState.value
-    val apiUrl = apiUrlState.value
-    val apiKey = apiKeyState.value
-    val model = modelState.value
+    platformNameState.value
+    apiUrlState.value
+    apiKeyState.value
+    modelState.value
 
     // Compute canProceed using derivedStateOf for proper reactivity
     val canProceed by remember {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/util/DefaultHashMap.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/util/DefaultHashMap.kt
@@ -1,9 +1,9 @@
 package dev.chungjungsoo.gptmobile.util
 
 /**
- Small implementation of HashMap, but with default values.
- This way the get operator will not throw an error or null.
- Inspired by Python collections DefaultDict.
+Small implementation of HashMap, but with default values.
+This way the get operator will not throw an error or null.
+Inspired by Python collections DefaultDict.
  */
 open class DefaultHashMap<K, V>(protected val defaultValueProvider: () -> V) : HashMap<K, V>() {
     override operator fun get(key: K): V {
diff --git a/app/src/main/kotlin/dev/chungjungsoo/gptmobile/util/FileUtils.kt b/app/src/main/kotlin/dev/chungjungsoo/gptmobile/util/FileUtils.kt
@@ -1,6 +1,5 @@
 package dev.chungjungsoo.gptmobile.util
 
-import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
 import android.util.Base64
@@ -82,39 +81,36 @@ object FileUtils {
      * @param filename File name or path
      * @return MIME type string, or "application/octet-stream" if unknown
      */
-    private fun getMimeTypeFromExtension(filename: String): String {
-        val extension = filename.substringAfterLast('.', "").lowercase()
-        return when (extension) {
-            // Images
-            "jpg", "jpeg" -> "image/jpeg"
+    private fun getMimeTypeFromExtension(filename: String): String = when (val extension = filename.substringAfterLast('.', "").lowercase()) {
+        // Images
+        "jpg", "jpeg" -> "image/jpeg"
 
-            "png" -> "image/png"
+        "png" -> "image/png"
 
-            "gif" -> "image/gif"
+        "gif" -> "image/gif"
 
-            "bmp" -> "image/bmp"
+        "bmp" -> "image/bmp"
 
-            "webp" -> "image/webp"
+        "webp" -> "image/webp"
 
-            "tiff", "tif" -> "image/tiff"
+        "tiff", "tif" -> "image/tiff"
 
-            "svg" -> "image/svg+xml"
+        "svg" -> "image/svg+xml"
 
-            // Documents
-            "pdf" -> "application/pdf"
+        // Documents
+        "pdf" -> "application/pdf"
 
-            "txt" -> "text/plain"
+        "txt" -> "text/plain"
 
-            "doc" -> "application/msword"
+        "doc" -> "application/msword"
 
-            "docx" -> "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+        "docx" -> "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
 
-            "xls" -> "application/vnd.ms-excel"
+        "xls" -> "application/vnd.ms-excel"
 
-            "xlsx" -> "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        "xlsx" -> "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
 
-            else -> MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) ?: "application/octet-stream"
-        }
+        else -> MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) ?: "application/octet-stream"
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -364,8 +364,8 @@ class ChatViewModel @Inject constructor(`
`364`	`364`	`val sortedAssistantMessages = assistantMessages.map { assistantMessage ->`
`365`	`365`	`assistantMessage.sortedWith(`
`366`	`366`	`compareBy(`
`367`		`- { it -> platformOrderMap[it.platformType] ?: Int.MAX_VALUE },`
`368`		`- { it -> it.platformType }`
	`367`	`+ { platformOrderMap[it.platformType] ?: Int.MAX_VALUE },`
	`368`	`+ { it.platformType }`
`369`	`369`	`)`
`370`	`370`	`)`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ class HomeViewModel @Inject constructor(`
`138`	`138`	`fun disableSearchMode() {`
`139`	`139`	`_chatListState.update { it.copy(isSearchMode = false) }`
`140`	`140`	`_searchQuery.update { "" }`
`141`		`- fetchChats()`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`fun enableSelectionMode() {`