Skip to content

Refactor/empty candidate view icons #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KazumaProject merged 7 commits into from
Jun 17, 2026
Merged

Refactor/empty candidate view icons #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d0de4aa
refactor empty suggestion adapter
KazumaProject Jun 16, 2026
dfddafe
fix two fingers key inout
KazumaProject Jun 16, 2026
4e9e397
update versions
KazumaProject Jun 16, 2026
b2c593e
fix switch toolbar icons to clipboard preview
KazumaProject Jun 16, 2026
ed43c42
settings for secret mode
KazumaProject Jun 16, 2026
6a7ebaa
fix settings
KazumaProject Jun 16, 2026
a0d6f87
fix icon in left side
KazumaProject Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ android {
applicationId "com.kazumaproject.markdownhelperkeyboard"
minSdk 24
targetSdk 36
versionCode 779
versionName "1.7.86"
versionCode 780
versionName "1.7.87"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

Expand Down
9 changes: 6 additions & 3 deletions .../com/kazumaproject/markdownhelperkeyboard/ime_service/CandidateStripPresentationPolicy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ data class CandidateStripPresentation(
val resetCandidateTabSelection: Boolean,
val showIndependentShortcutToolbar: Boolean,
val reserveIndependentShortcutToolbarSpace: Boolean,
val showIntegratedShortcut: Boolean
val showIntegratedShortcutItems: Boolean,
val showIntegratedShortcutEntry: Boolean
)

object CandidateStripPresentationPolicy {
Expand Down Expand Up @@ -49,8 +50,10 @@ object CandidateStripPresentationPolicy {
shortcutPresentation.showIndependentToolbar && !hideShortcutForCandidates,
reserveIndependentShortcutToolbarSpace =
shortcutPresentation.showIndependentToolbar && hideShortcutForCandidates,
showIntegratedShortcut =
shortcutPresentation.showIntegratedShortcuts && !hideShortcutForCandidates
showIntegratedShortcutItems =
shortcutPresentation.showIntegratedShortcutItems && !hideShortcutForCandidates,
showIntegratedShortcutEntry =
shortcutPresentation.showIntegratedShortcutEntry && !hideShortcutForCandidates
)
}
}
165 changes: 126 additions & 39 deletions app/src/main/java/com/kazumaproject/markdownhelperkeyboard/ime_service/IMEService.kt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .../main/java/com/kazumaproject/markdownhelperkeyboard/ime_service/ImePreferencesSnapshot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ data class ImePreferencesSnapshot(
val isOmissionSearchEnable: Boolean,
val delayTime: Int,
val isLearnDictionaryMode: Boolean,
val incognitoModeDetectionPreference: Boolean,
val showLearnedCandidatesInIncognitoPreference: Boolean,
val isUserDictionaryEnable: Boolean,
val isUserTemplateEnable: Boolean,
val hankakuPreference: Boolean,
Expand Down Expand Up @@ -265,6 +267,10 @@ data class ImePreferencesSnapshot(
isOmissionSearchEnable = appPreference.omission_search_preference ?: false,
delayTime = appPreference.time_same_pronounce_typing_preference ?: 1000,
isLearnDictionaryMode = appPreference.learn_dictionary_preference ?: true,
incognitoModeDetectionPreference =
appPreference.incognito_mode_detection_preference,
showLearnedCandidatesInIncognitoPreference =
appPreference.show_learned_candidates_in_incognito_preference,
isUserDictionaryEnable = appPreference.user_dictionary_preference ?: true,
isUserTemplateEnable = appPreference.user_template_preference ?: true,
hankakuPreference = appPreference.space_hankaku_preference ?: false,
Expand Down
21 changes: 16 additions & 5 deletions ...com/kazumaproject/markdownhelperkeyboard/ime_service/ShortcutToolbarPresentationPolicy.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ data class ShortcutToolbarPresentationState(

data class ShortcutToolbarPresentation(
val showIndependentToolbar: Boolean,
val showIntegratedShortcuts: Boolean
val showIntegratedShortcutItems: Boolean,
val showIntegratedShortcutEntry: Boolean
)

object ShortcutToolbarPresentationPolicy {
Expand All @@ -23,25 +24,35 @@ object ShortcutToolbarPresentationPolicy {
if (!state.shortcutToolbarVisible || state.symbolKeyboardShown) {
return ShortcutToolbarPresentation(
showIndependentToolbar = false,
showIntegratedShortcuts = false
showIntegratedShortcutItems = false,
showIntegratedShortcutEntry = false
)
}
if (!state.integratedInSuggestion) {
return ShortcutToolbarPresentation(
showIndependentToolbar = true,
showIntegratedShortcuts = false
showIntegratedShortcutItems = false,
showIntegratedShortcutEntry = false
)
}
val showIntegratedShortcuts =
val showIntegratedShortcutItems =
state.inputStringEmpty &&
state.tailEmpty &&
!state.clipboardPreviewShown &&
!state.selectedTextGemmaActionsShown &&
state.suggestionsEmpty &&
!state.customLayoutPickerShown
val isCentralSpecialContentShown =
state.clipboardPreviewShown || state.selectedTextGemmaActionsShown
val showIntegratedShortcutEntry =
state.inputStringEmpty &&
state.tailEmpty &&
isCentralSpecialContentShown &&
!state.customLayoutPickerShown
return ShortcutToolbarPresentation(
showIndependentToolbar = false,
showIntegratedShortcuts = showIntegratedShortcuts
showIntegratedShortcutItems = showIntegratedShortcutItems,
showIntegratedShortcutEntry = showIntegratedShortcutEntry
)
}
}
Loading
Loading