forked from upstream-mirrors/quik
Simplify showing back button on toolbar
This commit is contained in:
@@ -74,4 +74,8 @@ abstract class QkActivity<VM : QkViewModel<*, *>> : AppCompatActivity() {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected fun showBackButton(show: Boolean) {
|
||||||
|
supportActionBar?.setDisplayHomeAsUpEnabled(show)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ class BlockedActivity : QkThemedActivity<BlockedViewModel>(), BlockedView {
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.blocked_activity)
|
setContentView(R.layout.blocked_activity)
|
||||||
setTitle(R.string.blocked_title)
|
setTitle(R.string.blocked_title)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
colors.background
|
colors.background
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.compose_activity)
|
setContentView(R.layout.compose_activity)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
chipsAdapter.view = chips
|
chipsAdapter.view = chips
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class ConversationInfoActivity : QkThemedActivity<ConversationInfoViewModel>(),
|
|||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.conversation_info_activity)
|
setContentView(R.layout.conversation_info_activity)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
setTitle(R.string.info_title)
|
setTitle(R.string.info_title)
|
||||||
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class GalleryActivity : QkActivity<GalleryViewModel>(), GalleryView {
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.gallery_activity)
|
setContentView(R.layout.gallery_activity)
|
||||||
postponeEnterTransition()
|
postponeEnterTransition()
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
val transition = TransitionSet().apply {
|
val transition = TransitionSet().apply {
|
||||||
|
|||||||
@@ -27,14 +27,14 @@ import com.jakewharton.rxbinding2.view.clicks
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
|
import common.MenuItemAdapter
|
||||||
|
import common.base.QkThemedActivity
|
||||||
|
import common.widget.PreferenceView
|
||||||
import injection.appComponent
|
import injection.appComponent
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import kotlinx.android.synthetic.main.notification_prefs_activity.*
|
import kotlinx.android.synthetic.main.notification_prefs_activity.*
|
||||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||||
import common.MenuItemAdapter
|
|
||||||
import common.base.QkThemedActivity
|
|
||||||
import common.widget.PreferenceView
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
|
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
|
||||||
@@ -54,7 +54,7 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.notification_prefs_activity)
|
setContentView(R.layout.notification_prefs_activity)
|
||||||
setTitle(R.string.title_notification_prefs)
|
setTitle(R.string.title_notification_prefs)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
nightModeAdapter.setData(R.array.night_modes)
|
nightModeAdapter.setData(R.array.night_modes)
|
||||||
|
|||||||
@@ -24,14 +24,14 @@ import com.jakewharton.rxbinding2.view.clicks
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import injection.appComponent
|
import common.base.QkThemedActivity
|
||||||
import common.util.BillingManager
|
import common.util.BillingManager
|
||||||
import common.util.FontProvider
|
import common.util.FontProvider
|
||||||
import common.util.extensions.setBackgroundTint
|
import common.util.extensions.setBackgroundTint
|
||||||
import common.util.extensions.setTint
|
import common.util.extensions.setTint
|
||||||
import common.util.extensions.setVisible
|
import common.util.extensions.setVisible
|
||||||
|
import injection.appComponent
|
||||||
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
import kotlinx.android.synthetic.main.qksms_plus_activity.*
|
||||||
import common.base.QkThemedActivity
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
|
class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
|
||||||
@@ -47,7 +47,7 @@ class PlusActivity : QkThemedActivity<PlusViewModel>(), PlusView {
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.qksms_plus_activity)
|
setContentView(R.layout.qksms_plus_activity)
|
||||||
setTitle(R.string.title_qksms_plus)
|
setTitle(R.string.title_qksms_plus)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
fontProvider.getLato {
|
fontProvider.getLato {
|
||||||
|
|||||||
@@ -70,12 +70,15 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
|
|||||||
private var textSizeDialog: AlertDialog? = null
|
private var textSizeDialog: AlertDialog? = null
|
||||||
private var mmsSizeDialog: AlertDialog? = null
|
private var mmsSizeDialog: AlertDialog? = null
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
init {
|
||||||
appComponent.inject(this)
|
appComponent.inject(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.settings_activity)
|
setContentView(R.layout.settings_activity)
|
||||||
setTitle(R.string.title_settings)
|
setTitle(R.string.title_settings)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
nightModeAdapter.setData(R.array.night_modes)
|
nightModeAdapter.setData(R.array.night_modes)
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class ThemePickerActivity : QkThemedActivity<ThemePickerViewModel>(), ThemePicke
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.theme_picker_activity)
|
setContentView(R.layout.theme_picker_activity)
|
||||||
setTitle(R.string.title_theme)
|
setTitle(R.string.title_theme)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
showBackButton(true)
|
||||||
viewModel.bindView(this)
|
viewModel.bindView(this)
|
||||||
|
|
||||||
pager.offscreenPageLimit = 1
|
pager.offscreenPageLimit = 1
|
||||||
|
|||||||
Reference in New Issue
Block a user