mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 03:28:52 +01:00
#1063 - Add "About QKSMS" section in settings
This commit is contained in:
@@ -46,6 +46,8 @@ import feature.plus.PlusViewModel
|
||||
import feature.qkreply.QkReplyViewModel
|
||||
import feature.settings.SettingsActivity
|
||||
import feature.settings.SettingsViewModel
|
||||
import feature.settings.about.AboutActivity
|
||||
import feature.settings.about.AboutViewModel
|
||||
import feature.setup.SetupActivity
|
||||
import feature.setup.SetupViewModel
|
||||
import feature.themepicker.ThemePickerActivity
|
||||
@@ -134,6 +136,31 @@ class Navigator @Inject constructor(private val context: Context, private val no
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showAbout() {
|
||||
val intent = Intent(context, AboutActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showDeveloper() {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti"))
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showSourceCode() {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms"))
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showChangelog() {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/releases"))
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showLicense() {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/moezbhatti/qksms/blob/master/LICENSE"))
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showBlockedConversations() {
|
||||
val intent = Intent(context, BlockedActivity::class.java)
|
||||
startActivity(intent)
|
||||
@@ -205,6 +232,7 @@ class Navigator @Inject constructor(private val context: Context, private val no
|
||||
MainViewModel::class.java -> MainViewModel()
|
||||
PlusViewModel::class.java -> PlusViewModel()
|
||||
SetupViewModel::class.java -> SetupViewModel()
|
||||
AboutViewModel::class.java -> AboutViewModel()
|
||||
ComposeViewModel::class.java -> ComposeViewModel(intent)
|
||||
ConversationInfoViewModel::class.java -> ConversationInfoViewModel(intent)
|
||||
GalleryViewModel::class.java -> GalleryViewModel(intent)
|
||||
|
||||
@@ -80,7 +80,7 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
|
||||
textSizeDialog.adapter.setData(R.array.text_sizes)
|
||||
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
||||
|
||||
version.text = getString(R.string.settings_version, BuildConfig.VERSION_NAME)
|
||||
about.summary = getString(R.string.settings_version, BuildConfig.VERSION_NAME)
|
||||
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
|
||||
@@ -156,6 +156,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
newState { it.copy(syncing = false) }
|
||||
})
|
||||
}
|
||||
|
||||
R.id.about -> navigator.showAbout()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package feature.settings.about
|
||||
|
||||
import android.os.Bundle
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.BuildConfig
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
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.about_activity.*
|
||||
|
||||
class AboutActivity : QkThemedActivity<AboutViewModel>(), AboutView {
|
||||
|
||||
override val viewModelClass = AboutViewModel::class
|
||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.about_activity)
|
||||
setTitle(R.string.about_title)
|
||||
showBackButton(true)
|
||||
viewModel.bindView(this)
|
||||
|
||||
version.summary = BuildConfig.VERSION_NAME
|
||||
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||
|
||||
// Listen to clicks for all of the preferences
|
||||
(0 until preferences.childCount)
|
||||
.map { index -> preferences.getChildAt(index) }
|
||||
.mapNotNull { view -> view as? PreferenceView }
|
||||
.forEach { preference ->
|
||||
preference.clicks().map { preference }.subscribe(preferenceClickIntent)
|
||||
}
|
||||
}
|
||||
|
||||
override fun render(state: Unit) {
|
||||
// No special rendering required
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package feature.settings.about
|
||||
|
||||
import common.base.QkView
|
||||
import common.widget.PreferenceView
|
||||
import io.reactivex.subjects.Subject
|
||||
|
||||
interface AboutView : QkView<Unit> {
|
||||
|
||||
val preferenceClickIntent: Subject<PreferenceView>
|
||||
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
package feature.settings.about
|
||||
|
||||
import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.Navigator
|
||||
import common.base.QkViewModel
|
||||
import injection.appComponent
|
||||
import javax.inject.Inject
|
||||
|
||||
class AboutViewModel : QkViewModel<AboutView, Unit>(Unit) {
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
}
|
||||
|
||||
override fun bindView(view: AboutView) {
|
||||
super.bindView(view)
|
||||
|
||||
view.preferenceClickIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { preference ->
|
||||
when(preference.id) {
|
||||
R.id.developer -> navigator.showDeveloper()
|
||||
|
||||
R.id.source -> navigator.showSourceCode()
|
||||
|
||||
R.id.changelog -> navigator.showChangelog()
|
||||
|
||||
R.id.contact -> navigator.showSupport()
|
||||
|
||||
R.id.license -> navigator.showLicense()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -49,6 +49,8 @@ import feature.qkreply.QkReplyActivity
|
||||
import feature.qkreply.QkReplyViewModel
|
||||
import feature.settings.SettingsActivity
|
||||
import feature.settings.SettingsViewModel
|
||||
import feature.settings.about.AboutActivity
|
||||
import feature.settings.about.AboutViewModel
|
||||
import feature.setup.SetupActivity
|
||||
import feature.setup.SetupViewModel
|
||||
import feature.themepicker.ThemePickerActivity
|
||||
@@ -77,6 +79,7 @@ interface AppComponent {
|
||||
|
||||
fun inject(activity: MainActivity)
|
||||
fun inject(activity: SetupActivity)
|
||||
fun inject(activity: AboutActivity)
|
||||
fun inject(activity: BlockedActivity)
|
||||
fun inject(activity: ComposeActivity)
|
||||
fun inject(activity: ConversationInfoActivity)
|
||||
@@ -119,6 +122,7 @@ interface AppComponent {
|
||||
|
||||
fun inject(viewModel: MainViewModel)
|
||||
fun inject(viewModel: SetupViewModel)
|
||||
fun inject(viewModel: AboutViewModel)
|
||||
fun inject(viewModel: BlockedViewModel)
|
||||
fun inject(viewModel: ComposeViewModel)
|
||||
fun inject(viewModel: ConversationInfoViewModel)
|
||||
|
||||
Reference in New Issue
Block a user