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
a2693fe4
Commit
a2693fe4
authored
Apr 04, 2018
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep composer enabled when sending message; doing the opposite hides the keyboard
parent
bc4d466a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+1
-2
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+0
-2
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
a2693fe4
...
@@ -108,7 +108,6 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
...
@@ -108,7 +108,6 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
}
else
{
}
else
{
client
.
updateMessage
(
chatRoomId
,
messageId
,
text
)
client
.
updateMessage
(
chatRoomId
,
messageId
,
text
)
}
}
view
.
clearMessageComposition
()
view
.
enableSendMessageButton
(
false
)
view
.
enableSendMessageButton
(
false
)
}
catch
(
ex
:
Exception
)
{
}
catch
(
ex
:
Exception
)
{
ex
.
message
?.
let
{
ex
.
message
?.
let
{
...
@@ -220,7 +219,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
...
@@ -220,7 +219,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
}
}
if
(
messages
.
result
.
size
==
50
)
{
if
(
messages
.
result
.
size
==
50
)
{
// we loade at least count messages, try one more to fetch more messages
// we loade
d
at least count messages, try one more to fetch more messages
loadMissingMessages
()
loadMissingMessages
()
}
}
}
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
a2693fe4
...
@@ -291,7 +291,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -291,7 +291,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
override
fun
disableSendMessageButton
()
{
override
fun
disableSendMessageButton
()
{
button_send
.
isEnabled
=
false
button_send
.
isEnabled
=
false
text_message
.
isEnabled
=
false
}
}
override
fun
enableSendMessageButton
(
sendFailed
:
Boolean
)
{
override
fun
enableSendMessageButton
(
sendFailed
:
Boolean
)
{
...
@@ -585,7 +584,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -585,7 +584,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
text_message
.
requestFocus
()
text_message
.
requestFocus
()
emojiKeyboardPopup
.
showAtBottomPending
()
emojiKeyboardPopup
.
showAtBottomPending
()
KeyboardHelper
.
showSoftKeyboard
(
text_message
)
KeyboardHelper
.
showSoftKeyboard
(
text_message
)
}
}
setReactionButtonIcon
(
R
.
drawable
.
ic_keyboard_black_24dp
)
setReactionButtonIcon
(
R
.
drawable
.
ic_keyboard_black_24dp
)
}
else
{
}
else
{
...
...
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