diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index 327f996e..d37784b8 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -73,6 +73,7 @@
android:taskAffinity=""
android:theme="@style/AppThemeLightDialog" />
+
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
index b421755b..09767fad 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/Navigator.kt
@@ -36,6 +36,7 @@ import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
import com.moez.QKSMS.feature.gallery.GalleryActivity
import com.moez.QKSMS.feature.notificationprefs.NotificationPrefsActivity
import com.moez.QKSMS.feature.plus.PlusActivity
+import com.moez.QKSMS.feature.scheduled.ScheduledActivity
import com.moez.QKSMS.feature.settings.SettingsActivity
import com.moez.QKSMS.feature.settings.about.AboutActivity
import com.moez.QKSMS.feature.themepicker.ThemePickerActivity
@@ -115,6 +116,11 @@ class Navigator @Inject constructor(private val context: Context, private val no
from.startActivity(intent, options.toBundle())
}
+ fun showScheduled() {
+ val intent = Intent(context, ScheduledActivity::class.java)
+ startActivity(intent)
+ }
+
fun showSettings() {
val intent = Intent(context, SettingsActivity::class.java)
startActivity(intent)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
index 4440e674..13d2c34f 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
@@ -49,7 +49,6 @@ import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.feature.conversations.ConversationItemTouchCallback
import com.moez.QKSMS.feature.conversations.ConversationsAdapter
-import com.moez.QKSMS.feature.scheduled.ScheduledMessageAdapter
import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.kotlin.autoDisposable
import dagger.android.AndroidInjection
@@ -64,7 +63,6 @@ class MainActivity : QkThemedActivity(), MainView {
@Inject lateinit var navigator: Navigator
@Inject lateinit var conversationsAdapter: ConversationsAdapter
- @Inject lateinit var scheduledMessageAdapter: ScheduledMessageAdapter
@Inject lateinit var searchAdapter: SearchAdapter
@Inject lateinit var itemTouchCallback: ConversationItemTouchCallback
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -194,7 +192,6 @@ class MainActivity : QkThemedActivity(), MainView {
compose.setVisible(state.page is Inbox || state.page is Archived)
conversationsAdapter.emptyView = empty.takeIf { state.page is Inbox || state.page is Archived }
- scheduledMessageAdapter.emptyView = empty.takeIf { state.page is Archived }
when (state.page) {
is Inbox -> {
@@ -225,14 +222,6 @@ class MainActivity : QkThemedActivity(), MainView {
itemTouchHelper.attachToRecyclerView(null)
empty.setText(R.string.archived_empty_text)
}
-
- is Scheduled -> {
- setTitle(R.string.title_scheduled)
- if (recyclerView.adapter !== scheduledMessageAdapter) recyclerView.adapter = scheduledMessageAdapter
- scheduledMessageAdapter.updateData(state.page.data)
- itemTouchHelper.attachToRecyclerView(null)
- empty.setText(R.string.scheduled_empty_text)
- }
}
when (state.page is Inbox && state.page.showArchivedSnackbar) {
@@ -242,7 +231,6 @@ class MainActivity : QkThemedActivity(), MainView {
inbox.isSelected = state.page is Inbox
archived.isSelected = state.page is Archived
- scheduled.isSelected = state.page is Scheduled
if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START)
else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
index 56621bce..5dec0f5b 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainState.kt
@@ -18,9 +18,7 @@
*/
package com.moez.QKSMS.feature.main
-import com.moez.QKSMS.feature.scheduled.ScheduledMessageAdapter
import com.moez.QKSMS.model.Conversation
-import com.moez.QKSMS.model.ScheduledMessage
import com.moez.QKSMS.model.SearchResult
import com.moez.QKSMS.repository.SyncRepository
import io.realm.RealmResults
@@ -54,7 +52,4 @@ data class Archived(
val showClearButton: Boolean = false,
val markRead: Boolean = false,
val data: RealmResults? = null,
- val selected: Int = 0) : MainPage()
-
-data class Scheduled(
- val data: RealmResults) : MainPage()
\ No newline at end of file
+ val selected: Int = 0) : MainPage()
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
index 4befa386..9aa8f068 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt
@@ -36,7 +36,6 @@ import com.moez.QKSMS.manager.PermissionManager
import com.moez.QKSMS.manager.RatingManager
import com.moez.QKSMS.model.SyncLog
import com.moez.QKSMS.repository.ConversationRepository
-import com.moez.QKSMS.repository.ScheduledMessageRepository
import com.moez.QKSMS.repository.SyncRepository
import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.Observable
@@ -62,7 +61,6 @@ class MainViewModel @Inject constructor(
private val navigator: Navigator,
private val permissionManager: PermissionManager,
private val ratingManager: RatingManager,
- private val scheduledMessageRepo: ScheduledMessageRepository,
private val syncMessages: SyncMessages,
private val syncRepository: SyncRepository
) : QkViewModel(MainState(page = Inbox(data = conversationRepo.getConversations()))) {
@@ -182,6 +180,7 @@ class MainViewModel @Inject constructor(
view.drawerItemIntent
.doOnNext { newState { copy(drawerOpen = false) } }
+ .doOnNext { if (it == DrawerItem.SCHEDULED) navigator.showScheduled() }
.doOnNext { if (it == DrawerItem.SETTINGS) navigator.showSettings() }
.doOnNext { if (it == DrawerItem.PLUS) navigator.showQksmsPlusActivity() }
.doOnNext { if (it == DrawerItem.HELP) navigator.showSupport() }
@@ -190,7 +189,6 @@ class MainViewModel @Inject constructor(
when (it) {
DrawerItem.INBOX -> newState { copy(page = Inbox(data = conversationRepo.getConversations())) }
DrawerItem.ARCHIVED -> newState { copy(page = Archived(data = conversationRepo.getConversations(true))) }
- DrawerItem.SCHEDULED -> newState { copy(page = Scheduled(data = scheduledMessageRepo.getScheduledMessages())) }
else -> {
} // Do nothing
}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
new file mode 100644
index 00000000..06bbd5a1
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivity.kt
@@ -0,0 +1,35 @@
+package com.moez.QKSMS.feature.scheduled
+
+import android.os.Bundle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.base.QkThemedActivity
+import dagger.android.AndroidInjection
+import kotlinx.android.synthetic.main.scheduled_activity.*
+import javax.inject.Inject
+
+class ScheduledActivity : QkThemedActivity(), ScheduledView {
+
+ @Inject lateinit var adapter: ScheduledMessageAdapter
+ @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+ private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ AndroidInjection.inject(this)
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.scheduled_activity)
+ setTitle(R.string.scheduled_title)
+ showBackButton(true)
+ viewModel.bindView(this)
+
+ adapter.emptyView = empty
+ messages.adapter = adapter
+ }
+
+ override fun render(state: ScheduledState) {
+ adapter.updateData(state.scheduledMessages)
+ }
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt
new file mode 100644
index 00000000..8098dc4a
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledActivityModule.kt
@@ -0,0 +1,17 @@
+package com.moez.QKSMS.feature.scheduled
+
+import androidx.lifecycle.ViewModel
+import com.moez.QKSMS.injection.ViewModelKey
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntoMap
+
+@Module
+class ScheduledActivityModule {
+
+ @Provides
+ @IntoMap
+ @ViewModelKey(ScheduledViewModel::class)
+ fun provideScheduledViewModel(viewModel: ScheduledViewModel): ViewModel = viewModel
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt
new file mode 100644
index 00000000..30cee059
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledState.kt
@@ -0,0 +1,8 @@
+package com.moez.QKSMS.feature.scheduled
+
+import com.moez.QKSMS.model.ScheduledMessage
+import io.realm.RealmResults
+
+data class ScheduledState(
+ val scheduledMessages: RealmResults? = null
+)
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt
new file mode 100644
index 00000000..73e3013f
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledView.kt
@@ -0,0 +1,7 @@
+package com.moez.QKSMS.feature.scheduled
+
+import com.moez.QKSMS.common.base.QkView
+
+interface ScheduledView : QkView {
+
+}
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt
new file mode 100644
index 00000000..c52cfc06
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledViewModel.kt
@@ -0,0 +1,13 @@
+package com.moez.QKSMS.feature.scheduled
+
+import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.repository.ScheduledMessageRepository
+import javax.inject.Inject
+
+class ScheduledViewModel @Inject constructor(
+ scheduledMessageRepo: ScheduledMessageRepository
+) : QkViewModel(ScheduledState(
+ scheduledMessages = scheduledMessageRepo.getScheduledMessages()
+)) {
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
index 9747a7af..5bc7fea5 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/ActivityBuilderModule.kt
@@ -16,6 +16,8 @@ import com.moez.QKSMS.feature.plus.PlusActivity
import com.moez.QKSMS.feature.plus.PlusActivityModule
import com.moez.QKSMS.feature.qkreply.QkReplyActivity
import com.moez.QKSMS.feature.qkreply.QkReplyActivityModule
+import com.moez.QKSMS.feature.scheduled.ScheduledActivity
+import com.moez.QKSMS.feature.scheduled.ScheduledActivityModule
import com.moez.QKSMS.feature.settings.SettingsActivity
import com.moez.QKSMS.feature.settings.SettingsActivityModule
import com.moez.QKSMS.feature.settings.about.AboutActivity
@@ -60,6 +62,10 @@ abstract class ActivityBuilderModule {
@ContributesAndroidInjector(modules = [QkReplyActivityModule::class])
abstract fun bindQkReplyActivity(): QkReplyActivity
+ @ActivityScope
+ @ContributesAndroidInjector(modules = [ScheduledActivityModule::class])
+ abstract fun bindScheduledActivity(): ScheduledActivity
+
@ActivityScope
@ContributesAndroidInjector(modules = [SettingsActivityModule::class])
abstract fun bindSettingsActivity(): SettingsActivity
diff --git a/presentation/src/main/res/layout/scheduled_activity.xml b/presentation/src/main/res/layout/scheduled_activity.xml
new file mode 100644
index 00000000..6805d873
--- /dev/null
+++ b/presentation/src/main/res/layout/scheduled_activity.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 02b122ee..4ecb2276 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -21,7 +21,6 @@
QKSMS
Archived
- Scheduled
Settings
Notifications
Theme
@@ -52,7 +51,6 @@
Your conversations will appear here
No results
Your archived conversations will appear here
- Your scheduled messages will appear here
Start new conversation
Love texting again
Make QKSMS your default SMS app
@@ -134,6 +132,9 @@
Saved to gallery
+ Scheduled
+ Your scheduled messages will appear here
+
Appearance
General
QK Reply