瀏覽代碼

Fix crashing bug & Tag v3.2.0beta4

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 年之前
父節點
當前提交
27b438aacb

+ 2 - 2
app/build.gradle

@@ -17,8 +17,8 @@ android {
         targetSdkVersion 28
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 
-        versionCode 76
-        versionName "3.2.0beta3"
+        versionCode 77
+        versionName "3.2.0beta4"
 
 
         flavorDimensions "default"
         flavorDimensions "default"
         renderscriptTargetApi 19
         renderscriptTargetApi 19

+ 2 - 1
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java

@@ -31,6 +31,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.models.json.chat.ChatMessage;
 import com.nextcloud.talk.models.json.chat.ChatMessage;
 import com.nextcloud.talk.utils.DisplayUtils;
 import com.nextcloud.talk.utils.DisplayUtils;
 import com.stfalcon.chatkit.messages.MessageHolders;
 import com.stfalcon.chatkit.messages.MessageHolders;
+import com.vanniktech.emoji.EmojiTextView;
 
 
 import butterknife.BindView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.ButterKnife;
@@ -38,7 +39,7 @@ import butterknife.ButterKnife;
 public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageMessageViewHolder<ChatMessage> {
 public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageMessageViewHolder<ChatMessage> {
 
 
     @BindView(R.id.messageText)
     @BindView(R.id.messageText)
-    TextView messageText;
+    EmojiTextView messageText;
 
 
     public MagicPreviewMessageViewHolder(View itemView) {
     public MagicPreviewMessageViewHolder(View itemView) {
         super(itemView);
         super(itemView);

+ 1 - 1
app/src/main/res/layout/item_custom_incoming_text_message.xml

@@ -54,7 +54,7 @@
             android:textColor="@color/colorPrimary"
             android:textColor="@color/colorPrimary"
             android:textSize="12sp" />
             android:textSize="12sp" />
 
 
-        <androidx.emoji.widget.EmojiTextView
+        <com.vanniktech.emoji.EmojiTextView
             android:id="@id/messageText"
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"