Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 0839e81

Browse files
shubhsherlshubhsherl
committed
add icon, update string files
1 parent 793e2cc commit 0839e81

File tree

21 files changed

+254
-54
lines changed

21 files changed

+254
-54
lines changed

‎app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ class MembersAdapter(private val listener: (MemberUiModel) -> Unit, presenter: M
7373
notifyItemChanged(index)
7474
}
7575
}
76-
R.id.action_member_ignore-> {
77-
TODO("not implemented")
78-
// presenter?.toggleIgnore(this.userId, false){}
79-
}
8076
R.id.action_member_mute-> {
8177
presenter?.toggleMute(this.username, this.muted) {
8278
dataSet[index].muted = !this.muted

‎app/src/main/java/chat/rocket/android/members/adapter/ViewHolder.kt‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package chat.rocket.android.members.adapter
22

3-
import android.util.Log
43
import android.view.ContextThemeWrapper
54
import android.view.MenuItem
65
import android.view.View
@@ -33,9 +32,9 @@ class ViewHolder(
3332
image_avatar.setImageURI(memberUiModel.avatarUri)
3433
text_member.content = memberUiModel.displayName
3534
text_member.setCompoundDrawablesRelativeWithIntrinsicBounds(DrawableHelper.getUserStatusDrawable(memberUiModel.status, context), null, null, null)
36-
text_member_owner.content = "Owner"
37-
text_member_leader.content = "Leader"
38-
text_member_moderator.content = "Mod"
35+
text_member_owner.setText(R.string.owner)
36+
text_member_leader.setText(R.string.leader)
37+
text_member_moderator.setText(R.string.moderator)
3938
text_member_owner.isVisible =memberUiModel.roles?.contains("owner") == true
4039
text_member_leader.isVisible = memberUiModel.roles?.contains("leader") == true
4140
text_member_moderator.isVisible = memberUiModel.roles?.contains("moderator") == true
@@ -53,30 +52,28 @@ class ViewHolder(
5352
data?.let {
5453
var menuItems = view.context.inflate(R.menu.group_member_actions).toList()
5554
if (!isOwner && !isMod)
56-
menuItems = menuItems.filter { it.itemId == R.id.action_member_mute || it.itemId == R.id.action_member_ignore }
57-
else if (isMod)
58-
menuItems = menuItems.filter { it.itemId == R.id.action_member_mute || it.itemId == R.id.action_member_ignore || it.itemId == R.id.action_member_remove}
55+
menuItems = menuItems.filter { it.itemId == R.id.action_member_mute }
56+
else if (!isOwner && isMod)
57+
menuItems = menuItems.filter { it.itemId == R.id.action_member_mute || it.itemId == R.id.action_member_remove}
5958
menuItems.find { it.itemId == R.id.action_member_set_owner }?.apply {
60-
if (it.roles?.contains("owner") == true) title = "Remove as Owner"
59+
if (it.roles?.contains("owner") == true) setTitle(R.string.action_remove_owner)
6160
}
6261
menuItems.find { it.itemId == R.id.action_member_set_leader }?.apply {
63-
if (it.roles?.contains("leader") == true) title = "Remove as Leader"
62+
if (it.roles?.contains("leader") == true) setTitle(R.string.action_remove_leader)
6463
}
6564
menuItems.find { it.itemId == R.id.action_member_set_moderator }?.apply {
66-
if (it.roles?.contains("moderator") == true) title = "Remove as Moderator"
65+
if (it.roles?.contains("moderator") == true) setTitle(R.string.action_remove_moderator)
6766
}
6867
menuItems.find { it.itemId == R.id.action_member_mute }?.apply {
6968
if (it.muted) {
70-
title = "Unmute user"
69+
setTitle(R.string.action_unmute_user)
7170
setIcon(R.drawable.ic_mic_on_24dp)
7271
}
7372
}
74-
menuItems.find { it.itemId == R.id.action_member_ignore }?.apply {
73+
// TODO: Check why ignore is not working
74+
// menuItems.find { it.itemId == R.id.action_member_ignore }?.apply {
7575
// if (it.roles.contains("owner")) title = "Remove Owner"
76-
}
77-
menuItems.find { it.itemId == R.id.action_member_remove }?.apply {
78-
// if (it.roles.contains("owner")) title = "Remove Owner"
79-
}
76+
// }
8077
view.context?.let {
8178
if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
8279
with(it.baseContext as AppCompatActivity) {

‎app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package chat.rocket.android.members.presentation
22

33
import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
4-
import android.util.Log
54
import chat.rocket.android.core.lifecycle.CancelStrategy
65
import chat.rocket.android.db.DatabaseManager
76
import chat.rocket.android.helper.UserHelper
@@ -10,7 +9,6 @@ import chat.rocket.android.members.uimodel.MemberUiModelMapper
109
import chat.rocket.android.server.infraestructure.RocketChatClientFactory
1110
import chat.rocket.android.util.extension.launchUI
1211
import chat.rocket.android.util.extensions.isNotNullNorEmpty
13-
import chat.rocket.android.util.retryDB
1412
import chat.rocket.android.util.retryIO
1513
import chat.rocket.common.RocketChatException
1614
import chat.rocket.common.model.RoomType
@@ -140,18 +138,6 @@ class MembersPresenter @Inject constructor(
140138
}
141139
}
142140

143-
fun toggleIgnore(userId: String, isIgnored: Boolean = false, notifier: () ->Unit) {
144-
launchUI(strategy) {
145-
try {
146-
retryIO(description = "ignoreUser($roomId, $userId, ${!isIgnored})") { client.ignoreUser(roomId, userId, !isIgnored) }
147-
notifier()
148-
} catch (ex: RocketChatException) {
149-
view.showMessage(ex.message!!) // TODO Remove.
150-
Timber.e(ex) // FIXME: Right now we are only catching the exception with Timber.
151-
}
152-
}
153-
}
154-
155141
fun toggleMute(username: String?, isMuted: Boolean = false, notifier: () ->Unit) {
156142
launchUI(strategy) {
157143
try {

‎app/src/main/res/drawable/ic_leader.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<vector android:height="24dp" android:viewportHeight="93.602"
2+
android:viewportWidth="93.602" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="@color/actionMenuColor" android:pathData="M81.551,0h-69.5c-1.104,0 -2,0.896 -2,2v38.381c0,20.506 9.461,33.743 17.399,41.236c8.556,8.08 17.159,11.336 17.52,11.47l1.043,0.389c0.225,0.084 0.462,0.126 0.698,0.126c0.235,0 0.469,-0.041 0.693,-0.124l1.049,-0.387c0.365,-0.136 9.033,-3.415 17.602,-11.464c7.982,-7.496 17.496,-20.737 17.496,-41.246V2C83.551,0.896 82.654,0 81.551,0zM46.735,83.344c-6.157,-2.957 -26.684,-14.896 -26.684,-42.572V10.391h26.75L46.735,83.344z"/>
4+
</vector>

‎app/src/main/res/drawable/ic_moderator.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<vector android:height="24dp" android:viewportHeight="737.407"
2+
android:viewportWidth="737.408" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="@color/actionMenuColor" android:pathData="M674.417,123.507c-0.224,-9.759 -7.216,-18.177 -16.982,-19.511c-45.521,-6.252 -90.416,-17.129 -134.426,-33.248c-43.802,-16.042 -92.267,-38.436 -144.54,-67.93c-6.637,-3.747 -12.88,-3.77 -19.51,0c-51.911,29.479 -100.029,51.826 -144.177,67.93c-44.024,16.058 -88.897,27.004 -134.056,33.248c-9.767,1.349 -16.62,9.752 -17.707,19.511c-4.332,185.366 36.27,337.036 121.414,454.934c46.384,64.222 104.431,116.349 174.526,156.096c5.419,3.978 13.915,3.677 20.235,0c69.564,-40.41 127.534,-92.159 173.811,-156.096C638.262,460.62 678.533,308.88 674.417,123.507zM520.48,555.677c-40.225,55.564 -90.694,101.895 -151.762,139.112c-61.069,-37.218 -111.777,-83.378 -151.763,-139.112c-77.458,-107.962 -115.269,-246.08 -113.828,-414.463c42.637,-6.868 84.92,-18.432 127.195,-33.972c42.275,-15.533 88.528,-36.856 138.396,-63.952c49.868,27.096 95.757,48.419 138.033,63.952c42.275,15.541 84.912,27.104 127.557,33.972C635.75,310.684 597.699,448.995 520.48,555.677z"/>
4+
</vector>

‎app/src/main/res/drawable/ic_owner.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:viewportHeight="374.10623"
2+
android:viewportWidth="374" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3+
<path android:fillColor="@color/actionMenuColor" android:pathData="m328.664,75.746 l-140.605,-74.922c-2.086,-1.113 -4.586,-1.098 -6.656,0.039l-136.715,74.922c-2.242,1.23 -3.633,3.582 -3.633,6.141v97.867c0.082,80.449 47.746,153.23 121.457,185.461l18.977,8.27c1.773,0.773 3.793,0.777 5.57,0.008l21.383,-9.234c75.078,-31.531 123.922,-105.016 123.93,-186.445v-95.926c0,-2.586 -1.426,-4.965 -3.707,-6.18zM318.371,177.852c-0.016,75.816 -45.504,144.227 -115.41,173.566l-0.047,0.023 -18.621,8.039 -16.18,-7.059c-68.613,-30 -112.984,-97.742 -113.063,-172.629v-93.723l129.762,-71.117 133.559,71.168zM318.371,177.852"/>
4+
<path android:fillColor="@color/actionMenuColor" android:pathData="m133.168,175.254c-2.512,-2.941 -6.93,-3.289 -9.871,-0.777 -2.941,2.508 -3.289,6.93 -0.777,9.867l36.977,43.301c2.469,2.891 6.793,3.285 9.738,0.887l86.117,-70.063c3,-2.438 3.453,-6.848 1.012,-9.848 -2.438,-2.996 -6.848,-3.453 -9.848,-1.012l-80.813,65.742zM133.168,175.254"/>
5+
</vector>

‎app/src/main/res/drawable/ic_remove_red_24dp.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
7+
<path
8+
android:fillColor="@color/colorRed"
9+
android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
10+
11+
</vector>

‎app/src/main/res/menu/group_member_actions.xml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,31 @@
33

44
<item
55
android:id="@+id/action_member_set_owner"
6-
android:icon="@drawable/ic_action_message_info_outline_24dp"
7-
android:title="Set as Owner" />
6+
android:icon="@drawable/ic_owner"
7+
android:title="@string/action_set_owner" />
88
<item
99
android:id="@+id/action_member_set_leader"
10-
android:icon="@drawable/ic_action_message_reply_24dp"
11-
android:title="Set as Leader" />
10+
android:icon="@drawable/ic_leader"
11+
android:title="@string/action_set_leader" />
1212
<item
1313
android:id="@+id/action_member_set_moderator"
14-
android:icon="@drawable/ic_action_message_edit_24dp"
15-
android:title="Set as Moderator" />
14+
android:icon="@drawable/ic_moderator"
15+
android:title="@string/action_set_moderator" />
1616

17-
<item
18-
android:id="@+id/action_member_ignore"
19-
android:icon="@drawable/ic_ignore_24dp"
20-
android:title="Ignore" />
17+
<!--TODO implement ignoreUser-->
18+
<!--<item-->
19+
<!--android:id="@+id/action_member_ignore"-->
20+
<!--android:icon="@drawable/ic_ignore_24dp"-->
21+
<!--android:title="Ignore" />-->
2122

2223
<item
2324
android:id="@+id/action_member_mute"
2425
android:icon="@drawable/ic_mic_off_24dp"
25-
android:title="Mute user" />
26+
android:title="@string/action_mute_user" />
2627

2728
<item
2829
android:id="@+id/action_member_remove"
29-
android:icon="@drawable/ic_logout_black_24dp"
30-
android:title="Remove from room" />
30+
android:icon="@drawable/ic_remove_red_24dp"
31+
android:title="@string/action_remove_user" />
3132

3233
</menu>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,4 +349,19 @@
349349
<string name="required">*erforderlich</string>
350350
<string name="report_sent">Ihr Bericht wurde gesendet!</string>
351351

352+
<!--Member Action--><!-- TODO Add translation -->
353+
<string name="action_set_owner">Set as Owner</string>
354+
<string name="action_set_moderator">Set as Moderator</string>
355+
<string name="action_remove_owner">Remove as Owner</string>
356+
<string name="action_remove_leader">Remove as Leader</string>
357+
<string name="action_remove_moderator">Remove as Moderator</string>
358+
<string name="action_mute_user">Mute User</string>
359+
<string name="action_unmute_user">Unmute User</string>
360+
<string name="action_remove_user">Remove from Room</string>
361+
<string name="action_set_leader">Set as Leader</string>
362+
363+
<string name="owner">Owner</string>
364+
<string name="leader">Leader</string>
365+
<string name="moderator">Mod</string>
366+
352367
</resources>

‎app/src/main/res/values-es/strings.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,5 +343,20 @@
343343
<!-- Report -->
344344
<string name="submit">Submit</string> <!--TODO - Add proper translation-->
345345
<string name="required">*required</string> <!--TODO - Add proper translation-->
346-
<string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
346+
<string name="report_sent">Your report has been sent!</string>
347+
348+
<!--Member Action--><!-- TODO Add translation -->
349+
<string name="action_set_owner">Set as Owner</string>
350+
<string name="action_set_moderator">Set as Moderator</string>
351+
<string name="action_remove_owner">Remove as Owner</string>
352+
<string name="action_remove_leader">Remove as Leader</string>
353+
<string name="action_remove_moderator">Remove as Moderator</string>
354+
<string name="action_mute_user">Mute User</string>
355+
<string name="action_unmute_user">Unmute User</string>
356+
<string name="action_remove_user">Remove from Room</string>
357+
<string name="action_set_leader">Set as Leader</string> <!--TODO - Add proper translation-->
358+
359+
<string name="owner">Owner</string>
360+
<string name="leader">Leader</string>
361+
<string name="moderator">Mod</string>
347362
</resources>

0 commit comments

Comments
 (0)