remove more unnecessary icons
|
@ -39,6 +39,7 @@ import org.dslul.openboard.inputmethod.compat.TabHostCompat;
|
||||||
import org.dslul.openboard.inputmethod.keyboard.Key;
|
import org.dslul.openboard.inputmethod.keyboard.Key;
|
||||||
import org.dslul.openboard.inputmethod.keyboard.KeyboardActionListener;
|
import org.dslul.openboard.inputmethod.keyboard.KeyboardActionListener;
|
||||||
import org.dslul.openboard.inputmethod.keyboard.KeyboardLayoutSet;
|
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.KeyboardView;
|
||||||
import org.dslul.openboard.inputmethod.keyboard.internal.KeyDrawParams;
|
import org.dslul.openboard.inputmethod.keyboard.internal.KeyDrawParams;
|
||||||
import org.dslul.openboard.inputmethod.keyboard.internal.KeyVisualAttributes;
|
import org.dslul.openboard.inputmethod.keyboard.internal.KeyVisualAttributes;
|
||||||
|
@ -160,8 +161,14 @@ public final class EmojiPalettesView extends LinearLayout
|
||||||
R.layout.emoji_keyboard_tab_icon, null);
|
R.layout.emoji_keyboard_tab_icon, null);
|
||||||
// TODO: Replace background color with its own setting rather than using the
|
// TODO: Replace background color with its own setting rather than using the
|
||||||
// category page indicator background as a workaround.
|
// category page indicator background as a workaround.
|
||||||
iconView.setBackgroundColor(mCategoryPageIndicatorBackground);
|
iconView.setBackgroundColor(mCategoryPageIndicatorBackground); // only necessary for holo?
|
||||||
iconView.setColorFilter(Settings.getInstance().getCurrent().mColors.getKeyTextFilter());
|
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.setImageResource(mEmojiCategory.getCategoryTabIcon(categoryId));
|
iconView.setImageResource(mEmojiCategory.getCategoryTabIcon(categoryId));
|
||||||
iconView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
|
iconView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
|
||||||
tspec.setIndicator(iconView);
|
tspec.setIndicator(iconView);
|
||||||
|
@ -275,6 +282,7 @@ public final class EmojiPalettesView extends LinearLayout
|
||||||
colors.setBackgroundColor(mSpacebar.getBackground(), BackgroundType.SPACE);
|
colors.setBackgroundColor(mSpacebar.getBackground(), BackgroundType.SPACE);
|
||||||
colors.setKeyboardBackground(this); // todo: color on top appears a little darker than on normal keyboard, what is wrong?
|
colors.setKeyboardBackground(this); // todo: color on top appears a little darker than on normal keyboard, what is wrong?
|
||||||
mEmojiCategoryPageIndicatorView.setColors(colors.getAccent(), colors.getAdjustedBackground());
|
mEmojiCategoryPageIndicatorView.setColors(colors.getAccent(), colors.getAdjustedBackground());
|
||||||
|
findViewById(R.id.emoji_tab_strip).setBackgroundColor(colors.getAdjustedBackground());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -298,13 +306,11 @@ public final class EmojiPalettesView extends LinearLayout
|
||||||
if (mCurrentTab != null)
|
if (mCurrentTab != null)
|
||||||
mCurrentTab.setColorFilter(colors.getKeyTextFilter());
|
mCurrentTab.setColorFilter(colors.getKeyTextFilter());
|
||||||
mCurrentTab = (ImageView) mTabHost.getCurrentTabView();
|
mCurrentTab = (ImageView) mTabHost.getCurrentTabView();
|
||||||
// todo (later): doesn't work properly, decide which drawables to use for lxx emojis
|
// todo (later): update the lxx recents icon
|
||||||
// holo ones are good, but a bit larger (and scaling results in weird background outline)
|
if (categoryId == 0 && colors.getThemeStyle().equals(KeyboardTheme.THEME_STYLE_MATERIAL))
|
||||||
// and the recents is different
|
|
||||||
// dark ones seem to have transparency
|
|
||||||
// light ones are too dark, can only be used when overriding color
|
|
||||||
// mCurrentTab.setColorFilter(colors.accentColorFilter);
|
|
||||||
mCurrentTab.setColorFilter(colors.getAccent());
|
mCurrentTab.setColorFilter(colors.getAccent());
|
||||||
|
else
|
||||||
|
mCurrentTab.setColorFilter(colors.getAccentColorFilter());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Before Width: | Height: | Size: 771 B |
Before Width: | Height: | Size: 812 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 690 B |
Before Width: | Height: | Size: 898 B |
Before Width: | Height: | Size: 570 B |
Before Width: | Height: | Size: 661 B |
Before Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 869 B |
Before Width: | Height: | Size: 597 B |
Before Width: | Height: | Size: 641 B |
Before Width: | Height: | Size: 678 B |
Before Width: | Height: | Size: 764 B |
Before Width: | Height: | Size: 932 B |
Before Width: | Height: | Size: 1,006 B |
Before Width: | Height: | Size: 932 B |
Before Width: | Height: | Size: 797 B |
Before Width: | Height: | Size: 920 B |
Before Width: | Height: | Size: 751 B |
Before Width: | Height: | Size: 903 B |
Before Width: | Height: | Size: 572 B |
Before Width: | Height: | Size: 639 B |
Before Width: | Height: | Size: 730 B |
Before Width: | Height: | Size: 868 B |
Before Width: | Height: | Size: 500 B |
Before Width: | Height: | Size: 628 B |
Before Width: | Height: | Size: 440 B |
Before Width: | Height: | Size: 510 B |
Before Width: | Height: | Size: 590 B |
Before Width: | Height: | Size: 694 B |
Before Width: | Height: | Size: 448 B |
Before Width: | Height: | Size: 482 B |
Before Width: | Height: | Size: 491 B |
Before Width: | Height: | Size: 602 B |
Before Width: | Height: | Size: 647 B |
Before Width: | Height: | Size: 734 B |
Before Width: | Height: | Size: 647 B |
Before Width: | Height: | Size: 576 B |
Before Width: | Height: | Size: 684 B |
Before Width: | Height: | Size: 530 B |
Before Width: | Height: | Size: 588 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 998 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 752 B |
Before Width: | Height: | Size: 893 B |
Before Width: | Height: | Size: 959 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 794 B |
Before Width: | Height: | Size: 925 B |
Before Width: | Height: | Size: 921 B |
Before Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 965 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 1,009 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.6 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 2.7 KiB |