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

Switched to new emoji lookup pattern, added rendering support.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-06-28 16:56:30 -07:00
parent 2e31cfed11
commit 71e161c792
62 changed files with 100 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/org/thoughtcrime/securesms/components/EmojiDrawer.java
View File

@@ -24,6 +24,7 @@ import android.widget.TextView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.Emoji;
import java.io.File;
import java.io.IOException;
public class EmojiDrawer extends FrameLayout {
@@ -32,6 +33,7 @@ public class EmojiDrawer extends FrameLayout {
private FrameLayout recentEmojiGridLayout;
private EditText composeText;
private Emoji emoji;
public EmojiDrawer(Context context) {
super(context);
@@ -57,6 +59,7 @@ public class EmojiDrawer extends FrameLayout {
}
private void initialize() {
this.emoji = Emoji.getInstance(getContext());
LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.emoji_drawer, this, true);
@@ -79,14 +82,14 @@ public class EmojiDrawer extends FrameLayout {
private class EmojiClickListener implements AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
int start = composeText.getSelectionStart();
int end = composeText.getSelectionEnd ();
String emoji = Emoji.EMOJI_ASSET_CODE_MAP.get(Emoji.EMOJI_ASSETS.get(position));
int start = composeText.getSelectionStart();
int end = composeText.getSelectionEnd ();
String characters = emoji.getEmojiUnicode(position);
composeText.getText().replace(Math.min(start, end), Math.max(start, end),
emoji, 0, emoji.length());
characters, 0, characters.length());
composeText.setText(Emoji.emojify(getContext(), composeText.getText().toString()),
composeText.setText(emoji.emojify(composeText.getText().toString()),
TextView.BufferType.SPANNABLE);
composeText.setSelection(end+2);
@@ -97,7 +100,7 @@ public class EmojiDrawer extends FrameLayout {
@Override
public int getCount() {
return Emoji.EMOJI_ASSETS.size();
return emoji.getEmojiAssetCount();
}
@Override
@@ -112,25 +115,19 @@ public class EmojiDrawer extends FrameLayout {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
try {
String asset = Emoji.EMOJI_ASSETS.get(position);
Drawable drawable = Drawable.createFromStream(getContext().getAssets().open(asset + ".png"), null);
Drawable drawable = emoji.getEmojiDrawable(position);
if (convertView != null && convertView instanceof ImageView) {
((ImageView)convertView).setImageDrawable(drawable);
return convertView;
} else {
ImageView imageView = new ImageView(getContext());
imageView.setImageDrawable(drawable);
return imageView;
}
} catch (IOException ioe) {
throw new AssertionError(ioe);
if (convertView != null && convertView instanceof ImageView) {
((ImageView)convertView).setImageDrawable(drawable);
return convertView;
} else {
ImageView imageView = new ImageView(getContext());
imageView.setImageDrawable(drawable);
return imageView;
}
}
}
private class EmojiPagerAdapter extends PagerAdapter {
@Override