oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

WIP

This commit is contained in:
Niels Andriesse 2020-01-14 12:19:28 +11:00
parent 082b288301
commit 7d21e98ced
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
res/layout/attachment_type_selector.xml
View File

@ -16,15 +16,19 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="?attachment_type_selector_background">
<org.thoughtcrime.securesms.components.RecentPhotoViewRail
android:id="@+id/recent_photos"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_height="72dp"
android:padding="4dp"/>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
@ -43,8 +47,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/gallery_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:src="@drawable/ic_image_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__gallery_description"
@ -67,14 +71,15 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/camera_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:src="@drawable/ic_camera_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__camera_description"
app:circleColor="@color/green_400"/>
<TextView android:layout_marginTop="10dp"
<TextView
android:layout_marginTop="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
@ -93,8 +98,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/audio_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:contentDescription="@string/attachment_type_selector__audio_description"
android:scaleType="center"
android:src="@drawable/ic_headset_white_24dp"
@ -118,8 +123,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/document_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:contentDescription="@string/attachment_type_selector__file_description"
android:scaleType="center"
android:src="@drawable/ic_insert_drive_file_white_24dp"
@ -144,8 +149,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/contact_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:src="@drawable/ic_person_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__contact_description"
@ -183,8 +188,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/location_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:contentDescription="@string/attachment_type_selector__location_description"
android:scaleType="center"
android:src="@drawable/ic_location_on_white_24dp"
@ -208,8 +213,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/giphy_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:src="@drawable/ic_gif_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__gif_description"
@ -233,8 +238,8 @@
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/close_button"
android:layout_width="53dp"
android:layout_height="53dp"
android:layout_width="42dp"
android:layout_height="42dp"
android:paddingTop="4dp"
android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
android:scaleType="center"
@ -252,6 +257,11 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>

4
res/values/strings.xml
View File

@ -388,8 +388,8 @@
<string name="GroupMembersDialog_me">Me</string>
<!-- CropImageActivity -->
<string name="CropImageActivity_group_avatar">Group avatar</string>
<string name="CropImageActivity_profile_avatar">Avatar</string>
<string name="CropImageActivity_group_avatar">Group Photo</string>
<string name="CropImageActivity_profile_avatar">Photo</string>
<!-- InputPanel -->
<string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tap and hold to record a voice message, release to send</string>

5
src/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@ -470,7 +470,10 @@ public class ConversationItem extends LinearLayout
bodyText.setClickable(false);
bodyText.setFocusable(false);
bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
bodyBubble.setPadding(0, 0, 0, 0);
if (messageRecord.isOutgoing() && !isCaptionlessMms(messageRecord)) {
bodyBubble.setPadding(0, 0, 0, (int) getResources().getDimension(R.dimen.medium_spacing));
}
if (isCaptionlessMms(messageRecord)) {
bodyText.setVisibility(View.GONE);
} else {