TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 19:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-15 12:20:10 +11:00
parent 23336cc2ea
commit bfb6435d72
16 changed files with 130 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-sw420dp/attachment_type_selector.xml
View File

@@ -34,8 +34,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:weightSum="3">
<LinearLayout

2
res/layout/attachment_type_selector.xml
View File

@@ -34,8 +34,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:weightSum="3">
<LinearLayout

5
res/layout/conversation_fragment.xml
View File

@@ -49,7 +49,10 @@
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_gravity="bottom|end"
android:background="@drawable/scroll_to_bottom_button_background"
android:padding="@dimen/small_spacing"
android:paddingLeft="@dimen/small_spacing"
android:paddingTop="10dp"
android:paddingRight="@dimen/small_spacing"
android:paddingBottom="6dp"
android:tint="@color/text"
android:elevation="10dp"
android:contentDescription="@string/conversation_fragment__scroll_to_the_bottom_content_description"

15
res/layout/conversation_item_last_seen.xml
View File

@@ -10,11 +10,11 @@
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginStart="28dp"
android:layout_marginEnd="28dp"
android:layout_marginBottom="3dp"
android:background="?attr/conversation_item_last_seen_line_color" />
android:layout_height="1dp"
android:layout_marginStart="@dimen/large_spacing"
android:layout_marginEnd="@dimen/large_spacing"
android:layout_marginBottom="4dp"
android:background="@color/text" />
<TextView
android:id="@+id/text"
@@ -22,9 +22,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
style="@style/Signal.Text.Caption"
android:textAllCaps="true"
android:fontFamily="sans-serif-medium"
android:textColor="?attr/conversation_item_last_seen_text_color"
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
tools:text="3 unread messages" />
</LinearLayout>

37
res/layout/conversation_item_received.xml
View File

@@ -25,8 +25,8 @@
<RelativeLayout
android:id="@+id/contact_photo_container"
android:layout_width="@dimen/small_profile_picture_size"
android:layout_height="wrap_content"
android:layout_width="36dp"
android:layout_height="42dp"
android:layout_alignParentStart="true">
<org.thoughtcrime.securesms.loki.redesign.views.ProfilePictureView
@@ -37,9 +37,8 @@
<ImageView
android:id="@+id/moderator_icon_image_view"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="1.5dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/icon_crown"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" />
@@ -61,6 +60,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/message_bubble_edge_margin"
android:layout_marginStart="@dimen/large_spacing"
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
android:orientation="vertical"
android:clipToPadding="false"
android:clipChildren="false"
@@ -71,9 +72,8 @@
android:id="@+id/group_sender_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="2dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:orientation="horizontal"
android:visibility="gone"
@@ -87,6 +87,8 @@
style="@style/Signal.Text.Preview"
android:fontFamily="sans-serif-medium"
android:textColor="?conversation_item_received_text_primary_color"
android:textSize="@dimen/small_font_size"
android:alpha="0.6"
android:maxLines="1"
android:ellipsize="end"
tools:visibility="visible"
@@ -112,13 +114,13 @@
android:id="@+id/quote_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_marginStart="@dimen/large_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginEnd="@dimen/large_spacing"
android:visibility="gone"
app:message_type="incoming"
app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
app:quote_colorPrimary="@color/text"
app:quote_colorSecondary="@color/text"
tools:visibility="visible"/>
<ViewStub
@@ -152,9 +154,8 @@
android:layout="@layout/conversation_item_received_audio"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="6dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
<ViewStub
@@ -162,8 +163,7 @@
android:layout="@layout/conversation_item_received_document"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
@@ -171,8 +171,6 @@
android:id="@+id/conversation_item_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
style="@style/Signal.Text.Body"
@@ -187,10 +185,9 @@
android:id="@+id/conversation_item_footer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-4dp"
android:layout_marginTop="4dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:clipChildren="false"
android:clipToPadding="false"
android:alpha="0.6"

19
res/layout/conversation_item_sent.xml
View File

