TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-13 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

reduce emoji memory consumption

Browse Source 
Closes 
// FREEBIE
This commit is contained in:
Jake McGinty
2015-05-29 15:56:00 -07:00
committed by Moxie Marlinspike
parent ce610e0262
commit 05e45e92cf
7 changed files with 6 additions and 5 deletions
assets
emoji-0.pngemoji-1.pngemoji-2.pngemoji-3.pngemoji-4.png
res/values
dimens.xml
src/org/thoughtcrime/securesms/components/emoji
EmojiProvider.java

BIN
assets/emoji-0.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 347 KiB

After

(image error) Size: 227 KiB

BIN
assets/emoji-1.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 436 KiB

After

(image error) Size: 283 KiB

BIN
assets/emoji-2.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 515 KiB

After

(image error) Size: 332 KiB

BIN
assets/emoji-3.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 273 KiB

After

(image error) Size: 177 KiB

BIN
assets/emoji-4.png

Binary file not shown.
Side by Side Swipe Overlay

Before

(image error) Size: 315 KiB

After

(image error) Size: 206 KiB

4
res/values/dimens.xml

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="emoji_drawer_size">36sp</dimen> <dimen name="emoji_drawer_size">32sp</dimen>
<dimen name="min_emoji_drawer_height">200dp</dimen> <dimen name="min_emoji_drawer_height">200dp</dimen>
<dimen name="emoji_drawer_item_padding">3dp</dimen> <dimen name="emoji_drawer_item_padding">5dp</dimen>
<dimen name="emoji_drawer_indicator_height">1.5dp</dimen> <dimen name="emoji_drawer_indicator_height">1.5dp</dimen>
<dimen name="emoji_drawer_left_right_padding">5dp</dimen> <dimen name="emoji_drawer_left_right_padding">5dp</dimen>
<dimen name="conversation_item_date_text_size">12sp</dimen> <dimen name="conversation_item_date_text_size">12sp</dimen>

7
src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java

@@ -48,9 +48,9 @@ public class EmojiProvider {
public static final double EMOJI_FULL = 1.00; public static final double EMOJI_FULL = 1.00;
public static final double EMOJI_SMALL = 0.50; public static final double EMOJI_SMALL = 0.50;
public static final int EMOJI_RAW_HEIGHT = 128; public static final int EMOJI_RAW_HEIGHT = 96;
public static final int EMOJI_RAW_WIDTH = 136; public static final int EMOJI_RAW_WIDTH = 102;
public static final int EMOJI_VERT_PAD = 8; public static final int EMOJI_VERT_PAD = 6;
public static final int EMOJI_PER_ROW = 15; public static final int EMOJI_PER_ROW = 15;
private final Context context; private final Context context;
@@ -264,6 +264,7 @@ public class EmojiProvider {
Log.w(TAG, ioe); Log.w(TAG, ioe);
throw ioe; throw ioe;
} catch (BitmapDecodingException bde) { } catch (BitmapDecodingException bde) {
Log.w(TAG, "page " + page + " failed.");
Log.w(TAG, bde); Log.w(TAG, bde);
throw new AssertionError("emoji sprite asset is corrupted or android decoding is broken"); throw new AssertionError("emoji sprite asset is corrupted or android decoding is broken");
} }