Browse Source

Port Signal's emoji implementation to Briar

Add functionality to save and restore recently used Emojis

Update emoji and add new categories based on AOSP's XML file
Torsten Grote 3 years ago
parent
commit
d5beca5351
100 changed files with 4247 additions and 257 deletions
  1. 0 17
      LICENSE.txt
  2. 2 1
      briar-android/AndroidManifest.xml
  3. 58 0
      briar-android/artwork/ic_emoji_emoticons.svg
  4. BIN
      briar-android/assets/emoji_activity.png
  5. BIN
      briar-android/assets/emoji_animals_nature.png
  6. BIN
      briar-android/assets/emoji_flags.png
  7. BIN
      briar-android/assets/emoji_food_drink.png
  8. BIN
      briar-android/assets/emoji_objects.png
  9. BIN
      briar-android/assets/emoji_smiley_people.png
  10. BIN
      briar-android/assets/emoji_symbols.png
  11. BIN
      briar-android/assets/emoji_travel_places.png
  12. 4 0
      briar-android/build.gradle
  13. 5 0
      briar-android/proguard-rules.txt
  14. 10 0
      briar-android/res/drawable/ic_backspace_black.xml
  15. 9 0
      briar-android/res/drawable/ic_emoji_activity.xml
  16. 9 0
      briar-android/res/drawable/ic_emoji_animals_nature.xml
  17. 28 0
      briar-android/res/drawable/ic_emoji_emoticons.xml
  18. 9 0
      briar-android/res/drawable/ic_emoji_flags.xml
  19. 9 0
      briar-android/res/drawable/ic_emoji_food_drink.xml
  20. 9 0
      briar-android/res/drawable/ic_emoji_objects.xml
  21. 9 0
      briar-android/res/drawable/ic_emoji_recent.xml
  22. 9 0
      briar-android/res/drawable/ic_emoji_smiley_people.xml
  23. 9 0
      briar-android/res/drawable/ic_emoji_symbols.xml
  24. 10 0
      briar-android/res/drawable/ic_emoji_toggle.xml
  25. 9 0
      briar-android/res/drawable/ic_emoji_travel_places.xml
  26. 10 0
      briar-android/res/drawable/ic_keyboard_black.xml
  27. 9 8
      briar-android/res/layout/activity_conversation.xml
  28. 6 4
      briar-android/res/layout/activity_forum.xml
  29. 1 1
      briar-android/res/layout/activity_invitations.xml
  30. 1 1
      briar-android/res/layout/activity_rss_feed_manage.xml
  31. 2 2
      briar-android/res/layout/activity_sharing_status.xml
  32. 1 1
      briar-android/res/layout/author_view.xml
  33. 53 0
      briar-android/res/layout/emoji_drawer.xml
  34. 19 0
      briar-android/res/layout/emoji_grid_layout.xml
  35. 1 1
      briar-android/res/layout/fragment_blog.xml
  36. 1 1
      briar-android/res/layout/fragment_contact_list.xml
  37. 1 1
      briar-android/res/layout/fragment_forum_list.xml
  38. 1 1
      briar-android/res/layout/fragment_keyagreement_qr.xml
  39. 1 1
      briar-android/res/layout/introduction_contact_chooser.xml
  40. 1 1
      briar-android/res/layout/list_item_blog.xml
  41. 1 1
      briar-android/res/layout/list_item_blog_comment.xml
  42. 2 2
      briar-android/res/layout/list_item_blog_post.xml
  43. 1 1
      briar-android/res/layout/list_item_forum.xml
  44. 5 51
      briar-android/res/layout/forum_discussion_cell.xml
  45. 1 1
      briar-android/res/layout/list_item_introduction_in.xml
  46. 1 1
      briar-android/res/layout/list_item_invitations.xml
  47. 1 1
      briar-android/res/layout/list_item_msg_in.xml
  48. 1 1
      briar-android/res/layout/list_item_msg_notice_out.xml
  49. 1 1
      briar-android/res/layout/list_item_msg_out.xml
  50. 1 1
      briar-android/res/layout/list_item_shareable_invitation_in.xml
  51. 0 36
      briar-android/res/layout/text_input_field.xml
  52. 56 0
      briar-android/res/layout/text_input_view.xml
  53. 3 0
      briar-android/res/values/color.xml
  54. 13 0
      briar-android/res/values/dimens.xml
  55. 1352 0
      briar-android/res/values/emoji.xml
  56. 5 0
      briar-android/src/org/briarproject/android/ActivityComponent.java
  57. 1 1
      briar-android/src/org/briarproject/android/blogs/BlogFragment.java
  58. 1 1
      briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java
  59. 1 1
      briar-android/src/org/briarproject/android/blogs/BlogPostViewHolder.java
  60. 1 1
      briar-android/src/org/briarproject/android/blogs/FeedFragment.java
  61. 1 1
      briar-android/src/org/briarproject/android/blogs/RssFeedManageActivity.java
  62. 1 1
      briar-android/src/org/briarproject/android/contact/ContactListFragment.java
  63. 17 21
      briar-android/src/org/briarproject/android/contact/ConversationActivity.java
  64. 28 36
      briar-android/src/org/briarproject/android/forum/ForumActivity.java
  65. 6 11
      briar-android/src/org/briarproject/android/forum/ForumEntry.java
  66. 1 1
      briar-android/src/org/briarproject/android/forum/ForumListAdapter.java
  67. 1 1
      briar-android/src/org/briarproject/android/forum/ForumListFragment.java
  68. 19 26
      briar-android/src/org/briarproject/android/forum/ForumTestControllerImpl.java
  69. 1 1
      briar-android/src/org/briarproject/android/introduction/ContactChooserFragment.java
  70. 1 1
      briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java
  71. 1 1
      briar-android/src/org/briarproject/android/sharing/ContactSelectorFragment.java
  72. 1 1
      briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java
  73. 1 1
      briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java
  74. 1 1
      briar-android/src/org/briarproject/android/sharing/SharingStatusActivity.java
  75. 1 1
      briar-android/src/org/briarproject/android/util/AndroidUtils.java
  76. 1 1
      briar-android/src/org/briarproject/android/util/ArticleMovementMethod.java
  77. 5 1
      briar-android/src/org/briarproject/android/util/AuthorView.java
  78. 4 3
      briar-android/src/org/briarproject/android/util/BriarRecyclerView.java
  79. 1 1
      briar-android/src/org/briarproject/android/util/BriarRecyclerViewBehavior.java
  80. 3 1
      briar-android/src/org/briarproject/android/util/CameraView.java
  81. 5 2
      briar-android/src/org/briarproject/android/util/TextAvatarView.java
  82. 171 0
      briar-android/src/org/briarproject/android/view/TextInputView.java
  83. 3 1
      briar-android/src/org/briarproject/android/util/TrustIndicatorView.java
  84. 621 0
      briar-android/src/org/thoughtcrime/securesms/LICENSE
  85. 279 0
      briar-android/src/org/thoughtcrime/securesms/components/KeyboardAwareRelativeLayout.java
  86. 95 0
      briar-android/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
  87. 14 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/AnimatingImageSpan.java
  88. 202 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
  89. 47 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
  90. 35 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiFilter.java
  91. 18 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiPageModel.java
  92. 115 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
  93. 63 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiPages.java
  94. 301 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
  95. 39 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
  96. 97 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
  97. 60 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
  98. 89 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/EmojiView.java
  99. 144 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
  100. 0 0
      briar-android/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java

+ 0 - 17
LICENSE.txt

@@ -13,23 +13,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
--------------------------------------------------------------------------
-
-    All files under the directories briar-android/src, briar-api/src,
-    briar-core/src, briar-desktop/src and briar-test/src are licensed
-    under the Apache License, version 2.0 (the "License"); you may not
-    use these files except in compliance with the License.
-
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied. See the License for the specific language governing
-    permissions and limitations under the License.
-
 -------------------------------------------------------------------------
 
                     GNU GENERAL PUBLIC LICENSE

+ 2 - 1
briar-android/AndroidManifest.xml

@@ -134,7 +134,8 @@
 		<activity
 			android:name=".android.forum.ForumActivity"
 			android:label="@string/app_name"
-			android:parentActivityName=".android.NavDrawerActivity">
+			android:parentActivityName=".android.NavDrawerActivity"
+			android:windowSoftInputMode="adjustResize|stateHidden">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value=".android.NavDrawerActivity"

File diff suppressed because it is too large
+ 58 - 0
briar-android/artwork/ic_emoji_emoticons.svg


BIN
briar-android/assets/emoji_activity.png


