TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-17 11:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create UI path to new conversation screen

Browse Source
This commit is contained in:
Niels Andriesse
2019-06-06 15:01:06 +10:00
parent 858b34306b
commit b4328d1aa3
8 changed files with 122 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
res/layout/contact_filter_toolbar.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_width="0px"
android:layout_weight="1"
android:hint="@string/contact_selection_activity__enter_name_or_number"
android:hint="@string/activity_contact_selection_search_bar_placeholder"
android:inputType="textPersonName"
style="@style/TextSecure.TitleTextStyle"
android:background="@android:color/transparent"
@@ -33,26 +33,26 @@
android:paddingEnd="10dp"
android:gravity="center">
<ImageView android:id="@+id/search_dialpad"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:clickable="true"
android:focusable="true"
android:background="@drawable/circle_touch_highlight_background"
android:src="@drawable/ic_dialpad_white_24dp" />
<!--<ImageView android:id="@+id/search_dialpad"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="center_vertical"-->
<!--android:gravity="center_vertical"-->
<!--android:clickable="true"-->
<!--android:focusable="true"-->
<!--android:background="@drawable/circle_touch_highlight_background"-->
<!--android:src="@drawable/ic_dialpad_white_24dp" />-->
<ImageView android:id="@+id/search_keyboard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:clickable="true"
android:visibility="gone"
android:focusable="true"
android:background="@drawable/circle_touch_highlight_background"
android:src="@drawable/ic_keyboard_white_24dp" />
<!--<ImageView android:id="@+id/search_keyboard"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_gravity="center_vertical"-->
<!--android:gravity="center_vertical"-->
<!--android:clickable="true"-->
<!--android:visibility="gone"-->
<!--android:focusable="true"-->
<!--android:background="@drawable/circle_touch_highlight_background"-->
<!--android:src="@drawable/ic_keyboard_white_24dp" />-->
<ImageView android:id="@+id/search_clear"
android:layout_width="wrap_content"

10
res/values/strings.xml
View File

@@ -1529,8 +1529,14 @@
<string name="activity_key_pair_copy_button_title">Copy</string>
<string name="activity_key_pair_mnemonic_copied_message">Copied to Clipboard</string>
<string name="activity_key_pair_register_button_title">Register</string>
<!-- Settings -->
<!-- Settings activity -->
<string name="activity_settings_share_public_key_button_title">Share Public Key</string>
<string name="activity_settings_public_key_copied_message">Copied to Clipboard</string>
<string name="activity_settings_show_seed_button_title">Show Seed</string>
<string name="activity_settings_seed_dialog_title">Your Seed</string>
<string name="activity_settings_seed_dialog_copy_button_title">Copy</string>
<string name="activity_settings_seed_dialog_cancel_button_title">Cancel</string>
<string name="activity_settings_seed_copied_message">Copied to Clipboard</string>
<!-- Contact selection activity -->
<string name="activity_contact_selection_search_bar_placeholder">Search by name or public key</string>
</resources>

4
res/xml/preferences.xml
View File

@@ -37,4 +37,8 @@
android:title="@string/activity_settings_share_public_key_button_title"
android:icon="@drawable/ic_textsms_24dp"/>
<Preference android:key="preference_category_seed"
android:title="@string/activity_settings_show_seed_button_title"
android:icon="@drawable/ic_security_24dp"/>
</PreferenceScreen>