BIN
res/drawable-hdpi/ic_archive_white_24dp.png
Normal file
After Width: | Height: | Size: 247 B |
BIN
res/drawable-hdpi/ic_unarchive_white_24dp.png
Normal file
After Width: | Height: | Size: 258 B |
BIN
res/drawable-hdpi/ic_unarchive_white_36dp.png
Normal file
After Width: | Height: | Size: 354 B |
BIN
res/drawable-mdpi/ic_archive_white_24dp.png
Normal file
After Width: | Height: | Size: 181 B |
BIN
res/drawable-mdpi/ic_unarchive_white_24dp.png
Normal file
After Width: | Height: | Size: 181 B |
BIN
res/drawable-mdpi/ic_unarchive_white_36dp.png
Normal file
After Width: | Height: | Size: 258 B |
11
res/drawable-v21/conversation_list_item_read_background.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="@color/textsecure_primary">
|
||||
<item android:id="@android:id/mask" android:drawable="@android:color/black" />
|
||||
<item>
|
||||
<selector>
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
|
||||
<item android:drawable="@color/conversation_list_item_background_read_light" />
|
||||
</selector>
|
||||
</item>
|
||||
</ripple>
|
@@ -5,6 +5,7 @@
|
||||
<item>
|
||||
<selector>
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
|
||||
<item android:drawable="@color/conversation_list_item_background_read_dark" />
|
||||
</selector>
|
||||
</item>
|
||||
</ripple>
|
BIN
res/drawable-xhdpi/ic_archive_white_24dp.png
Normal file
After Width: | Height: | Size: 267 B |
BIN
res/drawable-xhdpi/ic_unarchive_white_24dp.png
Normal file
After Width: | Height: | Size: 273 B |
BIN
res/drawable-xhdpi/ic_unarchive_white_36dp.png
Normal file
After Width: | Height: | Size: 391 B |
BIN
res/drawable-xxhdpi/ic_archive_white_24dp.png
Normal file
After Width: | Height: | Size: 390 B |
BIN
res/drawable-xxhdpi/ic_unarchive_white_24dp.png
Normal file
After Width: | Height: | Size: 391 B |
BIN
res/drawable-xxhdpi/ic_unarchive_white_36dp.png
Normal file
After Width: | Height: | Size: 600 B |
BIN
res/drawable-xxxhdpi/ic_archive_white_24dp.png
Normal file
After Width: | Height: | Size: 489 B |
BIN
res/drawable-xxxhdpi/ic_archive_white_36dp.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-xxxhdpi/ic_archive_white_48dp.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
res/drawable-xxxhdpi/ic_unarchive_white_24dp.png
Normal file
After Width: | Height: | Size: 503 B |
BIN
res/drawable-xxxhdpi/ic_unarchive_white_36dp.png
Normal file
After Width: | Height: | Size: 753 B |
6
res/drawable/conversation_list_item_read_background.xml
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
|
||||
<item android:drawable="@color/conversation_list_item_background_read_light" />
|
||||
</selector>
|
@@ -2,4 +2,5 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
|
||||
<item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
|
||||
<item android:drawable="@color/conversation_list_item_background_read_dark" />
|
||||
</selector>
|
7
res/drawable/rounded_rectangle.xml
Normal file
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
|
||||
<solid android:color="@color/transparent"/>
|
||||
<stroke android:width="1dp" android:color="#ffbbbbbb"/>
|
||||
<corners android:radius="5dp"/>
|
||||
<padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp"/>
|
||||
</shape>
|
@@ -8,7 +8,6 @@
|
||||
android:layout_height="?android:attr/listPreferredItemHeight"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical"
|
||||
android:background="@drawable/conversation_list_item_background"
|
||||
android:paddingLeft="48dp"
|
||||
android:paddingRight="20dp">
|
||||
|
||||
@@ -18,7 +17,7 @@
|
||||
android:layout_height="40dp"
|
||||
android:foreground="@drawable/contact_photo_background"
|
||||
android:cropToPadding="true"
|
||||
tools:src="@color/md_material_blue_600"
|
||||
tools:src="@color/blue_600"
|
||||
android:layout_marginRight="10dp"
|
||||
android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
|
||||
|
||||
|
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<android.support.design.widget.CoordinatorLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:fab="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="fill_parent"
|
||||
@@ -27,7 +28,7 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.melnykov.fab.FloatingActionButton
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -35,9 +36,6 @@
|
||||
android:layout_margin="16dp"
|
||||
android:src="@drawable/ic_create_white_24dp"
|
||||
android:focusable="true"
|
||||
android:contentDescription="@string/conversation_list_fragment__fab_content_description"
|
||||
fab:fab_colorNormal="?fab_color"
|
||||
fab:fab_colorPressed="@color/textsecure_primary_dark"
|
||||
fab:fab_colorRipple="@color/textsecure_primary_dark" />
|
||||
android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
|
||||
|
||||
</FrameLayout>
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
|
17
res/layout/conversation_list_item_action.xml
Normal file
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<org.thoughtcrime.securesms.ConversationListItemAction
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp">
|
||||
|
||||
<TextView android:id="@+id/description"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="Archived conversations (2)"/>
|
||||
|
||||
</org.thoughtcrime.securesms.ConversationListItemAction>
|
@@ -4,7 +4,6 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:background="@drawable/conversation_list_item_background"
|
||||
android:layout_height="70dp">
|
||||
|
||||
<org.thoughtcrime.securesms.components.AvatarImageView
|
||||
@@ -62,6 +61,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/from"
|
||||
android:layout_toRightOf="@id/error"
|
||||
android:layout_toLeftOf="@+id/archived"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?attr/conversation_list_item_subject_color"
|
||||
android:fontFamily="sans-serif-light"
|
||||
@@ -98,5 +98,19 @@
|
||||
tools:text="30 mins"
|
||||
android:singleLine="true"/>
|
||||
|
||||
<TextView android:id="@+id/archived"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/date"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignBaseline="@id/subject"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:text="@string/conversation_list_item_view__archived"
|
||||
android:textColor="#ffbbbbbb"
|
||||
android:background="@drawable/rounded_rectangle"
|
||||
android:textSize="12sp"
|
||||
/>
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
</org.thoughtcrime.securesms.ConversationListItem>
|
||||
|
@@ -7,9 +7,6 @@
|
||||
<item android:title="@string/conversation__menu_view_media"
|
||||
android:id="@+id/menu_view_media" />
|
||||
|
||||
<item android:title="@string/conversation__menu_delete_thread"
|
||||
android:id="@+id/menu_delete_thread" />
|
||||
|
||||
<item android:title="@string/conversation__menu_conversation_settings"
|
||||
android:id="@+id/menu_conversation_settings"/>
|
||||
|
||||
|
@@ -5,10 +5,11 @@
|
||||
<item android:title="@string/conversation_list_batch__menu_delete_selected"
|
||||
android:id="@+id/menu_delete_selected"
|
||||
android:icon="?menu_trash_icon"
|
||||
app:showAsAction="ifRoom" />
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item android:title="@string/conversation_list_batch__menu_select_all"
|
||||
android:id="@+id/menu_select_all"
|
||||
android:icon="?menu_selectall_icon" />
|
||||
android:icon="?menu_selectall_icon"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
</menu>
|
10
res/menu/conversation_list_batch_archive.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item android:title="@string/conversation_list_batch__archive_selected"
|
||||
android:id="@+id/menu_archive_selected"
|
||||
android:icon="@drawable/ic_archive_white_24dp"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
</menu>
|
10
res/menu/conversation_list_batch_unarchive.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item android:title="@string/conversation_list_batch__archive_selected"
|
||||
android:id="@+id/menu_archive_selected"
|
||||
android:icon="@drawable/ic_unarchive_white_24dp"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
</menu>
|
@@ -24,7 +24,7 @@
|
||||
|
||||
<color name="gray95_transparent50">#7F111111</color>
|
||||
|
||||
<color name="conversation_list_item_background_read_light">#ffffffff</color>
|
||||
<color name="conversation_list_item_background_read_light">@color/gray5</color>
|
||||
<color name="conversation_list_item_background_unread_light">#ffffffff</color>
|
||||
<color name="conversation_list_item_background_read_dark">#ff000000</color>
|
||||
<color name="conversation_list_item_background_unread_dark">#ff333333</color>
|
||||
|
@@ -37,6 +37,7 @@
|
||||
|
||||
<dimen name="transfer_controls_expanded_width">150dp</dimen>
|
||||
<dimen name="transfer_controls_contracted_width">70dp</dimen>
|
||||
<dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
|
||||
|
||||
<!-- RedPhone -->
|
||||
<dimen name="incoming_widget_outer_radius">135dip</dimen>
|
||||
|
@@ -174,10 +174,18 @@
|
||||
</plurals>
|
||||
<string name="ConversationListFragment_deleting">Deleting</string>
|
||||
<string name="ConversationListFragment_deleting_selected_threads">Deleting selected threads...</string>
|
||||
<string name="ConversationListFragment_archived_conversations">Archived conversations</string>
|
||||
<string name="ConversationListFragment_undo">UNDO</string>
|
||||
<string name="ConversationListFragment_moved_conversation_to_inbox">Moved conversation to inbox</string>
|
||||
<string name="ConversationListFragment_archived_conversation">Archived conversation</string>
|
||||
<string name="ConversationListFragment_moved_conversations_to_inbox">Moved conversations to inbox</string>
|
||||
|
||||
<!-- ConversationListItem -->
|
||||
<string name="ConversationListItem_key_exchange_message">Key exchange message...</string>
|
||||
|
||||
<!-- ConversationListItemAction -->
|
||||
<string name="ConversationListItemAction_archived_conversations_d">Archived conversations (%d)</string>
|
||||
|
||||
<!-- CustomDefaultPreference -->
|
||||
<string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
|
||||
<string name="CustomDefaultPreference_using_default">Using default: %s</string>
|
||||
@@ -867,6 +875,7 @@
|
||||
<string name="AndroidManifest__message_details">Message details</string>
|
||||
<string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
|
||||
<string name="AndroidManifest__invite_friends">Invite friends</string>
|
||||
<string name="AndroidManifeset_conversations_archive">Conversations archive</string>
|
||||
|
||||
<!-- arrays.xml -->
|
||||
<string name="arrays__import_export">Import / export</string>
|
||||
@@ -1048,6 +1057,7 @@
|
||||
<!-- conversation_list_batch -->
|
||||
<string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
|
||||
<string name="conversation_list_batch__menu_select_all">Select all</string>
|
||||
<string name="conversation_list_batch__archive_selected">Archive selected</string>
|
||||
|
||||
<!-- conversation_list -->
|
||||
<string name="conversation_list__menu_search">Search</string>
|
||||
@@ -1055,6 +1065,7 @@
|
||||
<!-- conversation_list_item_view -->
|
||||
<string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>
|
||||
<string name="conversation_list_item_view__error_alert">Error alert</string>
|
||||
<string name="conversation_list_item_view__archived">Archived</string>
|
||||
|
||||
<!-- conversation_list_fragment -->
|
||||
<string name="conversation_list_fragment__fab_content_description">New conversation</string>
|
||||
@@ -1151,6 +1162,7 @@
|
||||
<!-- transport_selection_list_item -->
|
||||
<string name="transport_selection_list_item__transport_icon">Transport icon</string>
|
||||
|
||||
|
||||
<!-- EOF -->
|
||||
|
||||
</resources>
|
||||
|
@@ -95,7 +95,7 @@
|
||||
<item name="attachment_type_selector_background">@color/white</item>
|
||||
<item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
|
||||
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background</item>
|
||||
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background</item>
|
||||
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_read_background</item>
|
||||
<item name="conversation_list_item_count_color">#66333333</item>
|
||||
<item name="conversation_list_item_contact_color">#FF333333</item>
|
||||
<item name="conversation_list_item_subject_color">#FF444444</item>
|
||||
@@ -205,12 +205,13 @@
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="android:textColor">@color/text_color_dark_theme</item>
|
||||
<item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
|
||||
<item name="colorAccent">@color/textsecure_primary_dark</item>
|
||||
<item name="colorControlActivated">@color/signal_primary_dark</item>
|
||||
<item name="colorControlHighlight">@color/signal_primary_dark</item>
|
||||
<item name="android:windowBackground">@color/black</item>
|
||||
<item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
|
||||
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background_dark</item>
|
||||
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background</item>
|
||||
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_read_background_dark</item>
|
||||
<item name="conversation_list_item_count_color">#66dddddd</item>
|
||||
<item name="conversation_list_item_contact_color">#ffdddddd</item>
|
||||
<item name="conversation_list_item_subject_color">#ffdddddd</item>
|
||||
|