Merge branch '1343-vanniktech-emoji' into 'master'
Use vanniktech emoji library Closes #1343, #1314, #940, #930, #749, and #684 See merge request briar/briar!857
Showing
- bramble-api/src/main/java/org/briarproject/bramble/api/settings/SettingsManager.java 6 additions, 0 deletions...rg/briarproject/bramble/api/settings/SettingsManager.java
- bramble-core/src/main/java/org/briarproject/bramble/settings/SettingsManagerImpl.java 6 additions, 0 deletions...rg/briarproject/bramble/settings/SettingsManagerImpl.java
- briar-android/build.gradle 2 additions, 3 deletionsbriar-android/build.gradle
- briar-android/proguard-rules.txt 1 addition, 6 deletionsbriar-android/proguard-rules.txt
- briar-android/src/main/assets/emoji_activity.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_activity.png
- briar-android/src/main/assets/emoji_animals_nature.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_animals_nature.png
- briar-android/src/main/assets/emoji_flags.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_flags.png
- briar-android/src/main/assets/emoji_food_drink.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_food_drink.png
- briar-android/src/main/assets/emoji_objects.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_objects.png
- briar-android/src/main/assets/emoji_smiley_people.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_smiley_people.png
- briar-android/src/main/assets/emoji_symbols.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_symbols.png
- briar-android/src/main/assets/emoji_travel_places.png 0 additions, 0 deletionsbriar-android/src/main/assets/emoji_travel_places.png
- briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java 3 additions, 6 deletions...java/org/briarproject/briar/android/AndroidComponent.java
- briar-android/src/main/java/org/briarproject/briar/android/AppModule.java 11 additions, 0 deletions...c/main/java/org/briarproject/briar/android/AppModule.java
- briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java 4 additions, 0 deletions.../org/briarproject/briar/android/BriarApplicationImpl.java
- briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java 114 additions, 0 deletions.../java/org/briarproject/briar/android/RecentEmojiImpl.java
- briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java 1 addition, 0 deletions...a/org/briarproject/briar/android/blog/ReblogFragment.java
- briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java 1 addition, 0 deletions...riarproject/briar/android/blog/WriteBlogPostActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java 0 additions, 1 deletion...riar/android/privategroup/conversation/GroupActivity.java
- briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java 11 additions, 9 deletions...g/briarproject/briar/android/view/LargeTextInputView.java
Loading
Please register or sign in to comment