diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 3990eae7..1af1c5d2 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -67,6 +67,11 @@ + diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index 91c3a1aa..cbecbbc6 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -43,6 +43,7 @@ import feature.notificationprefs.NotificationPrefsActivity import feature.notificationprefs.NotificationPrefsViewModel import feature.plus.PlusActivity import feature.plus.PlusViewModel +import feature.qkreply.QkReplyViewModel import feature.settings.SettingsActivity import feature.settings.SettingsViewModel import feature.setup.SetupActivity @@ -187,6 +188,7 @@ class Navigator @Inject constructor(private val context: Context, private val no ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent) GalleryViewModel::class.java -> GalleryViewModel(intent) NotificationPrefsViewModel::class.java -> NotificationPrefsViewModel(intent) + QkReplyViewModel::class.java -> QkReplyViewModel(intent) SettingsViewModel::class.java -> SettingsViewModel() BlockedViewModel::class.java -> BlockedViewModel() ThemePickerViewModel::class.java -> ThemePickerViewModel(intent) diff --git a/presentation/src/main/java/common/base/QkThemedActivity.kt b/presentation/src/main/java/common/base/QkThemedActivity.kt index 557d4178..55a92c62 100644 --- a/presentation/src/main/java/common/base/QkThemedActivity.kt +++ b/presentation/src/main/java/common/base/QkThemedActivity.kt @@ -25,6 +25,7 @@ import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable import common.util.Colors +import common.util.extensions.setBackgroundTint import io.reactivex.rxkotlin.Observables import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject @@ -57,7 +58,8 @@ abstract class QkThemedActivity> : QkActivity() { @SuppressLint("InlinedApi") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - colors.appThemeResources + + getAppThemeResourcesObservable() .autoDisposable(scope()) .subscribe { res -> setTheme(res) } @@ -101,7 +103,12 @@ abstract class QkThemedActivity> : QkActivity() { colors.toolbarColor .autoDisposable(scope(Lifecycle.Event.ON_DESTROY)) - .subscribe { color -> toolbar?.setBackgroundColor(color) } + .subscribe { color -> toolbar?.setBackgroundTint(color) } } + /** + * This can be overridden in case an activity does not want to use the default themes + */ + open fun getAppThemeResourcesObservable() = colors.appThemeResources + } \ No newline at end of file diff --git a/presentation/src/main/java/common/util/Colors.kt b/presentation/src/main/java/common/util/Colors.kt index 306f62ef..78df8c25 100644 --- a/presentation/src/main/java/common/util/Colors.kt +++ b/presentation/src/main/java/common/util/Colors.kt @@ -74,6 +74,15 @@ class Colors @Inject constructor(private val context: Context, private val prefs } }) + val appDialogThemeResources = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), + { night, black -> + when { + night && black -> R.style.AppThemeBlackDialog + night && !black -> R.style.AppThemeDarkDialog + else -> R.style.AppThemeLightDialog + } + }) + val popupThemeResource = Observables.combineLatest(prefs.night.asObservable(), prefs.black.asObservable(), { night, black -> when { diff --git a/presentation/src/main/java/common/util/NotificationManagerImpl.kt b/presentation/src/main/java/common/util/NotificationManagerImpl.kt index c3a5af68..ae55da7a 100644 --- a/presentation/src/main/java/common/util/NotificationManagerImpl.kt +++ b/presentation/src/main/java/common/util/NotificationManagerImpl.kt @@ -33,6 +33,7 @@ import android.support.v4.app.RemoteInput import android.support.v4.app.TaskStackBuilder import com.moez.QKSMS.R import feature.compose.ComposeActivity +import feature.qkreply.QkReplyActivity import receiver.MarkReadReceiver import receiver.MarkSeenReceiver import receiver.RemoteMessagingReceiver @@ -97,6 +98,9 @@ class NotificationManagerImpl @Inject constructor( style.addMessage(message.getSummary(), message.date, name) } + val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + context.startActivity(intent) + val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId) val taskStackBuilder = TaskStackBuilder.create(context) taskStackBuilder.addParentStack(ComposeActivity::class.java) diff --git a/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt new file mode 100644 index 00000000..f732cd21 --- /dev/null +++ b/presentation/src/main/java/feature/qkreply/QkReplyActivity.kt @@ -0,0 +1,65 @@ +/* + * 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 feature.qkreply + +import android.os.Bundle +import android.view.ViewGroup +import android.view.Window +import android.view.WindowManager +import com.moez.QKSMS.R +import com.uber.autodispose.android.lifecycle.scope +import com.uber.autodispose.kotlin.autoDisposable +import common.base.QkThemedActivity +import common.util.extensions.setBackgroundTint +import injection.appComponent +import kotlinx.android.synthetic.main.qkreply_activity.* + +class QkReplyActivity : QkThemedActivity(), QkReplyView { + + override val viewModelClass = QkReplyViewModel::class + + init { + appComponent.inject(this) + } + + override fun onCreate(savedInstanceState: Bundle?) { + supportRequestWindowFeature(Window.FEATURE_NO_TITLE) + super.onCreate(savedInstanceState) + + setFinishOnTouchOutside(true) + setContentView(R.layout.qkreply_activity) + window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) + window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) + viewModel.bindView(this) + + + toolbar.clipToOutline = true + + colors.composeBackground + .autoDisposable(scope()) + .subscribe { color -> background.setBackgroundTint(color) } + } + + override fun render(state: QkReplyState) { + title = state.title + } + + override fun getAppThemeResourcesObservable() = colors.appDialogThemeResources + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyState.kt b/presentation/src/main/java/feature/qkreply/QkReplyState.kt new file mode 100644 index 00000000..10268c52 --- /dev/null +++ b/presentation/src/main/java/feature/qkreply/QkReplyState.kt @@ -0,0 +1,27 @@ +/* + * 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 feature.qkreply + +import io.realm.RealmResults +import model.Message + +data class QkReplyState( + val title: String = "", + val data: RealmResults? = null +) \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyView.kt b/presentation/src/main/java/feature/qkreply/QkReplyView.kt new file mode 100644 index 00000000..ce34a1ea --- /dev/null +++ b/presentation/src/main/java/feature/qkreply/QkReplyView.kt @@ -0,0 +1,23 @@ +/* + * 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 feature.qkreply + +import common.base.QkView + +interface QkReplyView : QkView \ No newline at end of file diff --git a/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt new file mode 100644 index 00000000..1d9b6878 --- /dev/null +++ b/presentation/src/main/java/feature/qkreply/QkReplyViewModel.kt @@ -0,0 +1,46 @@ +/* + * 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 feature.qkreply + +import android.content.Intent +import common.base.QkViewModel +import injection.appComponent +import io.reactivex.rxkotlin.plusAssign +import model.Conversation +import repository.MessageRepository +import util.extensions.asObservable +import javax.inject.Inject + +class QkReplyViewModel(intent: Intent) : QkViewModel(QkReplyState()) { + + @Inject lateinit var messageRepo: MessageRepository + + init { + appComponent.inject(this) + + val threadId = intent.getLongExtra("threadId", -1) + + disposables += messageRepo.getConversationAsync(threadId) + .asObservable() + .filter { it.isLoaded } + .filter { it.isValid } + .subscribe { conversation -> newState { it.copy(title = conversation.getTitle()) } } + } + +} diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt index 3a338b9c..d6ac1009 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -44,6 +44,8 @@ import feature.notificationprefs.NotificationPrefsActivity import feature.notificationprefs.NotificationPrefsViewModel import feature.plus.PlusActivity import feature.plus.PlusViewModel +import feature.qkreply.QkReplyActivity +import feature.qkreply.QkReplyViewModel import feature.settings.SettingsActivity import feature.settings.SettingsViewModel import feature.setup.SetupActivity @@ -80,6 +82,7 @@ interface AppComponent { fun inject(activity: GalleryActivity) fun inject(activity: NotificationPrefsActivity) fun inject(activity: PlusActivity) + fun inject(activity: QkReplyActivity) fun inject(activity: SettingsActivity) fun inject(activity: ThemePickerActivity) @@ -117,6 +120,7 @@ interface AppComponent { fun inject(viewModel: GalleryViewModel) fun inject(viewModel: NotificationPrefsViewModel) fun inject(viewModel: PlusViewModel) + fun inject(viewModel: QkReplyViewModel) fun inject(viewModel: SettingsViewModel) fun inject(viewModel: ThemePickerViewModel) diff --git a/presentation/src/main/res/layout/compose_activity.xml b/presentation/src/main/res/layout/compose_activity.xml index 50edc623..a12519e5 100644 --- a/presentation/src/main/res/layout/compose_activity.xml +++ b/presentation/src/main/res/layout/compose_activity.xml @@ -27,10 +27,10 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml index 5777d28f..2f95041e 100644 --- a/presentation/src/main/res/values/styles.xml +++ b/presentation/src/main/res/values/styles.xml @@ -27,6 +27,12 @@ false + + + + + +