TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 16:00:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add dark theme to emojiDrawer

Browse Source 
Fixes #3240
Closes #3353
This commit is contained in:
agrajaghh
2015-06-08 17:54:16 +02:00
committed by Jake McGinty
parent 40af2a81db
commit ae4f6b1dd4
80 changed files with 132 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
View File

@@ -1,8 +1,6 @@
package org.thoughtcrime.securesms.components.emoji;
import android.content.Context;
import android.support.annotation.ArrayRes;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.view.PagerAdapter;
@@ -13,7 +11,6 @@ import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
@@ -169,7 +166,7 @@ public class EmojiDrawer extends KeyboardAwareLinearLayout {
@Override public View getCustomTabView(ViewGroup viewGroup, int i) {
ImageView image = new ImageView(context);
image.setScaleType(ScaleType.CENTER_INSIDE);
image.setImageResource(pages.get(i).getIconRes());
image.setImageResource(ResUtil.getDrawableRes(context, pages.get(i).getIconAttr()));
return image;
}
}

2
src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
View File

@@ -1,7 +1,7 @@
package org.thoughtcrime.securesms.components.emoji;
public interface EmojiPageModel {
int getIconRes();
int getIconAttr();
String[] getEmoji();
boolean hasSpriteMap();
String getSprite();

12
src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
public class EmojiPages {
public static final List<EmojiPageModel> PAGES = Arrays.<EmojiPageModel>asList(
new StaticEmojiPageModel(R.drawable.emoji_category_people, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_people, new String[] {
"\u263a", "\ud83d\ude0a", "\ud83d\ude00", "\ud83d\ude01", "\ud83d\ude02", "\ud83d\ude03",
"\ud83d\ude04", "\ud83d\ude05", "\ud83d\ude06", "\ud83d\ude07", "\ud83d\ude08", "\ud83d\ude09",
"\ud83d\ude2f", "\ud83d\ude10", "\ud83d\ude11", "\ud83d\ude15", "\ud83d\ude20", "\ud83d\ude2c",
@@ -35,7 +35,7 @@ public class EmojiPages {
"\ud83d\udc4a", "\u261d", "\ud83d\udc46", "\ud83d\udc47", "\ud83d\udc48", "\ud83d\udc49",
"\ud83d\udc4b", "\ud83d\udc4f", "\ud83d\udc50",
}, "emoji-people.png"),
new StaticEmojiPageModel(R.drawable.emoji_category_objects, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_objects, new String[] {
"\ud83d\udd30", "\ud83d\udc84", "\ud83d\udc5e", "\ud83d\udc5f", "\ud83d\udc51", "\ud83d\udc52",
"\ud83c\udfa9", "\ud83c\udf93", "\ud83d\udc53", "\u231a", "\ud83d\udc54", "\ud83d\udc55",
"\ud83d\udc56", "\ud83d\udc57", "\ud83d\udc58", "\ud83d\udc59", "\ud83d\udc60", "\ud83d\udc61",
@@ -64,7 +64,7 @@ public class EmojiPages {
"\ud83d\udcfc", "\ud83c\udfa7", "\ud83c\udfa4", "\ud83c\udfb5", "\ud83c\udfb6", "\ud83c\udfbc",
"\ud83c\udfbb", "\ud83c\udfb9", "\ud83c\udfb7", "\ud83c\udfba", "\ud83c\udfb8", "\u303d",
}, "emoji-objects.png"),
new StaticEmojiPageModel(R.drawable.emoji_category_nature, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_nature, new String[] {
"\ud83d\udc15", "\ud83d\udc36", "\ud83d\udc29", "\ud83d\udc08", "\ud83d\udc31", "\ud83d\udc00",
"\ud83d\udc01", "\ud83d\udc2d", "\ud83d\udc39", "\ud83d\udc22", "\ud83d\udc07", "\ud83d\udc30",
"\ud83d\udc13", "\ud83d\udc14", "\ud83d\udc23", "\ud83d\udc24", "\ud83d\udc25", "\ud83d\udc26",
@@ -96,7 +96,7 @@ public class EmojiPages {
"\ud83c\udf06", "\ud83c\udf03", "\ud83c\udf0c", "\ud83c\udf09", "\ud83c\udf0a", "\ud83c\udf0b",
"\ud83c\udf0e", "\ud83c\udf0f", "\ud83c\udf0d", "\ud83c\udf10",
}, "emoji-nature.png"),
new StaticEmojiPageModel(R.drawable.emoji_category_places, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_places, new String[] {
"\ud83c\udfe0", "\ud83c\udfe1", "\ud83c\udfe2", "\ud83c\udfe3", "\ud83c\udfe4", "\ud83c\udfe5",
"\ud83c\udfe6", "\ud83c\udfe7", "\ud83c\udfe8", "\ud83c\udfe9", "\ud83c\udfea", "\ud83c\udfeb",
"\u26ea", "\u26f2", "\ud83c\udfec", "\ud83c\udfef", "\ud83c\udff0", "\ud83c\udfed",
@@ -118,7 +118,7 @@ public class EmojiPages {
"\ud83d\udea6", "\ud83d\udea7", "\ud83d\udea8", "\u2668", "\ud83d\udc8c", "\ud83d\udc8d",
"\ud83d\udc8e", "\ud83d\udc90", "\ud83d\udc92",
}, "emoji-places.png"),
new StaticEmojiPageModel(R.drawable.emoji_category_symbol, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_symbol, new String[] {
"\ud83d\udd1d", "\ud83d\udd19", "\ud83d\udd1b", "\ud83d\udd1c", "\ud83d\udd1a", "\u23f3",
"\u231b", "\u23f0", "\u2648", "\u2649", "\u264a", "\u264b",
"\u264c", "\u264d", "\u264e", "\u264f", "\u2650", "\u2651",
@@ -156,7 +156,7 @@ public class EmojiPages {
"\ud83d\udd04", "\ud83d\udce7", "\ud83d\udd05", "\ud83d\udd06", "\ud83d\udd07", "\ud83d\udd08",
"\ud83d\udd09", "\ud83d\udd0a",
}, "emoji-symbol.png"),
new StaticEmojiPageModel(R.drawable.emoji_category_emoticons, new String[] {
new StaticEmojiPageModel(R.attr.emoji_category_emoticons, new String[] {
"=-O", ":-P", ";-)", ":-(", ":-)", ":-!",
":-$", "B-)", ":O", ":-*", ":-D", ":'(",
":-\\", "O:-)", ":-[",

6
src/org/thoughtcrime/securesms/components/emoji/EmojiView.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Paint.Align;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION_CODES;
@@ -13,7 +12,8 @@ import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.view.View;
import com.google.common.base.Optional;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.ResUtil;
public class EmojiView extends View implements Drawable.Callback {
private String emoji;
@@ -58,7 +58,7 @@ public class EmojiView extends View implements Drawable.Callback {
} else {
float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom();
paint.setTextSize(targetFontSize);
paint.setColor(Color.BLACK);
paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color));
paint.getTextBounds(emoji, 0, emoji.length(), textBounds);
float overflow = textBounds.width() / (getWidth() - getPaddingLeft() - getPaddingRight());
if (overflow > 1f) {

4
src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
View File

@@ -42,8 +42,8 @@ public class RecentEmojiPageModel implements EmojiPageModel {
}
}
@Override public int getIconRes() {
return R.drawable.emoji_category_recent;
@Override public int getIconAttr() {
return R.attr.emoji_category_recent;
}
@Override public String[] getEmoji() {

20
src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
View File

@@ -1,22 +1,22 @@
package org.thoughtcrime.securesms.components.emoji;
import android.support.annotation.DrawableRes;
import android.support.annotation.AttrRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
public class StaticEmojiPageModel implements EmojiPageModel {
@DrawableRes private final int icon;
@NonNull private final String[] emoji;
@Nullable private final String sprite;
@AttrRes private final int iconAttr;
@NonNull private final String[] emoji;
@Nullable private final String sprite;
public StaticEmojiPageModel(@DrawableRes int icon, @NonNull String[] emoji, @Nullable String sprite) {
this.icon = icon;
this.emoji = emoji;
this.sprite = sprite;
public StaticEmojiPageModel(@AttrRes int iconAttr, @NonNull String[] emoji, @Nullable String sprite) {
this.iconAttr = iconAttr;
this.emoji = emoji;
this.sprite = sprite;
}
public int getIconRes() {
return icon;
public int getIconAttr() {
return iconAttr;
}
@NonNull public String[] getEmoji() {