Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
fdc55abd
Commit
fdc55abd
authored
Nov 05, 2018
by
Łukasz Rutkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Displays users who reacted in dialog
parent
fa5346fc
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
6 additions
and
57 deletions
+6
-57
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+0
-4
ChatRoomView.kt
...chat/rocket/android/chatroom/presentation/ChatRoomView.kt
+0
-2
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+5
-24
strings.xml
app/src/main/res/values-de/strings.xml
+0
-3
strings.xml
app/src/main/res/values-es/strings.xml
+0
-3
strings.xml
app/src/main/res/values-fr/strings.xml
+0
-3
strings.xml
app/src/main/res/values-ja/strings.xml
+0
-3
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+0
-3
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+0
-3
strings.xml
app/src/main/res/values-tr/strings.xml
+0
-3
strings.xml
app/src/main/res/values-uk/strings.xml
+0
-3
strings.xml
app/src/main/res/values/strings.xml
+1
-3
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
fdc55abd
...
@@ -1084,10 +1084,6 @@ class ChatRoomPresenter @Inject constructor(
...
@@ -1084,10 +1084,6 @@ class ChatRoomPresenter @Inject constructor(
view
.
showReactionsPopup
(
messageId
)
view
.
showReactionsPopup
(
messageId
)
}
}
fun
showReactionsSummary
(
emojiShortname
:
String
,
usernames
:
List
<
String
>)
{
view
.
showReactionsSummary
(
emojiShortname
,
usernames
,
currentLoggedUsername
)
}
fun
loadCommands
()
{
fun
loadCommands
()
{
launchUI
(
strategy
)
{
launchUI
(
strategy
)
{
try
{
try
{
...
...
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt
View file @
fdc55abd
...
@@ -140,8 +140,6 @@ interface ChatRoomView : LoadingView, MessageView {
...
@@ -140,8 +140,6 @@ interface ChatRoomView : LoadingView, MessageView {
fun
showReactionsPopup
(
messageId
:
String
)
fun
showReactionsPopup
(
messageId
:
String
)
fun
showReactionsSummary
(
emojiShortname
:
String
,
usernames
:
List
<
String
>,
currentLoggedUsername
:
String
?)
/**
/**
* Show list of commands.
* Show list of commands.
*
*
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
fdc55abd
...
@@ -666,30 +666,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -666,30 +666,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
}
}
override
fun
onReactionLongClicked
(
emojiShortname
:
String
,
usernames
:
List
<
String
>)
{
override
fun
onReactionLongClicked
(
emojiShortname
:
String
,
usernames
:
List
<
String
>)
{
presenter
.
showReactionsSummary
(
emojiShortname
,
usernames
)
AlertDialog
.
Builder
(
requireContext
())
}
.
setTitle
(
EmojiParser
.
parse
(
requireContext
(),
getString
(
R
.
string
.
alert_title_reactions_by
,
emojiShortname
)))
.
setItems
(
usernames
.
toTypedArray
(),
null
)
override
fun
showReactionsSummary
(
emojiShortname
:
String
,
usernames
:
List
<
String
>,
currentLoggedUsername
:
String
?)
{
.
setPositiveButton
(
R
.
string
.
msg_ok
,
null
)
var
usernamesString
=
usernames
.
asSequence
()
.
show
()
.
take
(
15
)
.
joinToString
{
username
->
if
(
username
==
currentLoggedUsername
)
{
getString
(
R
.
string
.
msg_you
).
toLowerCase
()
}
else
{
"@$username"
}
}
if
(
usernames
.
size
>
15
)
{
usernamesString
+=
" "
+
getString
(
R
.
string
.
And_more
,
usernames
.
size
-
15
).
toLowerCase
()
}
else
{
usernamesString
=
usernamesString
.
replace
(
""",([^,]+)$"""
.
toRegex
())
{
" ${getString(R.string.and)}${it.groupValues[1]}"
}
}
if
(
usernamesString
[
0
]
!=
'@'
)
{
usernamesString
=
usernamesString
.
capitalize
()
}
showToast
(
"$usernamesString ${getString(R.string.Reacted_with).toLowerCase()} $emojiShortname"
,
Toast
.
LENGTH_LONG
)
}
}
override
fun
showReactionsPopup
(
messageId
:
String
)
{
override
fun
showReactionsPopup
(
messageId
:
String
)
{
...
...
app/src/main/res/values-de/strings.xml
View file @
fdc55abd
...
@@ -282,9 +282,6 @@
...
@@ -282,9 +282,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Keine letzten Emojis
</string>
<string
name=
"msg_no_recent_emoji"
>
Keine letzten Emojis
</string>
<string
name=
"alert_title_default_skin_tone"
>
Standart Hautton
</string>
<string
name=
"alert_title_default_skin_tone"
>
Standart Hautton
</string>
<string
name=
"And_more"
>
Und %1$d mehr
</string>
<string
name=
"and"
>
und
</string>
<string
name=
"Reacted_with"
>
Reagierte mit
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Sortiere
</string>
<string
name=
"menu_chatroom_sort"
>
Sortiere
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
fdc55abd
...
@@ -278,9 +278,6 @@
...
@@ -278,9 +278,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Sin emojis recientes
</string>
<string
name=
"msg_no_recent_emoji"
>
Sin emojis recientes
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tono de piel predeterminado
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tono de piel predeterminado
</string>
<string
name=
"And_more"
>
Y %1$d mas
</string>
<string
name=
"and"
>
y
</string>
<string
name=
"Reacted_with"
>
Reacciono con
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Ordenar
</string>
<string
name=
"menu_chatroom_sort"
>
Ordenar
</string>
...
...
app/src/main/res/values-fr/strings.xml
View file @
fdc55abd
...
@@ -286,9 +286,6 @@
...
@@ -286,9 +286,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Aucun emoji récent
</string>
<string
name=
"msg_no_recent_emoji"
>
Aucun emoji récent
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tonalité de peau par défaut
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tonalité de peau par défaut
</string>
<string
name=
"And_more"
>
et encore %1$d
</string>
<string
name=
"and"
>
et
</string>
<string
name=
"Reacted_with"
>
a réagi avec
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Trier
</string>
<string
name=
"menu_chatroom_sort"
>
Trier
</string>
...
...
app/src/main/res/values-ja/strings.xml
View file @
fdc55abd
...
@@ -288,9 +288,6 @@
...
@@ -288,9 +288,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
最近の絵文字はありません
</string>
<string
name=
"msg_no_recent_emoji"
>
最近の絵文字はありません
</string>
<string
name=
"alert_title_default_skin_tone"
>
デフォルトスキントークン
</string>
<string
name=
"alert_title_default_skin_tone"
>
デフォルトスキントークン
</string>
<string
name=
"And_more"
>
さらに %1$d
</string>
<string
name=
"and"
>
と
</string>
<string
name=
"Reacted_with"
>
がリアクションしています
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
ソート
</string>
<string
name=
"menu_chatroom_sort"
>
ソート
</string>
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
fdc55abd
...
@@ -283,9 +283,6 @@
...
@@ -283,9 +283,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Nenhum emoji recente
</string>
<string
name=
"msg_no_recent_emoji"
>
Nenhum emoji recente
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tom de pele padrão
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tom de pele padrão
</string>
<string
name=
"And_more"
>
E mais %1$d
</string>
<string
name=
"and"
>
e
</string>
<string
name=
"Reacted_with"
>
Reagiu com
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Ordenar
</string>
<string
name=
"menu_chatroom_sort"
>
Ordenar
</string>
...
...
app/src/main/res/values-ru-rRU/strings.xml
View file @
fdc55abd
...
@@ -279,9 +279,6 @@
...
@@ -279,9 +279,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Пусто
</string>
<string
name=
"msg_no_recent_emoji"
>
Пусто
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон кожи по умолчанию
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон кожи по умолчанию
</string>
<string
name=
"And_more"
>
И еще %1$d
</string>
<string
name=
"and"
>
и
</string>
<string
name=
"Reacted_with"
>
Реагирует с
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Сортировать
</string>
<string
name=
"menu_chatroom_sort"
>
Сортировать
</string>
...
...
app/src/main/res/values-tr/strings.xml
View file @
fdc55abd
...
@@ -285,9 +285,6 @@
...
@@ -285,9 +285,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Son kullanılan emoji bulunmamaktadır
</string>
<string
name=
"msg_no_recent_emoji"
>
Son kullanılan emoji bulunmamaktadır
</string>
<string
name=
"alert_title_default_skin_tone"
>
Varsayılan tasarım tonu
</string>
<string
name=
"alert_title_default_skin_tone"
>
Varsayılan tasarım tonu
</string>
<string
name=
"And_more"
>
Ve %1$d kadar daha fazla
</string>
<string
name=
"and"
>
ve
</string>
<string
name=
"Reacted_with"
>
ile reaksiyona sokulur
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Sırala
</string>
<string
name=
"menu_chatroom_sort"
>
Sırala
</string>
...
...
app/src/main/res/values-uk/strings.xml
View file @
fdc55abd
...
@@ -282,9 +282,6 @@
...
@@ -282,9 +282,6 @@
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
Пусто
</string>
<string
name=
"msg_no_recent_emoji"
>
Пусто
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон шкіри за замовчуванням
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон шкіри за замовчуванням
</string>
<string
name=
"And_more"
>
І ще %1$d
</string>
<string
name=
"and"
>
і
</string>
<string
name=
"Reacted_with"
>
реагує з
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Сортувати
</string>
<string
name=
"menu_chatroom_sort"
>
Сортувати
</string>
...
...
app/src/main/res/values/strings.xml
View file @
fdc55abd
...
@@ -295,9 +295,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -295,9 +295,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<!-- Emoji message-->
<!-- Emoji message-->
<string
name=
"msg_no_recent_emoji"
>
No recent emojis
</string>
<string
name=
"msg_no_recent_emoji"
>
No recent emojis
</string>
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<string
name=
"And_more"
>
And %1$d more
</string>
<string
name=
"alert_title_reactions_by"
>
%1$s reactions by
</string>
<string
name=
"and"
>
and
</string>
<string
name=
"Reacted_with"
>
Reacted with
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Sort
</string>
<string
name=
"menu_chatroom_sort"
>
Sort
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment