TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 05:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transport options removed. Conversation activity cleanup.

Browse Source
This commit is contained in:
Anton Chekulaev
2020-12-07 17:40:47 +11:00
parent 66aec427d4
commit 30af903572
19 changed files with 156 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/conversation_input_panel.xml
View File

@@ -193,7 +193,7 @@
android:contentDescription="@string/ConversationActivity_add_attachment"
android:nextFocusLeft="@+id/embedded_text_editor" />
<org.thoughtcrime.securesms.components.SendButton
<ImageButton
android:id="@+id/send_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -201,7 +201,7 @@
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" />
android:background="@drawable/circle_touch_highlight_background"/>
</org.thoughtcrime.securesms.components.AnimatingToggle>

66
app/src/main/res/layout/experience_upgrade_preference_fragment.xml
View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="#FF2090ea">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/blurb"
android:textSize="@dimen/onboarding_title_size"
android:textIsSelectable="false"
android:gravity="center_horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:fontFamily="sans-serif-light"
android:text="@string/experience_upgrade_preference_fragment__read_receipts_are_here"
android:layout_marginTop="20dp"
android:textColor="@android:color/white" />
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp">
<ImageView android:layout_width="170dp"
android:layout_height="170dp"
android:src="@drawable/circle_tintable"
android:scaleType="fitCenter"/>
<ImageView android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
app:srcCompat="@drawable/read_receipt_vector"/>
</FrameLayout>
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/subblurb"
android:textSize="@dimen/onboarding_subtitle_size"
android:textIsSelectable="false"
android:gravity="center_horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:fontFamily="sans-serif-light"
android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
android:textColor="@android:color/white" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/preference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:enabled="true"
android:checked="true"
android:text="@string/experience_upgrade_preference_fragment__enable_read_receipts"
android:textSize="20sp"
android:textColor="@android:color/white"
app:theme="@style/Color1SwitchStyle"/>
</LinearLayout>

8
app/src/main/res/layout/mediasend_fragment.xml
View File

@@ -114,18 +114,16 @@
android:layout_width="@dimen/conversation_compose_height"
android:layout_height="@dimen/conversation_compose_height"
android:layout_marginStart="12dp"
android:layout_gravity="bottom"
android:background="@drawable/circle_tintable"
tools:backgroundTint="@color/core_blue">
android:layout_gravity="bottom">
<org.thoughtcrime.securesms.components.SendButton
<ImageButton
android:id="@+id/mediasend_send_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:contentDescription="@string/conversation_activity__send"
android:src="?conversation_transport_sms_indicator"
android:background="@drawable/circle_touch_highlight_background" />
android:background="@drawable/circle_touch_highlight_background"/>
</FrameLayout>

44
app/src/main/res/layout/transport_selection_list_item.xml
View File

@@ -1,44 +0,0 @@
<?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"
android:gravity="center_vertical"
android:paddingStart="10dp"
android:paddingEnd="10dp">
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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" />
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingStart="10dp">
<TextView android:id="@+id/text"
android:fontFamily="sans-serif-light"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="TextSecure" />
<TextView android:id="@+id/subtext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textSize="12dp"
android:visibility="gone"
tools:text="From Home"
tools:visibility="visible"/>
</LinearLayout>
</LinearLayout>