mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 04:38:03 +00:00
ShareActivity, destruction of RecipientsPanel
// FREEBIE
This commit is contained in:

committed by
Jake McGinty

parent
e2f7c1529a
commit
12dac6ccc3
13
res/drawable/share_list_divider_shape.xml
Normal file
13
res/drawable/share_list_divider_shape.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/conversation_list_item_background_read_light" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:left="73dp" android:right="10dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/conversation_list_divider_light" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
13
res/drawable/share_list_divider_shape_dark.xml
Normal file
13
res/drawable/share_list_divider_shape_dark.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/conversation_list_item_background_read_dark" />
|
||||
</shape>
|
||||
</item>
|
||||
<item android:left="73dp" android:right="10dp">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/conversation_list_divider_dark" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
@@ -6,12 +6,6 @@
|
||||
android:background="?conversation_background"
|
||||
android:orientation="vertical">
|
||||
|
||||
<org.thoughtcrime.securesms.components.RecipientsPanel
|
||||
android:id="@+id/recipients"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/layout_container"
|
||||
android:layout_width="fill_parent"
|
||||
|
13
res/layout/share_activity.xml
Normal file
13
res/layout/share_activity.xml
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/drawer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<fragment android:id="@+id/fragment_content"
|
||||
android:name="org.thoughtcrime.securesms.ShareFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
</LinearLayout>
|
17
res/layout/share_fragment.xml
Normal file
17
res/layout/share_fragment.xml
Normal file
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:scrollbarStyle="insideOverlay"
|
||||
android:fadingEdgeLength="16dip"
|
||||
android:divider="?share_list_item_divider"
|
||||
android:dividerHeight="1px" />
|
||||
|
||||
</LinearLayout>
|
44
res/layout/share_list_item_view.xml
Normal file
44
res/layout/share_list_item_view.xml
Normal file
@@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.thoughtcrime.securesms.ShareListItem
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.thoughtcrime.securesms.components.ForegroundImageView
|
||||
android:id="@+id/contact_photo_image"
|
||||
android:foreground="@drawable/contact_photo_background"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginBottom="3dp"
|
||||
android:layout_marginLeft="10dp"
|
||||
android:layout_marginRight="10dp"
|
||||
android:cropToPadding="true"
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dip"
|
||||
android:layout_marginLeft="4dip"
|
||||
android:layout_marginRight="8dip"
|
||||
android:layout_marginBottom="4dip"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@id/contact_photo_image"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView android:id="@+id/from"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textColor="?attr/conversation_list_item_contact_color"
|
||||
android:singleLine="true"
|
||||
android:gravity="bottom"
|
||||
android:ellipsize="marquee" />
|
||||
|
||||
</LinearLayout>
|
||||
</org.thoughtcrime.securesms.ShareListItem>
|
8
res/menu/share.xml
Normal file
8
res/menu/share.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:title="@string/text_secure_normal__menu_new_message"
|
||||
android:id="@+id/menu_new_message"
|
||||
android:icon="?attr/menu_new_conversation_icon"
|
||||
android:showAsAction="always" />
|
||||
|
||||
</menu>
|
@@ -9,6 +9,8 @@
|
||||
<attr name="conversation_list_item_date_color" format="reference|color"/>
|
||||
<attr name="conversation_list_item_divider" format="reference"/>
|
||||
|
||||
<attr name="share_list_item_divider" format="reference"/>
|
||||
|
||||
<attr name="conversation_sent_card_background" format="reference|color"/>
|
||||
<attr name="conversation_group_member_name" format="reference|color"/>
|
||||
<attr name="conversation_sent_text_primary_color" format="reference|color"/>
|
||||
|
@@ -84,13 +84,12 @@
|
||||
<string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sorry, the selected audio exceeds message size restrictions.</string>
|
||||
<string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Recipient is not a valid SMS or email address!</string>
|
||||
<string name="ConversationActivity_message_is_empty_exclamation">Message is empty!</string>
|
||||
<string name="ConversationActivity_forward_message_prefix">FWD</string>
|
||||
<string name="ConversationActivity_group_conversation_recipients">Group Conversation Recipients</string>
|
||||
<string name="ConversationActivity_group_conversation">Group Conversation</string>
|
||||
<string name="ConversationActivity_unnamed_group">Unnamed Group</string>
|
||||
<string name="ConversationActivity_d_recipients_in_group">%d members</string>
|
||||
<string name="ConversationActivity_d_recipients_in_group_singular">1 member</string>
|
||||
<string name="ConversationActivity_saving_draft">Saving draft...</string>
|
||||
<string name="ConversationActivity_saved_draft">Saved draft</string>
|
||||
<string name="ConversationActivity_invalid_recipient">Invalid recipient!</string>
|
||||
<string name="ConversationActivity_calls_not_supported">Calls Not Supported</string>
|
||||
<string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">This device does not appear to support dial actions.</string>
|
||||
@@ -116,6 +115,9 @@
|
||||
<!-- ConversationListItem -->
|
||||
<string name="ConversationListItem_key_exchange_message">Key exchange message...</string>
|
||||
|
||||
<!-- ShareActivity -->
|
||||
<string name="ShareActivity_share_with">Share with</string>
|
||||
|
||||
<!-- ExportFragment -->
|
||||
<string name="ExportFragment_export_to_sd_card">Export To SD Card?</string>
|
||||
<string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">This
|
||||
|
@@ -14,6 +14,8 @@
|
||||
<item name="conversation_list_item_date_color">#ff999999</item>
|
||||
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
|
||||
|
||||
<item name="share_list_item_divider">@drawable/share_list_divider_shape</item>
|
||||
|
||||
<item name="actionbar_icon">@drawable/actionbar_icon_holo_light</item>
|
||||
<item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
|
||||
|
||||
@@ -87,6 +89,8 @@
|
||||
<item name="conversation_list_item_date_color">#ffdddddd</item>
|
||||
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
|
||||
|
||||
<item name="share_list_item_divider">@drawable/share_list_divider_shape_dark</item>
|
||||
|
||||
<item name="conversation_group_member_name">#99ffffff</item>
|
||||
<item name="conversation_sent_text_primary_color">#ffeeeeee</item>
|
||||
<item name="conversation_sent_text_secondary_color">#44eeeeee</item>
|
||||
|
Reference in New Issue
Block a user