forked from upstream-mirrors/quik
#885 - Show version in settings screen
This commit is contained in:
@@ -26,6 +26,7 @@ import android.support.design.widget.Snackbar
|
|||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.support.v7.widget.RecyclerView
|
import android.support.v7.widget.RecyclerView
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
|
import com.moez.QKSMS.BuildConfig
|
||||||
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
|
||||||
@@ -87,6 +88,8 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
|
|||||||
textSizeAdapter.setData(R.array.text_sizes)
|
textSizeAdapter.setData(R.array.text_sizes)
|
||||||
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
||||||
|
|
||||||
|
version.text = getString(R.string.settings_version, BuildConfig.VERSION_NAME)
|
||||||
|
|
||||||
colors.background
|
colors.background
|
||||||
.autoDisposable(scope())
|
.autoDisposable(scope())
|
||||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||||
|
|||||||
@@ -203,6 +203,17 @@
|
|||||||
app:summary="@string/settings_sync_summary"
|
app:summary="@string/settings_sync_summary"
|
||||||
app:title="@string/settings_sync_title" />
|
app:title="@string/settings_sync_title" />
|
||||||
|
|
||||||
|
<common.widget.QkTextView
|
||||||
|
android:id="@+id/version"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="24dp"
|
||||||
|
android:layout_marginBottom="8dp"
|
||||||
|
app:textColor="tertiary"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
app:textSize="secondary"
|
||||||
|
tools:text="Version 3.0.0" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|||||||
@@ -119,6 +119,7 @@
|
|||||||
<string name="settings_mms_size_title">Max MMS attachment size</string>
|
<string name="settings_mms_size_title">Max MMS attachment size</string>
|
||||||
<string name="settings_sync_title">Sync messages</string>
|
<string name="settings_sync_title">Sync messages</string>
|
||||||
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
<string name="settings_sync_summary">Re-sync your messages with the native Android SMS database</string>
|
||||||
|
<string name="settings_version">Version %s</string>
|
||||||
|
|
||||||
<string name="blocked_title">Blocking</string>
|
<string name="blocked_title">Blocking</string>
|
||||||
<string name="blocked_empty">Your blocked conversations will appear here</string>
|
<string name="blocked_empty">Your blocked conversations will appear here</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user