mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 11:08:02 +00:00
Jake McGinty
committed by
Moxie Marlinspike
Moxie Marlinspike
parent
140cbe9f25
commit
daa98107c3
15
res/anim/animation_toggle_in.xml
Normal file
15
res/anim/animation_toggle_in.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:duration="150"
|
||||
android:fromXScale="0.6"
|
||||
android:fromYScale="0.6"
|
||||
android:toXScale="1.0"
|
||||
android:toYScale="1.0"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%" />
|
||||
<alpha
|
||||
android:duration="150"
|
||||
android:fromAlpha="0.0"
|
||||
android:toAlpha="1.0" />
|
||||
</set>
|
||||
15
res/anim/animation_toggle_out.xml
Normal file
15
res/anim/animation_toggle_out.xml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<set xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<scale
|
||||
android:duration="150"
|
||||
android:fromXScale="1.0"
|
||||
android:fromYScale="1.0"
|
||||
android:toXScale="0.60"
|
||||
android:toYScale="0.60"
|
||||
android:pivotX="50%"
|
||||
android:pivotY="50%" />
|
||||
<alpha
|
||||
android:duration="150"
|
||||
android:fromAlpha="1.0"
|
||||
android:toAlpha="0.0" />
|
||||
</set>
|
||||
BIN
res/drawable-hdpi/ic_send_push_white_24dp.png
Normal file
BIN
res/drawable-hdpi/ic_send_push_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
BIN
res/drawable-hdpi/ic_send_sms_white_24dp.png
Normal file
BIN
res/drawable-hdpi/ic_send_sms_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 757 B |
BIN
res/drawable-mdpi/ic_send_push_white_24dp.png
Normal file
BIN
res/drawable-mdpi/ic_send_push_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 485 B |
BIN
res/drawable-mdpi/ic_send_sms_white_24dp.png
Normal file
BIN
res/drawable-mdpi/ic_send_sms_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 485 B |
9
res/drawable-v21/circle_touch_highlight_background.xml
Normal file
9
res/drawable-v21/circle_touch_highlight_background.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="@color/touch_highlight">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="@color/black" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
BIN
res/drawable-xhdpi/ic_send_push_white_24dp.png
Normal file
BIN
res/drawable-xhdpi/ic_send_push_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 973 B |
BIN
res/drawable-xhdpi/ic_send_sms_white_24dp.png
Normal file
BIN
res/drawable-xhdpi/ic_send_sms_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 956 B |
BIN
res/drawable-xxhdpi/ic_send_push_white_24dp.png
Normal file
BIN
res/drawable-xxhdpi/ic_send_push_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
res/drawable-xxhdpi/ic_send_sms_white_24dp.png
Normal file
BIN
res/drawable-xxhdpi/ic_send_sms_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
res/drawable-xxhdpi/ic_send_white_24dp.png
Normal file
BIN
res/drawable-xxhdpi/ic_send_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 562 B |
BIN
res/drawable-xxxhdpi/ic_send_push_white_24dp.png
Normal file
BIN
res/drawable-xxxhdpi/ic_send_push_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
Normal file
BIN
res/drawable-xxxhdpi/ic_send_sms_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
5
res/drawable/circle_tintable.xml
Normal file
5
res/drawable/circle_tintable.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
<solid android:color="@color/white" />
|
||||
</shape>
|
||||
8
res/drawable/circle_touch_highlight_background.xml
Normal file
8
res/drawable/circle_touch_highlight_background.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?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>
|
||||
</selector>
|
||||
@@ -1,9 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent" />
|
||||
<padding android:bottom="@dimen/conversation_activity_compose_padding"
|
||||
android:left="@dimen/conversation_activity_compose_padding"
|
||||
android:right="@dimen/conversation_activity_compose_padding"
|
||||
android:top="@dimen/conversation_activity_compose_padding" />
|
||||
<solid android:color="@null" />
|
||||
</shape>
|
||||
@@ -4,6 +4,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:background="?conversation_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
@@ -60,73 +61,65 @@
|
||||
</FrameLayout>
|
||||
</ScrollView>
|
||||
|
||||
<View android:layout_width="match_parent"
|
||||
android:layout_height="1px"
|
||||
android:background="?conversation_editor_background" />
|
||||
<LinearLayout android:id="@+id/bottom_panel"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/bottom_panel"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
<LinearLayout android:id="@+id/compose_bubble"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/sent_bubble">
|
||||
|
||||
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
|
||||
<org.thoughtcrime.securesms.components.emoji.EmojiToggle
|
||||
android:id="@+id/emoji_toggle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="44dp"
|
||||
android:layout_width="37dp"
|
||||
android:layout_height="37dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:background="@drawable/touch_highlight_background"
|
||||
android:contentDescription="@string/conversation_activity__emoji_toggle_description"
|
||||
android:padding="10dp"/>
|
||||
android:contentDescription="@string/conversation_activity__emoji_toggle_description" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.ComposeText
|
||||
<org.thoughtcrime.securesms.components.ComposeText
|
||||
style="@style/ComposeEditText"
|
||||
android:id="@+id/embedded_text_editor"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:background="@drawable/compose_background"
|
||||
android:paddingTop="12dp"
|
||||
android:paddingBottom="12dp"
|
||||
android:paddingRight="0dp"
|
||||
android:paddingLeft="0dp"
|
||||
android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi"
|
||||
android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
|
||||
android:maxLength="2000"
|
||||
android:maxLines="4"
|
||||
android:minHeight="37dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:nextFocusForward="@+id/send_button"
|
||||
android:nextFocusRight="@+id/send_button"
|
||||
android:contentDescription="@string/conversation_activity__compose_description"
|
||||
android:textColor="?conversation_editor_text_color" />
|
||||
tools:hint="Send TextSecure message" />
|
||||
</LinearLayout>
|
||||
|
||||
<org.thoughtcrime.securesms.components.AnimatingToggle
|
||||
android:id="@+id/button_toggle"
|
||||
android:layout_width="46dp"
|
||||
android:layout_height="44dp"
|
||||
android:layout_gravity="bottom">
|
||||
android:id="@+id/button_toggle"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:background="@drawable/circle_tintable"
|
||||
android:layout_gravity="bottom">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/attach_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/touch_highlight_background"
|
||||
android:src="?conversation_attach"
|
||||
android:contentDescription="@string/ConversationActivity_add_attachment"
|
||||
android:nextFocusLeft="@+id/embedded_text_editor" />
|
||||
android:id="@+id/attach_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:background="@drawable/circle_touch_highlight_background"
|
||||
android:src="@drawable/ic_attach_white_24dp"
|
||||
android:contentDescription="@string/ConversationActivity_add_attachment"
|
||||
android:nextFocusLeft="@+id/embedded_text_editor" />
|
||||
|
||||
<org.thoughtcrime.securesms.components.SendButton
|
||||
android:id="@+id/send_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/touch_highlight_background"
|
||||
android:contentDescription="@string/conversation_activity__send"
|
||||
android:nextFocusLeft="@+id/embedded_text_editor"
|
||||
android:src="?conversation_transport_sms_indicator"
|
||||
android:focusable="true"
|
||||
android:clickable="false"
|
||||
android:enabled="false" />
|
||||
android:id="@+id/send_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:contentDescription="@string/conversation_activity__send"
|
||||
android:nextFocusLeft="@+id/embedded_text_editor"
|
||||
android:src="?conversation_transport_sms_indicator"
|
||||
android:background="@drawable/circle_touch_highlight_background" />
|
||||
|
||||
</org.thoughtcrime.securesms.components.AnimatingToggle>
|
||||
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?conversation_transport_popup_background">
|
||||
android:background="?conversation_transport_popup_background"
|
||||
android:elevation="2dp">
|
||||
<ListView android:id="@+id/transport_selection_list"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="@dimen/transport_selection_popup_width"
|
||||
android:layout_height="60dp"
|
||||
@@ -10,11 +11,16 @@
|
||||
<ImageView android:id="@+id/icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/transport_selection_list_item__transport_icon"/>
|
||||
android:padding="7dp"
|
||||
android:background="@drawable/circle_tintable"
|
||||
android:contentDescription="@string/transport_selection_list_item__transport_icon"
|
||||
tools:src="@drawable/ic_send_push_white_24dp"
|
||||
tools:backgroundTint="@color/textsecure_primary" />
|
||||
<TextView android:id="@+id/text"
|
||||
android:paddingLeft="10dp"
|
||||
android:fontFamily="sans-serif-light"
|
||||
android:textSize="16sp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"/>
|
||||
</LinearLayout>
|
||||
android:layout_height="wrap_content"
|
||||
tools:text="TextSecure" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="touch_highlight">#10000000</color>
|
||||
<color name="touch_highlight">#22000000</color>
|
||||
</resources>
|
||||
@@ -7,8 +7,8 @@
|
||||
<dimen name="emoji_drawer_left_right_padding">5dp</dimen>
|
||||
<dimen name="conversation_item_date_text_size">12sp</dimen>
|
||||
<dimen name="transport_selection_popup_width">200sp</dimen>
|
||||
<dimen name="transport_selection_popup_xoff">0dp</dimen>
|
||||
<dimen name="transport_selection_popup_yoff">1dp</dimen>
|
||||
<dimen name="transport_selection_popup_xoff">2dp</dimen>
|
||||
<dimen name="transport_selection_popup_yoff">2dp</dimen>
|
||||
<dimen name="contact_photo_target_size">64dp</dimen>
|
||||
<dimen name="contact_selection_photo_size">50dp</dimen>
|
||||
<dimen name="thumbnail_max_size">230dp</dimen>
|
||||
|
||||
@@ -176,4 +176,18 @@
|
||||
<item name="android:background">@drawable/error_round</item>
|
||||
</style>
|
||||
|
||||
<style name="ComposeEditText" parent="@style/Widget.AppCompat.EditText">
|
||||
<item name="android:padding">2dp</item>
|
||||
<item name="android:background">@null</item>
|
||||
<item name="android:maxLines">4</item>
|
||||
<item name="android:maxLength">2000</item>
|
||||
<item name="android:textColor">?conversation_item_sent_text_primary_color</item>
|
||||
<item name="android:capitalize">sentences</item>
|
||||
<item name="android:autoText">true</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:imeOptions">actionSend|flagNoEnterAction|flagNoExtractUi</item>
|
||||
<item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
|
||||
<item name="android:contentDescription">@string/conversation_activity__compose_description</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user