gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 13:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #601 and mentions

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-02 14:12:31 +02:00
parent 8cbc0c7bc9
commit 8d592a996d
12 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java
View File

@ -24,6 +24,8 @@ import android.accounts.Account;
import android.view.View; import android.view.View;
import android.widget.*; import android.widget.*;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.emoji.widget.EmojiTextView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
@ -144,7 +146,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem<AdvancedUserItem.User
static class UserItemViewHolder extends FlexibleViewHolder { static class UserItemViewHolder extends FlexibleViewHolder {
@BindView(R.id.name_text) @BindView(R.id.name_text)
public TextView contactDisplayName; public EmojiTextView contactDisplayName;
@BindView(R.id.secondary_text) @BindView(R.id.secondary_text)
public TextView serverUrl; public TextView serverUrl;
@BindView(R.id.avatar_image) @BindView(R.id.avatar_image)

3
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
View File

@ -25,7 +25,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView;
import androidx.emoji.widget.EmojiTextView; import androidx.emoji.widget.EmojiTextView;
@ -253,7 +252,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
public SimpleDraweeView simpleDraweeView; public SimpleDraweeView simpleDraweeView;
@Nullable @Nullable
@BindView(R.id.secondary_text) @BindView(R.id.secondary_text)
public TextView contactMentionId; public EmojiTextView contactMentionId;
@Nullable @Nullable
@BindView(R.id.voiceOrSimpleCallImageView) @BindView(R.id.voiceOrSimpleCallImageView)
ImageView voiceOrSimpleCallImageView; ImageView voiceOrSimpleCallImageView;

7
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
View File

@ -33,6 +33,8 @@ import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.emoji.widget.EmojiTextView;
import autodagger.AutoInjector; import autodagger.AutoInjector;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -47,6 +49,7 @@ import com.nextcloud.talk.utils.TextMatchers;
import com.nextcloud.talk.utils.database.user.UserUtils; import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.preferences.AppPreferences; import com.nextcloud.talk.utils.preferences.AppPreferences;
import com.stfalcon.chatkit.messages.MessageHolders; import com.stfalcon.chatkit.messages.MessageHolders;
import com.vanniktech.emoji.emoji.Emoji;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.HashMap; import java.util.HashMap;
@ -57,10 +60,10 @@ public class MagicIncomingTextMessageViewHolder
extends MessageHolders.IncomingTextMessageViewHolder<ChatMessage> { extends MessageHolders.IncomingTextMessageViewHolder<ChatMessage> {
@BindView(R.id.messageAuthor) @BindView(R.id.messageAuthor)
TextView messageAuthor; EmojiTextView messageAuthor;
@BindView(R.id.messageText) @BindView(R.id.messageText)
TextView messageText; EmojiTextView messageText;
@BindView(R.id.messageUserAvatar) @BindView(R.id.messageUserAvatar)
SimpleDraweeView messageUserAvatarView; SimpleDraweeView messageUserAvatarView;

4
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
View File

@ -31,6 +31,8 @@ import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.view.ViewCompat; import androidx.core.view.ViewCompat;
import androidx.emoji.widget.EmojiTextView;
import autodagger.AutoInjector; import autodagger.AutoInjector;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -50,7 +52,7 @@ import java.util.Map;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class MagicOutcomingTextMessageViewHolder extends MessageHolders.OutcomingTextMessageViewHolder<ChatMessage> { public class MagicOutcomingTextMessageViewHolder extends MessageHolders.OutcomingTextMessageViewHolder<ChatMessage> {
@BindView(R.id.messageText) @BindView(R.id.messageText)
TextView messageText; EmojiTextView messageText;
@BindView(R.id.messageTime) @BindView(R.id.messageTime)
TextView messageTimeView; TextView messageTimeView;

5
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
View File

@ -30,6 +30,9 @@ import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import androidx.emoji.widget.EmojiTextView;
import autodagger.AutoInjector; import autodagger.AutoInjector;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
@ -59,7 +62,7 @@ import java.util.concurrent.Callable;
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;
@Inject @Inject
Context context; Context context;

1
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
View File

@ -98,6 +98,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
} }
} }
} }
text.setText(messageString); text.setText(messageString);
} }
} }

2
app/src/main/res/layout/item_custom_incoming_preview_message.xml
View File

@ -53,7 +53,7 @@
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<TextView <androidx.emoji.widget.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"

4
app/src/main/res/layout/item_custom_incoming_text_message.xml
View File

@ -47,7 +47,7 @@
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<TextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/messageAuthor" android:id="@+id/messageAuthor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -55,7 +55,7 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="12sp" /> android:textSize="12sp" />
<TextView <androidx.emoji.widget.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"

2
app/src/main/res/layout/item_custom_outcoming_preview_message.xml
View File

@ -49,7 +49,7 @@
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<TextView <androidx.emoji.widget.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"

2
app/src/main/res/layout/item_custom_outcoming_text_message.xml
View File

@ -38,7 +38,7 @@
app:flexWrap="wrap" app:flexWrap="wrap"
app:justifyContent="flex_end"> app:justifyContent="flex_end">
<TextView <androidx.emoji.widget.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"

2
app/src/main/res/layout/item_system_message.xml
View File

@ -32,7 +32,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
<TextView <androidx.emoji.widget.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"

4
app/src/main/res/layout/rv_item_mention.xml
View File

@ -52,7 +52,7 @@
android:layout_toEndOf="@id/frame_layout" android:layout_toEndOf="@id/frame_layout"
android:orientation="vertical"> android:orientation="vertical">
<TextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/name_text" android:id="@+id/name_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -62,7 +62,7 @@
android:textSize="16sp" android:textSize="16sp"
tools:text="Call item text" /> tools:text="Call item text" />
<TextView <androidx.emoji.widget.EmojiTextView
android:id="@+id/secondary_text" android:id="@+id/secondary_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"