diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 67f37ec3..2c780659 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -88,11 +88,14 @@ class MessageRepository @Inject constructor( }) } - fun getBlockedConversations(): RealmResults { + fun getBlockedConversations(): Flowable> { return Realm.getDefaultInstance() .where(Conversation::class.java) .equalTo("blocked", true) - .findAll() + .findAllAsync() + .asFlowable() + .filter { it.isLoaded } + .map { it.toList() } } fun getConversationAsync(threadId: Long): Conversation { diff --git a/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt new file mode 100644 index 00000000..c8990e6c --- /dev/null +++ b/qksms/src/main/java/presentation/feature/blocked/BlockedAdapter.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Moez Bhatti + * + * This file is part of QKSMS. + * + * QKSMS is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * QKSMS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with QKSMS. If not, see . + */ +package presentation.feature.blocked + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.moez.QKSMS.R +import data.model.Contact +import data.model.Conversation +import data.model.PhoneNumber +import kotlinx.android.synthetic.main.blocked_list_item.view.* +import presentation.common.base.FlowableAdapter +import presentation.common.base.QkViewHolder +import javax.inject.Inject + +class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter() { + + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val conversation = getItem(position) + val view = holder.itemView + + view.avatars.contacts = conversation.recipients.map { recipient -> + recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) } + } + + view.title.text = conversation.getTitle() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainActivity.kt b/qksms/src/main/java/presentation/feature/main/MainActivity.kt index 63cc93e7..ced5ed3b 100644 --- a/qksms/src/main/java/presentation/feature/main/MainActivity.kt +++ b/qksms/src/main/java/presentation/feature/main/MainActivity.kt @@ -51,6 +51,7 @@ import kotlinx.android.synthetic.main.toolbar_search.* import presentation.common.MenuItemAdapter import presentation.common.Navigator import presentation.common.base.QkThemedActivity +import presentation.feature.blocked.BlockedAdapter import presentation.feature.conversations.ConversationItemTouchCallback import presentation.feature.conversations.ConversationsAdapter import javax.inject.Inject @@ -58,6 +59,7 @@ import javax.inject.Inject class MainActivity : QkThemedActivity(), MainView { @Inject lateinit var navigator: Navigator + @Inject lateinit var blockedAdapter: BlockedAdapter @Inject lateinit var conversationsAdapter: ConversationsAdapter @Inject lateinit var itemTouchCallback: ConversationItemTouchCallback @Inject lateinit var menuItemAdapter: MenuItemAdapter @@ -111,7 +113,6 @@ class MainActivity : QkThemedActivity(), MainView { drawer.clicks().subscribe() scheduled.isEnabled = false - blocked.isEnabled = false colors.background .doOnNext { color -> window.decorView.setBackgroundColor(color) } @@ -197,8 +198,8 @@ class MainActivity : QkThemedActivity(), MainView { when (state.page) { is Inbox -> { if (!inbox.isSelected) toolbarSearch.text = null - if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data + if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter + conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(recyclerView) menuItemAdapter.data = state.page.menu empty.setText(R.string.inbox_empty_text) @@ -207,8 +208,8 @@ class MainActivity : QkThemedActivity(), MainView { is Archived -> { if (!archived.isSelected) toolbarSearch.setText(R.string.title_archived) - if (recyclerView.adapter != conversationsAdapter) recyclerView.adapter = conversationsAdapter - if (conversationsAdapter.flowable != state.page.data) conversationsAdapter.flowable = state.page.data + if (recyclerView.adapter !== conversationsAdapter) recyclerView.adapter = conversationsAdapter + conversationsAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = state.page.menu empty.setText(R.string.archived_empty_text) @@ -226,7 +227,8 @@ class MainActivity : QkThemedActivity(), MainView { is Blocked -> { if (!blocked.isSelected) toolbarSearch.setText(R.string.title_blocked) - recyclerView.adapter = null + if (recyclerView.adapter != blockedAdapter) recyclerView.adapter = blockedAdapter + blockedAdapter.flowable = state.page.data itemTouchHelper.attachToRecyclerView(null) menuItemAdapter.data = ArrayList() empty.setText(R.string.blocked_empty_text) diff --git a/qksms/src/main/java/presentation/feature/main/MainState.kt b/qksms/src/main/java/presentation/feature/main/MainState.kt index 0cc58854..d3a0f5e0 100644 --- a/qksms/src/main/java/presentation/feature/main/MainState.kt +++ b/qksms/src/main/java/presentation/feature/main/MainState.kt @@ -18,6 +18,7 @@ */ package presentation.feature.main +import data.model.Conversation import data.model.InboxItem import data.model.MenuItem import io.reactivex.Flowable @@ -47,5 +48,5 @@ data class Scheduled( val empty: Boolean = false) : MainPage() data class Blocked( - val data: Any? = null, + val data: Flowable>? = null, val empty: Boolean = false) : MainPage() \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt index e6a8bac5..a6dca004 100644 --- a/qksms/src/main/java/presentation/feature/main/MainViewModel.kt +++ b/qksms/src/main/java/presentation/feature/main/MainViewModel.kt @@ -74,6 +74,16 @@ class MainViewModel : QkViewModel(MainState()) { }) } + private val blockedConversations by lazy { + messageRepo.getBlockedConversations() + .withLatestFrom(state.toFlowable(), { conversations, state -> + (state.page as? Blocked)?.let { page -> + newState { it.copy(page = page.copy(empty = conversations.isEmpty())) } + } + conversations + }) + } + private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) } private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) } private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) } @@ -158,7 +168,7 @@ class MainViewModel : QkViewModel(MainState()) { DrawerItem.INBOX -> newState { it.copy(page = Inbox(data = conversations)) } DrawerItem.ARCHIVED -> newState { it.copy(page = Archived(archivedConversations)) } DrawerItem.SCHEDULED -> newState { it.copy(page = Scheduled()) } - DrawerItem.BLOCKED -> newState { it.copy(page = Blocked()) } + DrawerItem.BLOCKED -> newState { it.copy(page = Blocked(blockedConversations)) } else -> { } // Do nothing } diff --git a/qksms/src/main/res/layout/blocked_list_item.xml b/qksms/src/main/res/layout/blocked_list_item.xml new file mode 100644 index 00000000..60ad8ef8 --- /dev/null +++ b/qksms/src/main/res/layout/blocked_list_item.xml @@ -0,0 +1,52 @@ + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/drawer_view.xml b/qksms/src/main/res/layout/drawer_view.xml index f0db39f8..93133d44 100644 --- a/qksms/src/main/res/layout/drawer_view.xml +++ b/qksms/src/main/res/layout/drawer_view.xml @@ -55,6 +55,21 @@ + + + + + + + + - - - - - - - -