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

Cleanups and improvements

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-01-29 13:23:36 +01:00
parent f17c6bd5b4
commit 9b419f88fa
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/ContactsView.kt
View File

@ -83,8 +83,7 @@ class ContactsView(private val bundle: Bundle? = null) : BaseView() {
val view = super.onCreateView(inflater, container) val view = super.onCreateView(inflater, container)
// todo - change empty state magic // todo - change empty state magic
participantsAdapter = Adapter.builder(this) val participantsAdapterBuilder = Adapter.builder(this)
.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_new_group), R.drawable.ic_people_group_white_24px)), ParticipantElementType.PARTICIPANT_NEW_GROUP.ordinal))
//.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_join_via_link), R.drawable.ic_link_white_24px)), ParticipantElementType.PARTICIPANT_JOIN_VIA_LINK.ordinal)) //.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_join_via_link), R.drawable.ic_link_white_24px)), ParticipantElementType.PARTICIPANT_JOIN_VIA_LINK.ordinal))
.addSource(ContactsViewSource(data = viewModel.contactsLiveData, elementType = ParticipantElementType.PARTICIPANT.ordinal)) .addSource(ContactsViewSource(data = viewModel.contactsLiveData, elementType = ParticipantElementType.PARTICIPANT.ordinal))
.addSource(ContactsHeaderSource(activity as Context, ParticipantElementType.PARTICIPANT_HEADER.ordinal)) .addSource(ContactsHeaderSource(activity as Context, ParticipantElementType.PARTICIPANT_HEADER.ordinal))
@ -97,7 +96,12 @@ class ContactsView(private val bundle: Bundle? = null) : BaseView() {
view.messageStateImageView.setImageDrawable((activity as Context).getDrawable(R.drawable.ic_announcement_white_24dp)) view.messageStateImageView.setImageDrawable((activity as Context).getDrawable(R.drawable.ic_announcement_white_24dp))
}) })
.setAutoScrollMode(Adapter.AUTOSCROLL_POSITION_0, true) .setAutoScrollMode(Adapter.AUTOSCROLL_POSITION_0, true)
.into(view.recyclerView)
if (!hasToken) {
participantsAdapterBuilder.addSource(FixedListSource(listOf(Pair(context.getString(R.string.nc_new_group), R.drawable.ic_people_group_white_24px)), ParticipantElementType.PARTICIPANT_NEW_GROUP.ordinal))
}
participantsAdapter = participantsAdapterBuilder.into(view.selectedParticipantsRecyclerView)
selectedParticipantsAdapter = Adapter.builder(this) selectedParticipantsAdapter = Adapter.builder(this)
.addSource(ContactsViewSource(data = viewModel.selectedParticipantsLiveData, elementType = ParticipantElementType.PARTICIPANT_SELECTED.ordinal, loadingIndicatorsEnabled = false, errorIndicatorEnabled = false, emptyIndicatorEnabled = false)) .addSource(ContactsViewSource(data = viewModel.selectedParticipantsLiveData, elementType = ParticipantElementType.PARTICIPANT_SELECTED.ordinal, loadingIndicatorsEnabled = false, errorIndicatorEnabled = false, emptyIndicatorEnabled = false))

6
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -227,7 +227,6 @@ class ConversationsListView : BaseView() {
} }
private fun openNewConversationScreen() { private fun openNewConversationScreen() {
val bundle = Bundle()
router.pushController( router.pushController(
RouterTransaction.with(ContactsView()) RouterTransaction.with(ContactsView())
.pushChangeHandler(HorizontalChangeHandler()) .pushChangeHandler(HorizontalChangeHandler())
@ -285,10 +284,7 @@ class ConversationsListView : BaseView() {
} }
override fun onFloatingActionButtonClick() { override fun onFloatingActionButtonClick() {
router?.pushController( openNewConversationScreen()
RouterTransaction.with(ContactsView())
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
} }
override fun getAppBarLayoutType(): AppBarLayoutType { override fun getAppBarLayoutType(): AppBarLayoutType {