gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-25 21:55:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #660

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-10-26 13:17:50 +02:00
parent b049f32044
commit 281692519a
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,7 +126,7 @@ class ConversationItem(
holder.dialogUnreadBubble!!.text = model.unreadMessages.toLong() holder.dialogUnreadBubble!!.text = model.unreadMessages.toLong()
.toString() .toString()
} else { } else {
holder.dialogUnreadBubble!!.text = "99+" holder.dialogUnreadBubble!!.text = context.getString(R.string.nc_99_plus)
} }
if (model.unreadMention) { if (model.unreadMention) {

7
app/src/main/res/drawable/bubble_circle_unread.xml
View File

@ -20,9 +20,8 @@
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval" >
<size android:width="16dp" android:height="16dp"/>
<solid android:color="#757575" /> <solid android:color="#757575" />
<size
android:width="32dp"
android:height="32dp" />
</shape> </shape>

4
app/src/main/res/drawable/bubble_circle_unread_mention.xml
View File

@ -23,6 +23,6 @@
android:shape="oval"> android:shape="oval">
<solid android:color="@color/colorPrimary" /> <solid android:color="@color/colorPrimary" />
<size <size
android:width="32dp" android:width="16dp"
android:height="32dp" /> android:height="16dp" />
</shape> </shape>

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

@ -52,7 +52,7 @@
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:listitem="@layout/rv_item_conversation" tools:listitem="@layout/rv_item_conversation_with_last_message"
/> />
</FrameLayout> </FrameLayout>

9
app/src/main/res/layout/rv_item_conversation.xml
View File

@ -44,11 +44,12 @@
android:src="@drawable/ic_lock_white_24px" android:src="@drawable/ic_lock_white_24px"
android:visibility="visible" /> android:visibility="visible" />
<ImageView xmlns:app="http://schemas.android.com/apk/res-auto" <ImageView
android:id="@+id/avatar_image" android:id="@+id/avatar_image"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/small_item_height"
android:layout_margin="@dimen/margin_between_elements"/> android:layout_margin="@dimen/margin_between_elements"
/>
</FrameLayout> </FrameLayout>
@ -58,10 +59,10 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/margin_between_elements"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_more_horiz_black_24dp" /> android:src="@drawable/ic_more_horiz_black_24dp"
/>
<LinearLayout <LinearLayout
android:id="@+id/linear_layout" android:id="@+id/linear_layout"

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

@ -88,18 +88,20 @@
<TextView <TextView
android:id="@id/dialogUnreadBubble" android:id="@id/dialogUnreadBubble"
android:layout_width="wrap_content" android:layout_width="16dp"
android:layout_height="wrap_content" android:layout_height="16dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@drawable/bubble_circle_unread" android:background="@drawable/bubble_circle_unread"
android:gravity="center" android:gravity="center_vertical"
android:layout_centerInParent="true"
android:lines="1" android:lines="1"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/conversation_unread_bubble" android:textColor="@color/conversation_unread_bubble"
android:textSize="12sp" android:textSize="8sp"
tools:background="@drawable/bubble_circle_unread" tools:background="@drawable/bubble_circle_unread"
tools:text="99+" /> tools:text="99+"
/>
</RelativeLayout> </RelativeLayout>

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

@ -320,6 +320,9 @@
<string name="nc_last_moderator_title">Could not leave conversation</string> <string name="nc_last_moderator_title">Could not leave conversation</string>
<string name="nc_last_moderator">You need to promote a new moderator before you can leave %1$s.</string> <string name="nc_last_moderator">You need to promote a new moderator before you can leave %1$s.</string>
<!-- Chat -->
<string name="nc_99_plus">99+</string>
<!-- Non-translatable strings --> <!-- Non-translatable strings -->
<string name="path_password_strike_through" translatable="false" <string name="path_password_strike_through" translatable="false"