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
4d30e05d
Commit
4d30e05d
authored
Jun 15, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Required change: Changes MemberViewModel to MemberUiModel
parent
9c7febef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
CreateChannelView.kt
...t/android/createchannel/presentation/CreateChannelView.kt
+2
-2
CreateChannelFragment.kt
.../rocket/android/createchannel/ui/CreateChannelFragment.kt
+3
-3
No files found.
app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelView.kt
View file @
4d30e05d
...
@@ -2,7 +2,7 @@ package chat.rocket.android.createchannel.presentation
...
@@ -2,7 +2,7 @@ package chat.rocket.android.createchannel.presentation
import
chat.rocket.android.core.behaviours.LoadingView
import
chat.rocket.android.core.behaviours.LoadingView
import
chat.rocket.android.core.behaviours.MessageView
import
chat.rocket.android.core.behaviours.MessageView
import
chat.rocket.android.members.
viewmodel.MemberView
Model
import
chat.rocket.android.members.
uimodel.MemberUi
Model
interface
CreateChannelView
:
LoadingView
,
MessageView
{
interface
CreateChannelView
:
LoadingView
,
MessageView
{
...
@@ -11,7 +11,7 @@ interface CreateChannelView : LoadingView, MessageView {
...
@@ -11,7 +11,7 @@ interface CreateChannelView : LoadingView, MessageView {
*
*
* @param dataSet The list of server's users to show.
* @param dataSet The list of server's users to show.
*/
*/
fun
showUserSuggestion
(
dataSet
:
List
<
Member
View
Model
>)
fun
showUserSuggestion
(
dataSet
:
List
<
Member
Ui
Model
>)
/**
/**
* Shows the navigation drawer with the chat item checked before showing the chat list.
* Shows the navigation drawer with the chat item checked before showing the chat list.
...
...
app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt
View file @
4d30e05d
...
@@ -13,7 +13,7 @@ import chat.rocket.android.createchannel.presentation.CreateChannelPresenter
...
@@ -13,7 +13,7 @@ import chat.rocket.android.createchannel.presentation.CreateChannelPresenter
import
chat.rocket.android.createchannel.presentation.CreateChannelView
import
chat.rocket.android.createchannel.presentation.CreateChannelView
import
chat.rocket.android.main.ui.MainActivity
import
chat.rocket.android.main.ui.MainActivity
import
chat.rocket.android.members.adapter.MembersAdapter
import
chat.rocket.android.members.adapter.MembersAdapter
import
chat.rocket.android.members.
viewmodel.MemberView
Model
import
chat.rocket.android.members.
uimodel.MemberUi
Model
import
chat.rocket.android.util.extensions.asObservable
import
chat.rocket.android.util.extensions.asObservable
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.showToast
import
chat.rocket.android.util.extensions.showToast
...
@@ -99,7 +99,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
...
@@ -99,7 +99,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
}
}
override
fun
showUserSuggestion
(
dataSet
:
List
<
Member
View
Model
>)
{
override
fun
showUserSuggestion
(
dataSet
:
List
<
Member
Ui
Model
>)
{
// Hiding the progress because we are showing it already.
// Hiding the progress because we are showing it already.
hideSuggestionViewInProgress
()
hideSuggestionViewInProgress
()
if
(
dataSet
.
isEmpty
())
{
if
(
dataSet
.
isEmpty
())
{
...
@@ -308,7 +308,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
...
@@ -308,7 +308,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
view_member_suggestion_loading
.
isVisible
=
false
view_member_suggestion_loading
.
isVisible
=
false
}
}
private
fun
showSuggestionViewResults
(
dataSet
:
List
<
Member
View
Model
>)
{
private
fun
showSuggestionViewResults
(
dataSet
:
List
<
Member
Ui
Model
>)
{
adapter
.
clearData
()
adapter
.
clearData
()
adapter
.
prependData
(
dataSet
)
adapter
.
prependData
(
dataSet
)
text_member_not_found
.
isVisible
=
false
text_member_not_found
.
isVisible
=
false
...
...
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