BIN
briar-android/assets/emoji_animals_nature.png


BIN
briar-android/assets/emoji_flags.png


BIN
briar-android/assets/emoji_food_drink.png


BIN
briar-android/assets/emoji_objects.png


BIN
briar-android/assets/emoji_smiley_people.png


BIN
briar-android/assets/emoji_symbols.png


BIN
briar-android/assets/emoji_travel_places.png


+ 4 - 0
briar-android/build.gradle

@@ -35,6 +35,8 @@ dependencies {
 	compile 'com.google.zxing:core:3.2.1'
 	apt 'com.google.dagger:dagger-compiler:2.0.2'
 	provided 'javax.annotation:jsr250-api:1.0'
+	compile 'com.jpardogo.materialtabstrip:library:1.1.0'
+	compile 'com.github.bumptech.glide:glide:3.7.0'
 
 	testCompile 'junit:junit:4.12'
 	testCompile 'net.jodah:concurrentunit:0.4.2'
@@ -60,6 +62,8 @@ dependencyVerification {
 			'com.android.support:support-vector-drawable:799bafe4c3de812386f0b291f744d5d6876452722dd40189b9ab87dbbf594ea1',
 			'com.android.support:recyclerview-v7:44040a888e23e0c93162a3377cfe06751080e3c22d369ab0d4301ef60d63b0fe',
 			'com.android.support:cardview-v7:4595f1c4a28cfa083b6c0920ad4d49e1c2ca4b8302a955e548f68eb63b74931b',
+			'com.jpardogo.materialtabstrip:library:24d19232b319f8c73e25793432357919a7ed972186f57a3b2c9093ea74ad8311',
+			'com.github.bumptech.glide:glide:76ef123957b5fbaebb05fcbe6606dd58c3bc3fcdadb257f99811d0ac9ea9b88b',
 	]
 }
 

+ 5 - 0
briar-android/proguard-rules.txt

@@ -60,3 +60,8 @@
 -dontwarn java.nio.**
 -dontwarn org.codehaus.mojo.animal_sniffer.**
 -dontwarn org.slf4j.impl.**
+
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}

+ 10 - 0
briar-android/res/drawable/ic_backspace_black.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:alpha="0.54"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z"/>
+</vector>

File diff suppressed because it is too large
+ 9 - 0
briar-android/res/drawable/ic_emoji_activity.xml


File diff suppressed because it is too large
+ 9 - 0
briar-android/res/drawable/ic_emoji_animals_nature.xml


+ 28 - 0
briar-android/res/drawable/ic_emoji_emoticons.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M15.4839,3.8557 C14.8224,3.89611,14.9476,5.06823,15.4034,5.47978
+C16.7652,6.93176,17.1508,8.98786,17.299,10.9051
+C17.4081,13.1214,17.2144,15.4608,16.1275,17.4387
+C15.7657,18.1699,14.7879,18.7118,14.9747,19.6345
+C15.2618,20.6719,16.1617,19.8774,16.5955,19.4508
+C18.5872,17.7088,19.4632,15.0228,19.5268,12.4373
+C19.5469,10.5193,19.295,8.516,18.3141,6.8329
+C17.6499,5.74222,16.9234,4.59896,15.8167,3.91355
+C15.6887,3.86763,15.5784,3.84987,15.4839,3.85564 Z M5.91182,7.65831
+A1.3631614,1.3631614,0,0,0,4.54866,9.02147
+A1.3631614,1.3631614,0,0,0,5.91182,10.3846
+A1.3631614,1.3631614,0,0,0,7.27498,9.02147
+A1.3631614,1.3631614,0,0,0,5.91182,7.65831 Z M8.98492,10.6595 L8.98492,12.7042
+L13.756,12.7042 L13.756,10.6595 L8.98494,10.6595 Z M5.83527,14.1306
+A1.3631614,1.3631614,0,0,0,4.47211,15.4938
+A1.3631614,1.3631614,0,0,0,5.83527,16.857
+A1.3631614,1.3631614,0,0,0,7.19843,15.4938
+A1.3631614,1.3631614,0,0,0,5.83527,14.1306 Z"/>
+</vector>

+ 9 - 0
briar-android/res/drawable/ic_emoji_flags.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
+</vector>

File diff suppressed because it is too large
+ 9 - 0
briar-android/res/drawable/ic_emoji_food_drink.xml


+ 9 - 0
briar-android/res/drawable/ic_emoji_objects.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M5,16L3,5L8.5,12L12,5L15.5,12L21,5L19,16H5M19,19A1,1 0 0,1 18,20H6A1,1 0 0,1 5,19V18H19V19Z"/>
+</vector>

+ 9 - 0
briar-android/res/drawable/ic_emoji_recent.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>

+ 9 - 0
briar-android/res/drawable/ic_emoji_smiley_people.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
+</vector>

+ 9 - 0
briar-android/res/drawable/ic_emoji_symbols.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M12,7.77L18.39,18H5.61L12,7.77M12,4L2,20h20L12,4z"/>
+</vector>

+ 10 - 0
briar-android/res/drawable/ic_emoji_toggle.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:alpha="0.54"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
+</vector>

+ 9 - 0
briar-android/res/drawable/ic_emoji_travel_places.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF2D3E50"
+		android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z"/>
+</vector>

+ 10 - 0
briar-android/res/drawable/ic_keyboard_black.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:alpha="0.54"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
+</vector>

+ 9 - 8
briar-android/res/layout/activity_conversation.xml

@@ -3,9 +3,9 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
+	android:orientation="vertical"
 	tools:context=".android.contact.ConversationActivity">
 
 	<android.support.v7.widget.Toolbar
@@ -38,17 +38,18 @@
 
 	</android.support.v7.widget.Toolbar>
 
-	<org.briarproject.android.util.BriarRecyclerView
+	<org.briarproject.android.view.BriarRecyclerView
 		android:id="@+id/conversationView"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"/>
+		android:layout_weight="1"
+		android:background="@color/window_background"/>
 
-	<View style="@style/Divider.Horizontal"/>
-
-	<include
-		layout="@layout/text_input_field"
+	<org.briarproject.android.view.TextInputView
+		android:id="@+id/text_input_container"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content"
+		android:background="@color/button_bar_background"
+		android:elevation="@dimen/margin_tiny"/>
 
 </LinearLayout>

+ 6 - 4
briar-android/res/layout/activity_forum.xml

@@ -6,16 +6,18 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<org.briarproject.android.util.BriarRecyclerView
+	<org.briarproject.android.view.BriarRecyclerView
 		android:id="@+id/forum_discussion_list"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
 		android:layout_weight="1"
 		app:scrollToEnd="false"/>
 
-	<include
-		layout="@layout/text_input_field"
+	<org.briarproject.android.view.TextInputView
+		android:id="@+id/text_input_container"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"/>
+		android:layout_height="wrap_content"
+		android:background="@color/button_bar_background"
+		android:elevation="@dimen/margin_tiny"/>
 
 </LinearLayout>

+ 1 - 1
briar-android/res/layout/activity_invitations.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.android.util.BriarRecyclerView
+<org.briarproject.android.view.BriarRecyclerView
 	android:id="@+id/invitationsView"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"

+ 1 - 1
briar-android/res/layout/activity_rss_feed_manage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.android.util.BriarRecyclerView
+<org.briarproject.android.view.BriarRecyclerView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:app="http://schemas.android.com/apk/res-auto"

+ 2 - 2
briar-android/res/layout/activity_sharing_status.xml

@@ -19,7 +19,7 @@
 
 		<View style="@style/Divider.ForumList"/>
 
-		<org.briarproject.android.util.BriarRecyclerView
+		<org.briarproject.android.view.BriarRecyclerView
 			android:id="@+id/sharedByView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
 
 		<View style="@style/Divider.ForumList"/>
 
-		<org.briarproject.android.util.BriarRecyclerView
+		<org.briarproject.android.view.BriarRecyclerView
 			android:id="@+id/sharedWithView"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/author_view.xml

@@ -37,7 +37,7 @@
 		android:textSize="@dimen/text_size_small"
 		tools:text="Author Name"/>
 
-	<org.briarproject.android.util.TrustIndicatorView
+	<org.briarproject.android.view.TrustIndicatorView
 		android:id="@+id/trustIndicator"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

+ 53 - 0
briar-android/res/layout/emoji_drawer.xml

