chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

EmojiCompat support (#600)

Browse source 
* Add EmojiCompat

* EmojiCompat doesn' replace all emojis anymore

* This app should be now capable of loading a EmojiCompat-font located in a file somewhere inside the device's storage

* Should now replace all emojis

* Add EmojiCompat support to EditTextTyped

* Provide EmojiCompat fonts

* The app won't crash anymore when no emoji font is available.
Emoji font should now be located at [Private external app directory]/files/EmojiCompat.ttf

* Removed BundledEmojiCompat dependency

Since this EmojiCompat-implementation does not rely on BundledEmojiCompat, there's no reason to have it enabled.

* Update EditTextTyped.kt

Since connection isn't assigned to (I tried doing so), it can be declared final/val again.

* Update README.md

* Add some non-working emoji preferences

* Add a short font list for testing

* Finished implementation

* Add Twemoji to font list

* Update documentation, more comments

* Delete AssetEmojiCompat which is obsolete now

* Update the font list

* Update the font list

* Fix font list & add Exception handling for malformed JSON files (hopefully)

* More fixes. It should work now...

* Removed AssetEmojiCompat (again)

* Add most of the changes

* Improved the EmojiCompat dialog's style

* The font list is now based on a static layout without external files

* Re-add the real font URL for Twemoji

* Emoji-font captions are now translatable

* Removed one unused String (loading)

* Removed emoji fonts from this repo

* Applied changes from the PR change requests

* The correct emoji font will be selected after cancelling a change

* Add details on the EmojiCompat fonts available (not shown yet)

* Add licensing information on Twemoji and Blobmoji

* Reworked some strings

* Moved FileEmojiCompat to its own library

* Update FileEmojiCompat to the latest version (1.0.3)

* EmojiCompat bug should be fixed

* Better handling of failed downloads

* Removed one TODO

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>

* Update emoji attribution strings

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>

* Fixed some misspelled strings

Signed-off-by: Constantin A <10349490+C1710@users.noreply.github.com>
This commit is contained in:
Constantin A 2018-05-10 11:16:56 +02:00 • committed by Konrad Pozniak
commit 1108652823
34 changed files with 1253 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/src/main/res/layout/about_emoji.xml Normal file
View file

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="72dp">
<ImageButton
android:id="@+id/about_blobmoji_expand"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
android:tint="@color/colorPrimary"
app:layout_constraintVertical_bias="0.5"
android:focusable="true"
android:contentDescription="@android:string/cancel" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="72dp"
android:layout_marginEnd="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/license_blobmoji"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"/>
</android.support.constraint.ConstraintLayout>
<TextView
android:id="@+id/license_apache"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Apache license 2.0"
android:autoLink="web"
android:visibility="gone"
android:layout_margin="16dp"
android:textSize="14sp"
android:textColor="?android:textColorSecondary"/>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="88dp">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="72dp"
android:layout_marginEnd="16dp"
android:autoLink="web"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/license_twemoji"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"/>
</android.support.constraint.ConstraintLayout>
</merge>

16
app/src/main/res/layout/activity_about.xml
View file

@ -31,7 +31,7 @@
android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textIsSelectable="true"
android:textStyle="bold" />
android:textStyle="bold"/>
<TextView
android:layout_width="match_parent"
@ -42,7 +42,7 @@
android:text="@string/about_tusky_license"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textIsSelectable="true" />
android:textIsSelectable="true"/>
<TextView
android:id="@+id/projectURL_TV"
@ -80,6 +80,18 @@
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:lineSpacingMultiplier="1.2"
android:padding="@dimen/text_content_margin"
android:text="@string/about_emoji"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textIsSelectable="true" />
<include layout="@layout/about_emoji" />
</LinearLayout>
</ScrollView>

4
app/src/main/res/layout/activity_account.xml
View file

@ -80,7 +80,7 @@
app:layout_constraintEnd_toEndOf="@id/follow_btn"
app:layout_constraintTop_toBottomOf="@id/follow_btn" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/account_display_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -116,7 +116,7 @@
app:srcCompat="@drawable/reblog_disabled_light"
tools:visibility="visible" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/account_note"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/activity_compose.xml
View file

@ -48,7 +48,7 @@
tools:text="Reply to @username"
tools:visibility="visible" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/composeReplyContentView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<EditText
<android.support.text.emoji.widget.EmojiEditText
android:id="@+id/composeContentWarningField"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/activity_report.xml
View file

@ -21,7 +21,7 @@
android:fadeScrollbars="false"
android:background="?attr/report_status_background_color" />
<EditText
<android.support.text.emoji.widget.EmojiEditText
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"

38
app/src/main/res/layout/dialog_emojicompat.xml Normal file
View file

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_marginTop="20dp">
<LinearLayout
android:id="@+id/emoji_font_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<include
android:id="@+id/item_blobmoji"
layout="@layout/item_emoji_pref" />
<include
android:id="@+id/item_twemoji"
layout="@layout/item_emoji_pref"/>
<include
android:id="@+id/item_nomoji"
layout="@layout/item_emoji_pref" />
</LinearLayout>
<!--There's a short explanation that you'll need to download the emoji fonts first-->
<TextView
android:id="@+id/emoji_download_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/emoji_font_list"
android:paddingBottom="24dp"
android:paddingTop="20dp"
android:paddingEnd="24dp"
android:paddingStart="24dp"
android:text="@string/download_fonts"
android:textColor="?android:attr/textColorSecondary"/>
</android.support.constraint.ConstraintLayout>

2
app/src/main/res/layout/item_account.xml
View file

@ -22,7 +22,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/account_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

4
app/src/main/res/layout/item_autocomplete.xml
View file

@ -22,7 +22,9 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<!--TODO: Check if this needs emoji support-->
<!--FIXME: The placeholder texts seem to be swapped-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_blocked_user.xml
View file

@ -38,7 +38,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/blocked_user_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

118
app/src/main/res/layout/item_emoji_pref.xml Normal file
View file

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/emojicompat_container"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?attr/selectableItemBackground"
xmlns:tools="http://schemas.android.com/tools">
<!--This is a thumbnail picture-->
<ImageView
android:id="@+id/emojicompat_thumb"
android:layout_width="48dp"
android:layout_height="48dp"
android:padding="4dp"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:srcCompat="@drawable/ic_emoji_24dp"/>
<!--This is the font's name-->
<TextView
android:id="@+id/emojicompat_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="72dp"
android:layout_marginTop="8dp"
tools:text="@string/system_default"
android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--A short caption...-->
<TextView
android:id="@+id/emojicompat_caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="72dp"
tools:text=""
app:layout_constraintTop_toBottomOf="@id/emojicompat_name"
app:layout_constraintStart_toStartOf="@id/emojicompat_name"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"/>
<!--This progress bar is shown while the font is downloading.-->
<ProgressBar
android:id="@+id/emojicompat_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="72dp"
android:layout_marginTop="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/emojicompat_name"
app:layout_constraintTop_toBottomOf="@id/emojicompat_name"
android:indeterminate="false"
android:visibility="gone"/>
<!--Click on it and the font will be downloaded!-->
<ImageButton
android:id="@+id/emojicompat_download"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_file_download_black_24dp"
android:tint="@color/colorPrimary"
app:layout_constraintVertical_bias="0.5"
android:focusable="true"
android:contentDescription="@string/download_fonts"
android:visibility="gone"/>
<!--TODO: enable this button again-->
<!--You should be able to cancel the download-->
<ImageButton
android:id="@+id/emojicompat_download_cancel"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_margin="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_cancel_black_24dp"
android:tint="@color/colorPrimary"
app:layout_constraintVertical_bias="0.5"
android:focusable="true"
android:contentDescription="@android:string/cancel"
android:visibility="gone"/>
<!--You'll probably want to select an emoji font, don't you?-->
<!--RadioButtons have a very strange behavior when it comes to their size.
That's why the width is set to such an unusual value.-->
<RadioButton
android:id="@+id/emojicompat_radio"
android:layout_width="52dp"
android:layout_height="72dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/emojicompat_name"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_bias="1"
android:visibility="visible" />
</android.support.constraint.ConstraintLayout>

2
app/src/main/res/layout/item_follow.xml
View file

@ -38,7 +38,7 @@
android:scaleType="fitCenter"
android:textSize="?attr/status_text_medium" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/notification_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_follow_request.xml
View file

@ -25,7 +25,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/follow_request_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_muted_user.xml
View file

@ -39,7 +39,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/muted_user_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_saved_toot.xml
View file

@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/content"
android:layout_width="0dp"
android:layout_height="wrap_content"

13
app/src/main/res/layout/item_status.xml
View file

@ -11,7 +11,7 @@
android:paddingLeft="14dp"
android:paddingRight="14dp">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_reblogged"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -54,7 +54,7 @@
android:paddingBottom="4dp"
android:paddingTop="@dimen/status_avatar_padding">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -90,7 +90,7 @@
android:textSize="?attr/status_text_medium"
tools:text="13:37" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -121,7 +121,7 @@
android:visibility="gone" />
</RelativeLayout>
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -247,7 +247,7 @@
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
app:srcCompat="@drawable/ic_eye_24dp" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp"
android:layout_height="0dp"
@ -265,7 +265,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<!--TODO: Check if this needs emoji support-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_media_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

18
app/src/main/res/layout/item_status_detailed.xml
View file

@ -32,7 +32,7 @@
android:minHeight="48dp"
android:orientation="vertical">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -56,7 +56,7 @@
</LinearLayout>
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -85,7 +85,7 @@
android:textOn="@string/status_content_warning_show_less"
android:textSize="?attr/status_text_large" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -123,7 +123,8 @@
android:paddingRight="6dp"
android:paddingTop="6dp">
<TextView
<!--TODO: check if this needs emoji support-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/card_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -134,7 +135,8 @@
android:textColor="?android:textColorPrimary"
android:textSize="?attr/status_text_medium" />
<TextView
<!--TODO: Check if this needs emoji support-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/card_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -269,7 +271,8 @@
app:layout_constraintTop_toTopOf="@+id/status_media_preview_container"
app:srcCompat="@drawable/ic_eye_24dp" />
<TextView
<!--TODO: Check if this needs emoji support-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp"
android:layout_height="0dp"
@ -287,7 +290,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<!--TODO: Check if this needs emoji support-->
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_media_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

7
app/src/main/res/layout/item_status_notification.xml
View file

@ -8,6 +8,7 @@
android:paddingLeft="14dp"
android:paddingRight="14dp">
<!--TODO: Check if this needs emoji support-->
<TextView
android:id="@+id/notification_top_text"
android:layout_width="wrap_content"
@ -32,7 +33,7 @@
android:layout_toEndOf="@+id/notification_status_avatar"
android:paddingBottom="4dp">
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/status_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -71,7 +72,7 @@
</RelativeLayout>
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/notification_content_warning_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -103,7 +104,7 @@
android:textOn="@string/status_content_warning_show_less"
android:textSize="?attr/status_text_medium" />
<TextView
<android.support.text.emoji.widget.EmojiTextView
android:id="@+id/notification_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"