Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply new Signal icons and color palette.

Browse Source
This commit is contained in:
alex-signal
2019-10-07 15:43:36 -03:00
committed by Greyson Parrelli
parent d698d3bd6f
commit 43954a176a
426 changed files with 1545 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/activity_contact_share_edit.xml
+5 -4
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/contact_share_edit_list"
@@ -16,7 +16,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:src="@drawable/ic_send_push_white_24dp"
android:tint="@color/white"
app:srcCompat="@drawable/ic_send_lock_24"
android:layout_margin="@dimen/floating_action_button_margin"/>
</FrameLayout>
res/layout/activity_map_bottom_sheet_view.xml
+1 -1
View File
@@ -19,7 +19,7 @@
app:fabSize="normal"
app:layout_anchor="@id/root_bottom_sheet"
app:layout_anchorGravity="top|end"
app:srcCompat="@drawable/ic_check" />
app:srcCompat="@drawable/ic_check_24" />
<LinearLayout
android:id="@+id/root_bottom_sheet"
res/layout/attachment_type_selector.xml
+1 -1
View File
@@ -217,7 +217,7 @@
android:src="@drawable/ic_keyboard_arrow_down_white_24dp"
android:scaleType="center"
android:contentDescription="@string/attachment_type_selector__drawer_description"
app:circleColor="@color/gray50"/>
app:circleColor="@color/core_grey_50"/>
<TextView android:layout_marginTop="10dp"
android:layout_width="wrap_content"
res/layout/camera_contact_selection_fragment.xml
+2 -1
View File
@@ -112,7 +112,8 @@
android:layout_marginTop="6dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="6dp"
android:src="@drawable/ic_send_push_white_24dp"
android:tint="@color/white"
app:srcCompat="@drawable/ic_send_lock_24"
android:background="@drawable/camera_send_button_background"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="@id/camera_contacts_selected_list"
res/layout/contact_filter_toolbar.xml
+7 -4
View File
@@ -16,7 +16,7 @@
android:layout_weight="1"
android:hint="@string/contact_selection_activity__enter_name_or_number"
android:inputType="textPersonName"
style="@style/TextSecure.TitleTextStyle"
android:textAppearance="@style/TextSecure.TitleTextStyle"
android:background="@android:color/transparent"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
@@ -40,7 +40,8 @@
android:gravity="center_vertical"
android:clickable="true"
android:focusable="true"
android:background="@drawable/circle_touch_highlight_background"
android:tint="?contact_filter_toolbar_icon_tint"
android:background="?actionBarItemBackground"
android:src="@drawable/ic_dialpad_white_24dp" />
<ImageView android:id="@+id/search_keyboard"
@@ -52,7 +53,8 @@
android:clickable="true"
android:visibility="gone"
android:focusable="true"
android:background="@drawable/circle_touch_highlight_background"
android:tint="?contact_filter_toolbar_icon_tint"
android:background="?actionBarItemBackground"
android:src="@drawable/ic_keyboard_white_24dp" />
<ImageView android:id="@+id/search_clear"
@@ -64,7 +66,8 @@
android:clickable="true"
android:visibility="gone"
android:focusable="true"
android:background="@drawable/circle_touch_highlight_background"
android:tint="?contact_filter_toolbar_icon_tint"
android:background="?actionBarItemBackground"
android:src="@drawable/ic_clear_white_24dp" />
</org.thoughtcrime.securesms.components.AnimatingToggle>
res/layout/contact_selection_activity.xml
+1 -1
View File
@@ -11,9 +11,9 @@
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="?attr/actionBarStyle"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:contentInsetStartWithNavigation="0dp"/>
<fragment android:id="@+id/contact_selection_list_fragment"
res/layout/conversation_activity.xml
+3 -2
View File
@@ -14,12 +14,13 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/conversation_list_toolbar_background"
android:theme="?attr/actionBarStyle"
android:theme="@style/TextSecure.DarkActionBar.Conversation"
app:contentInsetStartWithNavigation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="?homeAsUpIndicator"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:contentInsetStart="46dp"
tools:background="#ff007f00">
<include layout="@layout/conversation_title_view" />
res/layout/conversation_fragment.xml
-1
View File
@@ -27,7 +27,6 @@
android:layout_marginTop="8dp"
style="@style/Signal.Text.Caption"
android:textColor="?attr/conversation_item_sticky_date_text_color"
android:textAllCaps="true"
android:background="?attr/conversation_item_sticky_date_background"
android:elevation="9dp"
android:visibility="gone"
res/layout/conversation_input_panel.xml
+5 -3
View File
@@ -88,6 +88,7 @@
android:layout_height="@dimen/conversation_compose_height"
android:layout_gravity="bottom"
android:background="?selectableItemBackgroundBorderless"
android:tint="?icon_tint"
android:contentDescription="@string/conversation_activity__emoji_toggle_description"
android:paddingEnd="6dp" />
@@ -134,7 +135,7 @@
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description"
android:scaleType="fitCenter"
android:tint="?compose_icon_tint"
app:srcCompat="@drawable/ic_camera_filled_24" />
app:srcCompat="?conversation_attach_camera" />
<org.thoughtcrime.securesms.components.MicrophoneRecorderView
android:id="@+id/recorder_view"
@@ -210,12 +211,13 @@
android:background="@drawable/circle_touch_highlight_background"
android:contentDescription="@string/conversation_activity__send"
android:nextFocusLeft="@+id/embedded_text_editor"
android:paddingStart="11dp"
android:paddingStart="6dp"
android:paddingTop="6dp"
android:paddingEnd="6dp"
android:paddingBottom="6dp"
android:scaleType="fitCenter"
android:src="?conversation_transport_sms_indicator" />
android:tint="@color/core_white"
app:srcCompat="?conversation_transport_sms_indicator" />
</org.thoughtcrime.securesms.components.AnimatingToggle>
res/layout/conversation_item_footer.xml
+26 -35
View File
@@ -2,54 +2,43 @@
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical|end"
tools:parentTag="org.thoughtcrime.securesms.components.ConversationItemFooter">
<LinearLayout
android:layout_width="0dp"
<TextView
android:id="@+id/footer_date"
android:autoLink="none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="6dp"
android:orientation="horizontal"
android:gravity="left|start|center_vertical">
android:linksClickable="false"
style="@style/Signal.Text.Caption.MessageSent"
android:textColor="?conversation_item_sent_text_secondary_color"
tools:text="30m"/>
<TextView
android:id="@+id/footer_date"
android:autoLink="none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
style="@style/Signal.Text.Caption.MessageSent"
android:textColor="?conversation_item_sent_text_secondary_color"
android:textAllCaps="true"
tools:text="30 mins"/>
<org.thoughtcrime.securesms.components.ExpirationTimerView
android:id="@+id/footer_expiration_timer"
android:layout_gravity="center_vertical|end"
android:layout_marginStart="6dp"
android:layout_width="12dp"
android:layout_height="12dp"
android:visibility="gone"
tools:visibility="visible"/>
</LinearLayout>
<org.thoughtcrime.securesms.components.ExpirationTimerView
android:id="@+id/footer_expiration_timer"
android:layout_marginStart="4dp"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:visibility="gone"
tools:visibility="visible"/>
<TextView
android:id="@+id/footer_sim_info"
android:autoLink="none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:layout_marginStart="4dp"
android:maxWidth="140dp"
android:maxLines="1"
android:ellipsize="end"
android:linksClickable="false"
style="@style/Signal.Text.Caption.MessageSent"
android:layout_gravity="end|bottom"
android:layout_gravity="center_vertical"
android:fontFamily="sans-serif-light"
android:visibility="gone"
tools:visibility="visible"
@@ -61,14 +50,16 @@
android:layout_height="11dp"
android:src="@drawable/ic_unlocked_white_18dp"
android:visibility="gone"
android:layout_gravity="center_vertical|end"
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:contentDescription="@string/conversation_item__secure_message_description"
tools:visibility="visible"/>
<org.thoughtcrime.securesms.components.DeliveryStatusView
android:id="@+id/footer_delivery_status"
android:layout_width="20dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical" />
android:layout_marginStart="4dp"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</merge>
res/layout/conversation_item_header.xml
-1
View File
@@ -17,7 +17,6 @@
android:gravity="center"
style="@style/Signal.Text.Caption"
android:textColor="?conversation_item_update_text_color"
android:textAllCaps="true"
tools:text="March 1, 2015" />
</LinearLayout>
res/layout/conversation_item_last_seen.xml
+1 -4
View File
@@ -10,9 +10,7 @@
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_marginStart="28dp"
android:layout_marginEnd="28dp"
android:layout_height="1px"
android:layout_marginBottom="3dp"
android:background="?attr/conversation_item_last_seen_line_color" />
@@ -22,7 +20,6 @@
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"
tools:text="3 unread messages" />
res/layout/conversation_item_received.xml
+13 -9
View File
@@ -36,8 +36,9 @@
<FrameLayout
android:id="@+id/contact_photo_container"
android:layout_width="36dp"
android:layout_width="@dimen/conversation_item_avatar_size"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true">
@@ -47,7 +48,8 @@
android:layout_width="@dimen/conversation_item_avatar_size"
android:layout_height="@dimen/conversation_item_avatar_size"
android:cropToPadding="true"
android:contentDescription="@string/conversation_item_received__contact_photo_description" />
android:contentDescription="@string/conversation_item_received__contact_photo_description"
app:fallbackImageSize="small" />
</FrameLayout>
@@ -78,16 +80,16 @@
<TextView
android:id="@+id/group_message_sender"
style="@style/Signal.Text.Preview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4sp"
style="@style/Signal.Text.Preview"
android:fontFamily="sans-serif-medium"
android:textColor="?conversation_item_received_text_primary_color"
android:maxLines="1"
android:ellipsize="end"
tools:visibility="visible"
tools:text="+14152222222"/>
android:maxLines="1"
android:textColor="?conversation_item_received_text_primary_color"
android:textStyle="bold"
tools:text="+14152222222"
tools:visibility="visible" />
<TextView
android:id="@+id/group_message_sender_profile"
@@ -192,12 +194,13 @@
<org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_footer"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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:gravity="end"
android:clipChildren="false"
android:clipToPadding="false"
android:alpha="0.7"
@@ -211,6 +214,7 @@
android:layout_marginTop="6dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:gravity="end"
android:clipChildren="false"
android:clipToPadding="false"
android:visibility="gone"
res/layout/conversation_item_sent.xml
+3 -1
View File
@@ -151,12 +151,13 @@
<org.thoughtcrime.securesms.components.ConversationItemFooter
android:id="@+id/conversation_item_footer"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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:gravity="end"
android:clipChildren="false"
android:clipToPadding="false"
app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
@@ -169,6 +170,7 @@
android:layout_marginTop="6dp"
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:gravity="end"
android:clipChildren="false"
android:clipToPadding="false"
android:visibility="gone"
res/layout/conversation_item_thumbnail.xml
+3 -2
View File
@@ -42,7 +42,8 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
app:footer_text_color="@color/core_white"
app:footer_icon_color="@color/core_white"/>
android:gravity="end"
app:footer_text_color="?attr/conversation_subtitle_color"
app:footer_icon_color="?attr/conversation_subtitle_color"/>
</merge>
res/layout/conversation_item_update.xml
+3 -5
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.conversation.ConversationUpdateItem
xmlns:android="http://schemas.android.com/apk/res/android"
<org.thoughtcrime.securesms.conversation.ConversationUpdateItem xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/conversation_update_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -27,14 +27,13 @@
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="6dp"
android:src="@drawable/ic_timer" />
app:srcCompat="@drawable/ic_timer_24" />
<TextView
android:id="@+id/conversation_update_title"
style="@style/Signal.Text.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="?conversation_item_update_text_color"
tools:text="1 hour" />
@@ -70,7 +69,6 @@
android:gravity="center"
android:linksClickable="false"
android:minWidth="15sp"
android:textAllCaps="true"
android:textColor="?conversation_item_update_text_color"
tools:text="30 min ago" />
res/layout/conversation_list_activity.xml
+32 -20
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@id/container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@id/container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
@@ -16,40 +17,50 @@
android:elevation="4dp"
android:theme="?attr/actionBarStyle">
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView android:id="@+id/toolbar_icon"
android:contentDescription="@string/conversation_list_settings_shortcut"
android:layout_width="48dp"
android:layout_width="58dp"
android:layout_height="48dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:padding="6dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:paddingStart="12dp"
android:paddingEnd="18dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
tools:src="@drawable/ic_contact_picture" />
<TextView android:layout_width="wrap_content"
<TextView android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="25sp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/search_action"
android:layout_marginStart="66dp"
android:textColor="?attr/title_text_color_primary"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginStart="6dp"
app:layout_constraintStart_toEndOf="@id/toolbar_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/search_action"
android:textAlignment="viewStart" />
<ImageView android:id="@+id/search_action"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_search_white_24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?actionBarItemBackground"
app:srcCompat="@drawable/ic_search_24"
android:tint="?icon_tint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:contentDescription="@string/conversation_list_search_description"
android:padding="12dp" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.Toolbar>
@@ -63,6 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/conversation_list_toolbar_background"
android:elevation="4dp"
android:visibility="invisible" />
res/layout/conversation_list_fragment.xml
+3 -2
View File
@@ -76,7 +76,7 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="88dp"
android:contentDescription="@string/conversation_list_fragment__open_camera_description"
android:src="@drawable/ic_camera_filled_24"
app:srcCompat="@drawable/ic_camera_solid_24"
android:tint="?conversation_list_camera_icon_tint"
android:focusable="true"
app:backgroundTint="?conversation_list_camera_button_background"/>
@@ -87,7 +87,8 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:src="@drawable/ic_create_white_24dp"
android:tint="?conversation_list_compose_icon_tint"
app:srcCompat="@drawable/ic_compose_solid_24"
android:focusable="true"
android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
res/layout/conversation_list_item_view.xml
+4 -6
View File
@@ -14,17 +14,17 @@
<FrameLayout
android:id="@+id/avatar_container"
android:layout_width="54dp"
android:layout_width="58dp"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="6dp">
android:layout_marginEnd="2dp">
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image"
android:foreground="@drawable/contact_photo_background"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="52dp"
android:layout_height="52dp"
tools:src="@drawable/ic_contact_picture"
android:contentDescription="@string/conversation_list_item_view__contact_photo_image" />
@@ -132,7 +132,6 @@
android:layout_alignBaseline="@+id/from"
style="@style/Signal.Text.Caption"
android:textColor="?attr/conversation_list_item_date_color"
android:textAllCaps="true"
tools:text="30 mins"
android:singleLine="true"/>
@@ -149,7 +148,6 @@
style="@style/Signal.Text.Caption"
android:text="@string/conversation_list_item_view__archived"
android:textColor="@color/core_white"
android:textAllCaps="true"
android:background="@drawable/archived_indicator_background" />
res/layout/conversation_title_view.xml
+9 -6
View File
@@ -11,17 +11,20 @@
<org.thoughtcrime.securesms.components.AvatarImageView
android:id="@+id/contact_photo_image"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_width="36dp"
android:layout_height="48dp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginEnd="10dp"
android:paddingEnd="8dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:clickable="true"
android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
android:cropToPadding="true"
android:foreground="@drawable/contact_photo_background"
android:transitionName="contact_photo"
app:inverted="true"
app:fallbackImageSize="small"
tools:src="@drawable/ic_contact_picture" />
<LinearLayout
@@ -34,7 +37,7 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/title"
style="@style/TextSecure.TitleTextStyle"
style="@style/TextSecure.TitleTextStyle.Dark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -65,7 +68,7 @@
<TextView
android:id="@+id/verified_subtitle"
style="@style/TextSecure.SubtitleTextStyle"
style="@style/TextSecure.SubtitleTextStyle.Dark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
@@ -78,7 +81,7 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/subtitle"
style="@style/TextSecure.SubtitleTextStyle"
style="@style/TextSecure.SubtitleTextStyle.Dark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|start"
res/layout/conversation_typing_view.xml
+3 -1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<org.thoughtcrime.securesms.components.ConversationTypingView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -15,7 +16,8 @@
android:layout_width="@dimen/conversation_item_avatar_size"
android:layout_height="@dimen/conversation_item_avatar_size"
android:cropToPadding="true"
android:contentDescription="@string/conversation_item_received__contact_photo_description" />
android:contentDescription="@string/conversation_item_received__contact_photo_description"
app:fallbackImageSize="small" />
<FrameLayout
android:id="@+id/typing_bubble"
res/layout/device_add_fragment.xml
+1 -1
View File
@@ -37,7 +37,7 @@
android:src="@drawable/ic_devices_white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/gray27"
android:tint="@color/core_grey_25"
android:transitionName="devices"
android:layout_marginBottom="16dp"/>
res/layout/device_link_fragment.xml
+1 -1
View File
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_devices_white"
android:transitionName="devices"
android:tint="@color/gray27"
android:tint="@color/core_grey_25"
android:layout_marginBottom="25dp"
android:contentDescription="@string/device_link_fragment__link_device"/>
res/layout/document_view.xml
-1
View File
@@ -60,7 +60,6 @@
android:textAlignment="center"
android:scaleType="centerInside"
style="@style/Signal.Text.Caption"
android:textAllCaps="true"
android:textSize="10sp"
android:textColor="@color/core_black"
tools:visibility="visible"
res/layout/expiration_timer_menu.xml
+9 -7
View File
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
xmlns:app="http://schemas.android.com/apk/res-auto"
style="?android:attr/actionButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:focusable="true"
android:gravity="center">
<ImageView
android:id="@+id/menu_badge_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:src="@drawable/ic_timer"
app:srcCompat="@drawable/ic_timer_24"
android:tint="@color/transparent_white_80"
android:scaleType="fitCenter"/>
<TextView
res/layout/giphy_activity.xml
+5 -1
View File
@@ -25,10 +25,14 @@
app:layout_scrollFlags="scroll|enterAlways"/>
<com.google.android.material.tabs.TabLayout
app:tabBackground="@null"
app:tabTextColor="?conversation_subtitle_color"
app:tabSelectedTextColor="?conversation_title_color"
app:tabIndicatorColor="?conversation_title_color"
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarTabBarStyle"
android:theme="@style/TextSecure.Conversation.TabBar"
android:scrollbars="horizontal"/>
</com.google.android.material.appbar.AppBarLayout>
res/layout/giphy_activity_toolbar.xml
+6 -4
View File
@@ -14,7 +14,8 @@
android:gravity="center_vertical"
android:clickable="true"
android:background="@drawable/circle_touch_highlight_background"
android:src="@drawable/ic_search_white_24dp" />
android:tint="?conversation_subtitle_color"
app:srcCompat="@drawable/ic_search_24" />
<LinearLayout android:id="@+id/toggle_container"
android:layout_width="match_parent"
@@ -27,8 +28,8 @@
android:layout_weight="1"
android:layout_marginStart="5dp"
android:hint="@string/giphy_activity_toolbar__search_gifs_and_stickers"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textColor="?conversation_title_color"
android:textColorHint="?conversation_subtitle_color"
android:textCursorDrawable="@null"
android:maxLines="1"
android:singleLine="true"
@@ -47,7 +48,8 @@
android:focusable="true"
android:visibility="invisible"
android:background="@drawable/circle_touch_highlight_background"
android:src="@drawable/ic_clear_white_24dp" />
android:tint="?conversation_subtitle_color"
app:srcCompat="@drawable/ic_x" />
<org.thoughtcrime.securesms.components.AnimatingToggle
android:id="@+id/button_toggle"
res/layout/invite_activity.xml
+30 -11
View File
@@ -1,13 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.appcompat.widget.Toolbar
style="@style/TextSecure.HighlightActionBar"
android:theme="@style/TextSecure.HighlightActionBar"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextAppearance="@style/TextSecure.TitleTextStyle.Conversation"
app:subtitleTextAppearance="@style/TextSecure.SubtitleTextStyle.Conversation"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ScrollView android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:fillViewport="true"
android:clickable="false">
android:clickable="false"
app:layout_constraintTop_toBottomOf="@id/toolbar"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout android:layout_gravity="center"
android:layout_height="wrap_content"
@@ -63,7 +79,7 @@
tools:ignore="ButtonStyle" />
<Button android:id="@+id/sms_button"
android:drawableStart="@drawable/ic_message_black_18dp"
android:drawableStart="@drawable/ic_message_solid_24"
android:drawablePadding="10dp"
android:text="@string/InviteActivity_choose_contacts"
android:layout_width="wrap_content"
@@ -76,10 +92,12 @@
<LinearLayout android:id="@+id/sms_send_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone">
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar">
<org.thoughtcrime.securesms.components.ContactFilterToolbar
android:id="@+id/contact_filter"
@@ -88,7 +106,8 @@
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/TextSecure.LightActionBar" />
app:searchTextStyle="@style/TextSecure.TitleTextStyle.Light"
android:theme="@style/TextSecure.HighlightActionBar" />
<fragment android:id="@+id/contact_selection_list_fragment"
android:layout_width="match_parent"
@@ -119,4 +138,4 @@
</LinearLayout>
</LinearLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
res/layout/link_preview.xml
+1 -2
View File
@@ -48,7 +48,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="2dp"
android:textAllCaps="true"
android:textColor="?linkpreview_secondary_text_color"
app:layout_constraintStart_toEndOf="@+id/linkpreview_thumbnail"
app:layout_constraintTop_toBottomOf="@+id/linkpreview_title"
@@ -76,7 +75,7 @@
android:layout_marginEnd="6dp"
android:layout_marginTop="4dp"
android:src="@drawable/ic_close_white_18dp"
android:tint="@color/gray70"
android:tint="@color/core_grey_70"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
res/layout/longmessage_bubble_sent.xml
+1
View File
@@ -33,6 +33,7 @@
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:layout_gravity="end"
android:clipChildren="false"
android:clipToPadding="false"
app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
res/layout/media_keyboard.xml
+1 -1
View File
@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:padding="6dp"
android:src="@drawable/ic_search_white_24dp"
app:srcCompat="@drawable/ic_search_24"
android:tint="?media_keyboard_button_color"
android:background="?selectableItemBackgroundBorderless"
android:visibility="invisible"
res/layout/media_preview_activity.xml
+1 -1
View File
@@ -6,7 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray95">
android:background="@color/core_grey_95">
<org.thoughtcrime.securesms.components.viewpager.HackyViewPager
android:id="@+id/media_pager"
res/layout/mediapicker_folder_fragment.xml
+4 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
@@ -12,7 +12,8 @@
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="?attr/conversation_list_toolbar_background"
android:theme="?attr/actionBarStyle" />
android:theme="?attr/actionBarStyle"
app:navigationIcon="@drawable/ic_arrow_left_24"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mediapicker_folder_list"
res/layout/mediapicker_media_item.xml
+1 -1
View File
@@ -47,7 +47,7 @@
android:id="@+id/mediapicker_select_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent_black_90" />
android:background="@color/transparent_black_60" />
<FrameLayout
android:id="@+id/mediapicker_select_on"
res/layout/mediasend_activity.xml
+3 -2
View File
@@ -25,7 +25,7 @@
android:layout_gravity="bottom"
android:orientation="vertical"
android:clickable="true"
android:background="@color/transparent_black_70">
android:background="@color/transparent_black_40">
<org.thoughtcrime.securesms.components.emoji.EmojiEditText
android:id="@+id/mediasend_caption"
@@ -129,7 +129,8 @@
android:paddingStart="11dp"
android:scaleType="fitCenter"
android:contentDescription="@string/conversation_activity__send"
android:src="?conversation_transport_sms_indicator"
android:tint="@color/white"
app:srcCompat="?conversation_transport_sms_indicator"
android:background="@drawable/circle_touch_highlight_background" />
</FrameLayout>
res/layout/microphone_recorder_view.xml
+2 -2
View File
@@ -14,7 +14,7 @@
android:contentDescription="@string/conversation_activity__quick_attachment_drawer_record_and_send_audio_description"
android:scaleType="fitCenter"
android:tint="?compose_icon_tint"
app:srcCompat="@drawable/ic_mic_filled_24" />
app:srcCompat="?quick_mic_icon" />
<LinearLayout
android:id="@+id/lock_drop_target"
@@ -59,7 +59,7 @@
android:clickable="false"
android:visibility="gone"
android:tint="@color/core_white"
app:srcCompat="@drawable/ic_mic_filled_24"
app:srcCompat="?quick_mic_icon"
tools:ignore="ContentDescription"
tools:visibility="visible" />
</merge>
res/layout/profile_create_activity.xml
+2 -2
View File
@@ -57,7 +57,7 @@
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_profile_default"
app:srcCompat="@drawable/ic_profile_outline_40"
android:tint="@color/core_grey_60"
android:transitionName="avatar"
app:layout_constraintBottom_toBottomOf="@+id/avatar_background"
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/profile_create_activity__set_later"
android:textColor="@color/gray50" />
android:textColor="@color/core_grey_50" />
<org.thoughtcrime.securesms.components.emoji.MediaKeyboard
android:id="@+id/emoji_drawer"
res/layout/profile_preference_view.xml
+4 -1
View File
@@ -21,14 +21,17 @@
android:id="@+id/profile_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textSize="20sp"
android:textAlignment="viewStart"
android:textStyle="bold"
android:textColor="?attr/title_text_color_primary"
tools:text="Voltarine DeClyre"/>
<TextView android:id="@+id/number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/title_text_color_secondary"
android:textSize="14sp"
tools:text="+14151231234"/>
</LinearLayout>
res/layout/push_recipients_panel.xml
+2 -1
View File
@@ -17,7 +17,8 @@
android:layout_width="fill_parent"/>
<ImageButton android:id="@+id/contacts_button"
android:background="#00000000"
android:background="?actionBarItemBackground"
android:tint="?icon_tint"
android:layout_width="40dp"
android:layout_height="35dp"
android:layout_marginEnd="5dp"
res/layout/quote_view.xml
+1 -1
View File
@@ -178,6 +178,6 @@
android:layout_gravity="top|end"
android:background="@drawable/dismiss_background"
android:src="@drawable/ic_close_white_18dp"
android:tint="@color/gray70" />
android:tint="@color/core_grey_70" />
</merge>
res/layout/recipient_preference_activity.xml
+3 -2
View File
@@ -11,7 +11,7 @@
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_width="match_parent"
android:layout_height="300dp"
android:background="@color/transparent">
@@ -46,9 +46,10 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/TextSecure.LightActionBar"
android:background="@color/transparent"
android:layout_marginTop="24dp"
android:theme="@style/TextSecure.DarkActionBar.Conversation"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:layout_collapseMode="pin" >
</androidx.appcompat.widget.Toolbar>
res/layout/recipient_preference_contact_widget.xml
+6 -5
View File
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_message_white_24dp"
app:srcCompat="?attr/message_icon"
android:layout_marginEnd="20dp"/>
<ImageView android:id="@+id/call"
res/layout/recording_layout.xml
+1 -3
View File
@@ -19,7 +19,7 @@
android:importantForAccessibility="no"
android:tint="@color/red_500"
android:visibility="invisible"
app:srcCompat="@drawable/ic_mic_filled_24"
app:srcCompat="@drawable/ic_mic_solid_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -52,7 +52,6 @@
android:gravity="center_vertical"
android:padding="4dp"
android:text="@string/conversation_input_panel__cancel"
android:textAllCaps="true"
android:textColor="@color/red_500"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@@ -79,7 +78,6 @@
android:ellipsize="none"
android:gravity="center_vertical"
android:text="@string/conversation_input_panel__slide_to_cancel"
android:textAllCaps="true"
android:textColor="@color/core_grey_60"
android:visibility="gone"
tools:visibility="visible" />
res/layout/search_toolbar.xml
+5 -5
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
tools:parentTag="android.widget.LinearLayout"
tools:orientation="vertical">
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content"
android:layout_width="match_parent"
tools:parentTag="android.widget.LinearLayout"
tools:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
res/layout/share_activity.xml
+3 -4
View File
@@ -13,8 +13,6 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="?attr/actionBarStyle">
<RelativeLayout
@@ -24,7 +22,7 @@
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ShareActivity_share_with"
android:textColor="@color/white"
android:textColor="?attr/title_text_color_primary"
android:textSize="20sp"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
@@ -33,7 +31,8 @@
<ImageView android:id="@+id/search_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_search_white_24dp"
wheel:srcCompat="@drawable/ic_search_24"
android:tint="?icon_tint"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/>
res/layout/shared_contact_view.xml
+1
View File
@@ -62,6 +62,7 @@
android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
android:layout_marginTop="4dp"
android:layout_gravity="end"
android:elevation="9dp"
android:orientation="horizontal" />
res/layout/sticker_keyboard_icon_dark.xml
+1 -1
View File
@@ -10,6 +10,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_sticker_filled" />
app:srcCompat="@drawable/ic_sticker_solid_24" />
</FrameLayout>
res/layout/sticker_keyboard_icon_dark_selected.xml
+1 -1
View File
@@ -11,6 +11,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_sticker_filled" />
app:srcCompat="@drawable/ic_sticker_solid_24" />
</FrameLayout>
res/layout/sticker_keyboard_icon_light.xml
+1 -1
View File
@@ -10,6 +10,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_sticker_outline" />
app:srcCompat="@drawable/ic_sticker_outline_24" />
</FrameLayout>
res/layout/sticker_keyboard_icon_light_selected.xml
+1 -1
View File
@@ -11,6 +11,6 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_sticker_outline" />
app:srcCompat="@drawable/ic_sticker_outline_24" />
</FrameLayout>
res/layout/transport_selection_list_item.xml
+3 -1
View File
@@ -15,7 +15,9 @@
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"
android:tint="@color/white"
tools:src="@drawable/ic_send_lock_24"
tools:tint="@color/white"
tools:backgroundTint="@color/textsecure_primary" />
<LinearLayout android:orientation="vertical"
res/layout/verify_display_fragment.xml
+1 -1
View File
@@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="35dp"
android:textColor="@color/gray50"
android:textColor="@color/core_grey_50"
android:textSize="11sp"
android:visibility="invisible"
android:text="@string/verify_display_fragment__tap_to_scan"/>
res/layout/webrtc_answer_decline_button.xml
+6 -6
View File
@@ -17,7 +17,7 @@
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
android:tint="@color/gray20"
android:tint="@color/core_grey_20"
tools:alpha="1" />
<ImageView
@@ -29,7 +29,7 @@
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
android:tint="@color/gray20"
android:tint="@color/core_grey_20"
tools:alpha="1" />
<ImageView
@@ -41,7 +41,7 @@
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
android:tint="@color/gray20"
android:tint="@color/core_grey_20"
tools:alpha="1" />
<ImageView
@@ -53,7 +53,7 @@
android:alpha="0"
android:importantForAccessibility="no"
android:src="@drawable/ic_keyboard_arrow_up_white_36dp"
android:tint="@color/gray20"
android:tint="@color/core_grey_20"
tools:alpha="1" />
<TextView
@@ -67,7 +67,7 @@
android:shadowDy="2"
android:shadowRadius="4"
android:text="@string/webrtc_answer_decline_button__swipe_up_to_answer"
android:textColor="@color/gray20"
android:textColor="@color/core_grey_20"
android:textStyle="italic" />
<ImageView
@@ -93,7 +93,7 @@
android:shadowDy="2"
android:shadowRadius="4"
android:text="@string/webrtc_answer_decline_button__swipe_down_to_reject"
android:textColor="@color/gray20"
android:textColor="@color/core_grey_20"
android:textStyle="italic" />
</merge>