TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-19 13:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust compose field look

Browse Source 
1) Align top of compose bubble with top of attach/send icon

2) Simplify hint

3) Make hint size same as input size

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-04-15 10:12:00 -07:00
parent 5f5db5ded7
commit fe1cc3d6d1
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/layout/conversation_input_panel.xml
View File

@ -24,6 +24,8 @@
<LinearLayout android:id="@+id/compose_bubble" <LinearLayout android:id="@+id/compose_bubble"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@drawable/sent_bubble" android:background="@drawable/sent_bubble"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false"> android:clipToPadding="false">
@ -103,7 +105,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal"
tools:visibility="gone">
<TextView android:id="@+id/record_time" <TextView android:id="@+id/record_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -148,6 +151,7 @@
android:id="@+id/button_toggle" android:id="@+id/button_toggle"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginBottom="1dp"
android:background="@drawable/circle_tintable" android:background="@drawable/circle_tintable"
android:layout_gravity="bottom"> android:layout_gravity="bottom">

6
res/values/strings.xml
View File

@ -745,9 +745,9 @@
<string name="conversation_title_view__conversation_muted">Conversation muted</string> <string name="conversation_title_view__conversation_muted">Conversation muted</string>
<!-- conversation_activity --> <!-- conversation_activity -->
<string name="conversation_activity__type_message_push">Send Signal message</string> <string name="conversation_activity__type_message_push">Signal message</string>
<string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string> <string name="conversation_activity__type_message_sms_insecure">Unsecured SMS</string>
<string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string> <string name="conversation_activity__type_message_mms_insecure">Unsecured MMS</string>
<string name="conversation_activity__from_sim_name">From %1$s</string> <string name="conversation_activity__from_sim_name">From %1$s</string>
<string name="conversation_activity__send">Send</string> <string name="conversation_activity__send">Send</string>
<string name="conversation_activity__remove">Remove</string> <string name="conversation_activity__remove">Remove</string>

7
src/org/thoughtcrime/securesms/components/ComposeText.java
View File

@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
public class ComposeText extends EmojiEditText { public class ComposeText extends EmojiEditText {
private SpannableString hint; private CharSequence hint;
private SpannableString subHint; private SpannableString subHint;
@Nullable private InputPanel.MediaListener mediaListener; @Nullable private InputPanel.MediaListener mediaListener;
@ -70,12 +70,11 @@ public class ComposeText extends EmojiEditText {
} }
public void setHint(@NonNull String hint, @Nullable CharSequence subHint) { public void setHint(@NonNull String hint, @Nullable CharSequence subHint) {
this.hint = new SpannableString(hint); this.hint = hint;
this.hint.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
if (subHint != null) { if (subHint != null) {
this.subHint = new SpannableString(subHint); this.subHint = new SpannableString(subHint);
this.subHint.setSpan(new RelativeSizeSpan(0.8f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE); this.subHint.setSpan(new RelativeSizeSpan(0.5f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
} else { } else {
this.subHint = null; this.subHint = null;
} }