diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
index c1701154..41964452 100644
--- a/presentation/src/main/AndroidManifest.xml
+++ b/presentation/src/main/AndroidManifest.xml
@@ -79,7 +79,6 @@
-
, State, Present
private val appCompatActivity: AppCompatActivity?
get() = activity as? AppCompatActivity
+ protected val themedActivity: QkThemedActivity?
+ get() = activity as? QkThemedActivity
+
override var containerView: View? = null
@LayoutRes
diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
index 57c2a0fd..9b2742ff 100644
--- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkThemedActivity.kt
@@ -53,12 +53,12 @@ abstract class QkThemedActivity : QkActivity() {
* In case the activity should be themed for a specific conversation, the selected conversation
* can be changed by pushing the threadId to this subject
*/
- protected val threadId: Subject = BehaviorSubject.createDefault(0)
+ val threadId: Subject = BehaviorSubject.createDefault(0)
/**
* Switch the theme if the threadId changes
*/
- protected val theme = threadId
+ val theme = threadId
.distinctUntilChanged()
.switchMap { threadId -> colors.themeObservable(threadId) }
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
index c2ae4c0d..1b6e5037 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivity.kt
@@ -19,128 +19,34 @@
package com.moez.QKSMS.feature.conversationinfo
import android.os.Bundle
-import android.text.InputFilter
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import com.jakewharton.rxbinding2.view.clicks
+import com.bluelinelabs.conductor.Conductor
+import com.bluelinelabs.conductor.Router
+import com.bluelinelabs.conductor.RouterTransaction
import com.moez.QKSMS.R
-import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.androidxcompat.scope
import com.moez.QKSMS.common.base.QkThemedActivity
-import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
-import com.moez.QKSMS.common.util.extensions.dpToPx
-import com.moez.QKSMS.common.util.extensions.resolveThemeColor
-import com.moez.QKSMS.common.util.extensions.scrapViews
-import com.moez.QKSMS.common.util.extensions.setVisible
-import com.moez.QKSMS.common.widget.QkEditText
-import com.uber.autodispose.kotlin.autoDisposable
import dagger.android.AndroidInjection
-import io.reactivex.subjects.PublishSubject
-import io.reactivex.subjects.Subject
-import kotlinx.android.synthetic.main.conversation_info_activity.*
-import javax.inject.Inject
+import kotlinx.android.synthetic.main.container_activity.*
-class ConversationInfoActivity : QkThemedActivity(), ConversationInfoView {
+class ConversationInfoActivity : QkThemedActivity() {
- @Inject lateinit var navigator: Navigator
- @Inject lateinit var recipientAdapter: ConversationRecipientAdapter
- @Inject lateinit var mediaAdapter: ConversationMediaAdapter
- @Inject lateinit var itemDecoration: GridSpacingItemDecoration
- @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-
- override val nameIntent by lazy { name.clicks() }
- override val nameChangedIntent: Subject = PublishSubject.create()
- override val notificationsIntent by lazy { notifications.clicks() }
- override val themeIntent by lazy { themePrefs.clicks() }
- override val archiveIntent by lazy { archive.clicks() }
- override val blockIntent by lazy { block.clicks() }
- override val deleteIntent by lazy { delete.clicks() }
- override val confirmDeleteIntent: PublishSubject = PublishSubject.create()
-
- private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ConversationInfoViewModel::class.java] }
+ private lateinit var router: Router
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
- setContentView(R.layout.conversation_info_activity)
- showBackButton(true)
- viewModel.bindView(this)
- setTitle(R.string.info_title)
+ setContentView(R.layout.container_activity)
- items.postDelayed({ items.animateLayoutChanges = true }, 100)
-
- mediaAdapter.thumbnailClicks
- .autoDisposable(scope())
- .subscribe { view -> navigator.showImageAnimated(this, view) }
-
- recipients.adapter = recipientAdapter
-
- media.adapter = mediaAdapter
- media.addItemDecoration(itemDecoration)
-
- theme
- .autoDisposable(scope())
- .subscribe { recipients.scrapViews() }
- }
-
- override fun render(state: ConversationInfoState) {
- if (state.hasError) {
- finish()
- return
+ router = Conductor.attachRouter(this, container, savedInstanceState)
+ if (!router.hasRootController()) {
+ val threadId = intent.extras?.getLong("threadId") ?: 0L
+ router.setRoot(RouterTransaction.with(ConversationInfoController(threadId)))
}
-
- threadId.onNext(state.threadId)
- recipientAdapter.threadId = state.threadId
- recipientAdapter.updateData(state.recipients)
-
- name.setVisible(state.recipients?.size ?: 0 >= 2)
- name.summary = state.name
-
- notifications.setVisible(!state.blocked)
-
- archive.setVisible(!state.blocked)
- archive.title = getString(when (state.archived) {
- true -> R.string.info_unarchive
- false -> R.string.info_archive
- })
-
- block.title = getString(when (state.blocked) {
- true -> R.string.info_unblock
- false -> R.string.info_block
- })
-
- mediaAdapter.updateData(state.media)
}
- override fun showNameDialog(name: String) {
- val editText = QkEditText(this).apply {
- val padding = 8.dpToPx(this@ConversationInfoActivity)
- setPadding(padding * 3, padding, padding * 3, padding)
- setSingleLine(true)
- setHint(R.string.info_name_hint)
- setText(name)
- setHintTextColor(context.resolveThemeColor(android.R.attr.textColorTertiary))
- setTextColor(context.resolveThemeColor(android.R.attr.textColorPrimary))
- filters = arrayOf(InputFilter.LengthFilter(30))
- background = null
+ override fun onBackPressed() {
+ if (!router.handleBack()) {
+ super.onBackPressed()
}
-
- AlertDialog.Builder(this)
- .setTitle(R.string.info_name)
- .setView(editText)
- .setPositiveButton(R.string.button_save) { _, _ -> nameChangedIntent.onNext(editText.text.toString()) }
- .setNegativeButton(R.string.button_cancel, null)
- .show()
- }
-
- override fun showDeleteDialog() {
- AlertDialog.Builder(this)
- .setTitle(R.string.dialog_delete_title)
- .setMessage(resources.getQuantityString(R.plurals.dialog_delete_message, 1))
- .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(Unit) }
- .setNegativeButton(R.string.button_cancel, null)
- .show()
}
}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
new file mode 100644
index 00000000..549f50e9
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
@@ -0,0 +1,173 @@
+/*
+ * 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 com.moez.QKSMS.feature.conversationinfo
+
+import android.text.InputFilter
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import com.bluelinelabs.conductor.RouterTransaction
+import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
+import com.jakewharton.rxbinding2.view.clicks
+import com.moez.QKSMS.R
+import com.moez.QKSMS.common.Navigator
+import com.moez.QKSMS.common.base.QkController
+import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
+import com.moez.QKSMS.common.util.extensions.dpToPx
+import com.moez.QKSMS.common.util.extensions.resolveThemeColor
+import com.moez.QKSMS.common.util.extensions.scrapViews
+import com.moez.QKSMS.common.util.extensions.setVisible
+import com.moez.QKSMS.common.widget.QkEditText
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoModule
+import com.moez.QKSMS.feature.themepicker.ThemePickerController
+import com.moez.QKSMS.injection.appComponent
+import com.uber.autodispose.kotlin.autoDisposable
+import io.reactivex.Observable
+import io.reactivex.subjects.PublishSubject
+import io.reactivex.subjects.Subject
+import kotlinx.android.synthetic.main.conversation_info_controller.*
+import javax.inject.Inject
+
+class ConversationInfoController(val threadId: Long = 0) : QkController(), ConversationInfoView {
+
+ @Inject override lateinit var presenter: ConversationInfoPresenter
+ @Inject lateinit var navigator: Navigator
+ @Inject lateinit var recipientAdapter: ConversationRecipientAdapter
+ @Inject lateinit var mediaAdapter: ConversationMediaAdapter
+ @Inject lateinit var itemDecoration: GridSpacingItemDecoration
+
+ private val nameChangeSubject: Subject = PublishSubject.create()
+ private val confirmDeleteSubject: Subject = PublishSubject.create()
+
+ init {
+ appComponent
+ .conversationInfoBuilder()
+ .conversationInfoModule(ConversationInfoModule(this))
+ .build()
+ .inject(this)
+
+ layoutRes = R.layout.conversation_info_controller
+ }
+
+ override fun onViewCreated() {
+ items.postDelayed({ items.animateLayoutChanges = true }, 100)
+
+ mediaAdapter.thumbnailClicks
+ .autoDisposable(scope())
+ .subscribe { view -> navigator.showImageAnimated(activity!!, view) }
+
+ recipients.adapter = recipientAdapter
+
+ media.adapter = mediaAdapter
+ media.addItemDecoration(itemDecoration)
+
+ themedActivity
+ ?.theme
+ ?.autoDisposable(scope())
+ ?.subscribe { recipients?.scrapViews() }
+ }
+
+ override fun onAttach(view: View) {
+ super.onAttach(view)
+ presenter.bindIntents(this)
+ setTitle(R.string.info_title)
+ showBackButton(true)
+ }
+
+ override fun nameClicks(): Observable<*> = name.clicks()
+
+ override fun nameChanges(): Observable = nameChangeSubject
+
+ override fun notificationClicks(): Observable<*> = notifications.clicks()
+
+ override fun themeClicks(): Observable<*> = themePrefs.clicks()
+
+ override fun archiveClicks(): Observable<*> = archive.clicks()
+
+ override fun blockClicks(): Observable<*> = block.clicks()
+
+ override fun deleteClicks(): Observable<*> = delete.clicks()
+
+ override fun confirmDelete(): Observable<*> = confirmDeleteSubject
+
+ override fun render(state: ConversationInfoState) {
+ if (state.hasError) {
+ activity?.finish()
+ return
+ }
+
+ themedActivity?.threadId?.onNext(state.threadId)
+ recipientAdapter.threadId = state.threadId
+ recipientAdapter.updateData(state.recipients)
+
+ name.setVisible(state.recipients?.size ?: 0 >= 2)
+ name.summary = state.name
+
+ notifications.setVisible(!state.blocked)
+
+ archive.setVisible(!state.blocked)
+ archive.title = activity?.getString(when (state.archived) {
+ true -> R.string.info_unarchive
+ false -> R.string.info_archive
+ })
+
+ block.title = activity?.getString(when (state.blocked) {
+ true -> R.string.info_unblock
+ false -> R.string.info_block
+ })
+
+ mediaAdapter.updateData(state.media)
+ }
+
+ override fun showNameDialog(name: String) {
+ val editText = QkEditText(activity!!).apply {
+ val padding = 8.dpToPx(activity!!)
+ setPadding(padding * 3, padding, padding * 3, padding)
+ setSingleLine(true)
+ setHint(R.string.info_name_hint)
+ setText(name)
+ setHintTextColor(context.resolveThemeColor(android.R.attr.textColorTertiary))
+ setTextColor(context.resolveThemeColor(android.R.attr.textColorPrimary))
+ filters = arrayOf(InputFilter.LengthFilter(30))
+ background = null
+ }
+
+ AlertDialog.Builder(activity!!)
+ .setTitle(R.string.info_name)
+ .setView(editText)
+ .setPositiveButton(R.string.button_save) { _, _ -> nameChangeSubject.onNext(editText.text.toString()) }
+ .setNegativeButton(R.string.button_cancel, null)
+ .show()
+ }
+
+ override fun showThemePicker(threadId: Long) {
+ router.pushController(RouterTransaction.with(ThemePickerController(threadId))
+ .pushChangeHandler(FadeChangeHandler(150))
+ .popChangeHandler(FadeChangeHandler(150)))
+ }
+
+ override fun showDeleteDialog() {
+ AlertDialog.Builder(activity!!)
+ .setTitle(R.string.dialog_delete_title)
+ .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, 1))
+ .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteSubject.onNext(Unit) }
+ .setNegativeButton(R.string.button_cancel, null)
+ .show()
+ }
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
similarity index 91%
rename from presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
index 7ad9e86c..c3dce7f8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoViewModel.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoPresenter.kt
@@ -19,8 +19,7 @@
package com.moez.QKSMS.feature.conversationinfo
import com.moez.QKSMS.common.Navigator
-import com.moez.QKSMS.common.androidxcompat.scope
-import com.moez.QKSMS.common.base.QkViewModel
+import com.moez.QKSMS.common.base.QkPresenter
import com.moez.QKSMS.extensions.asObservable
import com.moez.QKSMS.interactor.DeleteConversations
import com.moez.QKSMS.interactor.MarkArchived
@@ -38,7 +37,7 @@ import io.reactivex.subjects.Subject
import javax.inject.Inject
import javax.inject.Named
-class ConversationInfoViewModel @Inject constructor(
+class ConversationInfoPresenter @Inject constructor(
@Named("threadId") threadId: Long,
messageRepo: MessageRepository,
private val conversationRepo: ConversationRepository,
@@ -48,7 +47,7 @@ class ConversationInfoViewModel @Inject constructor(
private val markBlocked: MarkBlocked,
private val markUnblocked: MarkUnblocked,
private val navigator: Navigator
-) : QkViewModel(
+) : QkPresenter(
ConversationInfoState(threadId = threadId, media = messageRepo.getPartsForConversation(threadId))
) {
@@ -98,18 +97,18 @@ class ConversationInfoViewModel @Inject constructor(
.subscribe { blocked -> newState { copy(blocked = blocked) } }
}
- override fun bindView(view: ConversationInfoView) {
- super.bindView(view)
+ override fun bindIntents(view: ConversationInfoView) {
+ super.bindIntents(view)
// Show the conversation title dialog
- view.nameIntent
+ view.nameClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.map { conversation -> conversation.name }
.autoDisposable(view.scope())
.subscribe(view::showNameDialog)
// Set the conversation title
- view.nameChangedIntent
+ view.nameChanges()
.withLatestFrom(conversation) { name, conversation ->
conversationRepo.setConversationName(conversation.id, name)
}
@@ -117,19 +116,19 @@ class ConversationInfoViewModel @Inject constructor(
.subscribe()
// Show the notifications settings for the conversation
- view.notificationsIntent
+ view.notificationClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
.subscribe { conversation -> navigator.showNotificationSettings(conversation.id) }
// Show the theme settings for the conversation
- view.themeIntent
+ view.themeClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
- .subscribe { conversation -> navigator.showThemePicker(conversation.id) }
+ .subscribe { conversation -> view.showThemePicker(conversation.id) }
// Toggle the archived state of the conversation
- view.archiveIntent
+ view.archiveClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
.subscribe { conversation ->
@@ -140,7 +139,7 @@ class ConversationInfoViewModel @Inject constructor(
}
// Toggle the blocked state of the conversation
- view.blockIntent
+ view.blockClicks()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
.subscribe { conversation ->
@@ -151,12 +150,12 @@ class ConversationInfoViewModel @Inject constructor(
}
// Show the delete confirmation dialog
- view.deleteIntent
+ view.deleteClicks()
.autoDisposable(view.scope())
.subscribe { view.showDeleteDialog() }
// Delete the conversation
- view.confirmDeleteIntent
+ view.confirmDelete()
.withLatestFrom(conversation) { _, conversation -> conversation }
.autoDisposable(view.scope())
.subscribe { conversation -> deleteConversations.execute(listOf(conversation.id)) }
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
index 6e3bbbd9..eeeb0e91 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoView.kt
@@ -18,21 +18,22 @@
*/
package com.moez.QKSMS.feature.conversationinfo
-import com.moez.QKSMS.common.base.QkView
+import com.moez.QKSMS.common.base.QkViewContract
import io.reactivex.Observable
-interface ConversationInfoView : QkView {
+interface ConversationInfoView : QkViewContract {
- val nameIntent: Observable<*>
- val nameChangedIntent: Observable
- val notificationsIntent: Observable
- val themeIntent: Observable
- val archiveIntent: Observable
- val blockIntent: Observable
- val deleteIntent: Observable
- val confirmDeleteIntent: Observable
+ fun nameClicks(): Observable<*>
+ fun nameChanges(): Observable
+ fun notificationClicks(): Observable<*>
+ fun themeClicks(): Observable<*>
+ fun archiveClicks(): Observable<*>
+ fun blockClicks(): Observable<*>
+ fun deleteClicks(): Observable<*>
+ fun confirmDelete(): Observable<*>
fun showNameDialog(name: String)
+ fun showThemePicker(threadId: Long)
fun showDeleteDialog()
}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt
new file mode 100644
index 00000000..b95224e6
--- /dev/null
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoComponent.kt
@@ -0,0 +1,37 @@
+/*
+ * 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 com.moez.QKSMS.feature.conversationinfo.injection
+
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
+import com.moez.QKSMS.injection.scope.ControllerScope
+import dagger.Subcomponent
+
+@ControllerScope
+@Subcomponent(modules = [ConversationInfoModule::class])
+interface ConversationInfoComponent {
+
+ fun inject(controller: ConversationInfoController)
+
+ @Subcomponent.Builder
+ interface Builder {
+ fun conversationInfoModule(module: ConversationInfoModule): Builder
+ fun build(): ConversationInfoComponent
+ }
+
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
similarity index 62%
rename from presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt
rename to presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
index 5c7d6f6f..29788eab 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/injection/ConversationInfoModule.kt
@@ -16,25 +16,20 @@
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see .
*/
-package com.moez.QKSMS.feature.conversationinfo
+package com.moez.QKSMS.feature.conversationinfo.injection
-import androidx.lifecycle.ViewModel
-import com.moez.QKSMS.injection.ViewModelKey
+import com.moez.QKSMS.feature.conversationinfo.ConversationInfoController
+import com.moez.QKSMS.injection.scope.ControllerScope
import dagger.Module
import dagger.Provides
-import dagger.multibindings.IntoMap
import javax.inject.Named
@Module
-class ConversationInfoActivityModule {
+class ConversationInfoModule(private val controller: ConversationInfoController) {
@Provides
+ @ControllerScope
@Named("threadId")
- fun provideIntent(activity: ConversationInfoActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
-
- @Provides
- @IntoMap
- @ViewModelKey(ConversationInfoViewModel::class)
- fun provideConversationInfoViewModel(viewModel: ConversationInfoViewModel): ViewModel = viewModel
+ fun provideThreadId(): Long = controller.threadId
}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt
deleted file mode 100644
index 4cecff51..00000000
--- a/presentation/src/main/java/com/moez/QKSMS/feature/themepicker/ThemePickerActivity.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 com.moez.QKSMS.feature.themepicker
-
-import android.os.Bundle
-import com.bluelinelabs.conductor.Conductor
-import com.bluelinelabs.conductor.Router
-import com.bluelinelabs.conductor.RouterTransaction
-import com.moez.QKSMS.R
-import com.moez.QKSMS.common.base.QkThemedActivity
-import dagger.android.AndroidInjection
-import kotlinx.android.synthetic.main.container_activity.*
-
-class ThemePickerActivity : QkThemedActivity() {
-
- private lateinit var router: Router
-
- override fun onCreate(savedInstanceState: Bundle?) {
- AndroidInjection.inject(this)
- super.onCreate(savedInstanceState)
- setContentView(R.layout.container_activity)
-
- router = Conductor.attachRouter(this, container, savedInstanceState)
- if (!router.hasRootController()) {
- val threadId = intent.extras?.getLong("threadId") ?: 0L
- router.setRoot(RouterTransaction.with(ThemePickerController(threadId)))
- }
- }
-
- override fun onBackPressed() {
- if (!router.handleBack()) {
- super.onBackPressed()
- }
- }
-
-}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
index 0c2d5753..a618b54a 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppComponent.kt
@@ -27,6 +27,7 @@ import com.moez.QKSMS.common.widget.QkEditText
import com.moez.QKSMS.common.widget.QkSwitch
import com.moez.QKSMS.common.widget.QkTextView
import com.moez.QKSMS.feature.compose.DetailedChipView
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
import com.moez.QKSMS.feature.settings.SettingsController
import com.moez.QKSMS.feature.settings.about.AboutController
import com.moez.QKSMS.feature.settings.swipe.SwipeActionsController
@@ -49,6 +50,7 @@ import javax.inject.Singleton
ServiceBuilderModule::class])
interface AppComponent {
+ fun conversationInfoBuilder(): ConversationInfoComponent.Builder
fun themePickerBuilder(): ThemePickerComponent.Builder
fun inject(application: QKApplication)
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
index 84713f8d..d213492c 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/AppModule.kt
@@ -26,6 +26,7 @@ import androidx.lifecycle.ViewModelProvider
import com.f2prateek.rx.preferences2.RxSharedPreferences
import com.moez.QKSMS.common.ViewModelFactory
import com.moez.QKSMS.common.util.NotificationManagerImpl
+import com.moez.QKSMS.feature.conversationinfo.injection.ConversationInfoComponent
import com.moez.QKSMS.feature.themepicker.injection.ThemePickerComponent
import com.moez.QKSMS.manager.AlarmManager
import com.moez.QKSMS.manager.AlarmManagerImpl
@@ -68,7 +69,9 @@ import dagger.Module
import dagger.Provides
import javax.inject.Singleton
-@Module(subcomponents = [ThemePickerComponent::class])
+@Module(subcomponents = [
+ ConversationInfoComponent::class,
+ ThemePickerComponent::class])
class AppModule(private var application: Application) {
@Provides
diff --git a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
index 7fe8c7fb..13fbc742 100644
--- a/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/injection/android/ActivityBuilderModule.kt
@@ -23,7 +23,6 @@ import com.moez.QKSMS.feature.blocked.BlockedActivityModule
import com.moez.QKSMS.feature.compose.ComposeActivity
import com.moez.QKSMS.feature.compose.ComposeActivityModule
import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivity
-import com.moez.QKSMS.feature.conversationinfo.ConversationInfoActivityModule
import com.moez.QKSMS.feature.gallery.GalleryActivity
import com.moez.QKSMS.feature.gallery.GalleryActivityModule
import com.moez.QKSMS.feature.main.MainActivity
@@ -37,7 +36,6 @@ 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.themepicker.ThemePickerActivity
import com.moez.QKSMS.injection.scope.ActivityScope
import dagger.Module
import dagger.android.ContributesAndroidInjector
@@ -58,7 +56,7 @@ abstract class ActivityBuilderModule {
abstract fun bindComposeActivity(): ComposeActivity
@ActivityScope
- @ContributesAndroidInjector(modules = [ConversationInfoActivityModule::class])
+ @ContributesAndroidInjector(modules = [])
abstract fun bindConversationInfoActivity(): ConversationInfoActivity
@ActivityScope
@@ -85,8 +83,4 @@ abstract class ActivityBuilderModule {
@ContributesAndroidInjector(modules = [BlockedActivityModule::class])
abstract fun bindBlockedActivity(): BlockedActivity
- @ActivityScope
- @ContributesAndroidInjector(modules = [])
- abstract fun bindThemePickerActivity(): ThemePickerActivity
-
}
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/conversation_info_activity.xml b/presentation/src/main/res/layout/conversation_info_activity.xml
deleted file mode 100644
index 52ae2189..00000000
--- a/presentation/src/main/res/layout/conversation_info_activity.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/presentation/src/main/res/layout/conversation_info_controller.xml b/presentation/src/main/res/layout/conversation_info_controller.xml
new file mode 100644
index 00000000..11323efb
--- /dev/null
+++ b/presentation/src/main/res/layout/conversation_info_controller.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file