@@ -0,0 +1,53 @@
+<?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">
+
+	<View
+		style="@style/Divider.Horizontal"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="40dp"
+		android:background="@color/emoji_pager_background"
+		android:orientation="horizontal">
+
+		<com.astuetz.PagerSlidingTabStrip
+			android:id="@+id/tabs"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			app:pstsIndicatorColor="@color/briar_accent"
+			app:pstsIndicatorHeight="@dimen/emoji_drawer_indicator_height"
+			app:pstsShouldExpand="true"
+			app:pstsTabPaddingLeftRight="@dimen/emoji_drawer_left_right_padding"/>
+
+		<View
+			android:layout_width="@dimen/margin_separator"
+			android:layout_height="match_parent"
+			android:layout_marginBottom="10dp"
+			android:layout_marginTop="10dp"
+			android:background="@color/divider"/>
+
+		<org.thoughtcrime.securesms.components.RepeatableImageKey
+			android:id="@+id/backspace"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:background="@color/emoji_pager_background"
+			android:paddingLeft="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
+			android:src="@drawable/ic_backspace_black"/>
+
+	</LinearLayout>
+
+	<View
+		style="@style/Divider.Horizontal"/>
+
+	<android.support.v4.view.ViewPager
+		android:id="@+id/emoji_pager"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="@color/window_background"
+		android:visibility="visible"/>
+
+</merge>

+ 19 - 0
briar-android/res/layout/emoji_grid_layout.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<GridView
+		android:id="@+id/emoji"
+		android:layout_width="fill_parent"
+		android:layout_height="match_parent"
+		android:columnWidth="@dimen/emoji_drawer_size"
+		android:gravity="center"
+		android:horizontalSpacing="0dp"
+		android:numColumns="auto_fit"
+		android:stretchMode="columnWidth"
+		android:verticalSpacing="0dp"
+		android:visibility="visible"/>
+
+</FrameLayout>

+ 1 - 1
briar-android/res/layout/fragment_blog.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.android.util.BriarRecyclerView
+<org.briarproject.android.view.BriarRecyclerView
 	android:id="@+id/postList"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"

+ 1 - 1
briar-android/res/layout/fragment_contact_list.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.android.util.BriarRecyclerView
+<org.briarproject.android.view.BriarRecyclerView
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/contactList"
 		android:layout_width="match_parent"

+ 1 - 1
briar-android/res/layout/fragment_forum_list.xml

@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<org.briarproject.android.util.BriarRecyclerView
+	<org.briarproject.android.view.BriarRecyclerView
 		android:id="@+id/forumList"
 		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:layout_width="match_parent"

+ 1 - 1
briar-android/res/layout/fragment_keyagreement_qr.xml

@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<org.briarproject.android.util.CameraView
+	<org.briarproject.android.view.CameraView
 		android:id="@+id/camera_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>

+ 1 - 1
briar-android/res/layout/introduction_contact_chooser.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.briarproject.android.util.BriarRecyclerView
+<org.briarproject.android.view.BriarRecyclerView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/contactList"

+ 1 - 1
briar-android/res/layout/list_item_blog.xml

@@ -8,7 +8,7 @@
 	android:layout_marginStart="@dimen/listitem_horizontal_margin"
 	android:background="?attr/selectableItemBackground">
 
-	<org.briarproject.android.util.TextAvatarView
+	<org.briarproject.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"

+ 1 - 1
briar-android/res/layout/list_item_blog_comment.xml

@@ -11,7 +11,7 @@
 		android:id="@+id/inputDivider"
 		style="@style/Divider.Horizontal"/>
 
-	<org.briarproject.android.util.AuthorView
+	<org.briarproject.android.view.AuthorView
 		android:id="@+id/authorView"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

+ 2 - 2
briar-android/res/layout/list_item_blog_post.xml

@@ -19,7 +19,7 @@
 			android:layout_height="wrap_content"
 			android:padding="@dimen/listitem_vertical_margin">
 
-			<org.briarproject.android.util.AuthorView
+			<org.briarproject.android.view.AuthorView
 				android:id="@+id/rebloggerView"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
 				android:layout_toLeftOf="@+id/commentView"
 				app:persona="reblogger"/>
 
-			<org.briarproject.android.util.AuthorView
+			<org.briarproject.android.view.AuthorView
 				android:id="@+id/authorView"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/list_item_forum.xml

@@ -8,7 +8,7 @@
 	android:layout_marginStart="@dimen/listitem_horizontal_margin"
 	android:background="?attr/selectableItemBackground">
 
-	<org.briarproject.android.util.TextAvatarView
+	<org.briarproject.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"

+ 5 - 51
briar-android/res/layout/forum_discussion_cell.xml

@@ -72,7 +72,7 @@
 		android:layout_marginLeft="@dimen/margin_medium"
 		android:layout_weight="1">
 
-		<TextView
+		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -85,59 +85,13 @@
 			android:textColor="@color/briar_text_primary"
 			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
 
-		<de.hdodenhof.circleimageview.CircleImageView
-			android:id="@+id/avatar"
-			android:layout_width="@dimen/forum_avatar_size"
-			android:layout_height="@dimen/forum_avatar_size"
-			android:layout_alignLeft="@id/text"
-			android:layout_below="@id/text"
-			android:layout_marginRight="@dimen/margin_small"
-			android:layout_marginTop="@dimen/margin_small"
-			android:src="@drawable/ic_launcher"
-			app:civ_border_color="@color/briar_primary"
-			app:civ_border_width="@dimen/avatar_border_width"
-			tools:src="@drawable/ic_launcher"
-			/>
-
-		<TextView
+		<org.briarproject.android.view.AuthorView
 			android:id="@+id/author"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_toRightOf="@id/avatar"
-			android:layout_alignBottom="@+id/avatar"
-			android:layout_alignTop="@+id/avatar"
-			android:gravity="center"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:textSize="@dimen/text_size_tiny"
-			tools:text="John Smith"/>
-
-		<org.briarproject.android.util.TrustIndicatorView
-			android:id="@+id/trustIndicator"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/avatar"
-			android:layout_alignTop="@+id/avatar"
-			android:scaleType="center"
-			android:layout_marginLeft="@dimen/margin_small"
-			android:layout_marginStart="@dimen/margin_small"
-			android:layout_toRightOf="@+id/author"
-			tools:src="@drawable/trust_indicator_verified"/>
-
-		<TextView
-			android:id="@+id/date"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignBottom="@+id/avatar"
-			android:layout_alignTop="@+id/avatar"
-			android:gravity="center"
-			android:layout_toRightOf="@+id/trustIndicator"
-			android:layout_marginLeft="@dimen/margin_small"
-			android:layout_marginStart="@dimen/margin_small"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:textSize="@dimen/text_size_tiny"
-			tools:text="09:09"/>
+			android:layout_alignLeft="@id/text"
+			android:layout_below="@id/text"
+			app:persona="commenter"/>
 
 		<ImageView
 			android:id="@+id/chevron"

+ 1 - 1
briar-android/res/layout/list_item_introduction_in.xml

@@ -6,7 +6,7 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<TextView
+	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 		android:id="@+id/msgBody"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/list_item_invitations.xml

@@ -9,7 +9,7 @@
 	android:background="?attr/selectableItemBackground"
 	android:paddingTop="@dimen/listitem_horizontal_margin">
 
-	<org.briarproject.android.util.TextAvatarView
+	<org.briarproject.android.view.TextAvatarView
 		android:id="@+id/avatarView"
 		android:layout_width="@dimen/listitem_picture_frame_size"
 		android:layout_height="@dimen/listitem_picture_frame_size"

+ 1 - 1
briar-android/res/layout/list_item_msg_in.xml

@@ -10,7 +10,7 @@
 	android:background="@drawable/msg_in"
 	android:orientation="vertical">
 
-	<TextView
+	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 		android:id="@+id/msgBody"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/list_item_msg_notice_out.xml

@@ -6,7 +6,7 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<TextView
+	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 		android:id="@+id/msgBody"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/list_item_msg_out.xml

@@ -15,7 +15,7 @@
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out">
 
-		<TextView
+		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/msgBody"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"

+ 1 - 1
briar-android/res/layout/list_item_shareable_invitation_in.xml

@@ -6,7 +6,7 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<TextView
+	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 		android:id="@+id/msgBody"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"

+ 0 - 36
briar-android/res/layout/text_input_field.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	android:id="@+id/text_input_container"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:background="@color/button_bar_background"
-	android:elevation="@dimen/margin_tiny"
-	android:gravity="bottom"
-	android:orientation="horizontal"
-	android:paddingLeft="@dimen/margin_large"
-	android:paddingStart="@dimen/margin_large">
-
-	<EditText
-		android:id="@+id/input_text"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="@dimen/margin_small"
-		android:layout_weight="1"
-		android:inputType="textMultiLine|textCapSentences"
-		android:maxLines="5"/>
-
-	<ImageView
-		android:id="@+id/btn_send"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_medium"
-		android:background="?attr/selectableItemBackground"
-		android:clickable="true"
-		android:contentDescription="@string/send"
-		android:onClick="sendMessage"
-		android:src="@drawable/social_send_now_white"
-		android:tint="@color/briar_primary"
-		/>
-
-</LinearLayout>

