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

Merge pull request #648 from veeti/tweaks-and-polish

Browse Source 
Assorted tweaks and polish
This commit is contained in:
Moxie Marlinspike
2014-03-02 14:01:20 -08:00
parent a2fe8a9d5c de100f5be7
commit 5cd8c922d2
23 changed files with 267 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi-v11/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 648 B

BIN
res/drawable-hdpi/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 587 B

BIN
res/drawable-mdpi-v11/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 470 B

BIN
res/drawable-mdpi/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 415 B

BIN
res/drawable-xhdpi-v11/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 789 B

BIN
res/drawable-xhdpi/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 753 B

BIN
res/drawable-xxhdpi-v11/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
res/drawable-xxhdpi/ic_dialog_attach.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

2
res/drawable/clickable_card.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="@color/card_background_active" />
<solid android:color="@color/touch_highlight" />
</shape>
<bitmap android:src="@drawable/card" />
</item>

10
res/drawable/contact_photo_background.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="oval">
<solid android:color="@color/touch_highlight" />
</shape>
</item>
<item android:drawable="@android:color/transparent" />
</selector>

13
res/drawable/emoji_toggle_background.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@android:color/transparent" />
<item android:state_focused="true"
android:drawable="@android:color/transparent" />
<item android:drawable="@android:color/transparent" />
</selector>

BIN
res/drawable/ic_dialog_attach.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 816 B

24
res/drawable/send_button_background.xml
View File

@@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:state_pressed="true" >
<shape>
<solid android:color="#FF33B5E5" />
</shape>
</item>
<!-- focused -->
<item android:state_focused="true" >
<shape>
<solid android:color="#FF33B5E5" />
</shape>
</item>
<!-- default -->
<item>
<shape>
<solid android:color="#00ffffff" />
</shape>
</item>
</selector>

5
res/drawable/touch_highlight_background.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/touch_highlight" />
<item android:drawable="@android:color/transparent" />
</selector>

4
res/layout/conversation_activity.xml
View File

@@ -82,7 +82,7 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:background="@drawable/emoji_toggle_background"
android:background="@drawable/touch_highlight_background"
android:padding="10dp"/>
<EditText
@@ -108,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:background="@drawable/send_button_background"
android:background="@drawable/touch_highlight_background"
android:contentDescription="@string/conversation_activity__send"
android:nextFocusLeft="@+id/embedded_text_editor"
android:padding="12dp"

4
res/layout/conversation_item_received.xml
View File

@@ -26,7 +26,9 @@
android:layout_marginRight="0dp"
android:orientation="horizontal">
<ImageView android:id="@+id/contact_photo"
<org.thoughtcrime.securesms.components.ForegroundImageView
android:id="@+id/contact_photo"
android:foreground="@drawable/contact_photo_background"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginRight="10dp"

18
res/layout/conversation_list_item_view.xml
View File

@@ -15,14 +15,16 @@
android:paddingRight="10dp"
android:visibility="visible">
<ImageView android:id="@+id/contact_photo_image"
android:layout_width="60dp"
android:layout_height="60dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:visibility="gone"
android:contentDescription="Contact Photo Image"
android:layout_marginLeft="0dp" />
<org.thoughtcrime.securesms.components.ForegroundImageView
android:id="@+id/contact_photo_image"
android:foreground="@drawable/contact_photo_background"
android:layout_width="60dp"
android:layout_height="60dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:visibility="gone"
android:contentDescription="Contact Photo Image"
android:layout_marginLeft="0dp" />
</FrameLayout>
<TextView android:id="@+id/from"

2
res/values-v19/colors.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="card_background_active">#99bebebe</color>
<color name="touch_highlight">#10000000</color>
</resources>

6
res/values/attrs.xml
View File

@@ -58,4 +58,10 @@
<attr name="menu_group_icon" format="reference" />
<attr name="menu_split_icon" format="reference" />
<attr name="menu_accept_icon" format="reference" />
<declare-styleable name="ForegroundImageView">
<attr name="android:foreground" />
<attr name="android:foregroundInsidePadding" />
<attr name="android:foregroundGravity" />
</declare-styleable>
</resources>

2
res/values/colors.xml
View File

@@ -11,7 +11,7 @@
<color name="textsecure_holo_blue_light">#ff33b5e5</color>
<color name="card_background_active">#9933b5e5</color>
<color name="touch_highlight">#400099cc</color>
<color name="conversation_item_sent_background_dark">#ff284e0a</color>
<color name="conversation_item_sent_background_light">#ff64a926</color>

4
res/values/strings.xml
View File

@@ -90,8 +90,8 @@
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received:%2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%4$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received: %2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived: %4$s</string>
<string name="ConversationFragment_confirm_message_delete">Confirm Message Delete</string>
<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>