Skip to content

Task/standardize command bar directions #355

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.

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
35 changes: 19 additions & 16 deletions app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
Original file line number Diff line number Diff line change
@@ -107,7 +107,6 @@ abstract class GeneralKeyboardIME(
var nounTypeSuggestion: List<String>? = null
var checkIfPluralWord: Boolean = false
private var currentEnterKeyType: Int? = null
private val commandCursor = "│"
val prepAnnotationConversionDict =
mapOf(
"German" to mapOf("Acc" to "Akk"),
@@ -459,24 +458,27 @@ abstract class GeneralKeyboardIME(
* to provide appropriate hints and prompts to the user.
*/
private fun updateCommandBarHintAndPrompt(isUserDarkMode: Boolean? = null) {
val commandBarButton = keyboardBinding.commandBar
val commandBarEditText = keyboardBinding.commandBar
val hintMessage = HintUtils.getCommandBarHint(currentState, language)
val promptText = HintUtils.getPromptText(currentState, language, context = this)
val promptTextView = keyboardBinding.promptText
promptTextView.text = promptText
commandBarButton.hint = hintMessage
commandBarEditText.hint = hintMessage

commandBarEditText.requestFocus()

if (isUserDarkMode == true) {
commandBarButton.setHintTextColor(getColor(R.color.hint_white))
commandBarButton.setTextColor(getColor(white))
commandBarButton.backgroundTintList = ContextCompat.getColorStateList(this, R.color.command_bar_color_dark)
commandBarEditText.setHintTextColor(getColor(R.color.hint_white))
commandBarEditText.setTextColor(getColor(white))
keyboardBinding.commandBarLayout.backgroundTintList =
ContextCompat.getColorStateList(this, R.color.command_bar_color_dark)
promptTextView.setTextColor(getColor(white))
promptTextView.setBackgroundColor(getColor(R.color.command_bar_color_dark))
keyboardBinding.promptTextBorder.setBackgroundColor(getColor(R.color.command_bar_color_dark))
} else {
commandBarButton.setHintTextColor(getColor(R.color.hint_black))
commandBarButton.setTextColor(Color.BLACK)
commandBarButton.backgroundTintList = ContextCompat.getColorStateList(this, R.color.white)
commandBarEditText.setHintTextColor(getColor(R.color.hint_black))
commandBarEditText.setTextColor(Color.BLACK)
keyboardBinding.commandBarLayout.backgroundTintList = ContextCompat.getColorStateList(this, white)
promptTextView.setTextColor(Color.BLACK)
promptTextView.setBackgroundColor(getColor(white))
keyboardBinding.promptTextBorder.setBackgroundColor(getColor(white))
@@ -1451,7 +1453,6 @@ abstract class GeneralKeyboardIME(
?.text
.toString()
.trim()
.dropLast(1)
lateinit var commandModeOutput: String
commandModeOutput =
when (currentState) {
@@ -1462,7 +1463,7 @@ abstract class GeneralKeyboardIME(
commandModeOutput = "$commandModeOutput "
}
inputConnection.commitText(commandModeOutput, 1)
binding?.commandBar?.text = ""
binding?.commandBar?.setText("")
} else {
if (imeOptionsActionId != IME_ACTION_NONE) {
inputConnection.performEditorAction(imeOptionsActionId)
@@ -1561,9 +1562,10 @@ abstract class GeneralKeyboardIME(
keyboard?.mShiftState = SHIFT_ON_ONE_CHAR
}
} else {
newText = "${commandBar.text.trim().dropLast(2)}$commandCursor"
newText = "${commandBar.text.trim().dropLast(1)}"
}
commandBar.text = newText
commandBar.setText(newText)
commandBar.setSelection(newText.length)
}
}

@@ -1649,13 +1651,14 @@ abstract class GeneralKeyboardIME(
binding.commandBar.paddingBottom,
)
}
val newText = "${commandBar.text.trim().dropLast(1)}$codeChar$commandCursor"
commandBar.text = newText
val newText = "${commandBar.text}$codeChar"
commandBar.setText(newText)
commandBar.setSelection(newText.length)
}
} else {
// Handling space key logic.
if (keyboardMode != keyboardLetters && code == KeyboardBase.KEYCODE_SPACE) {
binding?.commandBar?.text = " "
binding?.commandBar?.setText(" ")
val originalText = inputConnection.getExtractedText(ExtractedTextRequest(), 0).text
inputConnection.commitText(codeChar.toString(), 1)
val newText = inputConnection.getExtractedText(ExtractedTextRequest(), 0).text
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_custom_cursor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="2dp" android:height="24dp" /> <!-- Match ┃ height, narrow width -->
<solid android:color="@color/dark_scribe_blue" /> <!-- Adjust color -->
</shape>
49 changes: 29 additions & 20 deletions app/src/main/res/layout-land/keyboard_view_keyboard.xml
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
android:singleLine="true"
android:ellipsize="end"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
app:layout_constraintEnd_toStartOf="@+id/command_bar"
app:layout_constraintEnd_toStartOf="@id/command_bar_layout"
app:layout_constraintStart_toEndOf="@+id/scribe_key"
app:layout_constraintTop_toTopOf="@+id/command_field" />

@@ -62,34 +62,43 @@
android:text="│"
android:textFontWeight="500"
android:textSize="16sp"
app:layout_constraintBaseline_toBaselineOf="@+id/command_bar"
app:layout_constraintBaseline_toBaselineOf="@id/prompt_text"
app:layout_constraintBottom_toBottomOf="@+id/prompt_text"
app:layout_constraintEnd_toStartOf="@+id/command_bar"
app:layout_constraintEnd_toStartOf="@id/command_bar_layout"
app:layout_constraintStart_toEndOf="@+id/prompt_text"
app:layout_constraintTop_toTopOf="@+id/prompt_text" />


<Button
android:id="@+id/command_bar"
<LinearLayout
android:id="@+id/command_bar_layout"
android:layout_width="0dp"
android:layout_height="36dp"
android:textFontWeight="500"
android:layout_marginEnd="@dimen/tiny_margin"
android:background="@drawable/cmd_bar_background_right_rounded"
android:contentDescription="@string/command_bar"
android:elevation="0dp"
android:stateListAnimator="@null"
android:textSize="16sp"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAlignment="textStart"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
app:layout_constraintEnd_toEndOf="@+id/command_field"
app:layout_constraintBottom_toBottomOf="@id/command_field"
app:layout_constraintEnd_toEndOf="@id/command_field"
app:layout_constraintHorizontal_weight="50"
app:layout_constraintStart_toEndOf="@+id/prompt_text"
app:layout_constraintTop_toTopOf="@+id/command_field" />
app:layout_constraintStart_toEndOf="@id/prompt_text"
app:layout_constraintTop_toTopOf="@id/command_field"
android:layout_marginEnd="@dimen/tiny_margin">

<EditText
android:id="@+id/command_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:backgroundTint="@null"
android:contentDescription="@string/command_bar"
android:cursorVisible="true"
android:inputType="text"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAlignment="textStart"
android:textCursorDrawable="@drawable/ic_custom_cursor"
android:textFontWeight="500"
android:textSize="16sp" />
</LinearLayout>

<ImageView
android:id="@+id/top_keyboard_divider"
56 changes: 32 additions & 24 deletions app/src/main/res/layout/keyboard_view_keyboard.xml
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@
android:singleLine="true"
android:ellipsize="end"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
app:layout_constraintEnd_toStartOf="@+id/command_bar"
app:layout_constraintEnd_toStartOf="@id/command_bar_layout"
app:layout_constraintStart_toEndOf="@+id/scribe_key"
app:layout_constraintTop_toTopOf="@+id/command_field" />

@@ -62,34 +62,42 @@
android:text="│"
android:textFontWeight="500"
android:textSize="16sp"
app:layout_constraintBaseline_toBaselineOf="@+id/command_bar"
app:layout_constraintBottom_toBottomOf="@+id/prompt_text"
app:layout_constraintEnd_toStartOf="@+id/command_bar"
app:layout_constraintStart_toEndOf="@+id/prompt_text"
app:layout_constraintTop_toTopOf="@+id/prompt_text" />
app:layout_constraintBaseline_toBaselineOf="@id/prompt_text"
app:layout_constraintBottom_toBottomOf="@id/prompt_text"
app:layout_constraintEnd_toStartOf="@id/command_bar_layout"
app:layout_constraintStart_toEndOf="@id/prompt_text"
app:layout_constraintTop_toTopOf="@id/prompt_text" />


<Button
android:id="@+id/command_bar"
<LinearLayout
android:id="@+id/command_bar_layout"
android:layout_width="0dp"
android:layout_height="36dp"
android:textFontWeight="500"
android:layout_marginEnd="@dimen/tiny_margin"
android:background="@drawable/cmd_bar_background_right_rounded"
android:contentDescription="@string/command_bar"
android:elevation="0dp"
android:stateListAnimator="@null"
android:textSize="16sp"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAlignment="textStart"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
app:layout_constraintEnd_toEndOf="@+id/command_field"
app:layout_constraintBottom_toBottomOf="@id/command_field"
app:layout_constraintEnd_toEndOf="@id/command_field"
app:layout_constraintHorizontal_weight="50"
app:layout_constraintStart_toEndOf="@+id/prompt_text"
app:layout_constraintTop_toTopOf="@+id/command_field" />
app:layout_constraintStart_toEndOf="@id/prompt_text"
app:layout_constraintTop_toTopOf="@id/command_field"
android:layout_marginEnd="@dimen/tiny_margin">

<EditText
android:id="@+id/command_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:backgroundTint="@null"
android:contentDescription="@string/command_bar"
android:cursorVisible="true"
android:inputType="text"
android:paddingStart="8dp"
android:paddingTop="4dp"
android:paddingEnd="8dp"
android:paddingBottom="4dp"
android:textAlignment="textStart"
android:textCursorDrawable="@drawable/ic_custom_cursor"
android:textFontWeight="500"
android:textSize="16sp" />
</LinearLayout>

<ImageView
android:id="@+id/top_keyboard_divider"