+ 56 - 0
briar-android/res/layout/text_input_view.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	tools:showIn="@layout/activity_conversation">
+
+	<View
+		style="@style/Divider.Horizontal"
+		android:layout_alignParentTop="true"/>
+
+	<org.thoughtcrime.securesms.components.emoji.EmojiToggle
+		android:id="@+id/emoji_toggle"
+		android:layout_width="42dp"
+		android:layout_height="42dp"
+		android:layout_above="@+id/emoji_drawer"
+		android:layout_alignBottom="@+id/input_text"
+		android:layout_alignParentLeft="true"
+		android:background="?attr/selectableItemBackground"
+		android:padding="@dimen/margin_small"
+		android:scaleType="center"/>
+
+	<org.thoughtcrime.securesms.components.emoji.EmojiEditText
+		android:id="@+id/input_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_toLeftOf="@+id/btn_send"
+		android:layout_toRightOf="@+id/emoji_toggle"
+		android:inputType="textMultiLine|textCapSentences"
+		android:maxLines="5"
+		android:minHeight="42dp"/>
+
+	<ImageButton
+		android:id="@+id/btn_send"
+		android:layout_width="wrap_content"
+		android:layout_height="42dp"
+		android:layout_above="@+id/emoji_drawer"
+		android:layout_alignBottom="@+id/input_text"
+		android:layout_alignParentRight="true"
+		android:background="?attr/selectableItemBackground"
+		android:clickable="true"
+		android:contentDescription="@string/send"
+		android:enabled="false"
+		android:padding="@dimen/margin_small"
+		android:src="@drawable/social_send_now_white"
+		android:tint="@color/briar_primary"/>
+
+	<org.thoughtcrime.securesms.components.emoji.EmojiDrawer
+		android:id="@+id/emoji_drawer"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/input_text"
+		android:visibility="gone"/>
+
+</merge>

+ 3 - 0
briar-android/res/values/color.xml

@@ -27,6 +27,9 @@
 	<color name="briar_text_tertiary_inverse">#80ffffff</color>
 	<color name="briar_button_positive">#06b9ff</color>
 	<color name="briar_button_negative">#ff0000</color>
+	<color name="emoji_text_color">#ff000000</color>
+
+	<color name="emoji_pager_background">@color/window_background</color>
 
 	<!-- this is needed as preference_category_material layout uses this color as the text color -->
 	<color name="preference_fallback_accent_color">@color/briar_accent</color>

+ 13 - 0
briar-android/res/values/dimens.xml

@@ -46,4 +46,17 @@
 	<dimen name="blogs_avatar_icon_size">15dp</dimen>
 	<dimen name="blogs_avatar_comment_size">20dp</dimen>
 
+	<!-- Emoji -->
+	<dimen name="conversation_item_body_text_size">16sp</dimen>
+	<dimen name="emoji_drawer_size">32sp</dimen>
+	<dimen name="emoji_drawer_indicator_height">2dp</dimen>
+	<dimen name="emoji_drawer_item_padding">5dp</dimen>
+	<dimen name="emoji_drawer_left_right_padding">2dp</dimen>
+
+	<!-- Keyboard Sizes -->
+	<dimen name="min_keyboard_size">50dp</dimen>
+	<dimen name="default_custom_keyboard_size">220dp</dimen>
+	<dimen name="min_custom_keyboard_size">110dp</dimen>
+	<dimen name="min_custom_keyboard_top_margin">170dp</dimen>
+
 </resources>

File diff suppressed because it is too large
+ 1352 - 0
briar-android/res/values/emoji.xml


+ 5 - 0
briar-android/src/org/briarproject/android/ActivityComponent.java

@@ -40,6 +40,8 @@ import org.briarproject.android.sharing.ShareForumActivity;
 import org.briarproject.android.sharing.ShareForumMessageFragment;
 import org.briarproject.android.sharing.SharingStatusBlogActivity;
 import org.briarproject.android.sharing.SharingStatusForumActivity;
+import org.thoughtcrime.securesms.components.emoji.EmojiProvider;
+import org.thoughtcrime.securesms.components.emoji.RecentEmojiPageModel;
 
 import dagger.Component;
 
