oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/oxen-io/session-android into auto-play-voice-message

This commit is contained in:
Ryan Zhao 2021-07-08 11:03:53 +10:00
parent a1e63c5f8e 8ef2a930e3
commit b559f19ce5
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
View File

@ -90,6 +90,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
helpTranslateButton.setOnClickListener { helpTranslate() }
seedButton.setOnClickListener { showSeed() }
clearAllDataButton.setOnClickListener { clearAllData() }
val isLightMode = UiModeUtilities.isDayUiMode(this)
oxenLogoImageView.setImageResource(if (isLightMode) R.drawable.oxen_light_mode else R.drawable.oxen_dark_mode)
versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
}

BIN
app/src/main/res/drawable-xxxhdpi/oxen_dark_mode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable-xxxhdpi/oxen_light_mode.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

9
app/src/main/res/layout/activity_settings.xml
View File

@ -213,11 +213,18 @@
android:gravity="center"
android:text="@string/activity_settings_help_translate_session" />
<ImageView
android:id="@+id/oxenLogoImageView"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:src="@drawable/oxen_light_mode" />
<TextView
android:id="@+id/versionTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_spacing"
android:layout_marginTop="4dp"
android:layout_marginBottom="@dimen/medium_spacing"
android:gravity="center"
android:text="@string/version_s"