diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java index 146ea2f2f..061d50ccd 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java @@ -36,25 +36,31 @@ import java.util.Map; public final class KeyboardTheme implements Comparable { + // old themes public static final String THEME_FAMILY_MATERIAL = "Material"; public static final String THEME_FAMILY_HOLO = "Holo (Legacy)"; - public static final String THEME_VARIANT_LIGHT = "Light"; - public static final String THEME_VARIANT_DARK = "Dark"; - public static final String THEME_VARIANT_WHITE = "White"; - public static final String THEME_VARIANT_BLUE = "Blue"; + public static final String THEME_VARIANT_HOLO_WHITE = "White"; + public static final String THEME_VARIANT_HOLO_BLUE = "Blue"; public static final String THEME_VARIANT_CUSTOM = "User-defined"; public static final String THEME_VARIANT_HOLO_USER = "User-defined (Holo)"; + // new themes using the custom colors + public static final String THEME_LIGHT = "light"; + public static final String THEME_DARK = "dark"; + public static final String THEME_DARKER = "darker"; + public static final String THEME_BLACK = "black"; + public static final String THEME_USER = "user"; + public static final String THEME_USER_DARK = "user_dark"; + public static final String[] CUSTOM_THEME_VARIANTS = new String[] { THEME_LIGHT, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER }; + public static final String[] CUSTOM_THEME_VARIANTS_DARK = new String[] { THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_DARK }; + public static final String[] THEME_FAMILIES = {THEME_FAMILY_MATERIAL, THEME_FAMILY_HOLO}; public static final Map THEME_VARIANTS = new HashMap<>(); static { - THEME_VARIANTS.put(THEME_FAMILY_MATERIAL, - new String[] {THEME_VARIANT_LIGHT, THEME_VARIANT_DARK, THEME_VARIANT_CUSTOM}); + THEME_VARIANTS.put(THEME_FAMILY_MATERIAL, CUSTOM_THEME_VARIANTS); THEME_VARIANTS.put(THEME_FAMILY_HOLO, - new String[] {THEME_VARIANT_WHITE, THEME_VARIANT_BLUE, THEME_VARIANT_HOLO_USER}); - THEME_VARIANTS.put(THEME_FAMILY_HOLO, - new String[] {THEME_VARIANT_WHITE, THEME_VARIANT_BLUE, THEME_VARIANT_HOLO_USER}); + new String[] {THEME_VARIANT_HOLO_WHITE, THEME_VARIANT_HOLO_BLUE, THEME_VARIANT_HOLO_USER}); } private static final String TAG = KeyboardTheme.class.getSimpleName(); @@ -64,64 +70,30 @@ public final class KeyboardTheme implements Comparable { // These should be aligned with Keyboard.themeId and Keyboard.Case.keyboardTheme // attributes' values in attrs.xml. - public static final int THEME_ID_ICS = 0; - public static final int THEME_ID_KLP = 2; - public static final int THEME_ID_KLP_CUSTOM = 13; - public static final int THEME_ID_LXX_LIGHT = 3; - public static final int THEME_ID_LXX_DARK_AMOLED = 4; - public static final int THEME_ID_LXX_AUTO_AMOLED = 10; - public static final int THEME_ID_LXX_LIGHT_BORDER = 5; - public static final int THEME_ID_LXX_DARK_BORDER = 6; - public static final int THEME_ID_LXX_DARK = 7; - public static final int THEME_ID_LXX_AUTO = 9; - public static final int THEME_ID_LXX_AUTO_BORDER = 8; - public static final int THEME_ID_LXX_CUSTOM = 11; - public static final int THEME_ID_LXX_CUSTOM_BORDER = 12; - public static final int THEME_ID_LXX_BASE = 14; - public static final int THEME_ID_LXX_BASE_BORDER = 15; - public static final int DEFAULT_THEME_ID = THEME_ID_LXX_DARK_BORDER; - - private static KeyboardTheme[] AVAILABLE_KEYBOARD_THEMES; + public static final int THEME_ID_HOLO_BLUE = 0; + public static final int THEME_ID_HOLO_WHITE = 1; + public static final int THEME_ID_HOLO_CUSTOM = 2; // todo: custom <-> white? + public static final int THEME_ID_LXX_BASE = 3; + public static final int THEME_ID_LXX_BASE_BORDER = 4; + public static final int THEME_ID_LXX_CUSTOM = 5; // todo: custom <-> base? + public static final int THEME_ID_LXX_CUSTOM_BORDER = 6; + public static final int DEFAULT_THEME_ID = THEME_ID_LXX_CUSTOM; /* package private for testing */ static final KeyboardTheme[] KEYBOARD_THEMES = { - new KeyboardTheme(THEME_ID_ICS, "ICS", R.style.KeyboardTheme_ICS, + new KeyboardTheme(THEME_ID_HOLO_BLUE, "HoloBlue", R.style.KeyboardTheme_HoloBlue, // This has never been selected because we support ICS or later. VERSION_CODES.BASE), - new KeyboardTheme(THEME_ID_KLP, "KLP", R.style.KeyboardTheme_KLP, + new KeyboardTheme(THEME_ID_HOLO_WHITE, "HoloWhite", R.style.KeyboardTheme_HoloWhite, // Default theme for ICS, JB, and KLP. VERSION_CODES.ICE_CREAM_SANDWICH), - new KeyboardTheme(THEME_ID_LXX_LIGHT, "LXXLight", R.style.KeyboardTheme_LXX_Light, - // Default theme for LXX. - VERSION_CODES.BASE), - new KeyboardTheme(THEME_ID_LXX_DARK, "LXXDark", R.style.KeyboardTheme_LXX_Dark, - // This has never been selected as default theme. - VERSION_CODES.BASE), - new KeyboardTheme(THEME_ID_LXX_DARK_AMOLED, "LXXDarkAmoled", R.style.KeyboardTheme_LXX_Dark_Amoled, - // This has never been selected as default theme. - VERSION_CODES.BASE), - new KeyboardTheme(THEME_ID_LXX_LIGHT_BORDER, "LXXLightBorder", R.style.KeyboardTheme_LXX_Light_Border, - // This has never been selected as default theme. - Build.VERSION_CODES.BASE), - new KeyboardTheme(THEME_ID_LXX_DARK_BORDER, "LXXDarkBorder", R.style.KeyboardTheme_LXX_Dark_Border, - // This has never been selected as default theme. - VERSION_CODES.LOLLIPOP), - new KeyboardTheme(THEME_ID_LXX_AUTO_BORDER, "LXXAutoBorder", R.style.KeyboardTheme_LXX_Auto_Border, - // This has never been selected as default theme. - VERSION_CODES.LOLLIPOP), - new KeyboardTheme(THEME_ID_LXX_AUTO, "LXXAuto", R.style.KeyboardTheme_LXX_Auto, - // This has never been selected as default theme. - VERSION_CODES.LOLLIPOP), - new KeyboardTheme(THEME_ID_LXX_AUTO_AMOLED, "LXXAutoAmoled", R.style.KeyboardTheme_LXX_Auto_Amoled, - // This has never been selected as default theme. - VERSION_CODES.LOLLIPOP), new KeyboardTheme(THEME_ID_LXX_CUSTOM, "LXXCustom", R.style.KeyboardTheme_LXX_Base, // This has never been selected as default theme. VERSION_CODES.LOLLIPOP), new KeyboardTheme(THEME_ID_LXX_CUSTOM_BORDER, "LXXCustomBorder", R.style.KeyboardTheme_LXX_Base_Border, // This has never been selected as default theme. VERSION_CODES.LOLLIPOP), - new KeyboardTheme(THEME_ID_KLP_CUSTOM, "KLPCustom", R.style.KeyboardTheme_KLP, + new KeyboardTheme(THEME_ID_HOLO_CUSTOM, "HoloCustom", R.style.KeyboardTheme_HoloWhite, // This has never been selected as default theme. VERSION_CODES.BASE), new KeyboardTheme(THEME_ID_LXX_BASE, "LXXBase", R.style.KeyboardTheme_LXX_Base, @@ -265,27 +237,20 @@ public final class KeyboardTheme implements Comparable { } public static String getThemeFamily(int themeId) { - if (themeId == THEME_ID_ICS || themeId == THEME_ID_KLP || themeId == THEME_ID_KLP_CUSTOM) return THEME_FAMILY_HOLO; + if (themeId == THEME_ID_HOLO_BLUE || themeId == THEME_ID_HOLO_WHITE || themeId == THEME_ID_HOLO_CUSTOM) return THEME_FAMILY_HOLO; return THEME_FAMILY_MATERIAL; } public static String getThemeVariant(int themeId) { switch (themeId) { - case THEME_ID_LXX_DARK: - case THEME_ID_LXX_DARK_AMOLED: - case THEME_ID_LXX_DARK_BORDER: - return THEME_VARIANT_DARK; - case THEME_ID_LXX_LIGHT: - case THEME_ID_LXX_LIGHT_BORDER: - return THEME_VARIANT_LIGHT; - case THEME_ID_KLP: - return THEME_VARIANT_WHITE; - case THEME_ID_ICS: - return THEME_VARIANT_BLUE; + case THEME_ID_HOLO_WHITE: + return THEME_VARIANT_HOLO_WHITE; + case THEME_ID_HOLO_BLUE: + return THEME_VARIANT_HOLO_BLUE; case THEME_ID_LXX_CUSTOM: case THEME_ID_LXX_CUSTOM_BORDER: return THEME_VARIANT_CUSTOM; - case THEME_ID_KLP_CUSTOM: + case THEME_ID_HOLO_CUSTOM: return THEME_VARIANT_HOLO_USER; default: return null; @@ -294,12 +259,9 @@ public final class KeyboardTheme implements Comparable { public static boolean getHasKeyBorders(int themeId) { switch (themeId) { - case THEME_ID_LXX_DARK_BORDER: - case THEME_ID_LXX_LIGHT_BORDER: - case THEME_ID_LXX_AUTO_BORDER: case THEME_ID_LXX_CUSTOM_BORDER: - case THEME_ID_ICS: - case THEME_ID_KLP: + case THEME_ID_HOLO_BLUE: + case THEME_ID_HOLO_WHITE: return true; default: return false; @@ -310,28 +272,7 @@ public final class KeyboardTheme implements Comparable { switch (themeId) { case THEME_ID_LXX_CUSTOM: case THEME_ID_LXX_CUSTOM_BORDER: - case THEME_ID_KLP_CUSTOM: - return true; - default: - return false; - } - } - - public static boolean getIsDayNight(int themeId) { - switch (themeId) { - case THEME_ID_LXX_AUTO: - case THEME_ID_LXX_AUTO_AMOLED: - case THEME_ID_LXX_AUTO_BORDER: - return true; - default: - return false; - } - } - - public static boolean getIsAmoledMode(int themeId) { - switch (themeId) { - case THEME_ID_LXX_DARK_AMOLED: - case THEME_ID_LXX_AUTO_AMOLED: + case THEME_ID_HOLO_CUSTOM: return true; default: return false; @@ -339,40 +280,16 @@ public final class KeyboardTheme implements Comparable { } public static int getThemeForParameters(String family, String variant, - boolean keyBorders, boolean dayNight, boolean amoledMode) { + boolean keyBorders) { if (THEME_FAMILY_HOLO.equals(family)) { - if (THEME_VARIANT_BLUE.equals(variant)) return THEME_ID_ICS; - if (THEME_VARIANT_HOLO_USER.equals(variant)) return THEME_ID_KLP_CUSTOM; - return THEME_ID_KLP; + if (THEME_VARIANT_HOLO_BLUE.equals(variant)) return THEME_ID_HOLO_BLUE; + if (THEME_VARIANT_HOLO_USER.equals(variant)) return THEME_ID_HOLO_CUSTOM; + return THEME_ID_HOLO_WHITE; } - // check custom before dayNight, because now both can match - if (THEME_VARIANT_CUSTOM.equals(variant)) { - if (keyBorders) return THEME_ID_LXX_CUSTOM_BORDER; - return THEME_ID_LXX_CUSTOM; - } - if (dayNight) { - if (keyBorders) return THEME_ID_LXX_AUTO_BORDER; - if (amoledMode) return THEME_ID_LXX_AUTO_AMOLED; - return THEME_ID_LXX_AUTO; - } - if (THEME_VARIANT_DARK.equals(variant)) { - if (keyBorders) return THEME_ID_LXX_DARK_BORDER; - if (amoledMode) return THEME_ID_LXX_DARK_AMOLED; - return THEME_ID_LXX_DARK; - } - if (keyBorders) return THEME_ID_LXX_LIGHT_BORDER; - return THEME_ID_LXX_LIGHT; + if (keyBorders) return THEME_ID_LXX_CUSTOM_BORDER; + return THEME_ID_LXX_CUSTOM; } - public static final String THEME_LIGHT = "light"; - public static final String THEME_DARK = "dark"; - public static final String THEME_DARKER = "darker"; - public static final String THEME_BLACK = "black"; - public static final String THEME_USER = "user"; - public static final String THEME_USER_DARK = "user_dark"; - public static final String[] CUSTOM_THEME_VARIANTS = new String[] { THEME_LIGHT, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER }; - public static final String[] CUSTOM_THEME_VARIANTS_DARK = new String[] { THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_DARK }; - // todo (later): material you, system accent, ... // todo: copies of original themes might need adjustments, though maybe it's only Colors that needs to be adjusted public static Colors getCustomTheme(String theme, Context context, SharedPreferences prefs) { diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java index 81a40e6f4..ec4f944ce 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java @@ -17,6 +17,7 @@ package org.dslul.openboard.inputmethod.keyboard; import android.content.Context; +import android.content.SharedPreferences; import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -31,6 +32,8 @@ import android.graphics.drawable.NinePatchDrawable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; + +import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import org.dslul.openboard.inputmethod.keyboard.internal.KeyDrawParams; @@ -41,9 +44,11 @@ import org.dslul.openboard.inputmethod.latin.common.Colors; import org.dslul.openboard.inputmethod.latin.common.Constants; import org.dslul.openboard.inputmethod.latin.settings.Settings; import org.dslul.openboard.inputmethod.latin.suggestions.MoreSuggestionsView; +import org.dslul.openboard.inputmethod.latin.utils.DeviceProtectedUtils; import org.dslul.openboard.inputmethod.latin.utils.TypefaceUtils; import java.util.HashSet; +import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -383,7 +388,7 @@ public class KeyboardView extends View { final Rect padding = mKeyBackgroundPadding; bgWidth = keyWidth + padding.left + padding.right; // absurdly horrible workaround, because it's not possible to set padding as percentage of height in btn_keyboard_spacebar_lxx_base - if (mColors.isCustom && key.getBackgroundType() == Key.BACKGROUND_TYPE_SPACEBAR) { + if (mColors.isCustom && key.getBackgroundType() == Key.BACKGROUND_TYPE_SPACEBAR && !isHoloTheme()) { Rect p = new Rect(); background.getPadding(p); if (p.top != 0) { @@ -407,6 +412,16 @@ public class KeyboardView extends View { canvas.translate(-bgX, -bgY); } + private boolean isHoloTheme() { + final SharedPreferences prefs = DeviceProtectedUtils.getSharedPreferences(getContext()); + final int keyboardThemeId = KeyboardTheme.getThemeForParameters( + prefs.getString(Settings.PREF_THEME_FAMILY, ""), + prefs.getString(Settings.PREF_THEME_VARIANT, ""), + prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false) + ); + return KeyboardTheme.getThemeFamily(keyboardThemeId).equals(KeyboardTheme.THEME_FAMILY_HOLO); + } + // Draw key top visuals. protected void onDrawKeyTopVisuals(@Nonnull final Key key, @Nonnull final Canvas canvas, @Nonnull final Paint paint, @Nonnull final KeyDrawParams params) { diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.java index 3e5b417f4..c29504101 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.java @@ -55,23 +55,10 @@ public class Colors { } // todo (later): remove this and isCustom, once the old themes can be completely replaced + // for now there are the holo themes left, which don't require any of themeId and isNight public Colors(int themeId, final boolean isNight) { isCustom = false; - if (KeyboardTheme.getIsDayNight(themeId)) { - if (!isNight) - navBar = Color.rgb(236, 239, 241); - else if (themeId == KeyboardTheme.THEME_ID_LXX_DARK) - navBar = Color.rgb(38, 50, 56); - else - navBar = Color.BLACK; - } else if (KeyboardTheme.THEME_VARIANT_LIGHT.equals(KeyboardTheme.getThemeVariant(themeId))) { - navBar = Color.rgb(236, 239, 241); - } else if (themeId == KeyboardTheme.THEME_ID_LXX_DARK) { - navBar = Color.rgb(38, 50, 56); - } else { - // dark border is 13/13/13, but that's ok - navBar = Color.BLACK; - } + navBar = Color.BLACK; accent = 0; background = 0; keyBackground = 0; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt index 45b4a595c..79d3986dc 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/AppearanceSettingsFragment.kt @@ -37,7 +37,8 @@ import java.util.* * "Appearance" settings sub screen. */ @Suppress("Deprecation") // yes everything here is deprecated, but only work on this if really necessary -// todo: simplify when removing old themes +// todo: simplify when removing old themes (or migrating holo to same style as user themes) +// there is a bunch of ugly things in the theme settings, and mostly for historic reasons... // idea for color selection // left: which color (background, key, text,...) // right: color preview (always the correct one, even if determined automatically) @@ -56,10 +57,8 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC private lateinit var themeFamilyPref: ListPreference private lateinit var themeVariantPref: ListPreference - private lateinit var customThemeVariantPref: ListPreference private lateinit var customThemeVariantNightPref: ListPreference private lateinit var keyBordersPref: TwoStatePreference - private lateinit var amoledModePref: TwoStatePreference private var dayNightPref: TwoStatePreference? = null private lateinit var userColorsPref: Preference @@ -160,11 +159,9 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC private fun saveSelectedThemeId( family: String = themeFamilyPref.value, variant: String = themeVariantPref.value, - keyBorders: Boolean = keyBordersPref.isChecked, - dayNight: Boolean = dayNightPref?.isChecked ?: false, - amoledMode: Boolean = amoledModePref.isChecked + keyBorders: Boolean = keyBordersPref.isChecked ) { - selectedThemeId = KeyboardTheme.getThemeForParameters(family, variant, keyBorders, dayNight, amoledMode) + selectedThemeId = KeyboardTheme.getThemeForParameters(family, variant, keyBorders) KeyboardTheme.saveKeyboardThemeId(selectedThemeId, sharedPreferences) } @@ -178,45 +175,31 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC } } val variants = KeyboardTheme.THEME_VARIANTS[themeFamily]!! - val variant = KeyboardTheme.getThemeVariant(selectedThemeId) + val variant = if (isLegacyFamily) KeyboardTheme.getThemeVariant(selectedThemeId) + else sharedPreferences.getString(Settings.PREF_CUSTOM_THEME_VARIANT, KeyboardTheme.THEME_LIGHT) if (!skipThemeVariant) { themeVariantPref.apply { - entries = variants + entries = if (isLegacyFamily) variants // todo: translatable string for holo, not internal name + else variants.map { + val resId = resources.getIdentifier("theme_name_$it", "string", activity.packageName) + if (resId == 0) it else getString(resId) + }.toTypedArray() entryValues = variants value = variant ?: variants[0] - summary = variant ?: "Auto" - isEnabled = isLegacyFamily || !KeyboardTheme.getIsDayNight(selectedThemeId) + summary = if (isLegacyFamily) variant + else { + val resId = resources.getIdentifier("theme_name_$variant", "string", activity.packageName) + if (resId == 0) variant else getString(resId) + } } } - customThemeVariantPref.apply { - val variant = sharedPreferences.getString(Settings.PREF_CUSTOM_THEME_VARIANT, KeyboardTheme.THEME_LIGHT) - // todo (idea): re-work setting to actually see preview of theme colors... but that's a lot of work - val variants = KeyboardTheme.CUSTOM_THEME_VARIANTS - entries = variants.map { - val resId = resources.getIdentifier("theme_name_$it", "string", activity.packageName) - if (resId == 0) it else getString(resId) - }.toTypedArray() - entryValues = variants - value = variant - val resId = resources.getIdentifier("theme_name_$variant", "string", activity.packageName) - summary = if (resId == 0) variant else getString(resId) - isEnabled = true - } keyBordersPref.apply { - isEnabled = !isLegacyFamily && !KeyboardTheme.getIsAmoledMode(selectedThemeId) + isEnabled = !isLegacyFamily isChecked = isLegacyFamily || KeyboardTheme.getHasKeyBorders(selectedThemeId) } - amoledModePref.apply { - isEnabled = !isLegacyFamily && variant != KeyboardTheme.THEME_VARIANT_LIGHT - && !KeyboardTheme.getHasKeyBorders(selectedThemeId) - && !KeyboardTheme.getIsCustom(selectedThemeId) - isChecked = !isLegacyFamily && KeyboardTheme.getIsAmoledMode(selectedThemeId) - } dayNightPref?.apply { isEnabled = !isLegacyFamily - isChecked = !isLegacyFamily && (KeyboardTheme.getIsDayNight(selectedThemeId) - || (KeyboardTheme.getIsCustom(selectedThemeId) && sharedPreferences.getBoolean(Settings.PREF_THEME_DAY_NIGHT, false)) - ) + isChecked = !isLegacyFamily && KeyboardTheme.getIsCustom(selectedThemeId) && sharedPreferences.getBoolean(Settings.PREF_THEME_DAY_NIGHT, false) } } @@ -234,9 +217,19 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC } themeVariantPref = preferenceScreen.findPreference(Settings.PREF_THEME_VARIANT) as ListPreference themeVariantPref.apply { - title = "$title old (to be removed)" // todo: remove, this is just a workaround while there are still 2 ways of selecting variant onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> summary = entries[entryValues.indexOfFirst { it == value }] + + if (themeFamilyPref.value == KeyboardTheme.THEME_FAMILY_MATERIAL) { + // not so nice workaround, could be removed in the necessary re-work: new value seems + // to be stored only after this method call, but we update the summary and user-defined color enablement in here -> store it now + if (value == sharedPreferences.getString(Settings.PREF_CUSTOM_THEME_VARIANT, KeyboardTheme.THEME_LIGHT)) + return@OnPreferenceChangeListener true // avoid infinite loop + sharedPreferences.edit { putString(Settings.PREF_CUSTOM_THEME_VARIANT, value as String) } + + summary = entries[entryValues.indexOfFirst { it == value }] + needsReload = true + } saveSelectedThemeId(variant = value as String) updateThemePreferencesState(skipThemeFamily = true, skipThemeVariant = true) true @@ -248,44 +241,14 @@ class AppearanceSettingsFragment : SubScreenFragment(), Preference.OnPreferenceC updateThemePreferencesState(skipThemeFamily = true) true } - amoledModePref = preferenceScreen.findPreference(Settings.PREF_THEME_AMOLED_MODE) as TwoStatePreference - amoledModePref.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> - saveSelectedThemeId(amoledMode = value as Boolean) - updateThemePreferencesState(skipThemeFamily = true) - true - } dayNightPref = preferenceScreen.findPreference(Settings.PREF_THEME_DAY_NIGHT) as? TwoStatePreference dayNightPref?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> - saveSelectedThemeId(dayNight = value as Boolean) updateThemePreferencesState(skipThemeFamily = true) true } - customThemeVariantPref = preferenceScreen.findPreference(Settings.PREF_CUSTOM_THEME_VARIANT) as ListPreference - customThemeVariantPref.apply { - title = "$title new" // todo: remove, this is just a workaround while there are still 2 ways of selecting variant - onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> - // not so nice workaround, could be removed in the necessary re-work: new value seems - // to be stored only after this method call, but we update the summary and user-defined color enablement in here -> store it now - if (value == sharedPreferences.getString(Settings.PREF_CUSTOM_THEME_VARIANT, KeyboardTheme.THEME_LIGHT)) - return@OnPreferenceChangeListener true // avoid infinite loop - sharedPreferences.edit { putString(Settings.PREF_CUSTOM_THEME_VARIANT, value as String) } - - summary = entries[entryValues.indexOfFirst { it == value }] - needsReload = true - - // always switch to user-defined theme variant - val themeFamily = KeyboardTheme.getThemeFamily(selectedThemeId) - val variants = KeyboardTheme.THEME_VARIANTS[themeFamily]!! - val userVariant = variants.first { it.contains("user", true) } - saveSelectedThemeId(variant = userVariant as String) - updateThemePreferencesState(skipThemeFamily = true) - - true - } - } customThemeVariantNightPref = preferenceScreen.findPreference(Settings.PREF_CUSTOM_THEME_VARIANT_NIGHT) as ListPreference customThemeVariantNightPref.apply { - title = "$title new (night)" // todo: remove, this is just a workaround while there are still 2 ways of selecting variant + title = "$title (night)" // todo: string resource onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> // not so nice workaround, could be removed in the necessary re-work: new value seems // to be stored only after this method call, but we update the summary and user-defined color enablement in here -> store it now diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java index 83f1b3bd7..dc1a3b305 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java @@ -67,7 +67,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang public static final String PREF_CUSTOM_THEME_VARIANT_NIGHT = "custom_theme_variant_night"; public static final String PREF_THEME_KEY_BORDERS = "theme_key_borders"; public static final String PREF_THEME_DAY_NIGHT = "theme_auto_day_night"; - public static final String PREF_THEME_AMOLED_MODE = "theme_amoled_mode"; public static final String PREF_THEME_USER = "theme_select_colors"; public static final String PREF_THEME_USER_COLOR_TEXT = "theme_color_text"; public static final String PREF_THEME_USER_COLOR_HINT_TEXT = "theme_color_hint_text"; @@ -576,9 +575,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang final int keyboardThemeId = KeyboardTheme.getThemeForParameters( prefs.getString(Settings.PREF_THEME_FAMILY, ""), prefs.getString(Settings.PREF_THEME_VARIANT, ""), - prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false), - prefs.getBoolean(Settings.PREF_THEME_DAY_NIGHT, false), - prefs.getBoolean(Settings.PREF_THEME_AMOLED_MODE, false) + prefs.getBoolean(Settings.PREF_THEME_KEY_BORDERS, false) ); // todo: night mode can be unspecified -> maybe need to adjust for correct behavior on some devices? final boolean isNight = (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES; diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java index 4798110d3..b33a9c4d2 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SettingsFragment.java @@ -83,6 +83,12 @@ public final class SettingsFragment extends PreferenceFragment { if (actionBar != null && screenTitle != null) { actionBar.setTitle(screenTitle); } + + // todo: got a crash because it wasn't initialized... + // but sometimes wrong languages are returned when not initializing on creation of LatinIME + // maybe wait until some user actually encounters this bug, initializing here is really rare + SubtypeSettingsKt.init(getActivity()); + findPreference("screen_languages").setSummary(getEnabledSubtypesLabel()); if (BuildConfig.DEBUG) askAboutCrashReports(); diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png deleted file mode 100644 index 5014c9472..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png deleted file mode 100644 index 79594c872..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png deleted file mode 100644 index b1f543548..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png deleted file mode 100644 index f0a89c524..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png deleted file mode 100644 index 31cd37925..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png deleted file mode 100644 index b8717e668..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png deleted file mode 100644 index be0812fdf..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png deleted file mode 100644 index 4209ef92b..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png deleted file mode 100644 index a36ca323d..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png deleted file mode 100644 index c6a474a8e..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png deleted file mode 100644 index 32311666f..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png deleted file mode 100644 index 1256b8b21..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png deleted file mode 100644 index cd0d884c6..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png deleted file mode 100644 index c05605fbf..000000000 Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_ics.9.png b/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/emoji_category_tab_selected_ics.9.png rename to app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_klp.9.png b/app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/emoji_category_tab_selected_klp.9.png rename to app/src/main/res/drawable-hdpi/emoji_category_tab_selected_holo_white.9.png diff --git a/app/src/main/res/drawable-hdpi/ic_clipboard_pin_lxx_dark.png b/app/src/main/res/drawable-hdpi/ic_clipboard_pin_lxx_dark.png deleted file mode 100644 index 708249eb0..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_clipboard_pin_lxx_dark.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_background_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/keyboard_background_lxx_dark.9.png deleted file mode 100644 index e34c5666b..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_background_lxx_light.9.png b/app/src/main/res/drawable-hdpi/keyboard_background_lxx_light.9.png deleted file mode 100644 index bf5450cc7..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_background_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png deleted file mode 100644 index 93f300a13..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_ics.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_ics.9.png rename to app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_blue.9.png diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_klp.9.png rename to app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_holo_white.9.png diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png deleted file mode 100644 index 33d80877d..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png deleted file mode 100644 index eaf26ed76..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_border.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_border.9.png deleted file mode 100644 index cd330c375..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_lxx_dark_border.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png deleted file mode 100644 index 3f6a943b2..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png deleted file mode 100644 index 107cfc77d..000000000 Binary files a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png deleted file mode 100644 index bdf2e49f1..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png deleted file mode 100644 index 80cf6faba..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png deleted file mode 100644 index 5b23e22b4..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png deleted file mode 100644 index 3323d2c7d..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png deleted file mode 100644 index 81c1d71bf..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png deleted file mode 100644 index 8fff67bf1..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png deleted file mode 100644 index ca17d52ed..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png deleted file mode 100644 index 19aabf8a6..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png deleted file mode 100644 index 1c2c101e9..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png deleted file mode 100644 index edbaa8373..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png deleted file mode 100644 index b8e56dab4..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png deleted file mode 100644 index 281f83062..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png deleted file mode 100644 index cb2ca06d3..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png deleted file mode 100644 index 653da974c..000000000 Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_ics.9.png b/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/emoji_category_tab_selected_ics.9.png rename to app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_blue.9.png diff --git a/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_klp.9.png b/app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/emoji_category_tab_selected_klp.9.png rename to app/src/main/res/drawable-mdpi/emoji_category_tab_selected_holo_white.9.png diff --git a/app/src/main/res/drawable-mdpi/keyboard_background_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/keyboard_background_lxx_dark.9.png deleted file mode 100644 index 012d91455..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_background_lxx_light.9.png b/app/src/main/res/drawable-mdpi/keyboard_background_lxx_light.9.png deleted file mode 100644 index 91adfac47..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_background_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png deleted file mode 100644 index 1a7dd34ed..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_ics.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_ics.9.png rename to app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_blue.9.png diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_klp.9.png rename to app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_holo_white.9.png diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png deleted file mode 100644 index 71f16b035..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png deleted file mode 100644 index 69e7bc316..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_border.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_border.9.png deleted file mode 100644 index b4dab3d46..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_lxx_dark_border.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png deleted file mode 100644 index d85ca712a..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png deleted file mode 100644 index 983a6956c..000000000 Binary files a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png deleted file mode 100644 index 8709e63b2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png deleted file mode 100644 index 98edd3706..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png deleted file mode 100644 index ea002f53b..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png deleted file mode 100644 index 5a9507387..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png deleted file mode 100644 index b1c9006ad..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png deleted file mode 100644 index 52a4ad059..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png deleted file mode 100644 index 6ebc4e098..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png deleted file mode 100644 index 6392f6e00..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png deleted file mode 100644 index f05f987ac..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png deleted file mode 100644 index 3e8cac2c1..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png deleted file mode 100644 index ab032dc17..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png deleted file mode 100644 index c1ed863f8..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png deleted file mode 100644 index c3428bede..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png deleted file mode 100644 index f795ee9af..000000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_ics.9.png b/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_ics.9.png rename to app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_blue.9.png diff --git a/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_klp.9.png b/app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_klp.9.png rename to app/src/main/res/drawable-xhdpi/emoji_category_tab_selected_holo_white.9.png diff --git a/app/src/main/res/drawable-xhdpi/ic_clipboard_pin_lxx_dark.png b/app/src/main/res/drawable-xhdpi/ic_clipboard_pin_lxx_dark.png deleted file mode 100644 index ae5cd6062..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_clipboard_pin_lxx_dark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png deleted file mode 100644 index 1c3a38e10..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_light.9.png deleted file mode 100644 index a7f18b5c8..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_background_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png deleted file mode 100644 index f934e33bd..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_ics.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_ics.9.png rename to app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_blue.9.png diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_klp.9.png rename to app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_holo_white.9.png diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png deleted file mode 100644 index cf5b5d368..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png deleted file mode 100644 index 14253ab75..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png deleted file mode 100644 index 576a35765..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png deleted file mode 100644 index ac20faf80..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png deleted file mode 100644 index 7ccd1ea9d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png deleted file mode 100644 index f2b5e4c0a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png deleted file mode 100644 index 265109d33..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png deleted file mode 100644 index 2166f62ad..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png deleted file mode 100644 index 70346218f..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png deleted file mode 100644 index d1efb6e18..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png deleted file mode 100644 index 8a6583e7c..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png deleted file mode 100644 index b74d1ca83..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png deleted file mode 100644 index 48ae93f53..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png deleted file mode 100644 index 0a6c2ea79..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png deleted file mode 100644 index 65dc814f6..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png deleted file mode 100644 index 0339de37d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png deleted file mode 100644 index b57cfb3d2..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png deleted file mode 100644 index 8e74c6723..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png deleted file mode 100644 index 1ca1ae3e9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_ics.9.png b/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_ics.9.png rename to app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_blue.9.png diff --git a/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_klp.9.png b/app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_klp.9.png rename to app/src/main/res/drawable-xxhdpi/emoji_category_tab_selected_holo_white.9.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_clipboard_pin_lxx_dark.png b/app/src/main/res/drawable-xxhdpi/ic_clipboard_pin_lxx_dark.png deleted file mode 100644 index ba419856f..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_clipboard_pin_lxx_dark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png deleted file mode 100644 index 8b8917012..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png deleted file mode 100644 index 847df8a6e..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_background_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png deleted file mode 100644 index 1b92455e9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_ics.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_blue.9.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_ics.9.png rename to app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_blue.9.png diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_white.9.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_klp.9.png rename to app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_holo_white.9.png diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png deleted file mode 100644 index 440b5bbb7..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png deleted file mode 100644 index c2802abca..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png deleted file mode 100644 index f2c3bc65a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png deleted file mode 100644 index 2de0c9c42..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png deleted file mode 100644 index 8b495f39b..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png deleted file mode 100644 index 0b3d796e4..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png deleted file mode 100644 index 6edd4e3d5..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png deleted file mode 100644 index 61a5efc2f..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png deleted file mode 100644 index c60a23547..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png deleted file mode 100644 index 842c6858d..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png deleted file mode 100644 index 6b033067f..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png deleted file mode 100644 index 276065e3b..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png deleted file mode 100644 index e64147f4f..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png deleted file mode 100644 index c1300140c..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png deleted file mode 100644 index e433f5669..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png deleted file mode 100644 index ee4d16b64..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png deleted file mode 100644 index 14cba3c24..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png deleted file mode 100644 index 671c31f08..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png deleted file mode 100644 index 8a6f32afe..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clipboard_pin_lxx_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_clipboard_pin_lxx_dark.png deleted file mode 100644 index 767237e8c..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_clipboard_pin_lxx_dark.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png deleted file mode 100644 index a7dd5378b..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png deleted file mode 100644 index ef7ab2097..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_background_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png deleted file mode 100644 index 0e08b6b95..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_key_feedback_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png deleted file mode 100644 index 3489a9c4c..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png deleted file mode 100644 index da96eb4e5..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_amoled.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png deleted file mode 100644 index d0ed92208..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_lxx_dark_border.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png deleted file mode 100644 index 098fa0652..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_dark.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png deleted file mode 100644 index c1c48c973..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/keyboard_suggest_strip_lxx_light.9.png and /dev/null differ diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml deleted file mode 100644 index 6a7959cf3..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml deleted file mode 100644 index 699069f1f..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml deleted file mode 100644 index b2e993c8f..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml deleted file mode 100644 index 26fd241ba..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml deleted file mode 100644 index ee86a64ed..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml deleted file mode 100644 index 024984adb..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml deleted file mode 100644 index 4ca41c3ec..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml deleted file mode 100644 index 6762edd45..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_ics.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_functional_ics.xml rename to app/src/main/res/drawable/btn_keyboard_key_functional_holo_blue.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_klp.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_functional_klp.xml rename to app/src/main/res/drawable/btn_keyboard_key_functional_holo_white.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark.xml deleted file mode 100644 index fd1dbb9f0..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml deleted file mode 100644 index a205ec0d4..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_dark_border.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light.xml deleted file mode 100644 index e518ca11d..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml deleted file mode 100644 index be7bae474..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_lxx_light_border.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml deleted file mode 100644 index 4c45f9206..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_dark_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml deleted file mode 100644 index d9796f5d8..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_functional_normal_lxx_light_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_ics.xml b/app/src/main/res/drawable/btn_keyboard_key_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_ics.xml rename to app/src/main/res/drawable/btn_keyboard_key_holo_blue.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_klp.xml b/app/src/main/res/drawable/btn_keyboard_key_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_klp.xml rename to app/src/main/res/drawable/btn_keyboard_key_holo_white.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml deleted file mode 100644 index 3b71b3307..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_amoled.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_amoled.xml deleted file mode 100644 index 71773a89e..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_amoled.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml deleted file mode 100644 index a3f838a97..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml deleted file mode 100644 index 0eef25308..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml deleted file mode 100644 index 0cbb0d122..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml deleted file mode 100644 index 4f9565810..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_dark_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml deleted file mode 100644 index 0ed3aad44..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_normal_lxx_light_border.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml deleted file mode 100644 index 2c4fee132..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml deleted file mode 100644 index 346346957..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_ics.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_popup_ics.xml rename to app/src/main/res/drawable/btn_keyboard_key_popup_holo_blue.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_klp.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_key_popup_klp.xml rename to app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_dark.xml deleted file mode 100644 index 73e2cd868..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_dark.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_light.xml deleted file mode 100644 index d6cd2b831..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_popup_lxx_light.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml deleted file mode 100644 index fddf7a187..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_dark_border.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml deleted file mode 100644 index 4764221ff..000000000 --- a/app/src/main/res/drawable/btn_keyboard_key_pressed_lxx_light_border.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_ics.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_spacebar_ics.xml rename to app/src/main/res/drawable/btn_keyboard_spacebar_holo_blue.xml diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_klp.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/btn_keyboard_spacebar_klp.xml rename to app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_dark.xml deleted file mode 100644 index e930e40e4..000000000 --- a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_dark.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_light.xml deleted file mode 100644 index 2b059938d..000000000 --- a/app/src/main/res/drawable/btn_keyboard_spacebar_lxx_light.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/btn_suggestion_ics.xml b/app/src/main/res/drawable/btn_suggestion_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/btn_suggestion_ics.xml rename to app/src/main/res/drawable/btn_suggestion_holo_blue.xml diff --git a/app/src/main/res/drawable/btn_suggestion_klp.xml b/app/src/main/res/drawable/btn_suggestion_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/btn_suggestion_klp.xml rename to app/src/main/res/drawable/btn_suggestion_holo_white.xml diff --git a/app/src/main/res/drawable/btn_suggestion_lxx_dark.xml b/app/src/main/res/drawable/btn_suggestion_lxx_dark.xml deleted file mode 100644 index 84a91209e..000000000 --- a/app/src/main/res/drawable/btn_suggestion_lxx_dark.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/btn_suggestion_lxx_light.xml b/app/src/main/res/drawable/btn_suggestion_lxx_light.xml deleted file mode 100644 index 8dce19517..000000000 --- a/app/src/main/res/drawable/btn_suggestion_lxx_light.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml b/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml deleted file mode 100644 index b6b35d3bd..000000000 --- a/app/src/main/res/drawable/keyboard_background_lxx_dark_border.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml b/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml deleted file mode 100644 index 874555386..000000000 --- a/app/src/main/res/drawable/keyboard_background_lxx_light_border.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/keyboard_key_feedback_background_lxx_dark_border.xml b/app/src/main/res/drawable/keyboard_key_feedback_background_lxx_dark_border.xml deleted file mode 100644 index 72dc415fa..000000000 --- a/app/src/main/res/drawable/keyboard_key_feedback_background_lxx_dark_border.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/keyboard_key_feedback_ics.xml b/app/src/main/res/drawable/keyboard_key_feedback_holo_blue.xml similarity index 100% rename from app/src/main/res/drawable/keyboard_key_feedback_ics.xml rename to app/src/main/res/drawable/keyboard_key_feedback_holo_blue.xml diff --git a/app/src/main/res/drawable/keyboard_key_feedback_klp.xml b/app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml similarity index 100% rename from app/src/main/res/drawable/keyboard_key_feedback_klp.xml rename to app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml diff --git a/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml b/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml deleted file mode 100644 index 6d4507088..000000000 --- a/app/src/main/res/drawable/keyboard_key_feedback_lxx_dark.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_dark_border.xml b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_dark_border.xml deleted file mode 100644 index 0e2c62a83..000000000 --- a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_dark_border.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_light_border.xml b/app/src/main/res/drawable/keyboard_suggest_strip_lxx_light_border.xml deleted file mode 100644 index 098b8436d..000000000 --- a/app/src/main/res/drawable/keyboard_suggest_strip_lxx_light_border.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_clipboard_dark.xml b/app/src/main/res/drawable/sym_keyboard_clipboard_dark.xml deleted file mode 100644 index c5bd90c58..000000000 --- a/app/src/main/res/drawable/sym_keyboard_clipboard_dark.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 65fb9da09..fd1c1f768 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -227,8 +227,6 @@ Tema familie Outo dag/nag modus Voorkoms sal sisteem verstellings naboots - Diep swart agtergronde - Kan kragverbruik verminder, afhangende van die toestel se skermtegnologie "Gebruik stelseltale" "Verander sleutelbord" \ No newline at end of file diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 99c2ffef0..22680f4a7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -192,7 +192,6 @@ تمكين تغيير حجم لوحة المفاتيح تعطيل تعلم الكلمات الجديدة المزيد من المفاتيح - خلفيات سوداء عميقة مقياس ارتفاع لوحة المفاتيح وضع النهار / الوضع الليلي التصحيحات @@ -212,7 +211,6 @@ سيقوم مفتاح الحافظة بلصق محتوى الحافظة -إن وُجد- إن عُطِّل وقت الاحتفاظ بالتاريخ احذف بالسحب - يمكن أن تقلل من استخدام الطاقة اعتمادًا على تقنية شاشة الجهاز سمة العائلة متغير السمة الحدود الرئيسة diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 3dabc8c98..5d54a5b71 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -230,7 +230,6 @@ Заўсёды паказваць лічбавы радок Выдаліць свайпам %s (Акхор) - Глыбокі чорны фон Уключыць змяненне памеру клавіятуры Шкала вышыні клавіятуры Лічбавы рад @@ -243,7 +242,6 @@ Варыянт тэмы Межы клавіш Аўтаматычны рэжым дня/ночы - Эканомія зарада батарэі для AMOLED-экранаў Клавіша буфера абмену Правядзіце пальцам ад клавішы выдалення, каб выбраць і выдаліць адразу большыя часткі тэксту Аўтаматычна ўстаўляць прабел пасля знакаў прыпынку пры ўводзе новага слова diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index e44568523..6c1907149 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -256,8 +256,6 @@ দিবা অথবা রাত্রির রং সম্পাদনা? দিবা রাত্রি - গাঢ় কালো পটভূমি - ডিভাইসের স্ক্রিনের প্রযুক্তি ভেদে শক্তির ব্যবহার হ্রাস হতে পারে রঙিন ন্যাভিগেশন বার উজ্জ্বল নিষ্প্রভ diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8f6514b14..539624ee5 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -197,11 +197,9 @@ Configuració del corrector ortogràfic de l\'OpenBoard Esborra amb lliscament Tecla d\'accés a emoticones - Fons negre profund Desactiva l\'aprenentatge de paraules noves. Numera les files Mostra sempre el número de fila. - Pot reduir l\'ús energètic depenent de la tecnologia de la pantalla. Configuració de l\'OpenBoard Entrada Miscel·lània diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c9535f4e7..56a56b896 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -194,7 +194,6 @@ Hvis deaktiveret, vil udklipsholdertasten indsætte eventuelt indhold af udklipsholderen Opbevaringstid for historik Alfabet (Colemak Mod-DH) - Dybsorte baggrunde Tastegrænser Auto dag/nat-tilstand Udseende følger systemindstillinger @@ -215,7 +214,6 @@ Pegefelt på mellemrumstasten Auto-mellemrum efter tegnsætning %s (Akkhor) - Kan reducere strømforbruget afhængigt af enhedens skærmteknologi Alfabet (Workman) OpenBoard-indstillinger Input diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e8587aaa6..239212938 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -226,10 +226,8 @@ Aussehen (hell/dunkel) folgt der Systemeinstellung für den Tag-/Nachtmodus Tastenränder Automatischer Tag-/Nachtmodus - Tiefschwarzer Hintergrund %s (Bengali) Lat. Alphabet (Workman) Lat. Alphabet (Colemak Mod-DH) - Kann den Stromverbrauch reduzieren (abhängig von der Bildschirmtechnologie) Vertrauenslevel der Autokorrektur \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 669653e89..324f5b8d4 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -217,10 +217,8 @@ Αλφάβητο (Colemak Mod-DH) Αλφάβητο (Workman) Η εμφάνιση θα ακολουθεί τις ρυθμίσεις του συστήματος - Μπορεί να μειώσει τη χρήση ενέργειας ανάλογα με την τεχνολογία οθόνης της συσκευής Αυτόματο κενό μετά τη στίξη Παραλλαγή θέματος - Βαθύ μαύρο φόντο Ρυθμίσεις OpenBoard Εισαγωγή Περισσότερα πλήκτρα diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index ed46a1ed7..5b6eb4e98 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -208,7 +208,6 @@ Show long-press hints Keyboard height scale Auto day/night mode - Deep black backgrounds Key borders Theme family Theme variant @@ -216,7 +215,6 @@ Alphabet (Colemak Mod-DH) Alphabet (Workman) Appearance will follow system settings - Can reduce power usage depending on the device’s screen technology Change input method with space key Enable keyboard resizing Long pressing space key will prompt input method selection menu diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index 62f7c641f..61e77865d 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -220,8 +220,6 @@ Temas Variante del tema Modo claro/oscuro automático - Fondo oscuro (AMOLED) - Puede reducir el uso de energía dependiendo de la tecnología de pantalla del dispositivo Ajustes de OpenBoard Entrada Teclas adicionales diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b9a8a1b84..2d2c70f40 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -189,7 +189,6 @@ La apariencia seguirá los ajustes del sistema Alfabeto (Workman) Mostrar siempre fila de números - Puede reducir el uso de energía dependiendo de la tecnología de su pantalla Teclas adicionales Cambiar método de entrada con la barra espaciadora Al presionar por mucho tiempo la barra espaciadora, aparecerá el menú de selección del método de entrada @@ -216,7 +215,6 @@ Mostrar símbolos adicionales Mostrar sugerencias al mantener pulsado Modo claro/oscuro automático - Fondo negro Bordes de teclas Temas Variante de tema diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 335cd32cc..8f65df722 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -215,8 +215,6 @@ Gako-ertzak Egun/gau modu automatikoa Itxurak sistemaren ezarpenei jarraituko die - Atzeko plano ilun-ilunak - Gailuaren pantaila-teknologiaren arabera, energia-erabilera murriztu dezake OpenBoard Ezarpenak Giltza gehigarriak OpenBoard Ortografia Zuzentzailearen Ezarpenak diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index c4add0fd1..2d9c0f58d 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -229,6 +229,4 @@ نوع تم حاشیه کلید حالت روز/شب خودکار - پس زمینه سیاه مطلق - بسته به فناوری صفحه نمایش دستگاه می‌تواند مصرف انرژی را کاهش دهد \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1a4215067..b50340253 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -208,12 +208,10 @@ Échelle de hauteur du clavier Variante de thème L\'apparence suivra les paramètres système - Arrière-plans noir profond Forcer le mode incognito Famille de thème Bordures de touche Mode jour/nuit automatique - Peut réduire la consommation d\'énergie en fonction de la technologie d\'écran de l\'appareil Autoriser le redimensionnement du clavier Alphabet (Workman) Alphabet (Colemak Mod-DH) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index cf8e216f4..916e3468d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -209,7 +209,6 @@ Deaktiviraj učenje novih riječi Obitelj teme Varijanta teme - Može smanjiti potrošnju energije ovisno o tehnologiji ekrana uređaja Razmaknica kao dodirna ploča Prelazi prstom po razmaknici za pomicanje kursora Automatski dodaj razmak nakon interpunkcije @@ -226,7 +225,6 @@ Tipke s rubovima Automatski danji/noćni način rada Izgled će slijediti postavke sustava - Tamnocrne pozadine Tipka međuspremnika Broj retka "Upotrijebi jezike sustava" diff --git a/app/src/main/res/values-hu-rZZ/strings.xml b/app/src/main/res/values-hu-rZZ/strings.xml index 7b1fa64b7..8e6edbca5 100644 --- a/app/src/main/res/values-hu-rZZ/strings.xml +++ b/app/src/main/res/values-hu-rZZ/strings.xml @@ -219,12 +219,10 @@ Inkognitó mód kényszerítése Új szavak tanulásának letiltása Több kulcs - A készülék képernyőtechnológiájától függően csökkentheti az energiafelhasználást Automatikus szóköz írásjelek után Automatikus szóköz beillesztése az írásjelek után új szó beírásakor Számsor A megjelenés követi a rendszerbeállításokat - Mélyfekete háttér Bemenet Space billentyű trackpad A billentyűzet átméretezésének engedélyezése diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3941dc99b..1014bbe3d 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -196,7 +196,6 @@ Aktifkan riwayat clipboard Waktu simpan riwayat Tampilkan petunjuk tombol - Dapat mengurangi penggunaan daya tergantung pada teknologi layar perangkat Selalu tampilkan baris angka %smnt. Alfabet (Workman) @@ -222,7 +221,6 @@ Batas tombol Mode siang/malam otomatis Tampilan mengikuti pengaturan sistem - Latar belakang hitam pekat Variasi tema Keluarga tema Jika dinonaktifkan, menekan tombol ikon clipboard akan menempelkan konten yang disalin diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d22f55b93..6b6c97bba 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -214,8 +214,6 @@ Premendo a lungo la barra spaziatrice verrà visualizzato il menu di selezione del metodo di immissione %s (Akkhor) L\'aspetto seguirà le impostazioni di sistema - Sfondi nero profondo - Può ridurre il consumo energetico, a seconda della tecnologia dello schermo del dispositivo Tasti aggiuntivi Correzioni Suggerimenti diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index c08d11226..59ac35834 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -200,7 +200,6 @@ וריאנט נושא גבולות מקלדת מצב יום/לילה אוטומטי - יכול להפחית את צריכת החשמל בהתאם לטכנולוגיית המסך של המכשיר פתח את הגדרות בודק האיות של לוח שנה שפת מקלדת על ידי מקש רווח מפתח אמוג\'י @@ -228,7 +227,6 @@ כפה מקלדת אנונימית השבת למידה של מילים חדשות עוד מפתחות - רקע שחור עמוק ודאות התיקון האוטומטי "שימוש בשפות מערכת" "שינוי מקלדת" diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index 9c9d6dee5..521c7e5a0 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -214,7 +214,6 @@ ემოჯის ღილაკი ჟესტით წაშლა თემის ვარიანტი - მუქი შავი ფონები OpenBoard-ის მორგება შეყვანა თემის ოჯახი @@ -227,7 +226,6 @@ ისტორიის შენახვის დრო კურსორის გადასატანად გამოტოვების ღილაკს გაუსვით მეტი ღილაკი - შეუძლია შეამციროს ენერგიის მოხმარება, მოწყობილობის ეკრანის ტექნოლოგიაზე დამოკიდებულებით კლავიატურის ზომის შეცვლის დაშვება კლავიატურის სიმაღლის მასშტაბი ღილაკის კონტურები diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b99016955..50c9d0a2a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -223,12 +223,10 @@ 테마 패밀리 자동 밤낮 모드 시스템 설정에 따른 모양 - 기기의 화면 기술에 의존하여 전력 사용량을 줄일 수 있습니다 한번에 많은 글자들을 선택하고 제거하기 위해서는 삭제 키를 스와이프하기 커서를 움직이기 위해서는 스페이스바를 스와이프 테마 유형 키의 경계 - 진한 검정 배경 알파벳 (Workman) %s (벵골어) 알파벳 (Colemak Mod-DH) diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 66dea3386..5528a9fd9 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -194,7 +194,6 @@ എല്ലായ്പ്പോഴും നമ്പർ വരി കാണിക്കുക നമ്പർ വരി കീ സൂചനകൾ കാണിക്കുക - കടും കറുപ്പ് പശ്ചാത്തലങ്ങൾ ഓപ്പൺബോർഡ് സ്പെൽ ചെക്കർ ക്രമീകരണങ്ങൾ ഡിലീറ്റ് സ്വൈപ്പ് കഴ്‌സർ നീക്കാൻ സ്‌പേസ് ബാറിൽ സ്വൈപ്പ് ചെയ്യുക @@ -224,7 +223,6 @@ %s (അഖോർ ) തീം ഫാമിലി തീം വേരിയന്റ് - ഉപകരണത്തിന്റെ സ്‌ക്രീൻ സാങ്കേതികവിദ്യയെ ആശ്രയിച്ച് വൈദ്യുതി ഉപയോഗം കുറയ്ക്കാനാകും പരീക്ഷണാത്മകം ഇൻപുട്ട് അധിക കീകൾ diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 928ca34c7..d5d2ddfb5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -216,10 +216,8 @@ Vis tastaturhint Vis langtrykkshint Påtving inkognito-modus - Kan redusere effektforbruk avhengig av skjermteknologi Tastekanter Draktfamilie - Svarte bakgrunner "Bruk systemspråk" "Endre tastatur" \ No newline at end of file diff --git a/app/src/main/res/values-night/themes-lxx-auto-amoled.xml b/app/src/main/res/values-night/themes-lxx-auto-amoled.xml deleted file mode 100644 index 25e9a223d..000000000 --- a/app/src/main/res/values-night/themes-lxx-auto-amoled.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values-night/themes-lxx-auto-border.xml b/app/src/main/res/values-night/themes-lxx-auto-border.xml deleted file mode 100644 index 6eacd276d..000000000 --- a/app/src/main/res/values-night/themes-lxx-auto-border.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values-night/themes-lxx-auto.xml b/app/src/main/res/values-night/themes-lxx-auto.xml deleted file mode 100644 index d27bf2d61..000000000 --- a/app/src/main/res/values-night/themes-lxx-auto.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e5b141924..8f8c05b38 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -226,8 +226,6 @@ Alfabet (Workman) Thema familie Toetsen randen - Kan het stroomverbruik verminderen, afhankelijk van de schermtechnologie van het apparaat - Diep zwarte achtergronden Automatisch spatie invoegen na punt bij het typen van een nieuw woord OpenBoard Instellingen Invoer diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 17e785d0c..e9c0ae76c 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -225,8 +225,6 @@ Obramowanie klawiszy Automatyczny tryb dzienny/nocny Wygląd będzie zgodny z ustawieniami systemu - Głęboka czerń tła - Może zmniejszyć zużycie energii w zależności od technologii ekranu urządzenia Automatyczne wstawianie spacji po znaku interpunkcyjnym podczas wpisywania nowego słowa Automatyczne wstawianie spacji po znaku interpunkcyjnym Dokładność autokorekty diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e67b6b871..e1fae7c08 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -126,8 +126,6 @@ Variante do tema Família do tema Borda em teclas - Fundo muito escuro - Reduzir o uso de energia (dependendo da tecnologia de tela do dispositivo) Corretor Ortográfico do OpenBoard Configurar corretor ortográfico do OpenBoard Procurar nomes de contatos diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index cd3f62d17..dfa7725fe 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -194,8 +194,6 @@ Impor modo incógnito Modo diurno/noturno automático Aparência usa as definições do sistema - Fundo muito escuro - Pode reduzir a utilização de energia (conforme a tecnologia do ecrã) Verificação ortográfica OpenBoard Definições OpenBoard Introdução diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 76f1dc04f..5f3b93bf7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -212,8 +212,6 @@ Limite das teclas Família do tema Variante do tema - Pode reduzir a utilização de energia (conforme a tecnologia do ecrã) - Fundo muito escuro Teclas adicionais Alfabeto (Workman) Aparência usa as definições do sistema diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 08048f9c9..8f41b147d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -213,7 +213,6 @@ Латиница (Workman) Контуры клавиш Использовать системную тему - Чёрная тема (для OLED-экранов) Стиль темы Вариант темы Внешний вид будет следовать настройкам системы @@ -229,7 +228,6 @@ Дополнительные клавиши Предложения Долгое нажатие клавиши пробела вызовет меню выбора метода ввода - Экономия заряда батареи для устройств с OLED-экраном Цвет панели навигации Точность автоисправления Светлая diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 9c06169a8..709fdd1f1 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -209,7 +209,6 @@ Nastavitve pregledovalnika črkovanja OpenBoard Tipka odložišča Samodejni dnevni/nočni način - Ozadja z globoko črnino Spremeni višino tipkovnice Skupina tem Poskusne možnosti @@ -227,6 +226,5 @@ Podrsaj po preslednici za premik kazalca Prikaži namige z dolgim pritiskom Izgled bo sledil sistemskim nastavitvam - Odvisno od tehnologije zaslona lahko zmanjša porabo energije Dolg pritisk na preslednico bo priklical meni za izbiro načina vnosa \ No newline at end of file diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 5cc2e8115..4e7cfb59f 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -211,7 +211,6 @@ Дуг притисак на тастер за размак ће приказати мени за избор метода уноса Тхеме стиле Аутоматски режим дан/ноћ - Црна тема Изглед ће пратити подешавања система %s (Акхор) Абецеда (Colemak Mod-DH) @@ -226,7 +225,6 @@ Уклањање превлачењем Емоји кључ Кључне обрисе - Уштеда батерије за уређаје са ОЛЕД екранима Онемогућите учење нових речи Аутоматски убаци размак после интерпункције када куцате нову реч Додатни кључеви diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 322a6e824..4ab215f53 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -227,8 +227,6 @@ Kantlinjer runt tangenter Automatiskt dag-/nattläge Utseendet kommer följa systeminställningarna - Kan minska strömförbrukningen beroende på enhetens skärmteknik - Helsvarta bakgrunder Förtroende för automatisk korrigering "Använda systemspråk" "Byt tangentbord" diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 06ba17ebb..03cbdeb74 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -204,7 +204,6 @@ Alfabe (Workman) Tuş kenarlıkları Otomatik gündüz/gece modu - Aygıtın ekran teknolojisine bağlı olarak güç kullanımını azaltabilir OpenBoard Yazım Denetleyicisi %sdak. Öneriler @@ -223,7 +222,6 @@ Alfabe (Colemak Mod-DH) Tema ailesi Görünüm sistem ayarlarını takip edecektir - Derin siyah arka planlar OpenBoard Ayarları Giriş Ek tuşlar diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 01f3e0411..bc5a0a50a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -189,7 +189,6 @@ Вигляд наслідує системні налаштування Автоматично вставляти пробіл після знаків пунктуації під час введення нового слова Варіант теми - Може зменшити енергоспоживання в залежності від технології екрану пристрою Автоматичний режим день/ніч Введення %s (Аккгор) @@ -246,7 +245,6 @@ Рядок цифр Завжди показувати рядок цифр Границі клавіш - Глибокий чорний фон Додаткові клавіші Сімейство тем Алфавіт (Colemak Mod-DH) diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml index 8d857bf49..c561f02d3 100644 --- a/app/src/main/res/values-uz/strings.xml +++ b/app/src/main/res/values-uz/strings.xml @@ -200,8 +200,6 @@ Tema varianti Avtomatik kunduz/tun rejimi Tashqi ko\'rinish tizim sozlamalariga binoan - To\'q qora fon - Qurilma ekrani texnologiyasiga qarab quvvat sarfini kamaytirishi mumkin OpenBoard Imlo tekshiruvi OpenBoard Imlo Tekshiruvi Sozlamalari Bufer tugmasi diff --git a/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml b/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml deleted file mode 100644 index fe8cc3aee..000000000 --- a/app/src/main/res/values-v31/keyboard-icons-lxx-dark.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5c6d75d29..bc11d16a0 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -209,7 +209,6 @@ 标点后面自动插入空格 单词输入后自动添加空格 主题变化 - 可大幅减少耗电量（具体取决于设备的屏幕技术） 拼写检查 拼写检查设置 %s (学校管理模板) @@ -220,7 +219,6 @@ 边框 自动主题 系统自动 - 深色背景 输入 OpenBoard设置 额外键 diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index a3ca3066a..3afc9c237 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -234,22 +234,14 @@ - - - - - - - - - - - - - - - + {@link org.dslul.openboard.inputmethod.keyboard.KeyboardTheme#THEME_ID_HOLO_BLUE} etc. --> + + + + + + + @@ -502,12 +494,15 @@ + {@link org.dslul.openboard.inputmethod.keyboard.KeyboardTheme#THEME_ID_HOLO_BLUE} etc. --> - - - - + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 466b21a5f..7216961c5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,11 +21,11 @@ - #FF33B5E5 - #D833B5E5 - #B233B5E5 - #9933B5E5 - @android:color/white + #FF33B5E5 + #D833B5E5 + #B233B5E5 + #9933B5E5 + @android:color/white #66E0E4E5 #80000000 #A0FFFFFF @@ -35,13 +35,13 @@ #80000000 #C0000000 #111111 - - #FFF0F0F0 - #D8F0F0F0 - #B2F0F0F0 - #99E0E0E0 + + #FFF0F0F0 + #D8F0F0F0 + #B2F0F0F0 + #99E0E0E0 - #37474F #CC37474F @@ -54,57 +54,34 @@ #B337474F #1A73E8 #1457af - #ECEFF1 - #2637474F #1A73E8 #3683e8 - #2637474F #E6ECEFF1 - #E4E7E9 - #E8EAED #FFFFFF - #F3F5F6 #CCCED5 - #A9ABAD - #CCCED5 #FFFFFF - #CCFFFFFF - #80FFFFFF #80FFFFFF - #B3FFFFFF #5E97F6 - #FFFFFF - #D9FFFFFF - #B3FFFFFF #5E97F6 #436baf - #00000000 - #19FFFFFF #5E97F6 #86b0f6 - #1CFFFFFF - #E621272B - #21272B #0d0d0d #4d4d4d - #424242 #1f1f1f - #252525 - #1f1f1f #000000 #1A1A1A - #ff3c474c - @android:color/white diff --git a/app/src/main/res/values/keyboard-icons-lxx-dark-parent.xml b/app/src/main/res/values/keyboard-icons-lxx-dark-parent.xml deleted file mode 100644 index 73ea197e7..000000000 --- a/app/src/main/res/values/keyboard-icons-lxx-dark-parent.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/keyboard-icons-lxx-dark.xml b/app/src/main/res/values/keyboard-icons-lxx-dark.xml deleted file mode 100644 index 3c47bd03a..000000000 --- a/app/src/main/res/values/keyboard-icons-lxx-dark.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/app/src/main/res/values/themes-klp.xml b/app/src/main/res/values/themes-holo_white.xml similarity index 74% rename from app/src/main/res/values/themes-klp.xml rename to app/src/main/res/values/themes-holo_white.xml index 0b6d686c8..0698c4abb 100644 --- a/app/src/main/res/values/themes-klp.xml +++ b/app/src/main/res/values/themes-holo_white.xml @@ -19,57 +19,57 @@ --> - diff --git a/app/src/main/res/values/themes-lxx-auto-amoled.xml b/app/src/main/res/values/themes-lxx-auto-amoled.xml deleted file mode 100644 index 704a46fb7..000000000 --- a/app/src/main/res/values/themes-lxx-auto-amoled.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes-lxx-dark-border.xml b/app/src/main/res/values/themes-lxx-dark-border.xml deleted file mode 100644 index 977ca6466..000000000 --- a/app/src/main/res/values/themes-lxx-dark-border.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes-lxx-dark.xml b/app/src/main/res/values/themes-lxx-dark.xml deleted file mode 100644 index 27adc71d2..000000000 --- a/app/src/main/res/values/themes-lxx-dark.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes-lxx-light-border.xml b/app/src/main/res/values/themes-lxx-light-border.xml deleted file mode 100644 index 5e5dc4ea3..000000000 --- a/app/src/main/res/values/themes-lxx-light-border.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes-lxx-light.xml b/app/src/main/res/values/themes-lxx-light.xml deleted file mode 100644 index ce622e786..000000000 --- a/app/src/main/res/values/themes-lxx-light.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values/themes-lxx.xml b/app/src/main/res/values/themes-lxx.xml index 6f50fbfa1..167aeaf2e 100644 --- a/app/src/main/res/values/themes-lxx.xml +++ b/app/src/main/res/values/themes-lxx.xml @@ -23,7 +23,7 @@ name="InputView.LXX" parent="InputView" /> - +