luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-16 15:02:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove some unused colors and attrs

Browse source
This commit is contained in:
Helium314 2023-12-19 09:40:38 +01:00
parent 0c231b18ed
commit a70c927d75
13 changed files with 23 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/GestureFloatingTextDrawingPreview.java
View file

@ -29,9 +29,7 @@ import org.dslul.openboard.inputmethod.latin.settings.Settings;
* derived from it.
*
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextSize
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextColor
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewTextOffset
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewColor
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewHorizontalPadding
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewVerticalPadding
* @attr ref R.styleable#KeyboardView_gestureFloatingPreviewRoundRadius
@ -56,10 +54,10 @@ public class GestureFloatingTextDrawingPreview extends AbstractDrawingPreview {
final Colors colors = Settings.getInstance().getCurrent().mColors;
mGesturePreviewTextSize = mainKeyboardViewAttr.getDimensionPixelSize(
R.styleable.MainKeyboardView_gestureFloatingPreviewTextSize, 0);
mGesturePreviewTextColor = colors.get(ColorType.KEY_TEXT); //mainKeyboardViewAttr.getColor(R.styleable.MainKeyboardView_gestureFloatingPreviewTextColor, 0);
mGesturePreviewTextColor = colors.get(ColorType.KEY_TEXT);
mGesturePreviewTextOffset = mainKeyboardViewAttr.getDimensionPixelOffset(
R.styleable.MainKeyboardView_gestureFloatingPreviewTextOffset, 0);
mGesturePreviewColor = colors.get(ColorType.GESTURE_PREVIEW); //mainKeyboardViewAttr.getColor(R.styleable.MainKeyboardView_gestureFloatingPreviewColor, 0);
mGesturePreviewColor = colors.get(ColorType.GESTURE_PREVIEW);
mGesturePreviewHorizontalPadding = mainKeyboardViewAttr.getDimension(
R.styleable.MainKeyboardView_gestureFloatingPreviewHorizontalPadding, 0.0f);
mGesturePreviewVerticalPadding = mainKeyboardViewAttr.getDimension(

3
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/GestureTrailDrawingParams.java
View file

@ -22,7 +22,6 @@ import org.dslul.openboard.inputmethod.latin.settings.Settings;
* @attr ref R.styleable#MainKeyboardView_gestureTrailFadeoutStartDelay
* @attr ref R.styleable#MainKeyboardView_gestureTrailFadeoutDuration
* @attr ref R.styleable#MainKeyboardView_gestureTrailUpdateInterval
* @attr ref R.styleable#MainKeyboardView_gestureTrailColor
* @attr ref R.styleable#MainKeyboardView_gestureTrailWidth
*/
final class GestureTrailDrawingParams {
@ -42,7 +41,7 @@ final class GestureTrailDrawingParams {
public final int mTrailLingerDuration;
public GestureTrailDrawingParams(final TypedArray mainKeyboardViewAttr) {
mTrailColor = Settings.getInstance().getCurrent().mColors.get(ColorType.GESTURE_TRAIL); //mainKeyboardViewAttr.getColor(R.styleable.MainKeyboardView_gestureTrailColor, 0);
mTrailColor = Settings.getInstance().getCurrent().mColors.get(ColorType.GESTURE_TRAIL);
mTrailStartWidth = mainKeyboardViewAttr.getDimension(
R.styleable.MainKeyboardView_gestureTrailStartWidth, 0.0f);
mTrailEndWidth = mainKeyboardViewAttr.getDimension(

22
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyVisualAttributes.java
View file

@ -56,15 +56,15 @@ public final class KeyVisualAttributes {
R.styleable.Keyboard_Key_keyShiftedLetterHintRatio,
R.styleable.Keyboard_Key_keyHintLabelRatio,
R.styleable.Keyboard_Key_keyPreviewTextRatio,
R.styleable.Keyboard_Key_keyTextColor,
R.styleable.Keyboard_Key_keyTextColor, // todo: is this used anywhere
R.styleable.Keyboard_Key_keyTextInactivatedColor,
R.styleable.Keyboard_Key_keyTextShadowColor,
R.styleable.Keyboard_Key_functionalTextColor,
R.styleable.Keyboard_Key_keyHintLetterColor,
R.styleable.Keyboard_Key_keyHintLabelColor,
R.styleable.Keyboard_Key_functionalTextColor, // todo: is this used anywhere
R.styleable.Keyboard_Key_keyHintLetterColor, // todo: is this used anywhere
R.styleable.Keyboard_Key_keyHintLabelColor, // todo: is this used anywhere
R.styleable.Keyboard_Key_keyShiftedLetterHintInactivatedColor,
R.styleable.Keyboard_Key_keyShiftedLetterHintActivatedColor,
R.styleable.Keyboard_Key_keyPreviewTextColor,
R.styleable.Keyboard_Key_keyPreviewTextColor, // todo: is this used anywhere
R.styleable.Keyboard_Key_keyHintLabelVerticalAdjustment,
R.styleable.Keyboard_Key_keyLabelOffCenterRatio,
R.styleable.Keyboard_Key_keyHintLabelOffCenterRatio
@ -119,19 +119,17 @@ public final class KeyVisualAttributes {
R.styleable.Keyboard_Key_keyPreviewTextRatio);
final Colors colors = Settings.getInstance().getCurrent().mColors;
mTextColor = colors.get(ColorType.KEY_TEXT); //keyAttr.getColor(R.styleable.Keyboard_Key_keyTextColor, 0);
mTextColor = colors.get(ColorType.KEY_TEXT);
mTextInactivatedColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextInactivatedColor, 0);
mTextShadowColor = keyAttr.getColor(R.styleable.Keyboard_Key_keyTextShadowColor, 0);
// todo: maybe a separate color?
mFunctionalTextColor = colors.get(ColorType.KEY_TEXT); //keyAttr.getColor(R.styleable.Keyboard_Key_functionalTextColor, 0);
mHintLetterColor = colors.get(ColorType.KEY_HINT_TEXT); //keyAttr.getColor(R.styleable.Keyboard_Key_keyHintLetterColor, 0);
mHintLabelColor = colors.get(ColorType.KEY_TEXT); //keyAttr.getColor(R.styleable.Keyboard_Key_keyHintLabelColor, 0);
mFunctionalTextColor = colors.get(ColorType.FUNCTIONAL_KEY_TEXT);
mHintLetterColor = colors.get(ColorType.KEY_HINT_TEXT);
mHintLabelColor = colors.get(ColorType.KEY_TEXT);
mShiftedLetterHintInactivatedColor = keyAttr.getColor(
R.styleable.Keyboard_Key_keyShiftedLetterHintInactivatedColor, 0);
mShiftedLetterHintActivatedColor = keyAttr.getColor(
R.styleable.Keyboard_Key_keyShiftedLetterHintActivatedColor, 0);
// todo: maybe a separate color?
mPreviewTextColor = colors.get(ColorType.KEY_TEXT); //keyAttr.getColor(R.styleable.Keyboard_Key_keyPreviewTextColor, 0);
mPreviewTextColor = colors.get(ColorType.KEY_TEXT);
mHintLabelVerticalAdjustment = ResourceUtils.getFraction(keyAttr,
R.styleable.Keyboard_Key_keyHintLabelVerticalAdjustment, 0.0f);

3
app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/SlidingKeyInputDrawingPreview.java
View file

@ -22,7 +22,6 @@ import org.dslul.openboard.inputmethod.latin.settings.Settings;
/**
* Draw rubber band preview graphics during sliding key input.
*
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewColor
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewWidth
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewBodyRatio
* @attr ref R.styleable#MainKeyboardView_slidingKeyInputPreviewShadowRatio
@ -39,7 +38,7 @@ public final class SlidingKeyInputDrawingPreview extends AbstractDrawingPreview
private final Paint mPaint = new Paint();
public SlidingKeyInputDrawingPreview(final TypedArray mainKeyboardViewAttr) {
final int previewColor = Settings.getInstance().getCurrent().mColors.get(ColorType.GESTURE_TRAIL); //mainKeyboardViewAttr.getColor(R.styleable.MainKeyboardView_slidingKeyInputPreviewColor, 0);
final int previewColor = Settings.getInstance().getCurrent().mColors.get(ColorType.GESTURE_TRAIL);
final float previewRadius = mainKeyboardViewAttr.getDimension(
R.styleable.MainKeyboardView_slidingKeyInputPreviewWidth, 0) / 2.0f;
final int PERCENTAGE_INT = 100;

5
app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Colors.kt
View file

@ -248,7 +248,7 @@ class DynamicColors(context: Context, override val themeStyle: String, override
TOOL_BAR_EXPAND_KEY_BACKGROUND -> if (!isNight) accent else doubleAdjustedBackground
GESTURE_TRAIL -> gesture
KEY_TEXT, SUGGESTION_AUTO_CORRECT, REMOVE_SUGGESTION_ICON, CLEAR_CLIPBOARD_HISTORY_KEY,
KEY_ICON, ONE_HANDED_MODE_BUTTON, EMOJI_CATEGORY, TOOL_BAR_KEY -> keyText
KEY_ICON, ONE_HANDED_MODE_BUTTON, EMOJI_CATEGORY, TOOL_BAR_KEY, FUNCTIONAL_KEY_TEXT -> keyText
KEY_HINT_TEXT -> keyHintText
SPACE_BAR_TEXT -> spaceBarText
FUNCTIONAL_KEY_BACKGROUND -> functionalKey
@ -445,7 +445,7 @@ class DefaultColors (
EMOJI_CATEGORY_BACKGROUND, GESTURE_PREVIEW, MORE_KEYS_BACKGROUND, MORE_SUGGESTIONS_BACKGROUND, KEY_PREVIEW -> adjustedBackground
TOOL_BAR_EXPAND_KEY_BACKGROUND -> doubleAdjustedBackground
GESTURE_TRAIL -> gesture
KEY_TEXT, SUGGESTION_AUTO_CORRECT, REMOVE_SUGGESTION_ICON, CLEAR_CLIPBOARD_HISTORY_KEY,
KEY_TEXT, SUGGESTION_AUTO_CORRECT, REMOVE_SUGGESTION_ICON, CLEAR_CLIPBOARD_HISTORY_KEY, FUNCTIONAL_KEY_TEXT,
KEY_ICON, ONE_HANDED_MODE_BUTTON, EMOJI_CATEGORY, TOOL_BAR_KEY, TOOL_BAR_EXPAND_KEY -> keyText
KEY_HINT_TEXT -> keyHintText
SPACE_BAR_TEXT -> spaceBarText
@ -558,6 +558,7 @@ enum class ColorType {
EMOJI_CATEGORY,
EMOJI_CATEGORY_BACKGROUND,
EMOJI_CATEGORY_SELECTED,
FUNCTIONAL_KEY_TEXT,
FUNCTIONAL_KEY_BACKGROUND,
GESTURE_TRAIL,
GESTURE_PREVIEW,

4
app/src/main/java/org/dslul/openboard/inputmethod/latin/common/Constants.java
View file

@ -196,8 +196,8 @@ public final class Constants {
public static final int CODE_CLOSING_SQUARE_BRACKET = ']';
public static final int CODE_CLOSING_CURLY_BRACKET = '}';
public static final int CODE_CLOSING_ANGLE_BRACKET = '>';
public static final int CODE_INVERTED_QUESTION_MARK = 0xBF; // ¿
public static final int CODE_INVERTED_EXCLAMATION_MARK = 0xA1; // ¡
public static final int CODE_INVERTED_QUESTION_MARK = '¿';
public static final int CODE_INVERTED_EXCLAMATION_MARK = '¡';
public static final int CODE_GRAVE_ACCENT = '`';
public static final int CODE_CIRCUMFLEX_ACCENT = '^';
public static final int CODE_TILDE = '~';

8
app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripLayoutHelper.java
View file

@ -122,10 +122,10 @@ final class SuggestionStripLayoutHelper {
R.styleable.SuggestionStripView_alphaObsoleted, 1.0f);
final Colors colors = Settings.getInstance().getCurrent().mColors;
mColorValidTypedWord = colors.get(ColorType.SUGGESTION_VALID_WORD); //a.getColor(R.styleable.SuggestionStripView_colorValidTypedWord, 0);
mColorTypedWord = colors.get(ColorType.SUGGESTION_TYPED_WORD); //a.getColor(R.styleable.SuggestionStripView_colorTypedWord, 0);
mColorAutoCorrect = colors.get(ColorType.SUGGESTION_AUTO_CORRECT); //a.getColor(R.styleable.SuggestionStripView_colorAutoCorrect, 0);
mColorSuggested = colors.get(ColorType.SUGGESTED_WORD); //a.getColor(R.styleable.SuggestionStripView_colorSuggested, 0);
mColorValidTypedWord = colors.get(ColorType.SUGGESTION_VALID_WORD);
mColorTypedWord = colors.get(ColorType.SUGGESTION_TYPED_WORD);
mColorAutoCorrect = colors.get(ColorType.SUGGESTION_AUTO_CORRECT);
mColorSuggested = colors.get(ColorType.SUGGESTED_WORD);
final int colorMoreSuggestionsHint = colors.get(ColorType.MORE_SUGGESTIONS_HINT);
mSuggestionsCountInStrip = a.getInt(

4
app/src/main/res/values-v31/colors.xml
View file

@ -9,10 +9,6 @@
<!-- System theming colors for LXX_Light theme, overriding some colors in main colors.xml -->
<color name="highlight_color_lxx_light">@android:color/system_accent1_500</color>
<color name="gesture_trail_color_lxx_light">@android:color/system_accent1_200</color>
<color name="sliding_key_input_preview_color_lxx_light">@android:color/system_accent1_900</color>
<color name="action_key_background_lxx_light">@color/highlight_color_lxx_light</color>
<color name="action_key_background_pressed_lxx_light">@android:color/system_accent1_200</color>
<color name="icon_tint_system_accent_lxx_light">@color/highlight_color_lxx_light</color>
<!-- System theming colors for LXX_Dark theme, overriding some colors in main colors.xml -->
<color name="highlight_color_lxx_dark">@android:color/system_accent1_500</color>

8
app/src/main/res/values/attrs.xml
View file

@ -87,7 +87,6 @@
<attr name="touchNoiseThresholdDistance" format="dimension" />
<!-- Enable key selection by dragging finger -->
<attr name="keySelectionByDraggingFinger" format="boolean" />
<attr name="slidingKeyInputPreviewColor" format="color" />
<attr name="slidingKeyInputPreviewWidth" format="dimension" />
<attr name="slidingKeyInputPreviewBodyRatio" format="integer" />
<attr name="slidingKeyInputPreviewShadowRatio" format="integer" />
@ -126,7 +125,6 @@
<attr name="gestureTrailFadeoutDuration" format="integer" />
<!-- Interval of updating gesture trail in millisecond. -->
<attr name="gestureTrailUpdateInterval" format="integer" />
<attr name="gestureTrailColor" format="color" />
<attr name="gestureTrailStartWidth" format="dimension" />
<attr name="gestureTrailEndWidth" format="dimension" />
<attr name="gestureTrailBodyRatio" format="integer" />
@ -135,9 +133,7 @@
<attr name="gestureFloatingPreviewTextLingerTimeout" format="integer" />
<!-- Attributes for GestureFloatingPreviewText -->
<attr name="gestureFloatingPreviewTextSize" format="dimension" />
<attr name="gestureFloatingPreviewTextColor" format="color" />
<attr name="gestureFloatingPreviewTextOffset" format="dimension" />
<attr name="gestureFloatingPreviewColor" format="color" />
<attr name="gestureFloatingPreviewHorizontalPadding" format="dimension" />
<attr name="gestureFloatingPreviewVerticalPadding" format="dimension" />
<attr name="gestureFloatingPreviewRoundRadius" format="dimension" />
@ -198,10 +194,6 @@
<flag name="autoCorrectUnderline" value="0x02" />
<flag name="validTypedWordBold" value="0x04" />
</attr>
<attr name="colorValidTypedWord" format="color" />
<attr name="colorTypedWord" format="color" />
<attr name="colorAutoCorrect" format="color" />
<attr name="colorSuggested" format="color" />
<attr name="alphaObsoleted" format="fraction" />
<attr name="suggestionsCountInStrip" format="integer" />
<attr name="centerSuggestionPercentile" format="fraction" />

12
app/src/main/res/values/colors.xml
View file

@ -22,29 +22,17 @@
<color name="action_key_background_lxx_dark">#5E97F6</color>
<color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
<color name="gesture_trail_color_lxx_light">#1A73E8</color>
<color name="sliding_key_input_preview_color_lxx_light">#1457af</color>
<color name="action_key_background_lxx_light">#1A73E8</color>
<color name="action_key_background_pressed_lxx_light">#3683e8</color>
<color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
<color name="auto_correct_color_lxx_light">#37474F</color>
<color name="typed_word_color_lxx_light">#D937474F</color>
<color name="suggested_word_color_lxx_light">#B337474F</color>
<color name="key_functional_text_color_lxx_light">#CC37474F</color>
<color name="key_text_inactive_color_lxx_light">#B337474F</color>
<color name="language_on_spacebar_text_color_lxx_light">#B337474F</color>
<color name="highlight_color_holo_white">#FFF0F0F0</color>
<color name="typed_word_color_holo_white">#D8F0F0F0</color>
<color name="suggested_word_color_holo_white">#B2F0F0F0</color>
<color name="highlight_translucent_color_holo_white">#99E0E0E0</color>
<color name="key_text_color_blue">@android:color/white</color>
<color name="key_text_inactivated_color_holo">#66E0E4E5</color>
<color name="key_hint_letter_color_holo">#80000000</color>
<color name="key_hint_label_color_holo">#A0FFFFFF</color>
<color name="key_shifted_letter_hint_inactivated_color_holo">#66E0E4E5</color>
<color name="key_shifted_letter_hint_activated_color_holo">@android:color/white</color>
<color name="spacebar_text_color_holo">#FFC0C0C0</color>
<color name="spacebar_text_shadow_color_holo">#80000000</color>
<color name="gesture_floating_preview_color_holo">#C0000000</color>
<color name="emoji_tab_page_indicator_background_holo">#111111</color>
<!-- Color resources for the old LXX_Light theme, now used for THEME_LIGHT. -->

8
app/src/main/res/values/themes-holo_base.xml
View file

@ -63,10 +63,6 @@
<item name="keyPreviewBackground">@drawable/keyboard_key_feedback_holo_white</item>
<item name="keyPreviewHeight">@dimen/config_key_preview_height_holo</item>
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_holo</item>
<item name="gestureFloatingPreviewTextColor">@color/highlight_color_holo_white</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_holo</item>
<item name="gestureTrailColor">@color/highlight_color_holo_white</item>
<item name="slidingKeyInputPreviewColor">@color/highlight_translucent_color_holo_white</item>
<item name="languageOnSpacebarTextShadowRadius">1.0</item>
<item name="languageOnSpacebarTextShadowColor">@color/spacebar_text_shadow_color_holo</item>
</style>
@ -133,10 +129,6 @@
<item name="android:background">@android:color/white</item>
<item name="android:src">@drawable/suggestions_strip_divider_holo</item>
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_holo_white</item>
<item name="colorTypedWord">@color/typed_word_color_holo_white</item>
<item name="colorAutoCorrect">@color/highlight_color_holo_white</item>
<item name="colorSuggested">@color/suggested_word_color_holo_white</item>
<item name="alphaObsoleted">70%</item>
</style>
<style

8
app/src/main/res/values/themes-lxx-base.xml
View file

@ -49,10 +49,6 @@
<item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item>
<item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>
<item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_light</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_light</item>
<item name="gestureTrailColor">@color/gesture_trail_color_lxx_light</item>
<item name="slidingKeyInputPreviewColor">@color/sliding_key_input_preview_color_lxx_light</item>
<!-- A negative value to disable text shadow layer. -->
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
</style>
@ -125,10 +121,6 @@
<item name="android:background">@drawable/keyboard_background_lxx_base</item>
<item name="android:src">@drawable/suggestions_strip_divider</item>
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>
<item name="colorTypedWord">@color/typed_word_color_lxx_light</item>
<item name="colorAutoCorrect">@color/auto_correct_color_lxx_light</item>
<item name="colorSuggested">@color/suggested_word_color_lxx_light</item>
<item name="alphaObsoleted">70%</item>
</style>
<style

8
app/src/main/res/values/themes-rounded-base.xml
View file

@ -55,10 +55,6 @@
<item name="keyPreviewBackground">@drawable/keyboard_key_feedback_lxx_light</item>
<item name="keyPreviewHeight">@dimen/config_key_preview_height_lxx</item>
<item name="keyPreviewOffset">@dimen/config_key_preview_offset_lxx</item>
<item name="gestureFloatingPreviewTextColor">@color/auto_correct_color_lxx_light</item>
<item name="gestureFloatingPreviewColor">@color/gesture_floating_preview_color_lxx_light</item>
<item name="gestureTrailColor">@color/gesture_trail_color_lxx_light</item>
<item name="slidingKeyInputPreviewColor">@color/sliding_key_input_preview_color_lxx_light</item>
<!-- A negative value to disable text shadow layer. -->
<item name="languageOnSpacebarTextShadowRadius">-1.0</item>
</style>
@ -137,10 +133,6 @@
<item name="android:background">@drawable/keyboard_background_lxx_base</item>
<item name="android:src">@drawable/suggestions_strip_divider</item>
<item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>
<item name="colorValidTypedWord">@color/typed_word_color_lxx_light</item>
<item name="colorTypedWord">@color/typed_word_color_lxx_light</item>
<item name="colorAutoCorrect">@color/auto_correct_color_lxx_light</item>
<item name="colorSuggested">@color/suggested_word_color_lxx_light</item>
<item name="alphaObsoleted">70%</item>
</style>