@@ -37,6 +37,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginStart="@dimen/message_bubble_edge_margin"
android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
android:layout_gravity="end"
android:clipToPadding="false"
@@ -48,13 +49,13 @@
android:id="@+id/quote_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_marginStart="@dimen/large_spacing"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginEnd="@dimen/large_spacing"
android:visibility="gone"
app:message_type="outgoing"
app:quote_colorPrimary="?attr/conversation_item_quote_text_color"
app:quote_colorSecondary="?attr/conversation_item_quote_text_color"
app:quote_colorPrimary="@color/text"
app:quote_colorSecondary="@color/text"
tools:visibility="visible"/>
<ViewStub
@@ -62,7 +63,7 @@
android:layout="@layout/conversation_item_sent_shared_contact"
android:layout_width="@dimen/media_bubble_default_dimens"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="@dimen/medium_spacing"
android:visibility="gone"/>
<ViewStub
@@ -88,8 +89,8 @@
android:layout="@layout/conversation_item_sent_audio"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="6dp"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
<ViewStub
@@ -97,16 +98,14 @@
android:layout="@layout/conversation_item_sent_document"
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/message_bubble_top_padding"
android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/medium_spacing"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/conversation_item_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
style="@style/Signal.Text.Body"

17
res/layout/quote_view.xml
View File

@@ -23,7 +23,7 @@
<ImageView
android:id="@+id/quote_bar"
android:layout_width="@dimen/quote_corner_radius_bottom"
android:layout_width="@dimen/accent_line_thickness"
android:layout_height="match_parent"
android:src="@color/white"
tools:tint="@color/purple_400" />
@@ -43,8 +43,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Signal.Text.Caption"
android:textColor="@color/core_black"
android:textStyle="bold"
android:textColor="@color/text"
android:fontFamily="sans-serif-medium"
android:textSize="@dimen/small_font_size"
android:maxLines="1"
android:ellipsize="end"
tools:text="Peter Parker" />
@@ -71,7 +72,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/Signal.Text.Body"
android:textColor="@color/core_grey_90"
android:textColor="@color/text"
android:textSize="@dimen/medium_font_size"
android:maxLines="1"
android:ellipsize="end"
tools:text="The-Amazing-Spider-Man.cba" />
@@ -95,6 +97,7 @@
android:id="@+id/quote_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
style="@style/Signal.Text.Body"
android:ellipsize="end"
android:maxLines="2"
@@ -154,7 +157,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_broken_link"
android:tint="?attr/quote_missing_icon_color"/>
android:tint="@color/text"/>
<TextView
android:id="@+id/quote_missing_text"
@@ -162,7 +165,7 @@
android:layout_height="wrap_content"
style="@style/Signal.Text.Caption"
android:text="@string/QuoteView_original_missing"
android:textColor="@color/core_grey_90"/>
android:textColor="@color/text"/>
</LinearLayout>
@@ -178,6 +181,6 @@
android:layout_gravity="top|end"
android:background="@drawable/dismiss_background"
android:src="@drawable/ic_close_white_18dp"
android:tint="@color/gray70" />
android:tint="#99FFFFFF" />
</merge>

1
res/values/colors.xml
View File

@@ -24,6 +24,7 @@
<color name="compose_text_view_background">#141414</color>
<color name="received_message_background">#222325</color>
<color name="sent_message_background">#3F4146</color>
<color name="quote_not_found_background">#99FFFFFF</color>
<!-- Session -->
<!-- Loki -->

4
res/values/dimens.xml
View File

@@ -110,8 +110,8 @@
<dimen name="conversation_item_avatar_size">36dp</dimen>
<dimen name="quote_corner_radius_large">10dp</dimen>
<dimen name="quote_corner_radius_bottom">4dp</dimen>
<dimen name="quote_corner_radius_preview">18dp</dimen>
<dimen name="quote_corner_radius_bottom">2dp</dimen>
<dimen name="quote_corner_radius_preview">16dp</dimen>
<integer name="media_overview_cols">3</integer>
<dimen name="message_details_table_row_pad">10dp</dimen>