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

Basic navigation drawer support.

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-06-22 21:44:12 -07:00
parent 5263ac1f1a
commit 903ab92f5f
36 changed files with 194 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/values/arrays.xml
View File

@@ -41,12 +41,35 @@
<item>@string/preferences__slow</item>
<item>@string/preferences__custom</item>
</string-array>
<string-array name="pref_led_blink_pattern_values"
translatable="false">
<string-array name="pref_led_blink_pattern_values" translatable="false">
<item>300,300</item>
<item>500,2000</item>
<item>3000,3000</item>
<item>custom</item>
</string-array>
<string-array name="navigation_drawer_text">
<item>@string/arrays__import_export</item>
<item>@string/arrays__my_identity_key</item>
<item>@string/arrays__contact_keys</item>
</string-array>
<string-array name="navigation_drawer_values" translatable="false">
<item>import_export</item>
<item>my_identity_key</item>
<item>contact_identity_keys</item>
</string-array>
<string-array name="navigation_drawer_icons_light">
<item>@drawable/import_export_light</item>
<item>@drawable/my_identity_light</item>
<item>@drawable/contacts_identities_light</item>
</string-array>
<string-array name="navigation_drawer_icons_dark">
<item>@drawable/import_export_dark</item>
<item>@drawable/my_identity_dark</item>
<item>@drawable/contacts_identities_dark</item>
</string-array>
</resources>

5
res/values/attrs.xml
View File

@@ -16,4 +16,9 @@
<attr name="conversation_send_button" format="reference"/>
<attr name="conversation_send_secure_button" format="reference"/>
<attr name="conversation_delivered_indicator" format="reference"/>
<attr name="navigation_drawer_background" format="reference|color"/>
<attr name="navigation_drawer_text_color" format="color"/>
<attr name="navigation_drawer_icons" format="reference"/>
<attr name="navigation_drawer_shadow" format="reference"/>
</resources>

13
res/values/strings.xml
View File

@@ -84,7 +84,7 @@
<string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
<string name="ConversationActivity_calls_not_supported">Calls Not Supported</string>
<string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">This device does not appear to support dial actions.</string>
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nSent/Received:%3$s</string>
@@ -379,7 +379,12 @@
<string name="AndroidManifest__manage_identity_keys">Manage Identity Keys</string>
<string name="AndroidManifest__complete_key_exchange">Complete Key Exchange</string>
<string name="AndroidManifest__verify_imported_identity">Verify Imported Identity</string>
<!-- arrays.xml -->
<string name="arrays__import_export">Import / Export</string>
<string name="arrays__my_identity_key">My Identity Key</string>
<string name="arrays__contact_keys">Contact Keys</string>
<!-- preferences.xml -->
<string name="preferences__general">General</string>
<string name="preferences__use_settings">Use Settings</string>
@@ -459,6 +464,8 @@
<string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Scan through all conversation threads and enforce conversation length limits</string>
<string name="preferences__light_theme">Light Theme</string>
<string name="preferences__dark_theme">Dark Theme</string>
<string name="preferences__appearance">Appearance</string>
<string name="preferences__theme">Theme</string>
<!-- **************************************** -->
<!-- menus -->
@@ -528,8 +535,6 @@
<!-- verify_keys -->
<string name="verify_keys__menu_verified">Verified</string>
<string name="preferences__appearance">Appearance</string>
<string name="preferences__theme">Theme</string>
<!-- EOF -->
</resources>

18
res/values/themes.xml
View File

@@ -19,6 +19,15 @@
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_light</item>
</style>
<style name="TextSecure.LightTheme.NavigationDrawer" parent="@style/TextSecure.LightTheme">
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">@color/abs__background_holo_light</item>
<item name="navigation_drawer_text_color">#ff333333</item>
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_light</item>
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_light</item>
</style>
<style name="TextSecure.DarkTheme" parent="@style/Theme.Sherlock">
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
@@ -36,6 +45,15 @@
<item name="conversation_send_button">@drawable/ic_send_holo_dark</item>
<item name="conversation_send_secure_button">@drawable/ic_send_holo_dark_encrypted</item>
<item name="conversation_delivered_indicator">@drawable/ic_sms_mms_delivered_dark</item>
</style>
<style name="TextSecure.DarkTheme.NavigationDrawer" parent="@style/TextSecure.DarkTheme">
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">#ff333333</item>
<item name="navigation_drawer_text_color">#ffdddddd</item>
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_dark</item>
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
</style>
</resources>