From 510a9d23b5d532deb6d4f9be924214ed38bec7fd Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 20 Apr 2018 04:19:43 -0400 Subject: [PATCH] #1063 - Add "About QKSMS" section in settings --- presentation/src/main/AndroidManifest.xml | 1 + .../src/main/java/common/Navigator.kt | 28 +++++ .../java/feature/settings/SettingsActivity.kt | 2 +- .../feature/settings/SettingsViewModel.kt | 2 + .../feature/settings/about/AboutActivity.kt | 52 ++++++++ .../java/feature/settings/about/AboutView.kt | 11 ++ .../feature/settings/about/AboutViewModel.kt | 39 ++++++ .../src/main/java/injection/AppComponent.kt | 4 + .../drawable/ic_info_outline_black_24dp.xml | 9 ++ .../src/main/res/layout/about_activity.xml | 119 ++++++++++++++++++ .../src/main/res/layout/settings_activity.xml | 15 +-- .../src/main/res/values/donottranslate.xml | 11 ++ presentation/src/main/res/values/strings.xml | 10 ++ 13 files changed, 293 insertions(+), 10 deletions(-) create mode 100644 presentation/src/main/java/feature/settings/about/AboutActivity.kt create mode 100644 presentation/src/main/java/feature/settings/about/AboutView.kt create mode 100644 presentation/src/main/java/feature/settings/about/AboutViewModel.kt create mode 100644 presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml create mode 100644 presentation/src/main/res/layout/about_activity.xml create mode 100644 presentation/src/main/res/values/donottranslate.xml diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 1af1c5d2..6ed3f0d6 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -72,6 +72,7 @@ android:excludeFromRecents="true" android:taskAffinity="" android:theme="@style/AppThemeLightDialog" /> + diff --git a/presentation/src/main/java/common/Navigator.kt b/presentation/src/main/java/common/Navigator.kt index df493e20..e0678638 100644 --- a/presentation/src/main/java/common/Navigator.kt +++ b/presentation/src/main/java/common/Navigator.kt @@ -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) diff --git a/presentation/src/main/java/feature/settings/SettingsActivity.kt b/presentation/src/main/java/feature/settings/SettingsActivity.kt index 87d58d71..b8fddedc 100644 --- a/presentation/src/main/java/feature/settings/SettingsActivity.kt +++ b/presentation/src/main/java/feature/settings/SettingsActivity.kt @@ -80,7 +80,7 @@ class SettingsActivity : QkThemedActivity(), 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()) diff --git a/presentation/src/main/java/feature/settings/SettingsViewModel.kt b/presentation/src/main/java/feature/settings/SettingsViewModel.kt index f12de105..bf957f6b 100644 --- a/presentation/src/main/java/feature/settings/SettingsViewModel.kt +++ b/presentation/src/main/java/feature/settings/SettingsViewModel.kt @@ -156,6 +156,8 @@ class SettingsViewModel : QkViewModel(SettingsState newState { it.copy(syncing = false) } }) } + + R.id.about -> navigator.showAbout() } } diff --git a/presentation/src/main/java/feature/settings/about/AboutActivity.kt b/presentation/src/main/java/feature/settings/about/AboutActivity.kt new file mode 100644 index 00000000..42a9695c --- /dev/null +++ b/presentation/src/main/java/feature/settings/about/AboutActivity.kt @@ -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(), AboutView { + + override val viewModelClass = AboutViewModel::class + override val preferenceClickIntent: Subject = 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 + } + + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/settings/about/AboutView.kt b/presentation/src/main/java/feature/settings/about/AboutView.kt new file mode 100644 index 00000000..f567c810 --- /dev/null +++ b/presentation/src/main/java/feature/settings/about/AboutView.kt @@ -0,0 +1,11 @@ +package feature.settings.about + +import common.base.QkView +import common.widget.PreferenceView +import io.reactivex.subjects.Subject + +interface AboutView : QkView { + + val preferenceClickIntent: Subject + +} \ No newline at end of file diff --git a/presentation/src/main/java/feature/settings/about/AboutViewModel.kt b/presentation/src/main/java/feature/settings/about/AboutViewModel.kt new file mode 100644 index 00000000..c3c87fd8 --- /dev/null +++ b/presentation/src/main/java/feature/settings/about/AboutViewModel.kt @@ -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(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() + } + } + } + +} \ No newline at end of file diff --git a/presentation/src/main/java/injection/AppComponent.kt b/presentation/src/main/java/injection/AppComponent.kt index ad7b0cfe..99b108e0 100644 --- a/presentation/src/main/java/injection/AppComponent.kt +++ b/presentation/src/main/java/injection/AppComponent.kt @@ -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) diff --git a/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml b/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml new file mode 100644 index 00000000..cf53e145 --- /dev/null +++ b/presentation/src/main/res/drawable/ic_info_outline_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/presentation/src/main/res/layout/about_activity.xml b/presentation/src/main/res/layout/about_activity.xml new file mode 100644 index 00000000..73ffd345 --- /dev/null +++ b/presentation/src/main/res/layout/about_activity.xml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/settings_activity.xml b/presentation/src/main/res/layout/settings_activity.xml index 19ee4c70..ef5eccd1 100644 --- a/presentation/src/main/res/layout/settings_activity.xml +++ b/presentation/src/main/res/layout/settings_activity.xml @@ -194,16 +194,13 @@ app:summary="@string/settings_sync_summary" app:title="@string/settings_sync_title" /> - + app:icon="@drawable/ic_info_outline_black_24dp" + app:title="@string/settings_about_title" + tools:summary="Version 3.0.7" /> diff --git a/presentation/src/main/res/values/donottranslate.xml b/presentation/src/main/res/values/donottranslate.xml new file mode 100644 index 00000000..1708f072 --- /dev/null +++ b/presentation/src/main/res/values/donottranslate.xml @@ -0,0 +1,11 @@ + + + + Moez Bhatti + https://github.com/moezbhatti/qksms + https://github.com/moezbhatti/qksms/releases + team@qklabs.com + GNU General Public License v3.0 + © 2014–2018 + + \ No newline at end of file diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 1bceef57..1ed8d159 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -123,6 +123,7 @@ Max MMS attachment size Sync messages Re-sync your messages with the native Android SMS database + About QKSMS Version %s Blocking @@ -130,6 +131,15 @@ Unblock Would you like to unblock this conversation? + About + Version + Developer + Source code + Changelog + Contact + License + Copyright + Support development, unlock everything You can save a starving developer for just %s Lifetime upgrade for %1$s %2$s