diff --git a/app/build.gradle b/app/build.gradle index 3ab9c3bef..fbf6e4ea6 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "info.plateaukao.einkbro" minSdkVersion 21 targetSdkVersion 33 - versionCode 100100 - versionName "10.1.0" + versionCode 100101 + versionName "10.1.1" vectorDrawables.useSupportLibrary = true javaCompileOptions { diff --git a/app/src/main/java/info/plateaukao/einkbro/activity/SettingActivity.kt b/app/src/main/java/info/plateaukao/einkbro/activity/SettingActivity.kt index 69b95f3ab..62e4ea4db 100644 --- a/app/src/main/java/info/plateaukao/einkbro/activity/SettingActivity.kt +++ b/app/src/main/java/info/plateaukao/einkbro/activity/SettingActivity.kt @@ -266,7 +266,7 @@ class SettingActivity : ComponentActivity(), KoinComponent { ), NavigateSettingItem( R.string.setting_title_chat_gpt, - R.drawable.ic_sync_scroll, + R.drawable.ic_chat_gpt, destination = ChatGPT ), VersionSettingItem( @@ -644,19 +644,19 @@ class SettingActivity : ComponentActivity(), KoinComponent { private val chatGptSettingItems = listOf( ValueSettingItem( R.string.setting_title_edit_gpt_api_key, - R.drawable.ic_sync_scroll, + R.drawable.ic_chat_gpt, R.string.setting_summary_edit_gpt_api_key, config::gptApiKey ), ValueSettingItem( R.string.setting_title_edit_gpt_system_prompt, - R.drawable.ic_page_height, + R.drawable.icon_edit, R.string.setting_summary_edit_gpt_prompt, config::gptSystemPrompt ), ValueSettingItem( R.string.setting_title_edit_gpt_user_prompt_prefix, - R.drawable.ic_page_height, + R.drawable.icon_edit, R.string.setting_summary_edit_gpt_user_prompt, config::gptUserPromptPrefix ), diff --git a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeDialogFragment.kt b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeDialogFragment.kt index 82cfea372..9cc3732f8 100644 --- a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeDialogFragment.kt +++ b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/ActionModeDialogFragment.kt @@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight -import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.shape.RoundedCornerShape @@ -114,7 +113,7 @@ private fun ActionModeMenu( columns = GridCells.Fixed(4), modifier = Modifier .wrapContentHeight() - .wrapContentWidth() + .width(280.dp) ) { items(menuInfos.size) { index -> val info = menuInfos[index] diff --git a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/GPTDialogFragment.kt b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/GPTDialogFragment.kt index 8a71d9cb8..a6b14aa27 100644 --- a/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/GPTDialogFragment.kt +++ b/app/src/main/java/info/plateaukao/einkbro/view/dialog/compose/GPTDialogFragment.kt @@ -14,10 +14,11 @@ import android.view.WindowManager import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.material.Divider import androidx.compose.material.Icon import androidx.compose.material.Text @@ -132,8 +133,9 @@ private fun GptResponse( Box { Column( modifier = Modifier + .defaultMinSize(minWidth = 200.dp) .wrapContentHeight() - .width(320.dp), + .wrapContentWidth(), horizontalAlignment = Alignment.CenterHorizontally ) { if (showRequest.value) {