From ec1548fc72b611e778076f63d1944b3773e90e4d Mon Sep 17 00:00:00 2001
From: Linfye <3158203624@qq.com>
Date: Wed, 4 Sep 2024 19:30:41 +0800
Subject: [PATCH 1/2] remove cog and extend out the command bar
---
.../main/java/be/scri/views/MyKeyboardView.kt | 1 -
.../res/layout/keyboard_view_command_options.xml | 16 ++--------------
.../main/res/layout/keyboard_view_keyboard.xml | 16 +---------------
3 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/be/scri/views/MyKeyboardView.kt b/app/src/main/java/be/scri/views/MyKeyboardView.kt
index 2f693afd..c5b53b26 100644
--- a/app/src/main/java/be/scri/views/MyKeyboardView.kt
+++ b/app/src/main/java/be/scri/views/MyKeyboardView.kt
@@ -316,7 +316,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
topKeyboardDivider.background = ColorDrawable(strokeColor)
background = ColorDrawable(toolbarColor)
- settingsCog.applyColorFilter(mTextColor)
}
}
}
diff --git a/app/src/main/res/layout/keyboard_view_command_options.xml b/app/src/main/res/layout/keyboard_view_command_options.xml
index 212acebc..ac84a758 100644
--- a/app/src/main/res/layout/keyboard_view_command_options.xml
+++ b/app/src/main/res/layout/keyboard_view_command_options.xml
@@ -92,25 +92,13 @@
android:background="@drawable/cmd_key_background_rounded"
android:contentDescription="@string/command_bar"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
- app:layout_constraintEnd_toStartOf="@+id/settings_cog"
+ app:layout_constraintEnd_toEndOf="@+id/command_field"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_weight="27"
app:layout_constraintStart_toEndOf="@+id/separator_3"
app:layout_constraintTop_toTopOf="@+id/command_field" />
-
+
-
-
Date: Thu, 5 Sep 2024 09:18:51 +0800
Subject: [PATCH 2/2] remove landscape cog
---
.../main/java/be/scri/views/MyKeyboardView.kt | 17 ++---------------
.../res/layout-land/keyboard_view_keyboard.xml | 16 +---------------
2 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/app/src/main/java/be/scri/views/MyKeyboardView.kt b/app/src/main/java/be/scri/views/MyKeyboardView.kt
index c5b53b26..3e415556 100644
--- a/app/src/main/java/be/scri/views/MyKeyboardView.kt
+++ b/app/src/main/java/be/scri/views/MyKeyboardView.kt
@@ -351,25 +351,12 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
mToolbarHolder?.let { toolbarHolder ->
_keyboardBinding?.let { binding ->
- binding.settingsCog?.apply {
- setOnLongClickListener {
- context?.toast(R.string.settings)
- true
- }
- setOnClickListener {
- context?.let { ctx ->
- vibrateIfNeeded()
- Intent(ctx, SettingsFragment::class.java).apply {
- addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- ctx.startActivity(this)
- }
- }
- }
- }
}
+
}
}
+
fun vibrateIfNeeded() {
if (context.config.vibrateOnKeypress) {
performHapticFeedback()
diff --git a/app/src/main/res/layout-land/keyboard_view_keyboard.xml b/app/src/main/res/layout-land/keyboard_view_keyboard.xml
index 797e3821..43df0eb5 100644
--- a/app/src/main/res/layout-land/keyboard_view_keyboard.xml
+++ b/app/src/main/res/layout-land/keyboard_view_keyboard.xml
@@ -39,26 +39,12 @@
android:background="@drawable/cmd_bar_background_right_rounded"
android:contentDescription="@string/command_bar"
app:layout_constraintBottom_toBottomOf="@+id/command_field"
- app:layout_constraintEnd_toStartOf="@+id/settings_cog"
+ app:layout_constraintEnd_toEndOf="@+id/command_field"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_weight="84"
app:layout_constraintStart_toEndOf="@+id/scribe_key"
app:layout_constraintTop_toTopOf="@+id/command_field" />
-
-