TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-18 05:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining UI issues

Browse Source
This commit is contained in:
Niels Andriesse 2019-07-22 14:05:51 +10:00
parent 1da6f20f18
commit a767c84f74
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/activity_new_conversation.xml
View File

@ -6,7 +6,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<org.thoughtcrime.securesms.components.LabeledEditText <org.thoughtcrime.securesms.components.LabeledEditText
@ -14,7 +13,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
app:labeledEditText_background="@color/white"
app:labeledEditText_label="@string/activity_new_conversation_public_key_edit_text_label"/> app:labeledEditText_label="@string/activity_new_conversation_public_key_edit_text_label"/>
<TextView <TextView

9
res/values/colors.xml
View File

@ -1,7 +1,12 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<resources> <resources>
<color name="signal_primary">#ff5bca5b</color> <!-- Loki -->
<color name="signal_primary_dark">#ff5bca5b</color> <color name="loki_green">#78be20</color>
<color name="loki_darkest_gray">#0a0a0a</color>
<!-- Loki -->
<color name="signal_primary">@color/loki_green</color>
<color name="signal_primary_dark">@color/loki_green</color>
<color name="signal_primary_alpha33">#555bca5b</color> <color name="signal_primary_alpha33">#555bca5b</color>
<color name="signal_primary_alpha_focus">#882090ea</color> <color name="signal_primary_alpha_focus">#882090ea</color>

4
res/values/themes.xml
View File

@ -281,7 +281,7 @@
<item name="colorAccent">@color/textsecure_primary_dark</item> <item name="colorAccent">@color/textsecure_primary_dark</item>
<item name="colorControlActivated">@color/signal_primary_dark</item> <item name="colorControlActivated">@color/signal_primary_dark</item>
<item name="colorControlHighlight">@color/signal_primary_dark</item> <item name="colorControlHighlight">@color/signal_primary_dark</item>
<item name="android:windowBackground">@color/core_grey_95</item> <item name="android:windowBackground">@color/loki_darkest_gray</item>
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item> <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item> <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
@ -339,7 +339,7 @@
<item name="fab_color">@color/textsecure_primary_dark</item> <item name="fab_color">@color/textsecure_primary_dark</item>
<item name="lower_right_divet">@drawable/divet_lower_right_light</item> <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
<item name="conversation_background">@color/core_grey_95</item> <item name="conversation_background">@color/loki_darkest_gray</item>
<item name="conversation_editor_background">#22ffffff</item> <item name="conversation_editor_background">#22ffffff</item>
<item name="conversation_editor_text_color">#ffeeeeee</item> <item name="conversation_editor_text_color">#ffeeeeee</item>
<item name="conversation_input_background">@drawable/compose_background_dark</item> <item name="conversation_input_background">@drawable/compose_background_dark</item>

9
src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
View File

@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.loki
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem
import android.widget.Toast import android.widget.Toast
import kotlinx.android.synthetic.main.activity_new_conversation.* import kotlinx.android.synthetic.main.activity_new_conversation.*
import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
@ -33,6 +34,14 @@ class NewConversationActivity : PassphraseRequiredActionBarActivity() {
dynamicTheme.onResume(this) dynamicTheme.onResume(this)
} }
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home) {
onBackPressed()
return true
}
return super.onOptionsItemSelected(item)
}
private fun startNewConversationIfPossible() { private fun startNewConversationIfPossible() {
val hexEncodedPublicKey = publicKeyEditText.text.toString().trim() val hexEncodedPublicKey = publicKeyEditText.text.toString().trim()
if (PublicKeyValidation.isValid(hexEncodedPublicKey)) { if (PublicKeyValidation.isValid(hexEncodedPublicKey)) {