repurpose ImageDivet for avatar, minor lint, fix bitmap decoding
// FREEBIE
Before Width: | Height: | Size: 197 B |
Before Width: | Height: | Size: 199 B |
BIN
res/drawable-hdpi/divet_lower_right_dark.png
Normal file
After Width: | Height: | Size: 1018 B |
BIN
res/drawable-hdpi/divet_lower_right_light.png
Normal file
After Width: | Height: | Size: 1021 B |
Before Width: | Height: | Size: 197 B |
Before Width: | Height: | Size: 195 B |
Before Width: | Height: | Size: 617 B |
Before Width: | Height: | Size: 147 B |
Before Width: | Height: | Size: 147 B |
BIN
res/drawable-mdpi/divet_lower_right_dark.png
Normal file
After Width: | Height: | Size: 991 B |
BIN
res/drawable-mdpi/divet_lower_right_light.png
Normal file
After Width: | Height: | Size: 1000 B |
Before Width: | Height: | Size: 144 B |
Before Width: | Height: | Size: 147 B |
Before Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 231 B |
Before Width: | Height: | Size: 226 B |
BIN
res/drawable-xhdpi/divet_lower_right_dark.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
res/drawable-xhdpi/divet_lower_right_light.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 227 B |
Before Width: | Height: | Size: 226 B |
Before Width: | Height: | Size: 841 B |
BIN
res/drawable-xxhdpi/divet_lower_right_dark.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-xxhdpi/divet_lower_right_light.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
@@ -20,12 +20,13 @@
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<ImageView android:id="@+id/avatar"
|
||||
<org.thoughtcrime.securesms.components.ImageDivet android:id="@+id/avatar"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
position="bottom_right"
|
||||
android:layout_marginRight="10dp"
|
||||
android:background="@drawable/thin_border"
|
||||
android:src="@drawable/icon"/>
|
||||
android:src="@drawable/icon"
|
||||
android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
|
||||
|
||||
<EditText android:id="@+id/group_name"
|
||||
android:layout_width="match_parent"
|
||||
|
@@ -5,7 +5,7 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:fastScrollEnabled="true" />
|
||||
|
||||
|
@@ -20,7 +20,7 @@
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center|center_vertical"
|
||||
android:layout_marginTop="15dp"
|
||||
android:text="@string/contact_selection_group_activity__no_contacts"
|
||||
android:text="@string/contact_selection_group_activity__finding_contacts"
|
||||
android:textSize="20sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
@@ -2,7 +2,7 @@
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:title="@string/contact_selection__menu_finished"
|
||||
android:id="@+id/menu_selection_finished"
|
||||
android:icon="@drawable/ic_menu_done_holo_dark"
|
||||
android:icon="?menu_accept_icon"
|
||||
android:showAsAction="ifRoom"
|
||||
/>
|
||||
|
||||
|
@@ -2,9 +2,9 @@
|
||||
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:title="CREATE"
|
||||
<item android:title="@string/GroupCreateActivity_menu_create_title"
|
||||
android:id="@+id/menu_create_group"
|
||||
android:icon="@drawable/ic_menu_accept_holo_light"
|
||||
android:icon="?menu_accept_icon"
|
||||
android:showAsAction="always|withText"/>
|
||||
|
||||
</menu>
|
@@ -17,10 +17,9 @@
|
||||
<attr name="conversation_received_text_secondary_color" format="reference|color"/>
|
||||
|
||||
<attr name="actionbar_icon" format="reference" />
|
||||
<attr name="lower_right_divet" format="reference" />
|
||||
|
||||
<attr name="conversation_background" format="reference|color"/>
|
||||
<attr name="conversation_avatar_divet_right" format="reference"/>
|
||||
<attr name="conversation_avatar_divet_left" format="reference"/>
|
||||
<attr name="conversation_editor_background" format="reference|color"/>
|
||||
<attr name="conversation_editor_text_color" format="reference|color"/>
|
||||
<attr name="conversation_send_button" format="reference"/>
|
||||
@@ -45,4 +44,5 @@
|
||||
<attr name="menu_selectall_icon" format="reference" />
|
||||
<attr name="menu_group_icon" format="reference" />
|
||||
<attr name="menu_split_icon" format="reference" />
|
||||
<attr name="menu_accept_icon" format="reference" />
|
||||
</resources>
|
@@ -48,7 +48,10 @@
|
||||
<string name="ConversationItem_received_and_processed_key_exchange_message">Received and processed key exchange message.</string>
|
||||
<string name="ConversationItem_error_received_stale_key_exchange_message">Error, received stale key exchange message.</string>
|
||||
<string name="ConversationItem_received_key_exchange_message_click_to_process">Received key exchange message, click to process.</string>
|
||||
|
||||
<string name="ConversationItem_group_action_left">%1$s has left the group.</string>
|
||||
<string name="ConversationItem_group_action_joined">%1$s have joined the group.</string>
|
||||
<string name="ConversationItem_group_action_modify">%1$s has updated the group.</string>
|
||||
|
||||
<!-- ConversationActivity -->
|
||||
<string name="ConversationActivity_initiate_secure_session_question">Initiate Secure Session?</string>
|
||||
<string name="ConversationActivity_initiate_secure_session_with_s_question">Initiate secure session with %s?</string>
|
||||
@@ -128,6 +131,9 @@
|
||||
<string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
|
||||
<string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
|
||||
<string name="GroupCreateActivity_file_io_exception">File I/O error, couldn\'t create a temporary image file.</string>
|
||||
<string name="GroupCreateActivity_avatar_content_description">Group Avatar</string>
|
||||
<string name="GroupCreateActivity_menu_create_title">Create Group</string>
|
||||
<string name="GroupCreateActivity_creating_group">Creating %1$s…</string>
|
||||
|
||||
<!-- ImportFragment -->
|
||||
<string name="ImportFragment_import_system_sms_database">Import System SMS Database?</string>
|
||||
|
@@ -10,6 +10,7 @@
|
||||
<item name="conversation_list_item_date_color">#ff999999</item>
|
||||
|
||||
<item name="actionbar_icon">@drawable/actionbar_icon_holo_light</item>
|
||||
<item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
|
||||
|
||||
<item name="conversation_group_member_name">#99000000</item>
|
||||
<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
|
||||
@@ -18,8 +19,6 @@
|
||||
<item name="conversation_received_text_secondary_color">#33000000</item>
|
||||
|
||||
<item name="conversation_background">#ffdddddd</item>
|
||||
<item name="conversation_avatar_divet_right">@drawable/divet_right_light</item>
|
||||
<item name="conversation_avatar_divet_left">@drawable/divet_left_light</item>
|
||||
<item name="conversation_editor_background">#eeeeee</item>
|
||||
<item name="conversation_editor_text_color">@color/edit_text_light_theme</item>
|
||||
<item name="conversation_send_button">@drawable/ic_send_holo_light</item>
|
||||
@@ -39,6 +38,7 @@
|
||||
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_light</item>
|
||||
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_light</item>
|
||||
<item name="menu_split_icon">@drawable/ic_menu_split_holo_light</item>
|
||||
<item name="menu_accept_icon">@drawable/ic_menu_accept_holo_light</item>
|
||||
|
||||
</style>
|
||||
|
||||
@@ -69,10 +69,9 @@
|
||||
<item name="conversation_received_text_secondary_color">#33000000</item>
|
||||
|
||||
<item name="actionbar_icon">@drawable/actionbar_icon_holo_dark</item>
|
||||
<item name="lower_right_divet">@drawable/divet_lower_right_light</item>
|
||||
|
||||
<item name="conversation_background">@color/black</item>
|
||||
<item name="conversation_avatar_divet_right">@drawable/divet_right_dark</item>
|
||||
<item name="conversation_avatar_divet_left">@drawable/divet_left_dark</item>
|
||||
<item name="conversation_editor_background">@color/black</item>
|
||||
<item name="conversation_editor_text_color">@color/edit_text_dark_theme</item>
|
||||
<item name="conversation_send_button">@drawable/ic_send_holo_dark</item>
|
||||
@@ -91,6 +90,7 @@
|
||||
<item name="menu_trash_icon">@drawable/ic_menu_trash_holo_dark</item>
|
||||
<item name="menu_selectall_icon">@drawable/ic_menu_selectall_holo_dark</item>
|
||||
<item name="menu_split_icon">@drawable/ic_menu_split_holo_dark</item>
|
||||
<item name="menu_accept_icon">@drawable/ic_menu_accept_holo_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkTheme.NavigationDrawer"
|
||||
|