TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 10:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further Lokify UI

Browse Source
This commit is contained in:
Niels Andriesse
2019-07-22 13:08:56 +10:00
parent b71293fb11
commit 1da6f20f18
14 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/activity_account_details.xml
View File

@@ -5,7 +5,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:fillViewport="true"
tools:context=".loki.AccountDetailsActivity">
@@ -39,7 +38,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
app:labeledEditText_background="@color/white"
app:labeledEditText_label="@string/activity_account_details_name_edit_text_label"/>
<com.dd.CircularProgressButton

6
res/layout/activity_key_pair.xml
View File

@@ -5,7 +5,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:fillViewport="true"
tools:context=".loki.KeyPairActivity">
@@ -52,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="20dp"
android:background="@color/white"
android:background="@color/transparent"
android:textColor="@color/signal_primary"
android:text="@string/activity_key_pair_copy_button_title"
android:elevation="0dp"
@@ -75,14 +74,13 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="20dp"
android:visibility="gone"
app:labeledEditText_background="@color/white"
app:labeledEditText_label="@string/activity_key_pair_mnemonic_edit_text_label"/>
<Button
android:id="@+id/toggleModeButton"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:background="@color/transparent"
android:textColor="@color/signal_primary"
android:text="@string/activity_key_pair_toggle_mode_button_title_1"
android:elevation="0dp"

9
res/menu/conversation_context.xml
View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/conversation_context__menu_message_details"
<!-- <item android:title="@string/conversation_context__menu_message_details"
android:id="@+id/menu_context_details"
android:icon="?menu_info_icon"
app:showAsAction="always" />
app:showAsAction="always" /> -->
<item android:title="@string/conversation_context__menu_delete_message"
android:id="@+id/menu_context_delete_message"
@@ -15,10 +16,10 @@
android:icon="?menu_copy_icon"
app:showAsAction="always" />
<item android:title="@string/conversation_context__menu_forward_message"
<!-- <item android:title="@string/conversation_context__menu_forward_message"
android:id="@+id/menu_context_forward"
android:icon="?menu_forward_icon"
app:showAsAction="always" />
app:showAsAction="always" /> -->
<item android:title="@string/conversation_context__menu_resend_message"
android:id="@+id/menu_context_resend"

6
res/values/colors.xml
View File

@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<color name="signal_primary">#ff2090ea</color>
<color name="signal_primary_dark">#ff1c7ac5</color>
<color name="signal_primary_alpha33">#552090ea</color>
<color name="signal_primary">#ff5bca5b</color>
<color name="signal_primary_dark">#ff5bca5b</color>
<color name="signal_primary_alpha33">#555bca5b</color>
<color name="signal_primary_alpha_focus">#882090ea</color>
<color name="textsecure_primary">@color/signal_primary</color>

2
res/values/core_colors.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="core_blue">#2090ea</color>
<color name="core_blue">#5bca5b</color>
<color name="core_green">#4caf50</color>
<color name="core_red">#f44336</color>
<color name="core_red_highlight">#ef5350</color>