From a8b73b71e6fbff712ffcf194bcdf44a9774e722b Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 9 Apr 2018 16:35:07 -0400 Subject: [PATCH] Simplify showing back button on toolbar --- presentation/src/main/java/common/base/QkActivity.kt | 4 ++++ .../src/main/java/feature/blocked/BlockedActivity.kt | 2 +- .../src/main/java/feature/compose/ComposeActivity.kt | 2 +- .../feature/conversationinfo/ConversationInfoActivity.kt | 2 +- .../src/main/java/feature/gallery/GalleryActivity.kt | 2 +- .../notificationprefs/NotificationPrefsActivity.kt | 8 ++++---- presentation/src/main/java/feature/plus/PlusActivity.kt | 6 +++--- .../src/main/java/feature/settings/SettingsActivity.kt | 7 +++++-- .../main/java/feature/themepicker/ThemePickerActivity.kt | 2 +- 9 files changed, 21 insertions(+), 14 deletions(-) diff --git a/presentation/src/main/java/common/base/QkActivity.kt b/presentation/src/main/java/common/base/QkActivity.kt index f0729cd5..bb618130 100644 --- a/presentation/src/main/java/common/base/QkActivity.kt +++ b/presentation/src/main/java/common/base/QkActivity.kt @@ -74,4 +74,8 @@ abstract class QkActivity> : AppCompatActivity() { return result } + protected fun showBackButton(show: Boolean) { + supportActionBar?.setDisplayHomeAsUpEnabled(show) + } + } \ No newline at end of file diff --git a/presentation/src/main/java/feature/blocked/BlockedActivity.kt b/presentation/src/main/java/feature/blocked/BlockedActivity.kt index 5619b8b9..5f009aae 100644 --- a/presentation/src/main/java/feature/blocked/BlockedActivity.kt +++ b/presentation/src/main/java/feature/blocked/BlockedActivity.kt @@ -49,7 +49,7 @@ class BlockedActivity : QkThemedActivity(), BlockedView { super.onCreate(savedInstanceState) setContentView(R.layout.blocked_activity) setTitle(R.string.blocked_title) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) colors.background diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index b1a04d20..8dc72606 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -82,7 +82,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.compose_activity) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) chipsAdapter.view = chips diff --git a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt index 6e021de9..adaac21f 100644 --- a/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt +++ b/presentation/src/main/java/feature/conversationinfo/ConversationInfoActivity.kt @@ -54,7 +54,7 @@ class ConversationInfoActivity : QkThemedActivity(), override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.conversation_info_activity) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) setTitle(R.string.info_title) diff --git a/presentation/src/main/java/feature/gallery/GalleryActivity.kt b/presentation/src/main/java/feature/gallery/GalleryActivity.kt index 43fe972f..2dd7755e 100644 --- a/presentation/src/main/java/feature/gallery/GalleryActivity.kt +++ b/presentation/src/main/java/feature/gallery/GalleryActivity.kt @@ -44,7 +44,7 @@ class GalleryActivity : QkActivity(), GalleryView { super.onCreate(savedInstanceState) setContentView(R.layout.gallery_activity) postponeEnterTransition() - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) val transition = TransitionSet().apply { diff --git a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt index 2b545ff8..78ef8c72 100644 --- a/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt +++ b/presentation/src/main/java/feature/notificationprefs/NotificationPrefsActivity.kt @@ -27,14 +27,14 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable +import common.MenuItemAdapter +import common.base.QkThemedActivity +import common.widget.PreferenceView import injection.appComponent import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import kotlinx.android.synthetic.main.notification_prefs_activity.* import kotlinx.android.synthetic.main.settings_switch_widget.view.* -import common.MenuItemAdapter -import common.base.QkThemedActivity -import common.widget.PreferenceView import javax.inject.Inject class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView { @@ -54,7 +54,7 @@ class NotificationPrefsActivity : QkThemedActivity() super.onCreate(savedInstanceState) setContentView(R.layout.notification_prefs_activity) setTitle(R.string.title_notification_prefs) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) nightModeAdapter.setData(R.array.night_modes) diff --git a/presentation/src/main/java/feature/plus/PlusActivity.kt b/presentation/src/main/java/feature/plus/PlusActivity.kt index a711d951..028f9edf 100644 --- a/presentation/src/main/java/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/feature/plus/PlusActivity.kt @@ -24,14 +24,14 @@ import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable -import injection.appComponent +import common.base.QkThemedActivity import common.util.BillingManager import common.util.FontProvider import common.util.extensions.setBackgroundTint import common.util.extensions.setTint import common.util.extensions.setVisible +import injection.appComponent import kotlinx.android.synthetic.main.qksms_plus_activity.* -import common.base.QkThemedActivity import javax.inject.Inject class PlusActivity : QkThemedActivity(), PlusView { @@ -47,7 +47,7 @@ class PlusActivity : QkThemedActivity(), PlusView { super.onCreate(savedInstanceState) setContentView(R.layout.qksms_plus_activity) setTitle(R.string.title_qksms_plus) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) fontProvider.getLato { diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index 33245f4c..64e8234c 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -70,12 +70,15 @@ class SettingsActivity : QkThemedActivity(), SettingsView { private var textSizeDialog: AlertDialog? = null private var mmsSizeDialog: AlertDialog? = null - override fun onCreate(savedInstanceState: Bundle?) { + init { appComponent.inject(this) + } + + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.settings_activity) setTitle(R.string.title_settings) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) nightModeAdapter.setData(R.array.night_modes) diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt index ec54fdc1..739461af 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt @@ -56,7 +56,7 @@ class ThemePickerActivity : QkThemedActivity(), ThemePicke super.onCreate(savedInstanceState) setContentView(R.layout.theme_picker_activity) setTitle(R.string.title_theme) - supportActionBar?.setDisplayHomeAsUpEnabled(true) + showBackButton(true) viewModel.bindView(this) pager.offscreenPageLimit = 1