gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-10 08:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve conversation list layout and dark-theme-colors

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-03-25 22:33:29 +01:00
parent ea5ad958ba
commit adac29d756
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
6 changed files with 82 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java
View File

@ -2,6 +2,8 @@
* Nextcloud Talk application * Nextcloud Talk application
* *
* @author Mario Danic * @author Mario Danic
* @author Andy Scherzinger
* Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
* Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> * Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -21,6 +23,8 @@
package com.nextcloud.talk.adapters.items; package com.nextcloud.talk.adapters.items;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.LayerDrawable;
@ -30,14 +34,15 @@ import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.content.ContextCompat;
import androidx.emoji.widget.EmojiTextView; import androidx.emoji.widget.EmojiTextView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import com.amulyakhare.textdrawable.TextDrawable;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.interfaces.DraweeController;
import com.facebook.drawee.view.SimpleDraweeView; import com.facebook.drawee.view.SimpleDraweeView;
import com.google.android.material.chip.Chip;
import com.nextcloud.talk.R; import com.nextcloud.talk.R;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.database.UserEntity;
@ -113,17 +118,32 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
} }
if (conversation.getUnreadMessages() > 0) { if (conversation.getUnreadMessages() > 0) {
holder.dialogName.setTypeface(
holder.dialogName.getTypeface(),
Typeface.BOLD
);
holder.dialogDate.setTypeface(
holder.dialogDate.getTypeface(),
Typeface.BOLD
);
holder.dialogLastMessage.setTypeface(
holder.dialogLastMessage.getTypeface(),
Typeface.BOLD
);
holder.dialogUnreadBubble.setVisibility(View.VISIBLE); holder.dialogUnreadBubble.setVisibility(View.VISIBLE);
if (conversation.getUnreadMessages() < 100) { if (conversation.getUnreadMessages() < 1000) {
holder.dialogUnreadBubble.setText(Long.toString(conversation.getUnreadMessages())); holder.dialogUnreadBubble.setText(Long.toString(conversation.getUnreadMessages()));
} else { } else {
holder.dialogUnreadBubble.setText("99+"); holder.dialogUnreadBubble.setText(R.string.tooManyUnreadMessages);
} }
if (conversation.isUnreadMention() || conversation.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) { if (conversation.isUnreadMention() || conversation.type == Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
holder.dialogUnreadBubble.setBackground(context.getDrawable(R.drawable.bubble_circle_unread_mention)); holder.dialogUnreadBubble.setChipBackgroundColorResource(R.color.colorPrimary);
holder.dialogUnreadBubble.setTextColor(Color.WHITE);
} else { } else {
holder.dialogUnreadBubble.setBackground(context.getDrawable(R.drawable.bubble_circle_unread)); holder.dialogUnreadBubble.setChipBackgroundColorResource(R.color.conversation_unread_bubble);
holder.dialogUnreadBubble.setTextColor(
ContextCompat.getColor(context, R.color.conversation_unread_bubble_text));
} }
} else { } else {
holder.dialogUnreadBubble.setVisibility(View.GONE); holder.dialogUnreadBubble.setVisibility(View.GONE);
@ -254,7 +274,7 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv
@BindView(R.id.dialogLastMessage) @BindView(R.id.dialogLastMessage)
EmojiTextView dialogLastMessage; EmojiTextView dialogLastMessage;
@BindView(R.id.dialogUnreadBubble) @BindView(R.id.dialogUnreadBubble)
TextView dialogUnreadBubble; Chip dialogUnreadBubble;
@BindView(R.id.passwordProtectedRoomImageView) @BindView(R.id.passwordProtectedRoomImageView)
ImageView passwordProtectedRoomImageView; ImageView passwordProtectedRoomImageView;
@BindView(R.id.favoriteConversationImageView) @BindView(R.id.favoriteConversationImageView)

47
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -46,17 +48,19 @@
<ImageView <ImageView
android:id="@+id/passwordProtectedRoomImageView" android:id="@+id/passwordProtectedRoomImageView"
android:layout_width="@dimen/margin_between_elements" android:layout_width="16dp"
android:layout_height="@dimen/margin_between_elements" android:layout_height="16dp"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:background="@drawable/shape_lock_bubble" /> android:background="@drawable/shape_lock_bubble" />
<ImageView <ImageView
android:id="@+id/favoriteConversationImageView" android:id="@+id/favoriteConversationImageView"
android:layout_width="@dimen/margin_between_elements" android:layout_width="16dp"
android:layout_height="@dimen/margin_between_elements" android:layout_height="16dp"
android:layout_gravity="top|end" android:layout_gravity="top|end"
android:background="@drawable/shape_favorite_bubble" /> android:src="@drawable/ic_star_black_24dp"
app:tint="@color/favorite_icon_tint"
app:tintMode="src_in"/>
</FrameLayout> </FrameLayout>
@ -64,7 +68,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/dialogName" android:layout_below="@id/dialogName"
android:layout_marginTop="8dp" android:layout_marginTop="6dp"
android:layout_toEndOf="@id/dialogAvatarFrameLayout"> android:layout_toEndOf="@id/dialogAvatarFrameLayout">
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
@ -73,28 +77,31 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toStartOf="@id/dialogUnreadBubble" android:layout_toStartOf="@id/dialogUnreadBubble"
android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
android:ellipsize="end" android:ellipsize="end"
android:gravity="top" android:gravity="top"
android:lines="1" android:lines="1"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/textColorMaxContrast" android:textColor="@color/textColorMaxContrast"
android:textSize="14sp"
tools:text="This is the last message\nof an incredibly long two line conversation text" /> tools:text="This is the last message\nof an incredibly long two line conversation text" />
<TextView <com.google.android.material.chip.Chip
android:id="@id/dialogUnreadBubble" android:id="@+id/dialogUnreadBubble"
style="@style/Widget.MaterialComponents.Chip.Choice"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="18dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@drawable/bubble_circle_unread" android:gravity="top"
android:gravity="center"
android:lines="1" android:lines="1"
android:textAlignment="center" android:textAppearance="@style/ChipUnreadMessagesTextAppearance"
android:textColor="@color/conversation_unread_bubble" android:textColor="@color/conversation_unread_bubble_text"
android:textSize="12sp" app:chipBackgroundColor="@color/conversation_unread_bubble"
tools:background="@drawable/bubble_circle_unread" app:chipEndPadding="-1dp"
tools:text="99+" /> app:chipMinTouchTargetSize="0dp"
app:chipStartPadding="-3dp"
app:ensureMinTouchTargetSize="false"
tools:text="999+" />
</RelativeLayout> </RelativeLayout>
@ -103,9 +110,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="2dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/textColorMaxContrast" /> android:textSize="14sp"
android:textColor="@color/textColorMaxContrast"
tools:text="yesterday"/>
<androidx.emoji.widget.EmojiTextView <androidx.emoji.widget.EmojiTextView
android:id="@id/dialogName" android:id="@id/dialogName"
@ -114,6 +124,7 @@
android:layout_alignTop="@id/dialogAvatarFrameLayout" android:layout_alignTop="@id/dialogAvatarFrameLayout"
android:layout_toStartOf="@id/dialogDate" android:layout_toStartOf="@id/dialogDate"
android:layout_toEndOf="@id/dialogAvatarFrameLayout" android:layout_toEndOf="@id/dialogAvatarFrameLayout"
android:layout_marginTop="2dp"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"

17
app/src/main/res/values-night/colors.xml
View File

@ -2,10 +2,12 @@
<!-- <!--
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Andy Scherzinger
~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
~ @author Daniel Bailey ~ @author Daniel Bailey
~ @author Mario Danic
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2019 Daniel Bailey <db@grappleIT.co.uk> ~ Copyright (C) 2019 Daniel Bailey <db@grappleIT.co.uk>
~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ 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 ~ it under the terms of the GNU General Public License as published by
@ -22,16 +24,19 @@
--> -->
<resources> <resources>
<color name="conversation_item_header">#ffffff</color> <color name="conversation_item_header">#deffffff</color>
<color name="bg_default">#222222</color> <color name="bg_default">#121212</color>
<color name="bg_alt">#222222</color> <color name="bg_alt">#121212</color>
<color name="nc_darkGreen">#00AA00</color> <color name="nc_darkGreen">#00AA00</color>
<color name="conversation_unread_bubble">#373737</color>
<color name="conversation_unread_bubble_text">#D8D8D8</color>
<!-- Chat window incoming message text & informational --> <!-- Chat window incoming message text & informational -->
<color name="nc_incoming_text_default">#D8D8D8</color> <color name="nc_incoming_text_default">#D8D8D8</color>
<color name="nc_grey">@android:color/holo_purple</color> <color name="nc_grey">@android:color/holo_purple</color>
<color name="bg_bottom_sheet">#222222</color> <color name="bg_bottom_sheet">#121212</color>
<color name="bg_message_list_incoming_bubble">#484848</color> <color name="bg_message_list_incoming_bubble">#484848</color>
<color name="bg_message_list_incoming_bubble_deleted">#66484848</color> <color name="bg_message_list_incoming_bubble_deleted">#66484848</color>

7
app/src/main/res/values/colors.xml
View File

@ -3,6 +3,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -30,7 +32,8 @@
<!-- Name of person or group for the chat conversation --> <!-- Name of person or group for the chat conversation -->
<color name="conversation_item_header">#000000</color> <color name="conversation_item_header">#000000</color>
<color name="conversation_unread_bubble">#FFFFFF</color> <color name="conversation_unread_bubble">#DBDBDB</color>
<color name="conversation_unread_bubble_text">#222222</color>
<color name="nc_darkRed">#D32F2F</color> <color name="nc_darkRed">#D32F2F</color>
<color name="nc_darkGreen">#006400</color> <color name="nc_darkGreen">#006400</color>
@ -59,5 +62,5 @@
<color name="bg_bottom_sheet">#46ffffff</color> <color name="bg_bottom_sheet">#46ffffff</color>
<color name="call_buttons_background">#BF999999</color> <color name="call_buttons_background">#BF999999</color>
<color name="favorite_icon_tint">#FFCC00</color>
</resources> </resources>

3
app/src/main/res/values/strings.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -356,4 +358,5 @@
<!-- Non-translatable strings --> <!-- Non-translatable strings -->
<string name="path_password_strike_through" translatable="false" <string name="path_password_strike_through" translatable="false"
tools:override="true">M3.27,4.27L19.74,20.74</string> tools:override="true">M3.27,4.27L19.74,20.74</string>
<string name="tooManyUnreadMessages" translatable="false">999+</string>
</resources> </resources>

8
app/src/main/res/values/styles.xml
View File

@ -2,6 +2,8 @@
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
~ @author Andy Scherzinger
~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com> ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -26,6 +28,7 @@
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimary</item>
<item name="colorAccent">@color/colorPrimary</item> <item name="colorAccent">@color/colorPrimary</item>
<item name="android:windowBackground">@color/bg_default</item>
<item name="android:panelFullBackground">@color/colorPrimary</item> <item name="android:panelFullBackground">@color/colorPrimary</item>
<item name="android:itemBackground">@color/nc_outcoming_text_default</item> <item name="android:itemBackground">@color/nc_outcoming_text_default</item>
<item name="android:textColor">@color/nc_incoming_text_default</item> <item name="android:textColor">@color/nc_incoming_text_default</item>
@ -55,6 +58,11 @@
<item name="android:textColor">@color/colorPrimary</item> <item name="android:textColor">@color/colorPrimary</item>
</style> </style>
<style name="ChipUnreadMessagesTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="appActionBarStyle" parent="@style/Widget.MaterialComponents.ActionBar.Solid"> <style name="appActionBarStyle" parent="@style/Widget.MaterialComponents.ActionBar.Solid">
<item name="android:colorPrimary">@color/fg_inverse</item> <item name="android:colorPrimary">@color/fg_inverse</item>
<item name="android:textColor">@color/fg_inverse</item> <item name="android:textColor">@color/fg_inverse</item>