partially revert 43626b009c

commit got rid of many (almost) duplicate files, but introduced visual glitches on some Android versions
see https://github.com/Helium314/openboard/issues/110#issuecomment-1709317156
This commit is contained in:
Helium314 2023-09-09 09:50:50 +02:00
parent cbca99843b
commit 565c9504db
57 changed files with 14 additions and 25 deletions

View file

@ -39,7 +39,6 @@ import org.dslul.openboard.inputmethod.compat.TabHostCompat;
import org.dslul.openboard.inputmethod.keyboard.Key;
import org.dslul.openboard.inputmethod.keyboard.KeyboardActionListener;
import org.dslul.openboard.inputmethod.keyboard.KeyboardLayoutSet;
import org.dslul.openboard.inputmethod.keyboard.KeyboardTheme;
import org.dslul.openboard.inputmethod.keyboard.KeyboardView;
import org.dslul.openboard.inputmethod.keyboard.internal.KeyDrawParams;
import org.dslul.openboard.inputmethod.keyboard.internal.KeyVisualAttributes;
@ -161,14 +160,8 @@ public final class EmojiPalettesView extends LinearLayout
R.layout.emoji_keyboard_tab_icon, null);
// TODO: Replace background color with its own setting rather than using the
// category page indicator background as a workaround.
iconView.setBackgroundColor(mCategoryPageIndicatorBackground); // only necessary for holo?
final Colors colors = Settings.getInstance().getCurrent().mColors;
iconView.setColorFilter(colors.getKeyTextFilter());
// todo: this should not be here, but whatever...
if (categoryId != 0 && colors.getThemeStyle().equals(KeyboardTheme.THEME_STYLE_MATERIAL)) {
iconView.setScaleX(0.75f);
iconView.setScaleY(0.75f);
}
iconView.setBackgroundColor(mCategoryPageIndicatorBackground);
iconView.setColorFilter(Settings.getInstance().getCurrent().mColors.getKeyTextFilter());
iconView.setImageResource(mEmojiCategory.getCategoryTabIcon(categoryId));
iconView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
tspec.setIndicator(iconView);
@ -282,7 +275,6 @@ public final class EmojiPalettesView extends LinearLayout
colors.setBackgroundColor(mSpacebar.getBackground(), BackgroundType.SPACE);
colors.setKeyboardBackground(this); // todo: color on top appears a little darker than on normal keyboard, what is wrong?
mEmojiCategoryPageIndicatorView.setColors(colors.getAccent(), colors.getAdjustedBackground());
findViewById(R.id.emoji_tab_strip).setBackgroundColor(colors.getAdjustedBackground());
}
@Override
@ -306,11 +298,8 @@ public final class EmojiPalettesView extends LinearLayout
if (mCurrentTab != null)
mCurrentTab.setColorFilter(colors.getKeyTextFilter());
mCurrentTab = (ImageView) mTabHost.getCurrentTabView();
// todo (later): update the lxx recents icon
if (categoryId == 0 && colors.getThemeStyle().equals(KeyboardTheme.THEME_STYLE_MATERIAL))
mCurrentTab.setColorFilter(colors.getAccent());
else
mCurrentTab.setColorFilter(colors.getAccentColorFilter());
// mCurrentTab.setColorFilter(colors.accentColorFilter); not working because of lxx icon color
mCurrentTab.setColorFilter(colors.getAccent());
}
/**

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 869 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 764 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 825 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,006 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 920 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 639 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 868 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 550 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 734 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 893 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 925 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

@ -68,16 +68,16 @@
<item name="categoryPageIndicatorColor">@color/highlight_color_lxx_light</item>
<item name="categoryPageIndicatorBackground">@color/emoji_tab_page_indicator_background_lxx_base</item>
<item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_normal_lxx_light</item>
<item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_normal_holo_dark</item>
<item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_normal_holo_dark</item>
<item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_normal_holo_dark</item>
<item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_normal_holo_dark</item>
<item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_normal_holo_dark</item>
<item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_normal_holo_dark</item>
<item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_normal_holo_dark</item>
<item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_normal_holo_dark</item>
<item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_normal_holo_dark</item>
<item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_normal_holo_dark</item>
<item name="iconEmojiCategory1Tab">@drawable/ic_emoji_smileys_emotion_normal_lxx_light</item>
<item name="iconEmojiCategory2Tab">@drawable/ic_emoji_people_body_normal_lxx_light</item>
<item name="iconEmojiCategory3Tab">@drawable/ic_emoji_animals_nature_normal_lxx_light</item>
<item name="iconEmojiCategory4Tab">@drawable/ic_emoji_food_drink_normal_lxx_light</item>
<item name="iconEmojiCategory5Tab">@drawable/ic_emoji_travel_places_normal_lxx_light</item>
<item name="iconEmojiCategory6Tab">@drawable/ic_emoji_activities_normal_lxx_light</item>
<item name="iconEmojiCategory7Tab">@drawable/ic_emoji_objects_normal_lxx_light</item>
<item name="iconEmojiCategory8Tab">@drawable/ic_emoji_symbols_normal_lxx_light</item>
<item name="iconEmojiCategory9Tab">@drawable/ic_emoji_flags_normal_lxx_light</item>
<item name="iconEmojiCategory10Tab">@drawable/ic_emoji_emoticons_normal_lxx_light</item>
</style>
<style
name="ClipboardHistoryView.LXX_Base"