mirror/Keyboard
1
0
Fork 0
mirror of https://github.com/FossifyOrg/Keyboard.git synced 2026-06-14 08:35:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into add_chuvash

Browse Source
This commit is contained in:
Naveen Singh
2024-06-24 08:34:18 -04:00
committed by GitHub
parent 5a50d88f0e e7313f98c2
commit 60f263161a
18 changed files with 209 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/org/fossify/keyboard/activities/SettingsActivity.kt
View File

@@ -52,7 +52,12 @@ class SettingsActivity : SimpleActivity() {
binding.apply {
updateTextColors(settingsNestedScrollview)
arrayOf(settingsColorCustomizationSectionLabel, settingsGeneralSettingsLabel).forEach {
arrayOf(
settingsColorCustomizationSectionLabel,
settingsGeneralSettingsLabel,
settingsKeyboardSettingsLabel,
settingsClipboardSettingsLabel
).forEach {
it.setTextColor(getProperPrimaryColor())
}
}

20
app/src/main/kotlin/org/fossify/keyboard/extensions/Context.kt
View File

@@ -57,6 +57,26 @@ fun Context.getCurrentClip(): String? {
return clipboardManager.primaryClip?.getItemAt(0)?.text?.toString()
}
fun Context.getKeyboardBackgroundColor(): Int {
val color = if (config.isUsingSystemTheme) {
resources.getColor(R.color.you_keyboard_background_color, theme)
} else {
getProperBackgroundColor().darkenColor(2)
}
// use darker background color when key borders are enabled
if (config.showKeyBorders) {
val darkerColor = color.darkenColor(2)
return if (darkerColor == Color.WHITE) {
resources.getColor(R.color.md_grey_200, theme)
} else {
darkerColor
}
}
return color
}
fun Context.getStrokeColor(): Int {
return if (config.isUsingSystemTheme) {
if (isUsingSystemDarkTheme()) {

2
app/src/main/kotlin/org/fossify/keyboard/helpers/Config.kt
View File

@@ -24,7 +24,7 @@ class Config(context: Context) : BaseConfig(context) {
set(enableCapitalization) = prefs.edit().putBoolean(SENTENCES_CAPITALIZATION, enableCapitalization).apply()
var showKeyBorders: Boolean
get() = prefs.getBoolean(SHOW_KEY_BORDERS, false)
get() = prefs.getBoolean(SHOW_KEY_BORDERS, true)
set(showKeyBorders) = prefs.edit().putBoolean(SHOW_KEY_BORDERS, showKeyBorders).apply()
var lastExportedClipsFolder: String

2
app/src/main/kotlin/org/fossify/keyboard/helpers/MyKeyboard.kt
View File

@@ -300,7 +300,7 @@ class MyKeyboard {
row.defaultHorizontalGap = mDefaultHorizontalGap
mKeyboardHeightMultiplier = getKeyboardHeightMultiplier(context.config.keyboardHeightPercentage)
characters.forEachIndexed { index, character ->
characters.forEach { character ->
val key = Key(row)
if (column >= MAX_KEYS_PER_MINI_ROW) {
column = 0

33
app/src/main/kotlin/org/fossify/keyboard/services/SimpleKeyboardIME.kt
View File

@@ -3,6 +3,7 @@ package org.fossify.keyboard.services
import android.annotation.SuppressLint
import android.content.SharedPreferences
import android.graphics.Bitmap
import android.graphics.Color
import android.graphics.drawable.Icon
import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.RippleDrawable
@@ -29,15 +30,16 @@ import androidx.autofill.inline.common.TextViewStyle
import androidx.autofill.inline.common.ViewStyle
import androidx.autofill.inline.v1.InlineSuggestionUi
import androidx.core.graphics.drawable.toBitmap
import org.fossify.commons.extensions.applyColorFilter
import org.fossify.commons.extensions.getProperBackgroundColor
import org.fossify.commons.extensions.getProperTextColor
import org.fossify.commons.extensions.getSharedPrefs
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding
import org.fossify.commons.extensions.*
import org.fossify.commons.helpers.isNougatPlus
import org.fossify.commons.helpers.isPiePlus
import org.fossify.keyboard.R
import org.fossify.keyboard.databinding.KeyboardViewKeyboardBinding
import org.fossify.keyboard.extensions.config
import org.fossify.keyboard.extensions.getKeyboardBackgroundColor
import org.fossify.keyboard.extensions.getStrokeColor
import org.fossify.keyboard.extensions.safeStorageContext
import org.fossify.keyboard.helpers.*
@@ -81,15 +83,38 @@ class SimpleKeyboardIME : InputMethodService(), OnKeyboardActionListener, Shared
override fun onCreateInputView(): View {
binding = KeyboardViewKeyboardBinding.inflate(layoutInflater)
binding.keyboardHolder.setBackgroundColor(safeStorageContext.getKeyboardBackgroundColor())
keyboardView = binding.keyboardView.apply {
setKeyboardHolder(binding)
setKeyboard(keyboard!!)
setEditorInfo(currentInputEditorInfo)
setupNavigationBarPadding()
mOnKeyboardActionListener = this@SimpleKeyboardIME
}
return binding.root
}
private fun setupNavigationBarPadding() {
window.window?.apply {
WindowCompat.setDecorFitsSystemWindows(this, false)
decorView.setOnApplyWindowInsetsListener { _, insets ->
val windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
val bottomPadding = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom
binding.keyboardHolder.updatePadding(bottom = bottomPadding)
insets
}
}
}
override fun onStartInputView(editorInfo: EditorInfo?, restarting: Boolean) {
super.onStartInputView(editorInfo, restarting)
window.window?.apply {
navigationBarColor = Color.TRANSPARENT
updateNavigationBarForegroundColor(safeStorageContext.getKeyboardBackgroundColor())
}
}
override fun onPress(primaryCode: Int) {
if (primaryCode != 0) {
keyboardView?.vibrateIfNeeded()

124
app/src/main/kotlin/org/fossify/keyboard/views/MyKeyboardView.kt
View File

@@ -87,7 +87,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private var mTextColor = 0
private var mBackgroundColor = 0
private var mKeyboardBackgroundColor = 0
private var mPrimaryColor = 0
private var mStrokeColor = 0
private var mKeyColor = 0
private var mKeyColorPressed = 0
@@ -144,6 +146,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
private var mKeyBackground: Drawable? = null
private var mShowKeyBorders: Boolean = false
private var mUsingSystemTheme: Boolean = true
private var mVoiceInputMethod: String = ""
private var mToolbarHolder: View? = null
private var mClipboardManagerHolder: View? = null
@@ -209,7 +212,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
with(context.safeStorageContext) {
mTextColor = getProperTextColor()
mBackgroundColor = getProperBackgroundColor()
mKeyboardBackgroundColor = getKeyboardBackgroundColor()
mPrimaryColor = getProperPrimaryColor()
mStrokeColor = getStrokeColor()
}
mPreviewPopup = PopupWindow(context)
@@ -381,46 +386,43 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
with(context.safeStorageContext) {
mTextColor = getProperTextColor()
mBackgroundColor = getProperBackgroundColor()
mKeyboardBackgroundColor = getKeyboardBackgroundColor()
mPrimaryColor = getProperPrimaryColor()
mStrokeColor = getStrokeColor()
mShowKeyBorders = config.showKeyBorders
mUsingSystemTheme = config.isUsingSystemTheme
mVoiceInputMethod = config.voiceInputMethod
}
val isMainKeyboard = changedView == null || changedView != keyboardPopupBinding?.miniKeyboardView
mKeyColor = getKeyColor()
mKeyColorPressed = mKeyColor.adjustAlpha(0.2f)
mKeyBackground = if (mShowKeyBorders && isMainKeyboard) {
resources.getDrawable(R.drawable.keyboard_key_selector_outlined, context.theme)
} else {
resources.getDrawable(R.drawable.keyboard_key_selector, context.theme)
}
mKeyColor = getKeyColor()
mKeyColorPressed = mKeyColor.adjustAlpha(0.2f)
val strokeColor = context.getStrokeColor()
val toolbarColor = getToolbarColor()
val darkerColor = getKeyboardBackgroundColor()
val miniKeyboardBackgroundColor = getToolbarColor(4)
if (!isMainKeyboard) {
val previewBackground = background as LayerDrawable
previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(miniKeyboardBackgroundColor)
previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(strokeColor)
previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(mKeyboardBackgroundColor)
previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(mStrokeColor)
background = previewBackground
} else {
background.applyColorFilter(darkerColor)
background.applyColorFilter(mKeyboardBackgroundColor)
}
val rippleBg = resources.getDrawable(R.drawable.clipboard_background, context.theme) as RippleDrawable
val layerDrawable = rippleBg.findDrawableByLayerId(R.id.clipboard_background_holder) as LayerDrawable
layerDrawable.findDrawableByLayerId(R.id.clipboard_background_stroke).applyColorFilter(strokeColor)
layerDrawable.findDrawableByLayerId(R.id.clipboard_background_stroke).applyColorFilter(mStrokeColor)
layerDrawable.findDrawableByLayerId(R.id.clipboard_background_shape).applyColorFilter(mBackgroundColor)
val wasDarkened = mBackgroundColor != mBackgroundColor.darkenColor()
keyboardViewBinding?.apply {
topKeyboardDivider.beGoneIf(wasDarkened)
topKeyboardDivider.background = ColorDrawable(strokeColor)
mToolbarHolder?.background = ColorDrawable(toolbarColor)
topKeyboardDivider.background = ColorDrawable(mStrokeColor)
mToolbarHolder?.background = ColorDrawable(mKeyboardBackgroundColor)
clipboardValue.apply {
background = rippleBg
@@ -432,13 +434,13 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
pinnedClipboardItems.applyColorFilter(mTextColor)
clipboardClear.applyColorFilter(mTextColor)
voiceInputButton.applyColorFilter(mTextColor)
voiceInputButton.beGoneIf(context.config.voiceInputMethod.isEmpty())
voiceInputButton.beGoneIf(mVoiceInputMethod.isEmpty())
mToolbarHolder?.beInvisibleIf(context.isDeviceLocked)
topClipboardDivider.beGoneIf(wasDarkened)
topClipboardDivider.background = ColorDrawable(strokeColor)
clipboardManagerHolder.background = ColorDrawable(toolbarColor)
topClipboardDivider.background = ColorDrawable(mStrokeColor)
clipboardManagerHolder.background = ColorDrawable(mKeyboardBackgroundColor)
clipboardManagerClose.applyColorFilter(mTextColor)
clipboardManagerManage.applyColorFilter(mTextColor)
@@ -448,7 +450,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
clipboardContentPlaceholder2.setTextColor(mTextColor)
}
setupEmojiPalette(toolbarColor = toolbarColor, backgroundColor = mBackgroundColor, textColor = mTextColor)
setupEmojiPalette(toolbarColor = mKeyboardBackgroundColor, backgroundColor = mBackgroundColor, textColor = mTextColor)
if (context.config.keyboardLanguage == LANGUAGE_VIETNAMESE_TELEX) {
setupLanguageTelex()
} else {
@@ -587,7 +589,6 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
val key = keys[i]
val code = key.code
// TODO: Space key background on a KEYBOARD_PHONE should not be applied
setupKeyBackground(key, code, canvas)
// Switch the character to uppercase if shift is pressed
@@ -616,7 +617,16 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
if (key.topSmallNumber.isNotEmpty() && !(context.config.showNumbersRow && Regex("\\d").matches(key.topSmallNumber))) {
canvas.drawText(key.topSmallNumber, key.width - mTopSmallNumberMarginWidth, mTopSmallNumberMarginHeight, smallLetterPaint)
val bounds = Rect().also {
smallLetterPaint.getTextBounds(key.topSmallNumber, 0, key.topSmallNumber.length, it)
}
canvas.drawText(
key.topSmallNumber,
key.width - bounds.width() / 2f - mTopSmallNumberMarginWidth,
key.y + mTopSmallNumberSize + mTopSmallNumberMarginHeight,
smallLetterPaint
)
}
// Turn off drop shadow
@@ -633,19 +643,19 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
if (code == KEYCODE_ENTER) {
key.icon!!.applyColorFilter(mPrimaryColor.getContrastColor())
key.secondaryIcon?.applyColorFilter(mPrimaryColor.getContrastColor())
key.secondaryIcon?.applyColorFilter(mPrimaryColor.getContrastColor().adjustAlpha(0.6f))
} else if (code == KEYCODE_DELETE || code == KEYCODE_SHIFT || code == KEYCODE_EMOJI) {
key.icon!!.applyColorFilter(mTextColor)
key.secondaryIcon?.applyColorFilter(mTextColor)
key.secondaryIcon?.applyColorFilter(mTextColor.adjustAlpha(0.6f))
}
val keyIcon = key.icon!!
val secondaryIcon = key.secondaryIcon
if (secondaryIcon != null) {
val keyIconWidth = (keyIcon.intrinsicWidth * 0.9f).toInt()
val keyIconHeight = (keyIcon.intrinsicHeight * 0.9f).toInt()
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * .6f).toInt()
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * .6f).toInt()
val secondaryIconWidth = (secondaryIcon.intrinsicWidth * 0.5f).toInt()
val secondaryIconHeight = (secondaryIcon.intrinsicHeight * 0.5f).toInt()
val centerX = key.width / 2
val centerY = key.height / 2
@@ -733,19 +743,16 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
private fun getSpaceKeyBackground(): Drawable? {
val drawableId = if (mUsingSystemTheme) {
if (mShowKeyBorders) {
R.drawable.keyboard_space_background_material_outlined
} else {
R.drawable.keyboard_space_background_material
}
} else {
if (mShowKeyBorders) {
R.drawable.keyboard_key_selector_outlined
} else {
R.drawable.keyboard_space_background
}
if (mShowKeyBorders) {
return mKeyBackground
}
val drawableId = if (mUsingSystemTheme) {
R.drawable.keyboard_space_background_material
} else {
R.drawable.keyboard_space_background
}
return resources.getDrawable(drawableId, context.theme)
}
@@ -897,11 +904,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
}
val previewBackgroundColor = getToolbarColor(4)
val previewBackground = mPreviewText!!.background as LayerDrawable
previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(previewBackgroundColor)
previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(context.getStrokeColor())
previewBackground.findDrawableByLayerId(R.id.button_background_shape).applyColorFilter(mKeyboardBackgroundColor)
previewBackground.findDrawableByLayerId(R.id.button_background_stroke).applyColorFilter(mStrokeColor)
mPreviewText!!.background = previewBackground
mPreviewText!!.setTextColor(mTextColor)
@@ -1462,7 +1467,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
emojiPaletteClose.applyColorFilter(textColor)
emojiPaletteLabel.setTextColor(textColor)
emojiPaletteBottomBar.background = ColorDrawable(backgroundColor)
emojiPaletteBottomBar.background = ColorDrawable(toolbarColor)
emojiPaletteModeChange.apply {
setTextColor(textColor)
setOnClickListener {
@@ -1505,6 +1510,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
fun openEmojiPalette() {
keyboardViewBinding!!.emojiPaletteHolder.beVisible()
keyboardViewBinding!!.suggestionsHolder.beGone()
setupEmojis()
}
@@ -1512,6 +1518,7 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
keyboardViewBinding?.apply {
emojiPaletteHolder.beGone()
emojisList.scrollToPosition(0)
suggestionsHolder.beVisible()
}
}
@@ -1649,39 +1656,8 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
}
}
private fun maybeDarkenColor(color: Int, factor: Int): Int {
// use darker background color when key borders are enabled
if (context.config.showKeyBorders) {
val darkerColor = color.darkenColor(factor)
return if (darkerColor == Color.WHITE) {
resources.getColor(R.color.md_grey_200, context.theme)
} else {
darkerColor
}
}
return color
}
private fun getToolbarColor(factor: Int = 8): Int {
val color = if (context.config.isUsingSystemTheme) {
resources.getColor(R.color.you_keyboard_toolbar_color, context.theme)
} else {
mBackgroundColor.darkenColor(factor)
}
return maybeDarkenColor(color, 2)
}
private fun getKeyboardBackgroundColor(): Int {
val color = if (context.config.isUsingSystemTheme) {
resources.getColor(R.color.you_keyboard_background_color, context.theme)
} else {
mBackgroundColor.darkenColor(2)
}
return maybeDarkenColor(color, 6)
}
private fun getKeyColor(): Int {
val backgroundColor = getKeyboardBackgroundColor()
val backgroundColor = context.getKeyboardBackgroundColor()
val lighterColor = backgroundColor.lightenColor()
val keyColor = if (context.config.isUsingSystemTheme) {
lighterColor

23
app/src/main/res/drawable/keyboard_space_background_material_outlined.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<layer-list>
<item android:id="@+id/space_pressed" android:bottom="@dimen/small_margin" android:left="@dimen/tiny_margin" android:right="@dimen/tiny_margin" android:state_pressed="true" android:top="@dimen/small_margin">
<shape android:shape="rectangle">
<solid android:color="@android:color/system_accent2_600"/>
<corners android:radius="@dimen/medium_margin"/>
</shape>
</item>
</layer-list>
</item>
<item>
<layer-list>
<item android:id="@+id/space_normal" android:bottom="@dimen/small_margin" android:left="@dimen/tiny_margin" android:right="@dimen/tiny_margin" android:state_pressed="true" android:top="@dimen/small_margin">
<shape android:shape="rectangle">
<solid android:color="@android:color/system_accent2_700"/>
<corners android:radius="@dimen/medium_margin"/>
</shape>
</item>
</layer-list>
</item>
</selector>

138
app/src/main/res/layout/activity_settings.xml
View File

@@ -117,20 +117,54 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_manage_clipboard_items_holder"
android:id="@+id/settings_keyboard_language_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_language_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_language" />
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_language"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_keyboard_language_label"
tools:text="@string/translation_english" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_manage_keyboard_languages_holder"
style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_manage_clipboard_items_label"
android:id="@+id/settings_manage_keyboard_languages"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/manage_clipboard_items" />
android:text="@string/manage_keyboard_languages" />
</RelativeLayout>
<include
android:id="@+id/settings_general_divider"
layout="@layout/divider" />
<TextView
android:id="@+id/settings_keyboard_settings_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/keyboard_short" />
<RelativeLayout
android:id="@+id/settings_vibrate_on_keypress_holder"
style="@style/SettingsHolderCheckboxStyle"
@@ -176,21 +210,6 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_show_clipboard_content_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_show_clipboard_content"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_clipboard_content" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_show_numbers_row_holder"
style="@style/SettingsHolderCheckboxStyle"
@@ -221,6 +240,29 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_keyboard_height_multiplier_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_height" />
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_keyboard_height_multiplier_label"
tools:text="@string/small" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_voice_input_method_holder"
style="@style/SettingsHolderTextViewStyle"
@@ -244,66 +286,48 @@
</RelativeLayout>
<include
android:id="@+id/settings_keyboard_divider"
layout="@layout/divider" />
<!-- CLIPBOARD SETTINGS -->
<TextView
android:id="@+id/settings_clipboard_settings_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/clipboard" />
<RelativeLayout
android:id="@+id/settings_manage_keyboard_languages_holder"
android:id="@+id/settings_manage_clipboard_items_holder"
style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_manage_keyboard_languages"
android:id="@+id/settings_manage_clipboard_items_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/manage_keyboard_languages" />
android:text="@string/manage_clipboard_items" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_keyboard_language_holder"
style="@style/SettingsHolderTextViewStyle"
android:id="@+id/settings_show_clipboard_content_holder"
style="@style/SettingsHolderCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_language_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_language" />
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_language"
style="@style/SettingsTextValueStyle"
<org.fossify.commons.views.MyAppCompatCheckbox
android:id="@+id/settings_show_clipboard_content"
style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_keyboard_language_label"
tools:text="@string/translation_english" />
android:text="@string/show_clipboard_content" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_keyboard_height_multiplier_holder"
style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier_label"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/keyboard_height" />
<org.fossify.commons.views.MyTextView
android:id="@+id/settings_keyboard_height_multiplier"
style="@style/SettingsTextValueStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/settings_keyboard_height_multiplier_label"
tools:text="@string/small" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout/keyboard_view_keyboard.xml
View File

@@ -9,7 +9,6 @@
android:id="@+id/toolbar_holder"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
android:layout_above="@+id/keyboard_view"
app:layout_constraintBottom_toTopOf="@+id/keyboard_view"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@@ -70,7 +69,6 @@
</LinearLayout>
</org.fossify.keyboard.views.InlineContentViewHorizontalScrollView>
<ImageView

12
app/src/main/res/menu/menu_main.xml
View File

@@ -5,14 +5,14 @@
android:id="@+id/settings"
android:icon="@drawable/ic_settings_cog_vector"
android:title="@string/settings"
app:showAsAction="always" />
<item
android:id="@+id/about"
android:icon="@drawable/ic_info_vector"
android:title="@string/about"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/more_apps_from_us"
android:title="@string/more_apps_from_us"
app:showAsAction="never" />
<item
android:id="@+id/about"
android:icon="@drawable/ic_info_vector"
android:title="@string/about"
app:showAsAction="never" />
</menu>

3
app/src/main/res/values-night-v31/colors.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="you_keyboard_background_color">@android:color/system_neutral1_900</color>
<color name="you_keyboard_toolbar_color">#151515</color>
<color name="you_keyboard_background_color">@android:color/system_neutral2_900</color>
</resources>

3
app/src/main/res/values-v31/colors.xml
View File

@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="you_keyboard_background_color">@android:color/system_neutral1_10</color>
<color name="you_keyboard_toolbar_color">@android:color/system_neutral1_50</color>
<color name="you_keyboard_background_color">@color/m3_ref_palette_dynamic_neutral_variant96</color>
</resources>

8
app/src/main/res/values/dimens.xml
View File

@@ -1,14 +1,14 @@
<resources>
<dimen name="popup_max_move_distance">60dp</dimen>
<dimen name="top_small_number_margin_width">12dp</dimen>
<dimen name="top_small_number_margin_height">18dp</dimen>
<dimen name="top_small_number_margin_width">5dp</dimen>
<dimen name="top_small_number_margin_height">5dp</dimen>
<dimen name="toolbar_height">46dp</dimen>
<dimen name="toolbar_icon_height">32dp</dimen>
<dimen name="clip_drag_icon_height">40dp</dimen>
<dimen name="key_height">60dp</dimen>
<dimen name="vertical_correction">-10dp</dimen>
<dimen name="clip_pin_size">28dp</dimen>
<dimen name="emoji_item_size">46dp</dimen>
<dimen name="emoji_item_size">42dp</dimen>
<dimen name="emoji_category_item_size">24dp</dimen>
<dimen name="emoji_top_bar_elevation">4dp</dimen>
<dimen name="emoji_palette_btn_size">42dp</dimen>
@@ -17,6 +17,6 @@
<dimen name="keyboard_text_size">22sp</dimen>
<dimen name="preview_text_size">26sp</dimen>
<dimen name="label_text_size">16sp</dimen> <!-- text size used at keys with longer labels, like "123" -->
<dimen name="emoji_text_size">28sp</dimen>
<dimen name="emoji_text_size">30sp</dimen>
<dimen name="emoji_category_text_size">14sp</dimen>
</resources>

2
app/src/main/res/xml/keys_letters_hebrew.xml
View File

@@ -143,7 +143,7 @@
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="123"
app:keyLabel="\?123"
app:keyWidth="15%p" />
<Key
app:keyLabel=","

2
app/src/main/res/xml/keys_symbols.xml
View File

@@ -65,7 +65,7 @@
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="abc"
app:keyLabel="ABC"
app:keyWidth="15%p" />
<Key
app:keyLabel=","

2
app/src/main/res/xml/keys_symbols_alt.xml
View File

@@ -73,7 +73,7 @@
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="abc"
app:keyLabel="ABC"
app:keyWidth="15%p" />
<Key
app:keyLabel=","

2
app/src/main/res/xml/keys_symbols_shift.xml
View File

@@ -62,7 +62,7 @@
<Key
app:code="-2"
app:keyEdgeFlags="left"
app:keyLabel="abc"
app:keyLabel="ABC"
app:keyWidth="15%p" />
<Key
app:keyLabel=","

10
gradle/libs.versions.toml
View File

@@ -1,15 +1,15 @@
[versions]
#jetbrains
kotlin = "1.9.0"
kotlin = "1.9.23"
#AndroidX
androidx-autofill = "1.1.0"
androidx-emoji2 = "1.2.0"
androidx-emoji2 = "1.4.0"
#KSP
ksp = "1.9.0-1.0.12"
ksp = "1.9.23-1.0.19"
#Room
room = "2.6.0-beta01"
room = "2.6.1"
#Fossify
commons = "f056aa71e7"
commons = "6ee990894c"
#Gradle
gradlePlugins-agp = "8.2.0"
#build