@@ -114,6 +116,9 @@ public interface ActivityComponent {
 
 	void inject(RssFeedManageActivity activity);
 
+	void inject(EmojiProvider emojiProvider);
+	void inject(RecentEmojiPageModel recentEmojiPageModel);
+
 	// Fragments
 	void inject(ContactListFragment fragment);
 	void inject(ForumListFragment fragment);

+ 1 - 1
briar-android/src/org/briarproject/android/blogs/BlogFragment.java

@@ -25,7 +25,7 @@ import org.briarproject.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.android.fragment.BaseFragment;
 import org.briarproject.android.sharing.ShareBlogActivity;
 import org.briarproject.android.sharing.SharingStatusBlogActivity;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.blogs.BlogPostHeader;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.identity.Author;

+ 1 - 1
briar-android/src/org/briarproject/android/blogs/BlogListAdapter.java

@@ -15,7 +15,7 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 import org.briarproject.android.util.AndroidUtils;
-import org.briarproject.android.util.TextAvatarView;
+import org.briarproject.android.view.TextAvatarView;
 import org.briarproject.api.blogs.Blog;
 import org.briarproject.api.sync.GroupId;
 

+ 1 - 1
briar-android/src/org/briarproject/android/blogs/BlogPostViewHolder.java

@@ -18,7 +18,7 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 import org.briarproject.android.blogs.BlogPostAdapter.OnBlogPostClickListener;
-import org.briarproject.android.util.AuthorView;
+import org.briarproject.android.view.AuthorView;
 import org.briarproject.api.blogs.BlogCommentHeader;
 import org.briarproject.api.blogs.BlogPostHeader;
 import org.briarproject.api.identity.Author;

+ 1 - 1
briar-android/src/org/briarproject/android/blogs/FeedFragment.java

@@ -22,7 +22,7 @@ import org.briarproject.android.blogs.BlogPostAdapter.OnBlogPostClickListener;
 import org.briarproject.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.android.controller.handler.UiResultHandler;
 import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.blogs.Blog;
 import org.briarproject.api.blogs.BlogPostHeader;
 import org.briarproject.api.db.DbException;

+ 1 - 1
briar-android/src/org/briarproject/android/blogs/RssFeedManageActivity.java

@@ -14,7 +14,7 @@ import org.briarproject.R;
 import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.blogs.RssFeedAdapter.RssFeedListener;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.feed.Feed;
 import org.briarproject.api.feed.FeedManager;

+ 1 - 1
briar-android/src/org/briarproject/android/contact/ContactListFragment.java

@@ -20,7 +20,7 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.api.AndroidNotificationManager;
 import org.briarproject.android.fragment.BaseFragment;
 import org.briarproject.android.keyagreement.KeyAgreementActivity;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.blogs.BlogSharingManager;
 import org.briarproject.api.contact.Contact;
 import org.briarproject.api.contact.ContactId;

+ 17 - 21
briar-android/src/org/briarproject/android/contact/ConversationActivity.java

@@ -16,9 +16,6 @@ import android.util.SparseArray;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -27,8 +24,11 @@ import org.briarproject.R;
 import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.api.AndroidNotificationManager;
+import org.briarproject.android.contact.ConversationAdapter.IntroductionHandler;
 import org.briarproject.android.introduction.IntroductionActivity;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
+import org.briarproject.android.view.TextInputView;
+import org.briarproject.android.view.TextInputView.TextInputListener;
 import org.briarproject.api.FormatException;
 import org.briarproject.api.blogs.BlogSharingManager;
 import org.briarproject.api.clients.SessionId;
@@ -93,8 +93,7 @@ import static org.briarproject.android.contact.ConversationItem.IncomingItem;
 import static org.briarproject.android.contact.ConversationItem.OutgoingItem;
 
 public class ConversationActivity extends BriarActivity
-		implements EventListener, OnClickListener,
-		ConversationAdapter.IntroductionHandler {
+		implements EventListener, IntroductionHandler, TextInputListener {
 
 	private static final Logger LOG =
 			Logger.getLogger(ConversationActivity.class.getName());
@@ -113,8 +112,7 @@ public class ConversationActivity extends BriarActivity
 	private ImageView toolbarStatus;
 	private TextView toolbarTitle;
 	private BriarRecyclerView list;
-	private EditText content;
-	private View sendButton;
+	private TextInputView textInputView;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -139,6 +137,7 @@ public class ConversationActivity extends BriarActivity
 	private volatile boolean connected = false;
 	private volatile Map<MessageId, byte[]> bodyCache = new HashMap<>();
 
+	@SuppressWarnings("ConstantConditions")
 	@Override
 	public void onCreate(Bundle state) {
 		super.onCreate(state);
@@ -177,13 +176,8 @@ public class ConversationActivity extends BriarActivity
 		list.setAdapter(adapter);
 		list.setEmptyText(getString(R.string.no_private_messages));
 
-		content = (EditText) findViewById(R.id.input_text);
-		sendButton = findViewById(R.id.btn_send);
-		if (sendButton != null) {
-			// Enabled after loading the conversation
-			sendButton.setEnabled(false);
-			sendButton.setOnClickListener(this);
-		}
+		textInputView = (TextInputView) findViewById(R.id.text_input_container);
+		textInputView.setListener(this);
 	}
 
 	@Override
@@ -262,6 +256,10 @@ public class ConversationActivity extends BriarActivity
 
 	@Override
 	public void onBackPressed() {
+		if (textInputView.isEmojiDrawerOpen()) {
+			textInputView.hideEmojiDrawer();
+			return;
+		}
 		// FIXME disabled exit transition, because it doesn't work for some reason #318
 		//supportFinishAfterTransition();
 		finish();
@@ -367,7 +365,7 @@ public class ConversationActivity extends BriarActivity
 		runOnUiThread(new Runnable() {
 			@Override
 			public void run() {
-				sendButton.setEnabled(true);
+				textInputView.setSendButtonEnabled(true);
 				if (headers.isEmpty() && introductions.isEmpty() &&
 						invitations.isEmpty()) {
 					// we have no messages,
@@ -637,14 +635,12 @@ public class ConversationActivity extends BriarActivity
 	}
 
 	@Override
-	public void onClick(View view) {
+	public void onSendClick(String text) {
 		markMessagesRead();
-		String message = content.getText().toString();
-		if (message.equals("")) return;
+		if (text.equals("")) return;
 		long timestamp = System.currentTimeMillis();
 		timestamp = Math.max(timestamp, getMinTimestampForNewMessage());
-		createMessage(StringUtils.toUtf8(message), timestamp);
-		content.setText("");
+		createMessage(StringUtils.toUtf8(text), timestamp);
 	}
 
 	private long getMinTimestampForNewMessage() {

+ 28 - 36
briar-android/src/org/briarproject/android/forum/ForumActivity.java

@@ -21,8 +21,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -31,11 +29,13 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.api.AndroidNotificationManager;
 import org.briarproject.android.controller.handler.UiResultHandler;
+import org.briarproject.android.forum.ForumController.ForumPostListener;
 import org.briarproject.android.sharing.ShareForumActivity;
 import org.briarproject.android.sharing.SharingStatusForumActivity;
-import org.briarproject.android.util.AndroidUtils;
-import org.briarproject.android.util.BriarRecyclerView;
-import org.briarproject.android.util.TrustIndicatorView;
+import org.briarproject.android.view.AuthorView;
+import org.briarproject.android.view.BriarRecyclerView;
+import org.briarproject.android.view.TextInputView;
+import org.briarproject.android.view.TextInputView.TextInputListener;
 import org.briarproject.api.forum.Forum;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageId;
@@ -48,8 +48,6 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import im.delight.android.identicons.IdenticonDrawable;
-
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
 import static android.support.v7.widget.RecyclerView.NO_POSITION;
@@ -59,7 +57,7 @@ import static android.view.View.VISIBLE;
 import static android.widget.Toast.LENGTH_SHORT;
 
 public class ForumActivity extends BriarActivity implements
-		ForumController.ForumPostListener {
+		ForumPostListener, TextInputListener {
 
 	static final String FORUM_NAME = "briar.FORUM_NAME";
 
@@ -80,8 +78,7 @@ public class ForumActivity extends BriarActivity implements
 	protected ForumAdapter forumAdapter;
 
 	private BriarRecyclerView recyclerView;
-	private EditText textInput;
-	private ViewGroup inputContainer;
+	private TextInputView textInput;
 	private LinearLayoutManager linearLayoutManager;
 
 	private volatile GroupId groupId = null;
@@ -101,9 +98,9 @@ public class ForumActivity extends BriarActivity implements
 
 		forumAdapter = new ForumAdapter();
 
-		inputContainer = (ViewGroup) findViewById(R.id.text_input_container);
-		inputContainer.setVisibility(GONE);
-		textInput = (EditText) findViewById(R.id.input_text);
+		textInput = (TextInputView) findViewById(R.id.text_input_container);
+		textInput.setVisibility(GONE);
+		textInput.setListener(this);
 		recyclerView =
 				(BriarRecyclerView) findViewById(R.id.forum_discussion_list);
 		recyclerView.setAdapter(forumAdapter);
@@ -140,7 +137,7 @@ public class ForumActivity extends BriarActivity implements
 	@Override
 	protected void onRestoreInstanceState(Bundle savedInstanceState) {
 		super.onRestoreInstanceState(savedInstanceState);
-		inputContainer.setVisibility(
+		textInput.setVisibility(
 				savedInstanceState.getBoolean(KEY_INPUT_VISIBILITY) ?
 						VISIBLE : GONE);
 	}
@@ -150,7 +147,7 @@ public class ForumActivity extends BriarActivity implements
 	protected void onSaveInstanceState(Bundle outState) {
 		super.onSaveInstanceState(outState);
 		outState.putBoolean(KEY_INPUT_VISIBILITY,
-				inputContainer.getVisibility() == VISIBLE);
+				textInput.getVisibility() == VISIBLE);
 		ForumEntry replyEntry = forumAdapter.getReplyEntry();
 		if (replyEntry != null) {
 			outState.putByteArray(KEY_REPLY_ID,
@@ -190,8 +187,10 @@ public class ForumActivity extends BriarActivity implements
 
 	@Override
 	public void onBackPressed() {
-		if (inputContainer.getVisibility() == VISIBLE) {
-			inputContainer.setVisibility(GONE);
+		if (textInput.isEmojiDrawerOpen()) {
+			textInput.hideEmojiDrawer();
+		} else if (textInput.getVisibility() == VISIBLE) {
+			textInput.setVisibility(GONE);
 			forumAdapter.setReplyEntry(null);
 		} else {
 			super.onBackPressed();
@@ -202,8 +201,8 @@ public class ForumActivity extends BriarActivity implements
 		// An animation here would be an overkill because of the keyboard
 		// popping up.
 		// only clear the text when the input container was not visible
-		if (inputContainer.getVisibility() != VISIBLE) {
-			inputContainer.setVisibility(VISIBLE);
+		if (textInput.getVisibility() != VISIBLE) {
+			textInput.setVisibility(VISIBLE);
 			textInput.setText("");
 		}
 		textInput.requestFocus();
@@ -260,8 +259,8 @@ public class ForumActivity extends BriarActivity implements
 		recyclerView.stopPeriodicUpdate();
 	}
 
-	public void sendMessage(View view) {
-		String text = textInput.getText().toString();
+	@Override
+	public void onSendClick(String text) {
 		if (text.trim().length() == 0)
 			return;
 		if (forumController.getForum() == null) return;
@@ -274,7 +273,7 @@ public class ForumActivity extends BriarActivity implements
 					replyEntry.getMessageId());
 		}
 		hideSoftKeyboard(textInput);
-		inputContainer.setVisibility(GONE);
+		textInput.setVisibility(GONE);
 		forumAdapter.setReplyEntry(null);
 	}
 
@@ -334,10 +333,9 @@ public class ForumActivity extends BriarActivity implements
 
 	static class ForumViewHolder extends RecyclerView.ViewHolder {
 
-		final TextView textView, lvlText, authorText, dateText, repliesText;
+		final TextView textView, lvlText, repliesText;
+		final AuthorView author;
 		final View[] lvls;
-		public final ImageView avatar;
-		final TrustIndicatorView trust;
 		final View chevron, replyButton;
 		final ViewGroup cell;
 		final View topDivider;
@@ -347,8 +345,7 @@ public class ForumActivity extends BriarActivity implements
 
 			textView = (TextView) v.findViewById(R.id.text);
 			lvlText = (TextView) v.findViewById(R.id.nested_line_text);
-			authorText = (TextView) v.findViewById(R.id.author);
-			dateText = (TextView) v.findViewById(R.id.date);
+			author = (AuthorView) v.findViewById(R.id.author);
 			repliesText = (TextView) v.findViewById(R.id.replies);
 			int[] nestedLineIds = {
 					R.id.nested_line_1, R.id.nested_line_2, R.id.nested_line_3,
@@ -358,8 +355,6 @@ public class ForumActivity extends BriarActivity implements
 			for (int i = 0; i < lvls.length; i++) {
 				lvls[i] = v.findViewById(nestedLineIds[i]);
 			}
-			avatar = (ImageView) v.findViewById(R.id.avatar);
-			trust = (TrustIndicatorView) v.findViewById(R.id.trustIndicator);
 			chevron = v.findViewById(R.id.chevron);
 			replyButton = v.findViewById(R.id.btn_reply);
 			cell = (ViewGroup) v.findViewById(R.id.forum_cell);
@@ -604,7 +599,7 @@ public class ForumActivity extends BriarActivity implements
 		public ForumViewHolder onCreateViewHolder(ViewGroup parent,
 				int viewType) {
 			View v = LayoutInflater.from(parent.getContext())
-					.inflate(R.layout.forum_discussion_cell, parent, false);
+					.inflate(R.layout.list_item_forum_post, parent, false);
 			return new ForumViewHolder(v);
 		}
 
@@ -635,10 +630,9 @@ public class ForumActivity extends BriarActivity implements
 			} else {
 				ui.lvlText.setVisibility(GONE);
 			}
-			ui.authorText.setText(data.getAuthor());
-			ui.dateText.setText(AndroidUtils
-					.formatDate(ForumActivity.this, data.getTimestamp()));
-			ui.trust.setTrustLevel(data.getStatus());
+			ui.author.setAuthor(data.getAuthor());
+			ui.author.setDate(data.getTimestamp());
+			ui.author.setAuthorStatus(data.getStatus());
 
 			int replies = getReplyCount(data);
 			if (replies == 0) {
@@ -648,8 +642,6 @@ public class ForumActivity extends BriarActivity implements
 						.getQuantityString(R.plurals.message_replies, replies,
 								replies));
 			}
-			ui.avatar.setImageDrawable(
-					new IdenticonDrawable(data.getAuthorId().getBytes()));
 
 			if (hasDescendants(data)) {
 				ui.chevron.setVisibility(VISIBLE);

+ 6 - 11
briar-android/src/org/briarproject/android/forum/ForumEntry.java

@@ -1,6 +1,7 @@
 package org.briarproject.android.forum;
 
 import org.briarproject.api.forum.ForumPostHeader;
+import org.briarproject.api.identity.Author;
 import org.briarproject.api.identity.Author.Status;
 import org.briarproject.api.identity.AuthorId;
 import org.briarproject.api.sync.MessageId;
@@ -11,26 +12,24 @@ public class ForumEntry {
 	private final String text;
 	private final int level;
 	private final long timestamp;
-	private final String author;
-	private final AuthorId authorId;
+	private final Author author;
 	private Status status;
 	private boolean isShowingDescendants = true;
 	private boolean isRead = true;
 
 	ForumEntry(ForumPostHeader h, String text, int level) {
-		this(h.getId(), text, level, h.getTimestamp(), h.getAuthor().getName(),
-				h.getAuthor().getId(), h.getAuthorStatus());
+		this(h.getId(), text, level, h.getTimestamp(), h.getAuthor(),
+				h.getAuthorStatus());
 		this.isRead = h.isRead();
 	}
 
 	public ForumEntry(MessageId messageId, String text, int level,
-			long timestamp, String author, AuthorId authorId, Status status) {
+			long timestamp, Author author, Status status) {
 		this.messageId = messageId;
 		this.text = text;
 		this.level = level;
 		this.timestamp = timestamp;
 		this.author = author;
-		this.authorId = authorId;
 		this.status = status;
 	}
 
@@ -46,14 +45,10 @@ public class ForumEntry {
 		return timestamp;
 	}
 
-	public String getAuthor() {
+	public Author getAuthor() {
 		return author;
 	}
 
-	AuthorId getAuthorId() {
-		return authorId;
-	}
-
 	public Status getStatus() {
 		return status;
 	}

+ 1 - 1
briar-android/src/org/briarproject/android/forum/ForumListAdapter.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 import org.briarproject.android.util.AndroidUtils;
-import org.briarproject.android.util.TextAvatarView;
+import org.briarproject.android.view.TextAvatarView;
 import org.briarproject.api.forum.Forum;
 import org.briarproject.api.sync.GroupId;
 

+ 1 - 1
briar-android/src/org/briarproject/android/forum/ForumListFragment.java

@@ -18,7 +18,7 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.api.AndroidNotificationManager;
 import org.briarproject.android.fragment.BaseEventFragment;
 import org.briarproject.android.sharing.InvitationsForumActivity;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.db.NoSuchGroupException;
 import org.briarproject.api.event.ContactRemovedEvent;

+ 19 - 26
briar-android/src/org/briarproject/android/forum/ForumTestControllerImpl.java

@@ -3,7 +3,8 @@ package org.briarproject.android.forum;
 import org.briarproject.android.controller.handler.ResultHandler;
 import org.briarproject.api.UniqueId;
 import org.briarproject.api.forum.Forum;
-import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
 import org.briarproject.api.sync.GroupId;
 import org.briarproject.api.sync.MessageId;
 
@@ -20,34 +21,27 @@ import static org.briarproject.api.identity.Author.Status.UNVERIFIED;
 
 public class ForumTestControllerImpl implements ForumController {
 
+	@Inject
+	AuthorFactory authorFactory;
+
 	private static final Logger LOG =
 			Logger.getLogger(ForumControllerImpl.class.getName());
 
-	private final static String[] AUTHORS = {
-			"Guðmundur",
-			"Jónas",
-			"Geir Þorsteinn Gísli Máni Halldórsson Guðjónsson Mogensen",
-			"Baldur Friðrik",
-			"Anna Katrín",
-			"Þór",
-			"Anna Þorbjörg",
-			"Guðrún",
-			"Helga",
-			"Haraldur"
+	private final Author[] AUTHORS = {
+			authorFactory.createAuthor("Guðmundur", new byte[42]),
+			authorFactory.createAuthor("Jónas", new byte[42]),
+			authorFactory.createAuthor(
+					"Geir Þorsteinn Gísli Máni Halldórsson Guðjónsson Mogensen",
+					new byte[42]),
+			authorFactory.createAuthor("Baldur Friðrik", new byte[42]),
+			authorFactory.createAuthor("Anna Katrín", new byte[42]),
+			authorFactory.createAuthor("Þór", new byte[42]),
+			authorFactory.createAuthor("Anna Þorbjörg", new byte[42]),
+			authorFactory.createAuthor("Guðrún", new byte[42]),
+			authorFactory.createAuthor("Helga", new byte[42]),
+			authorFactory.createAuthor("Haraldur", new byte[42])
 	};
 
-	private final static AuthorId[] AUTHOR_ID = new AuthorId[AUTHORS.length];
-
-	static {
-		SecureRandom random = new SecureRandom();
-		for (int i = 0; i < AUTHOR_ID.length; i++) {
-			byte[] b = new byte[UniqueId.LENGTH];
-			random.nextBytes(b);
-			AUTHOR_ID[i] = new AuthorId(b);
-
-		}
-	}
-
 	private final static String SAGA =
 			"Það er upphaf á sögu þessari að Hákon konungur " +
 					"Aðalsteinsfóstri réð fyrir Noregi og var þetta á ofanverðum " +
@@ -117,8 +111,7 @@ public class ForumTestControllerImpl implements ForumController {
 			random.nextBytes(b);
 			forumEntries[e] =
 					new ForumEntry(new MessageId(b), SAGA.substring(0, i[e]),
-							l[e], timestamp, AUTHORS[authorIndex],
-							AUTHOR_ID[authorIndex], UNVERIFIED);
+							l[e], timestamp, AUTHORS[authorIndex], UNVERIFIED);
 		}
 		LOG.info("forum entries: " + forumEntries.length);
 		resultHandler.onResult(true);

+ 1 - 1
briar-android/src/org/briarproject/android/introduction/ContactChooserFragment.java

@@ -17,7 +17,7 @@ import org.briarproject.android.contact.ContactListAdapter;
 import org.briarproject.android.contact.ContactListItem;
 import org.briarproject.android.contact.ConversationItem;
 import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.contact.Contact;
 import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.contact.ContactManager;

+ 1 - 1
briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java

@@ -23,7 +23,7 @@ import org.briarproject.R;
 import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.api.AndroidExecutor;
 import org.briarproject.android.fragment.BaseEventFragment;
-import org.briarproject.android.util.CameraView;
+import org.briarproject.android.view.CameraView;
 import org.briarproject.android.util.QrCodeDecoder;
 import org.briarproject.android.util.QrCodeUtils;
 import org.briarproject.api.event.Event;

+ 1 - 1
briar-android/src/org/briarproject/android/sharing/ContactSelectorFragment.java

@@ -17,7 +17,7 @@ import org.briarproject.android.ActivityComponent;
 import org.briarproject.android.contact.BaseContactListAdapter;
 import org.briarproject.android.contact.ContactListItem;
 import org.briarproject.android.fragment.BaseFragment;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.contact.Contact;
 import org.briarproject.api.contact.ContactId;
 import org.briarproject.api.contact.ContactManager;

+ 1 - 1
briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java

@@ -10,7 +10,7 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import org.briarproject.R;
-import org.briarproject.android.util.TextAvatarView;
+import org.briarproject.android.view.TextAvatarView;
 import org.briarproject.api.contact.Contact;
 import org.briarproject.api.sharing.InvitationItem;
 import org.briarproject.util.StringUtils;

+ 1 - 1
briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java

@@ -7,7 +7,7 @@ import android.widget.Toast;
 
 import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.event.ContactRemovedEvent;
 import org.briarproject.api.event.Event;
 import org.briarproject.api.event.EventBus;

+ 1 - 1
briar-android/src/org/briarproject/android/sharing/SharingStatusActivity.java

@@ -8,7 +8,7 @@ import android.view.MenuItem;
 import org.briarproject.R;
 import org.briarproject.android.BriarActivity;
 import org.briarproject.android.contact.ContactListItem;
-import org.briarproject.android.util.BriarRecyclerView;
+import org.briarproject.android.view.BriarRecyclerView;
 import org.briarproject.api.contact.Contact;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.identity.IdentityManager;

+ 1 - 1
briar-android/src/org/briarproject/android/util/AndroidUtils.java

@@ -15,7 +15,6 @@ import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.format.DateUtils;
-import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
@@ -23,6 +22,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import org.briarproject.R;
+import org.briarproject.android.view.ArticleMovementMethod;
 import org.briarproject.android.widget.LinkDialogFragment;
 import org.briarproject.util.IoUtils;
 import org.briarproject.util.StringUtils;

+ 1 - 1
briar-android/src/org/briarproject/android/util/ArticleMovementMethod.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.text.Layout;
 import android.text.Spannable;

+ 5 - 1
briar-android/src/org/briarproject/android/util/AuthorView.java

@@ -1,10 +1,11 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
+import android.support.annotation.UiThread;
 import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
@@ -18,6 +19,8 @@ import android.widget.TextView;
 
 import org.briarproject.R;
 import org.briarproject.android.blogs.BlogActivity;
+import org.briarproject.android.util.AndroidUtils;
+import org.briarproject.android.view.TrustIndicatorView;
 import org.briarproject.api.identity.Author;
 import org.briarproject.api.identity.Author.Status;
 import org.briarproject.api.sync.GroupId;
@@ -34,6 +37,7 @@ import static android.util.TypedValue.COMPLEX_UNIT_PX;
 import static org.briarproject.android.BriarActivity.GROUP_ID;
 import static org.briarproject.api.identity.Author.Status.OURSELVES;
 
+@UiThread
 public class AuthorView extends RelativeLayout {
 
 	private final CircleImageView avatar;

+ 4 - 3
briar-android/src/org/briarproject/android/util/BriarRecyclerView.java

@@ -1,7 +1,8 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView.Adapter;
 import android.util.AttributeSet;
@@ -34,11 +35,11 @@ public class BriarRecyclerView extends FrameLayout {
 		this(context, null, 0);
 	}
 
-	public BriarRecyclerView(Context context, AttributeSet attrs) {
+	public BriarRecyclerView(Context context, @Nullable AttributeSet attrs) {
 		this(context, attrs, 0);
 	}
 
-	public BriarRecyclerView(Context context, AttributeSet attrs,
+	public BriarRecyclerView(Context context, @Nullable AttributeSet attrs,
 			int defStyle) {
 		super(context, attrs, defStyle);
 

+ 1 - 1
briar-android/src/org/briarproject/android/util/BriarRecyclerViewBehavior.java

@@ -1,4 +1,4 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;

+ 3 - 1
briar-android/src/org/briarproject/android/util/CameraView.java

@@ -1,4 +1,4 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
 import android.hardware.Camera;
@@ -12,6 +12,8 @@ import android.util.DisplayMetrics;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
+import org.briarproject.android.util.PreviewConsumer;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;

+ 5 - 2
briar-android/src/org/briarproject/android/util/TextAvatarView.java

@@ -1,8 +1,10 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.Nullable;
+import android.support.annotation.UiThread;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
@@ -16,6 +18,7 @@ import org.briarproject.api.identity.Author;
 import de.hdodenhof.circleimageview.CircleImageView;
 import im.delight.android.identicons.IdenticonDrawable;
 
+@UiThread
 public class TextAvatarView extends FrameLayout {
 
 	final private AppCompatTextView character;
@@ -23,7 +26,7 @@ public class TextAvatarView extends FrameLayout {
 	final private TextView badge;
 	private int unreadCount;
 
-	public TextAvatarView(Context context, AttributeSet attrs) {
+	public TextAvatarView(Context context, @Nullable AttributeSet attrs) {
 		super(context, attrs);
 
 		LayoutInflater inflater = (LayoutInflater) context

+ 171 - 0
briar-android/src/org/briarproject/android/view/TextInputView.java

@@ -0,0 +1,171 @@
+package org.briarproject.android.view;
+
+import android.content.Context;
+import android.os.IBinder;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.annotation.UiThread;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import org.briarproject.R;
+import org.thoughtcrime.securesms.components.KeyboardAwareRelativeLayout;
+import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
+import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiEventListener;
+import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
+import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
+
+import java.util.logging.Logger;
+
+import static android.content.Context.INPUT_METHOD_SERVICE;
+
+@UiThread
+public class TextInputView extends KeyboardAwareRelativeLayout
+		implements EmojiEventListener {
+
+	private static final String TAG = TextInputView.class.getName();
+	private static final Logger LOG = Logger.getLogger(TAG);
+
+	private EmojiEditText editText;
+	private View sendButton;
+	private EmojiDrawer emojiDrawer;
+
+	private TextInputListener listener;
+
+	public TextInputView(Context context) {
+		this(context, null);
+	}
+
+	public TextInputView(Context context, @Nullable AttributeSet attrs) {
+		this(context, attrs, 0);
+	}
+
+	public TextInputView(Context context, @Nullable AttributeSet attrs,
+			int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+
+		LayoutInflater inflater = (LayoutInflater) context
+				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+		inflater.inflate(R.layout.text_input_view, this, true);
+
+		// find views
+		EmojiToggle emojiToggle = (EmojiToggle) findViewById(R.id.emoji_toggle);
+		editText = (EmojiEditText) findViewById(R.id.input_text);
+		emojiDrawer = (EmojiDrawer) findViewById(R.id.emoji_drawer);
+		sendButton = findViewById(R.id.btn_send);
+
+		emojiToggle.attach(emojiDrawer);
+		emojiToggle.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				onEmojiToggleClicked();
+			}
+		});
+		editText.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				showSoftKeyboard();
+			}
+		});
+		sendButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (listener != null) {
+					listener.onSendClick(editText.getText().toString());
+					editText.setText("");
+				}
+			}
+		});
+		emojiDrawer.setEmojiEventListener(this);
+	}
+
+	@Override
+	public void onKeyEvent(KeyEvent keyEvent) {
+		editText.dispatchKeyEvent(keyEvent);
+	}
+
+	@Override
+	public void onEmojiSelected(String emoji) {
+		editText.insertEmoji(emoji);
+	}
+
+	private void onEmojiToggleClicked() {
+		if (isEmojiDrawerOpen()) {
+			showSoftKeyboard();
+		} else {
+			showEmojiDrawer();
+		}
+	}
+
+	public void setText(String text) {
+		editText.setText(text);
+	}
+
+	public void setHint(@StringRes int res) {
+		editText.setHint(res);
+	}
+
+	public void setSendButtonEnabled(boolean enabled) {
+		sendButton.setEnabled(enabled);
+	}
+
+	public void setListener(TextInputListener listener) {
+		this.listener = listener;
+	}
+
+	public interface TextInputListener {
+		void onSendClick(String text);
+	}
+
+	public void showSoftKeyboard() {
+		if (isKeyboardOpen()) return;
+
+		if (emojiDrawer.isShowing()) {
+			postOnKeyboardOpen(new Runnable() {
+				@Override
+				public void run() {
+					hideEmojiDrawer();
+				}
+			});
+		}
+		editText.post(new Runnable() {
+			@Override
+			public void run() {
+				editText.requestFocus();
+				Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+				((InputMethodManager) o).showSoftInput(editText, 0);
+			}
+		});
+	}
+
+	public void hideSoftKeyboard() {
+		IBinder token = editText.getWindowToken();
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		((InputMethodManager) o).hideSoftInputFromWindow(token, 0);
+	}
+
+	public void showEmojiDrawer() {
+		if (isKeyboardOpen()) {
+			postOnKeyboardClose(new Runnable() {
+				@Override public void run() {
+					emojiDrawer.show(getKeyboardHeight());
+				}
+			});
+			hideSoftKeyboard();
+		} else {
+			emojiDrawer.show(getKeyboardHeight());
+		}
+	}
+
+	public void hideEmojiDrawer() {
+		emojiDrawer.hide();
+	}
+
+	public boolean isEmojiDrawerOpen() {
+		return emojiDrawer.isShowing();
+	}
+
+}

+ 3 - 1
briar-android/src/org/briarproject/android/util/TrustIndicatorView.java

@@ -1,6 +1,7 @@
-package org.briarproject.android.util;
+package org.briarproject.android.view;
 
 import android.content.Context;
+import android.support.annotation.UiThread;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.widget.ImageView;
@@ -10,6 +11,7 @@ import org.briarproject.api.identity.Author.Status;
 
 import static org.briarproject.api.identity.Author.Status.OURSELVES;
 
+@UiThread
 public class TrustIndicatorView extends ImageView {
 
 	public TrustIndicatorView(Context context) {

+ 621 - 0
briar-android/src/org/thoughtcrime/securesms/LICENSE

@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

+ 279 - 0
briar-android/src/org/thoughtcrime/securesms/components/KeyboardAwareRelativeLayout.java

@@ -0,0 +1,279 @@
+/**
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms.components;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Build;
+import android.os.Build.VERSION_CODES;
+import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+import android.support.annotation.UiThread;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Surface;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+
+import org.briarproject.R;
+
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * RelativeLayout that, when a view container, will report back when it thinks a soft keyboard
+ * has been opened and what its height would be.
+ */
+@UiThread
+public class KeyboardAwareRelativeLayout extends RelativeLayout {
+	private static final String TAG =
+			KeyboardAwareRelativeLayout.class.getSimpleName();
+
+	private final Rect rect = new Rect();
+	private final Set<OnKeyboardHiddenListener> hiddenListeners =
+			new HashSet<>();
+	private final Set<OnKeyboardShownListener> shownListeners = new HashSet<>();
+	private final int minKeyboardSize;
+	private final int minCustomKeyboardSize;
+	private final int defaultCustomKeyboardSize;
+	private final int minCustomKeyboardTopMargin;
+	private final int statusBarHeight;
+
+	private int viewInset;
+
+	private boolean keyboardOpen = false;
+	private int rotation = -1;
+
+	public KeyboardAwareRelativeLayout(Context context) {
+		this(context, null);
+	}
+
+	public KeyboardAwareRelativeLayout(Context context,
+			@Nullable AttributeSet attrs) {
+		this(context, attrs, 0);
+	}
+
+	public KeyboardAwareRelativeLayout(Context context,
+			@Nullable AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+		final int statusBarRes = getResources()
+				.getIdentifier("status_bar_height", "dimen", "android");
+		minKeyboardSize =
+				getResources().getDimensionPixelSize(R.dimen.min_keyboard_size);
+		minCustomKeyboardSize = getResources()
+				.getDimensionPixelSize(R.dimen.min_custom_keyboard_size);
+		defaultCustomKeyboardSize = getResources()
+				.getDimensionPixelSize(R.dimen.default_custom_keyboard_size);
+		minCustomKeyboardTopMargin = getResources()
+				.getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin);
+		statusBarHeight = statusBarRes > 0 ?
+				getResources().getDimensionPixelSize(statusBarRes) : 0;
+		viewInset = getViewInset();
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+		updateRotation();
+		updateKeyboardState();
+		super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+	}
+
+	private void updateRotation() {
+		int oldRotation = rotation;
+		rotation = getDeviceRotation();
+		if (oldRotation != rotation) {
+			Log.w(TAG, "rotation changed");
+			onKeyboardClose();
+		}
+	}
+
+	private void updateKeyboardState() {
+		if (isLandscape()) {
+			if (keyboardOpen) onKeyboardClose();
+			return;
+		}
+
+		if (viewInset == 0 && Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP)
+			viewInset = getViewInset();
+		final int availableHeight =
+				this.getRootView().getHeight() - statusBarHeight - viewInset;
+		getWindowVisibleDisplayFrame(rect);
+
+		final int keyboardHeight = availableHeight - (rect.bottom - rect.top);
+
+		if (keyboardHeight > minKeyboardSize) {
+			if (getKeyboardHeight() != keyboardHeight)
+				setKeyboardPortraitHeight(keyboardHeight);
+			if (!keyboardOpen) onKeyboardOpen(keyboardHeight);
+		} else if (keyboardOpen) {
+			onKeyboardClose();
+		}
+	}
+
+	@TargetApi(VERSION_CODES.LOLLIPOP)
+	private int getViewInset() {
+		try {
+			Field attachInfoField = View.class.getDeclaredField("mAttachInfo");
+			attachInfoField.setAccessible(true);
+			Object attachInfo = attachInfoField.get(this);
+			if (attachInfo != null) {
+				Field stableInsetsField =
+						attachInfo.getClass().getDeclaredField("mStableInsets");
+				stableInsetsField.setAccessible(true);
+				Rect insets = (Rect) stableInsetsField.get(attachInfo);
+				return insets.bottom;
+			}
+		} catch (NoSuchFieldException nsfe) {
+			Log.w(TAG, "field reflection error when measuring view inset",
+					nsfe);
+		} catch (IllegalAccessException iae) {
+			Log.w(TAG, "access reflection error when measuring view inset",
+					iae);
+		}
+		return 0;
+	}
+
+	protected void onKeyboardOpen(int keyboardHeight) {
+		Log.w(TAG, "onKeyboardOpen(" + keyboardHeight + ")");
+		keyboardOpen = true;
+
+		notifyShownListeners();
+	}
+
+	protected void onKeyboardClose() {
+		Log.w(TAG, "onKeyboardClose()");
+		keyboardOpen = false;
+		notifyHiddenListeners();
+	}
+
+	public boolean isKeyboardOpen() {
+		return keyboardOpen;
+	}
+
+	public int getKeyboardHeight() {
+		return isLandscape() ? getKeyboardLandscapeHeight() :
+				getKeyboardPortraitHeight();
+	}
+
+	public boolean isLandscape() {
+		int rotation = getDeviceRotation();
+		return rotation == Surface.ROTATION_90 ||
+				rotation == Surface.ROTATION_270;
+	}
+
+	private int getDeviceRotation() {
+		WindowManager windowManager = (WindowManager) getContext()
+				.getSystemService(Activity.WINDOW_SERVICE);
+		return windowManager.getDefaultDisplay().getRotation();
+	}
+
+	private int getKeyboardLandscapeHeight() {
+		return Math.max(getHeight(), getRootView().getHeight()) / 2;
+	}
+
+	private int getKeyboardPortraitHeight() {
+		int keyboardHeight =
+				PreferenceManager.getDefaultSharedPreferences(getContext())
+						.getInt("keyboard_height_portrait",
+								defaultCustomKeyboardSize);
+		return clamp(keyboardHeight, minCustomKeyboardSize,
+				getRootView().getHeight() - minCustomKeyboardTopMargin);
+	}
+
+	private int clamp(int value, int min, int max) {
+		return Math.min(Math.max(value, min), max);
+	}
+
+	private void setKeyboardPortraitHeight(int height) {
+		PreferenceManager.getDefaultSharedPreferences(getContext())
+				.edit().putInt("keyboard_height_portrait", height).apply();
+	}
+
+	public void postOnKeyboardClose(final Runnable runnable) {
+		if (keyboardOpen) {
+			addOnKeyboardHiddenListener(new OnKeyboardHiddenListener() {
+				@Override
+				public void onKeyboardHidden() {
+					removeOnKeyboardHiddenListener(this);
+					runnable.run();
+				}
+			});
+		} else {
+			runnable.run();
+		}
+	}
+