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 0fca466cf..81438d129 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 @@ -26,6 +26,7 @@ public final class KeyboardTheme implements Comparable { // old themes public static final String STYLE_MATERIAL = "Material"; public static final String STYLE_HOLO = "Holo"; + public static final String STYLE_ROUNDED = "Rounded"; // new themes using the custom colors public static final String THEME_LIGHT = "light"; @@ -36,15 +37,17 @@ public final class KeyboardTheme implements Comparable { public static final String THEME_USER = "user"; public static final String THEME_USER_NIGHT = "user_night"; public static final String[] COLORS = new String[] { THEME_LIGHT, THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER }; - public static final String[] COLORS_DARK = new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_NIGHT}; + public static final String[] COLORS_DARK = new String[] { THEME_HOLO_WHITE, THEME_DARK, THEME_DARKER, THEME_BLACK, THEME_USER_NIGHT }; - public static final String[] STYLES = { STYLE_MATERIAL, STYLE_HOLO }; + public static final String[] STYLES = { STYLE_MATERIAL, STYLE_HOLO, STYLE_ROUNDED }; // These should be aligned with Keyboard.themeId and Keyboard.Case.keyboardTheme // attributes' values in attrs.xml. public static final int THEME_ID_HOLO_BASE = 0; public static final int THEME_ID_LXX_BASE = 1; public static final int THEME_ID_LXX_BASE_BORDER = 2; + public static final int THEME_ID_ROUNDED_BASE = 3; + public static final int THEME_ID_ROUNDED_BASE_BORDER = 4; public static final int DEFAULT_THEME_ID = THEME_ID_LXX_BASE; /* package private for testing */ @@ -55,6 +58,10 @@ public final class KeyboardTheme implements Comparable { VERSION_CODES.LOLLIPOP), new KeyboardTheme(THEME_ID_LXX_BASE_BORDER, "LXXBaseBorder", R.style.KeyboardTheme_LXX_Base_Border, VERSION_CODES.LOLLIPOP), + new KeyboardTheme(THEME_ID_ROUNDED_BASE, "RoundedBase", R.style.KeyboardTheme_Rounded_Base, + VERSION_CODES.LOLLIPOP), + new KeyboardTheme(THEME_ID_ROUNDED_BASE_BORDER, "RoundedBaseBorder", R.style.KeyboardTheme_Rounded_Base_Border, + VERSION_CODES.LOLLIPOP) }; static { @@ -119,6 +126,8 @@ public static KeyboardTheme getKeyboardTheme(final Context context) { final int matchingId; if (style.equals(STYLE_HOLO)) matchingId = THEME_ID_HOLO_BASE; + else if (style.equals(STYLE_ROUNDED)) + matchingId = borders ? THEME_ID_ROUNDED_BASE_BORDER : THEME_ID_ROUNDED_BASE; else matchingId = borders ? THEME_ID_LXX_BASE_BORDER : THEME_ID_LXX_BASE; for (KeyboardTheme keyboardTheme : KEYBOARD_THEMES) { 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 429ce6d0a..147a6f9ca 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 @@ -6,6 +6,8 @@ package org.dslul.openboard.inputmethod.keyboard; +import static org.dslul.openboard.inputmethod.keyboard.KeyboardTheme.STYLE_ROUNDED; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -461,6 +463,7 @@ protected void onDrawKeyTopVisuals(@NonNull final Key key, @NonNull final Canvas blendAlpha(paint, params.mAnimAlpha); final float labelCharHeight = TypefaceUtils.getReferenceCharHeight(paint); final float labelCharWidth = TypefaceUtils.getReferenceCharWidth(paint); + final boolean isFunctionalKeyAndRoundedStyle = mColors.getThemeStyle().equals(STYLE_ROUNDED) && key.isFunctional(); final float hintX, hintBaseline; if (key.hasHintLabel()) { // The hint label is placed just right of the key label. Used mainly on @@ -482,14 +485,16 @@ protected void onDrawKeyTopVisuals(@NonNull final Key key, @NonNull final Canvas // The hint letter is placed at top-right corner of the key. Used mainly on phone. final float hintDigitWidth = TypefaceUtils.getReferenceDigitWidth(paint); final float hintLabelWidth = TypefaceUtils.getStringWidth(hintLabel, paint); - hintX = keyWidth - mKeyHintLetterPadding - - Math.max(hintDigitWidth, hintLabelWidth) / 2.0f; hintBaseline = -paint.ascent(); + hintX = isFunctionalKeyAndRoundedStyle + ? keyWidth - hintBaseline + : keyWidth - mKeyHintLetterPadding - Math.max(hintDigitWidth, hintLabelWidth) / 2.0f; paint.setTextAlign(Align.CENTER); } - final float adjustmentY = params.mHintLabelVerticalAdjustment * labelCharHeight; - canvas.drawText( - hintLabel, 0, hintLabel.length(), hintX, hintBaseline + adjustmentY, paint); + final float adjustmentY = isFunctionalKeyAndRoundedStyle + ? hintBaseline * 0.5f + : params.mHintLabelVerticalAdjustment * labelCharHeight; + canvas.drawText(hintLabel, 0, hintLabel.length(), hintX, hintBaseline + adjustmentY, paint); } // Draw key icon. @@ -517,7 +522,7 @@ protected void onDrawKeyTopVisuals(@NonNull final Key key, @NonNull final Canvas } } - // Draw popup hint "..." at the bottom right corner of the key. + // Draw popup hint "..." at the center or bottom right corner of the key, depending on style. protected void drawKeyPopupHint(@NonNull final Key key, @NonNull final Canvas canvas, @NonNull final Paint paint, @NonNull final KeyDrawParams params) { if (TextUtils.isEmpty(mKeyPopupHintLetter)) { @@ -525,13 +530,21 @@ protected void drawKeyPopupHint(@NonNull final Key key, @NonNull final Canvas ca } final int keyWidth = key.getDrawWidth(); final int keyHeight = key.getHeight(); - + final float labelCharWidth = TypefaceUtils.getReferenceCharWidth(paint); + final float hintX; + final float hintBaseline = paint.ascent(); paint.setTypeface(params.mTypeface); paint.setTextSize(params.mHintLetterSize); paint.setColor(params.mHintLabelColor); paint.setTextAlign(Align.CENTER); - final float hintX = keyWidth - mKeyHintLetterPadding - - TypefaceUtils.getReferenceCharWidth(paint) / 2.0f; + if (mColors.getThemeStyle().equals(STYLE_ROUNDED)) { + if (key.getBackgroundType() == Key.BACKGROUND_TYPE_SPACEBAR) + hintX = keyWidth + hintBaseline + labelCharWidth * 0.1f; + else + hintX = key.isFunctional() || key.isActionKey() ? keyWidth / 2.0f : keyWidth - mKeyHintLetterPadding - labelCharWidth / 2.0f; + } else { + hintX = keyWidth - mKeyHintLetterPadding - TypefaceUtils.getReferenceCharWidth(paint) / 2.0f; + } final float hintY = keyHeight - mKeyPopupHintLetterPadding; canvas.drawText(mKeyPopupHintLetter, hintX, hintY, paint); } 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 5d3818b93..484d70bc0 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 @@ -131,8 +131,14 @@ class AppearanceSettingsFragment : SubScreenFragment() { private fun setupTheme() { stylePref.apply { - entries = KeyboardTheme.STYLES entryValues = KeyboardTheme.STYLES + entries = entryValues.map { + val resId = resources.getIdentifier("style_name_$it", "string", requireContext().packageName) + if (resId == 0) it else getString(resId) + }.toTypedArray() + if (value !in entryValues) + value = entryValues.first().toString() + onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value -> summary = entries[entryValues.indexOfFirst { it == value }] setColorPrefs(value.toString()) diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java index adf135a00..8c34a0e1c 100644 --- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java +++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/suggestions/SuggestionStripView.java @@ -58,7 +58,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import androidx.appcompat.widget.PopupMenu; -import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; public final class SuggestionStripView extends RelativeLayout implements OnClickListener, @@ -87,6 +86,7 @@ public interface Listener { private final ImageButton mToolbarKey; private final Drawable mIncognitoIcon; private final Drawable mToolbarArrowIcon; + private final Drawable mBinIcon; private final ViewGroup mToolbar; private final View mToolbarContainer; private final ViewGroup mPinnedKeys; @@ -159,6 +159,10 @@ public SuggestionStripView(final Context context, final AttributeSet attrs, final ImageButton selectAllKey = findViewById(R.id.suggestions_strip_select_all_key); final ImageButton settingsKey = findViewById(R.id.suggestions_strip_settings_key); final ImageButton oneHandedKey = findViewById(R.id.suggestions_strip_one_handed_key); + final ImageButton arrowLeft = findViewById(R.id.suggestions_strip_left_key); + final ImageButton arrowRight = findViewById(R.id.suggestions_strip_right_key); + final ImageButton arrowUp = findViewById(R.id.suggestions_strip_up_key); + final ImageButton arrowDown = findViewById(R.id.suggestions_strip_down_key); for (int pos = 0; pos < SuggestedWords.MAX_SUGGESTIONS; pos++) { final TextView word = new TextView(context, null, R.attr.suggestionWordStyle); @@ -190,17 +194,22 @@ public SuggestionStripView(final Context context, final AttributeSet attrs, final TypedArray keyboardAttr = context.obtainStyledAttributes(attrs, R.styleable.Keyboard, defStyle, R.style.SuggestionStripView); mIncognitoIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconIncognitoKey); + mToolbarArrowIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconToolbarKey); + mBinIcon = keyboardAttr.getDrawable(R.styleable.Keyboard_iconBin); voiceKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconShortcutKey)); clipboardKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconClipboardNormalKey)); settingsKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconSettingsKey)); - selectAllKey.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_select_all)); + selectAllKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconSelectAll)); + arrowLeft.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowLeft)); + arrowRight.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowRight)); + arrowUp.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowUp)); + arrowDown.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconArrowDown)); oneHandedKey.setImageDrawable(keyboardAttr.getDrawable(R.styleable.Keyboard_iconStartOneHandedMode)); keyboardAttr.recycle(); final int toolbarHeight = Math.min(mToolbarKey.getLayoutParams().height, (int) getResources().getDimension(R.dimen.config_suggestions_strip_height)); mToolbarKey.getLayoutParams().height = toolbarHeight; mToolbarKey.getLayoutParams().width = toolbarHeight; // we want it square - mToolbarArrowIcon = ContextCompat.getDrawable(context, R.drawable.ic_arrow_right); mDefaultBackground = mToolbarKey.getBackground(); colors.setBackgroundColor(mDefaultBackground, BackgroundType.SUGGESTION); mEnabledToolKeyBackground.setColors(new int[] {colors.getAccent() | 0xFF000000, Color.TRANSPARENT}); // ignore alpha on accent color @@ -370,7 +379,7 @@ private void onLongClickClipboardKey() { @SuppressLint("ClickableViewAccessibility") // no need for View#performClick, we return false mostly anyway private boolean onLongClickSuggestion(final TextView wordView) { - final Drawable icon = ContextCompat.getDrawable(getContext(), R.drawable.ic_delete); + final Drawable icon = mBinIcon; icon.setColorFilter(Settings.getInstance().getCurrent().mColors.getKeyTextFilter()); int w = icon.getIntrinsicWidth(); int h = icon.getIntrinsicWidth(); diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_rounded_base.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_rounded_base.9.png new file mode 100644 index 000000000..dbcf54f11 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background_rounded_base.9.png differ diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_rounded_base.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_rounded_base.9.png new file mode 100644 index 000000000..95f20fd31 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background_rounded_base.9.png differ diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_rounded_base.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_rounded_base.9.png new file mode 100644 index 000000000..9a4ad7fcc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background_rounded_base.9.png differ diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_rounded_base.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_rounded_base.9.png new file mode 100644 index 000000000..97c86ce0b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background_rounded_base.9.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_rounded_base.9.png b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_rounded_base.9.png new file mode 100644 index 000000000..0de9144fc Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/keyboard_popup_panel_background_rounded_base.9.png differ diff --git a/app/src/main/res/drawable/btn_keyboard_key_functional_rounded_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_functional_rounded_base_border.xml new file mode 100644 index 000000000..b570c3bf2 --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_functional_rounded_base_border.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_functional_rounded_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_functional_rounded_base_border.xml new file mode 100644 index 000000000..48704428b --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_normal_functional_rounded_base_border.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_normal_rounded_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_normal_rounded_base_border.xml new file mode 100644 index 000000000..88edef7d3 --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_normal_rounded_base_border.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_rounded_base.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_rounded_base.xml new file mode 100644 index 000000000..9e2152e11 --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_popup_rounded_base.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_functional_rounded_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_functional_rounded_base_border.xml new file mode 100644 index 000000000..fe34e4d51 --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_functional_rounded_base_border.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_pressed_rounded_base.xml b/app/src/main/res/drawable/btn_keyboard_key_pressed_rounded_base.xml new file mode 100644 index 000000000..a6362b52a --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_pressed_rounded_base.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_rounded_base.xml b/app/src/main/res/drawable/btn_keyboard_key_rounded_base.xml new file mode 100644 index 000000000..ebdb16a99 --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_rounded_base.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_keyboard_key_rounded_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_rounded_base_border.xml new file mode 100644 index 000000000..158b30edc --- /dev/null +++ b/app/src/main/res/drawable/btn_keyboard_key_rounded_base_border.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_suggestion_rounded_base.xml b/app/src/main/res/drawable/btn_suggestion_rounded_base.xml new file mode 100644 index 000000000..c7a9f0eb3 --- /dev/null +++ b/app/src/main/res/drawable/btn_suggestion_rounded_base.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml new file mode 100644 index 000000000..e112dc055 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_down.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_down_rounded.xml b/app/src/main/res/drawable/ic_arrow_down_rounded.xml new file mode 100644 index 000000000..74d51614f --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_down_rounded.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_left_rounded.xml b/app/src/main/res/drawable/ic_arrow_left_rounded.xml new file mode 100644 index 000000000..b59becc81 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_left_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_right_rounded.xml b/app/src/main/res/drawable/ic_arrow_right_rounded.xml new file mode 100644 index 000000000..509ea68d8 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_right_rounded.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrow_up_rounded.xml b/app/src/main/res/drawable/ic_arrow_up_rounded.xml new file mode 100644 index 000000000..7f601c4fa --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_up_rounded.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_clipboard_pin_rounded.xml b/app/src/main/res/drawable/ic_clipboard_pin_rounded.xml new file mode 100644 index 000000000..ad09b2c4e --- /dev/null +++ b/app/src/main/res/drawable/ic_clipboard_pin_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_delete_rounded.xml b/app/src/main/res/drawable/ic_delete_rounded.xml new file mode 100644 index 000000000..580225d1a --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_rounded.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_emoji_activities_rounded.xml b/app/src/main/res/drawable/ic_emoji_activities_rounded.xml new file mode 100644 index 000000000..348d9e11d --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_activities_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_emoticons_rounded.xml b/app/src/main/res/drawable/ic_emoji_emoticons_rounded.xml new file mode 100644 index 000000000..0f94b4b8f --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_emoticons_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_flags_rounded.xml b/app/src/main/res/drawable/ic_emoji_flags_rounded.xml new file mode 100644 index 000000000..e81496762 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_flags_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_food_drink_rounded.xml b/app/src/main/res/drawable/ic_emoji_food_drink_rounded.xml new file mode 100644 index 000000000..d0e606fdf --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_food_drink_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_objects_rounded.xml b/app/src/main/res/drawable/ic_emoji_objects_rounded.xml new file mode 100644 index 000000000..4570148eb --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_objects_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_people_body_rounded.xml b/app/src/main/res/drawable/ic_emoji_people_body_rounded.xml new file mode 100644 index 000000000..438b3ace4 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_people_body_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_recents_rounded.xml b/app/src/main/res/drawable/ic_emoji_recents_rounded.xml new file mode 100644 index 000000000..48530f9d8 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_recents_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_smileys_emotion_rounded.xml b/app/src/main/res/drawable/ic_emoji_smileys_emotion_rounded.xml new file mode 100644 index 000000000..41be7abf8 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_smileys_emotion_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_symbols_rounded.xml b/app/src/main/res/drawable/ic_emoji_symbols_rounded.xml new file mode 100644 index 000000000..714f0ea55 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_symbols_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_emoji_travel_places_rounded.xml b/app/src/main/res/drawable/ic_emoji_travel_places_rounded.xml new file mode 100644 index 000000000..35aec83c3 --- /dev/null +++ b/app/src/main/res/drawable/ic_emoji_travel_places_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_select_all_rounded.xml b/app/src/main/res/drawable/ic_select_all_rounded.xml new file mode 100644 index 000000000..6c876ee1d --- /dev/null +++ b/app/src/main/res/drawable/ic_select_all_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_clear_clipboard_rounded.xml b/app/src/main/res/drawable/sym_keyboard_clear_clipboard_rounded.xml new file mode 100644 index 000000000..0c8908923 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_clear_clipboard_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_clipboard_rounded.xml b/app/src/main/res/drawable/sym_keyboard_clipboard_rounded.xml new file mode 100644 index 000000000..9db64b400 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_clipboard_rounded.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_delete_rounded.xml b/app/src/main/res/drawable/sym_keyboard_delete_rounded.xml new file mode 100644 index 000000000..3ccd613df --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_delete_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_done_rounded.xml b/app/src/main/res/drawable/sym_keyboard_done_rounded.xml new file mode 100644 index 000000000..42a32a234 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_done_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_go_rounded.xml b/app/src/main/res/drawable/sym_keyboard_go_rounded.xml new file mode 100644 index 000000000..9c46b55cb --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_go_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_return_rounded.xml b/app/src/main/res/drawable/sym_keyboard_return_rounded.xml new file mode 100644 index 000000000..4013da361 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_return_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_search_rounded.xml b/app/src/main/res/drawable/sym_keyboard_search_rounded.xml new file mode 100644 index 000000000..1b423e644 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_search_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_send_rounded.xml b/app/src/main/res/drawable/sym_keyboard_send_rounded.xml new file mode 100644 index 000000000..abf15c51b --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_send_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_settings_rounded.xml b/app/src/main/res/drawable/sym_keyboard_settings_rounded.xml new file mode 100644 index 000000000..1ee0aaa40 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_settings_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml new file mode 100644 index 000000000..f05fc08f9 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_shift_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_smiley_rounded.xml b/app/src/main/res/drawable/sym_keyboard_smiley_rounded.xml new file mode 100644 index 000000000..7d6e02e4f --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_smiley_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_space_rounded.xml b/app/src/main/res/drawable/sym_keyboard_space_rounded.xml new file mode 100644 index 000000000..867e61c13 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_space_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_start_onehanded_rounded.xml b/app/src/main/res/drawable/sym_keyboard_start_onehanded_rounded.xml new file mode 100644 index 000000000..479f41900 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_start_onehanded_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_stop_onehanded_rounded.xml b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_rounded.xml new file mode 100644 index 000000000..cb37049f7 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_tab_rounded.xml b/app/src/main/res/drawable/sym_keyboard_tab_rounded.xml new file mode 100644 index 000000000..69e422da5 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_tab_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_voice_off_rounded.xml b/app/src/main/res/drawable/sym_keyboard_voice_off_rounded.xml new file mode 100644 index 000000000..2d5a62a3d --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_voice_off_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sym_keyboard_voice_rounded.xml b/app/src/main/res/drawable/sym_keyboard_voice_rounded.xml new file mode 100644 index 000000000..9045a7888 --- /dev/null +++ b/app/src/main/res/drawable/sym_keyboard_voice_rounded.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/suggestions_strip_down_key.xml b/app/src/main/res/layout/suggestions_strip_down_key.xml index 09bc4c684..ccef08688 100644 --- a/app/src/main/res/layout/suggestions_strip_down_key.xml +++ b/app/src/main/res/layout/suggestions_strip_down_key.xml @@ -6,8 +6,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/config_suggestions_strip_edge_key_width" android:layout_height="fill_parent" - android:src="@drawable/ic_arrow_up" android:scaleX="1.2" - android:scaleY="-1.2" + android:scaleY="1.2" android:tag="down_key" style="?attr/suggestionWordStyle" /> diff --git a/app/src/main/res/layout/suggestions_strip_left_key.xml b/app/src/main/res/layout/suggestions_strip_left_key.xml index ad201ad9e..eaf06e94d 100644 --- a/app/src/main/res/layout/suggestions_strip_left_key.xml +++ b/app/src/main/res/layout/suggestions_strip_left_key.xml @@ -6,7 +6,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/config_suggestions_strip_edge_key_width" android:layout_height="fill_parent" - android:src="@drawable/ic_arrow_left" android:scaleX="1.2" android:scaleY="1.2" android:tag="left_key" diff --git a/app/src/main/res/layout/suggestions_strip_right_key.xml b/app/src/main/res/layout/suggestions_strip_right_key.xml index 66ab15d0f..7e449ad3d 100644 --- a/app/src/main/res/layout/suggestions_strip_right_key.xml +++ b/app/src/main/res/layout/suggestions_strip_right_key.xml @@ -6,7 +6,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/config_suggestions_strip_edge_key_width" android:layout_height="fill_parent" - android:src="@drawable/ic_arrow_right" android:scaleX="1.2" android:scaleY="1.2" android:tag="right_key" diff --git a/app/src/main/res/layout/suggestions_strip_up_key.xml b/app/src/main/res/layout/suggestions_strip_up_key.xml index d24671138..d7ddf5c94 100644 --- a/app/src/main/res/layout/suggestions_strip_up_key.xml +++ b/app/src/main/res/layout/suggestions_strip_up_key.xml @@ -6,7 +6,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="@dimen/config_suggestions_strip_edge_key_width" android:layout_height="fill_parent" - android:src="@drawable/ic_arrow_up" android:scaleX="1.2" android:scaleY="1.2" android:tag="up_key" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 498e59848..ba6b67e86 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -235,6 +235,7 @@ Nouveau dictionnaire: Licence Open-source Forcer le mode incognito Style + Arrondi Couleurs Couleurs (mode nuit) Bordures des touches diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 65d82d055..9ff86f31d 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -216,6 +216,8 @@ + + @@ -269,6 +271,13 @@ + + + + + + + @@ -473,6 +482,8 @@ + + diff --git a/app/src/main/res/values/keyboard-icons-holo.xml b/app/src/main/res/values/keyboard-icons-holo.xml index e7a14ef88..ac8ee9120 100644 --- a/app/src/main/res/values/keyboard-icons-holo.xml +++ b/app/src/main/res/values/keyboard-icons-holo.xml @@ -32,5 +32,12 @@ @drawable/sym_keyboard_stop_onehanded_holo @drawable/sym_keyboard_switch_onehanded_holo @drawable/sym_keyboard_numpad_key_holo + @drawable/ic_arrow_right + @drawable/ic_select_all + @drawable/ic_arrow_left + @drawable/ic_arrow_right + @drawable/ic_arrow_up + @drawable/ic_arrow_down + @drawable/ic_delete diff --git a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml index a59866567..9580e5be8 100644 --- a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml +++ b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml @@ -37,5 +37,12 @@ @drawable/sym_keyboard_stop_onehanded_lxx @drawable/ic_arrow_left @drawable/sym_keyboard_numpad_key_lxx + @drawable/ic_arrow_right + @drawable/ic_select_all + @drawable/ic_arrow_left + @drawable/ic_arrow_right + @drawable/ic_arrow_up + @drawable/ic_arrow_down + @drawable/ic_delete diff --git a/app/src/main/res/values/keyboard-icons-rounded.xml b/app/src/main/res/values/keyboard-icons-rounded.xml new file mode 100644 index 000000000..d41fa938c --- /dev/null +++ b/app/src/main/res/values/keyboard-icons-rounded.xml @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6d2e595ab..8d7702a90 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -576,6 +576,8 @@ New dictionary: \u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ Style + + Rounded Colors diff --git a/app/src/main/res/values/themes-rounded-base-border.xml b/app/src/main/res/values/themes-rounded-base-border.xml new file mode 100644 index 000000000..c49699c66 --- /dev/null +++ b/app/src/main/res/values/themes-rounded-base-border.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/themes-rounded-base.xml b/app/src/main/res/values/themes-rounded-base.xml new file mode 100644 index 000000000..46f0c1bc2 --- /dev/null +++ b/app/src/main/res/values/themes-rounded-base.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml-sw600dp/key_styles_enter.xml b/app/src/main/res/xml-sw600dp/key_styles_enter.xml index ba5c9f330..41b2a19d8 100644 --- a/app/src/main/res/xml-sw600dp/key_styles_enter.xml +++ b/app/src/main/res/xml-sw600dp/key_styles_enter.xml @@ -67,7 +67,7 @@ - + - + - +