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

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

@@ -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})")
     }
 

app/src/main/res/layout/activity_settings.xml

@@ -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"