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

Move timestamp outside the bubble

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-05-08 20:54:43 +02:00
parent 27c60bcce4
commit 53caf09570
4 changed files with 71 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -157,7 +157,8 @@ public class ChatController extends BaseController implements MessagesListAdapte
MessagesListAdapter.HoldersConfig holdersConfig = new MessagesListAdapter.HoldersConfig(); MessagesListAdapter.HoldersConfig holdersConfig = new MessagesListAdapter.HoldersConfig();
holdersConfig.setIncoming(MagicIncomingTextMessageViewHolder.class, holdersConfig.setIncoming(MagicIncomingTextMessageViewHolder.class,
R.layout.item_custom_incoming_text_message); R.layout.item_custom_incoming_text_message);
holdersConfig.setOutcomingTextHolder(MagicOutcomingTextMessageViewHolder.class); holdersConfig.setOutcoming(MagicOutcomingTextMessageViewHolder.class,
R.layout.item_custom_outcoming_text_message);
adapter = new MessagesListAdapter<>(currentUser.getUserId(), holdersConfig, new ImageLoader() { adapter = new MessagesListAdapter<>(currentUser.getUserId(), holdersConfig, new ImageLoader() {
@Override @Override

1
app/src/main/res/layout/controller_chat.xml
View File

@ -39,6 +39,7 @@
app:outcomingDefaultBubbleSelectedColor="@color/colorPrimaryDark" app:outcomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
app:outcomingTextSize="@dimen/chat_text_size" app:outcomingTextSize="@dimen/chat_text_size"
app:outcomingTimeTextSize="12sp" app:outcomingTimeTextSize="12sp"
app:outcomingTimeTextColor="@color/warm_grey_four"
app:outcomingTextColor="@color/nc_outcoming_text_default" app:outcomingTextColor="@color/nc_outcoming_text_default"
app:outcomingTextLinkColor="@color/nc_outcoming_text_default" app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
app:incomingTextColor="@color/nc_incoming_text_default" app:incomingTextColor="@color/nc_incoming_text_default"

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

@ -64,14 +64,15 @@
app:layout_flexGrow="1" app:layout_flexGrow="1"
app:layout_wrapBefore="true"/> app:layout_wrapBefore="true"/>
<TextView
android:id="@id/messageTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textSize="12sp"
app:layout_alignSelf="center"/>
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
<TextView
android:id="@id/messageTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/bubble"
android:layout_below="@id/bubble"
android:layout_marginStart="16dp"/>
</RelativeLayout> </RelativeLayout>

60
app/src/main/res/layout/item_custom_outcoming_text_message.xml Normal file
View File

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Nextcloud Talk application
~
~ @author Mario Danic
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~
~ 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/>.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp">
<com.google.android.flexbox.FlexboxLayout
android:id="@id/bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginLeft="@dimen/message_outcoming_bubble_margin_left"
android:layout_marginStart="@dimen/message_outcoming_bubble_margin_left"
app:alignContent="stretch"
app:alignItems="stretch"
app:flexWrap="wrap"
app:justifyContent="flex_end">
<TextView
android:id="@id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignWithParentIfMissing="true"/>
</com.google.android.flexbox.FlexboxLayout>
<TextView
android:id="@id/messageTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/bubble"
android:layout_below="@id/bubble"
android:layout_marginStart="16dp"/>
</RelativeLayout>