Support for per-recipient muting, blocking, and ringtones.

Fixes #757
Fixes #354
Fixes #222
Closes #1815
Closes #3378

// FREEBIE

res/layout/blocked_contact_list_item.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.thoughtcrime.securesms.preferences.BlockedContactListItem
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/listPreferredItemHeight"
+        android:paddingRight="25dip">
+
+    <org.thoughtcrime.securesms.components.AvatarImageView
+            android:id="@+id/contact_photo_image"
+            android:layout_width="@dimen/contact_selection_photo_size"
+            android:layout_height="@dimen/contact_selection_photo_size"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop"
+            android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
+
+    <TextView android:id="@+id/name"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_alignParentTop="true"
+              android:layout_marginLeft="14dip"
+              android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+              android:singleLine="true"
+              android:ellipsize="marquee"
+              android:layout_toRightOf="@id/contact_photo_image"
+              android:gravity="center_vertical|left"
+              android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</org.thoughtcrime.securesms.preferences.BlockedContactListItem>

res/layout/blocked_contacts_fragment.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingLeft="16dip"
+              android:paddingRight="16dip">
+
+    <ListView android:id="@id/android:list"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_weight="1"
+              android:drawSelectorOnTop="false"/>
+
+    <TextView android:id="@id/android:empty"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_gravity="center|center_vertical"
+              android:gravity="center|center_vertical"
+              android:textSize="20sp"
+              android:text="@string/blocked_contacts_fragment__no_blocked_contacts"/>
+
+</LinearLayout>

res/layout/conversation_activity.xml

@@ -131,6 +131,13 @@
 
             </LinearLayout>
 
+            <Button android:id="@+id/unblock_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="20dp"
+                    android:text="Unblock"
+                    android:visibility="gone"/>
+
            <TextView android:id="@+id/space_left"
                      android:paddingLeft="5dip"
                      android:layout_width="fill_parent"

res/layout/conversation_list_item_view.xml

@@ -17,7 +17,6 @@
         android:layout_marginTop="3dp"
         android:layout_marginBottom="3dp"
         android:cropToPadding="true"
-        android:visibility="gone"
         tools:src="@drawable/ic_contact_picture"
         android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
         android:layout_marginRight="10dp"
@@ -50,7 +49,8 @@
                       android:textColor="?attr/conversation_list_item_contact_color"
                       android:singleLine="true"
                       tools:text="Jules Bonnot"
-                      android:ellipsize="marquee" />
+                      android:ellipsize="end"
+                      android:drawablePadding="5dp"/>
 
             <ImageView android:id="@+id/error"
                        android:layout_marginLeft="3dip"

res/layout/conversation_title_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationTitleView
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:layout_gravity="center_vertical"
+              android:gravity="center_vertical">
+
+    <TextView android:id="@+id/title"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:drawablePadding="5dp"
+              android:gravity="center_vertical"
+              android:layout_gravity="center_vertical"
+              style="@style/TextSecure.TitleTextStyle"/>
+
+    <TextView android:id="@+id/subtitle"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_gravity="center_vertical"
+              android:gravity="center_vertical"
+              style="@style/TextSecure.SubtitleTextStyle"/>
+
+</org.thoughtcrime.securesms.ConversationTitleView>

res/layout/recipient_preference_activity.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_height="130dp"
+            android:layout_width="match_parent"
+            android:minHeight="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/TextSecure.LightActionBar">
+
+        <RelativeLayout android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:gravity="center_vertical">
+
+            <org.thoughtcrime.securesms.components.AvatarImageView
+                    android:id="@+id/avatar"
+                    android:foreground="@drawable/contact_photo_background"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:cropToPadding="true"
+                    android:layout_marginLeft="0dp"
+                    android:layout_alignParentLeft="true"/>
+
+            <TextView android:id="@+id/name"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:ellipsize="end"
+                      style="@style/TextSecure.TitleTextStyle"
+                      android:layout_toRightOf="@id/avatar"
+                      android:layout_marginLeft="10dip"/>
+
+            <TextView android:id="@+id/blocked_indicator"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_toRightOf="@id/avatar"
+                      android:layout_below="@id/name"
+                      android:layout_alignLeft="@id/name"
+                      android:text="@string/recipient_preference_activity__blocked"
+                      android:textSize="12sp"
+                      android:textStyle="bold"
+                      android:textColor="?recipient_preference_blocked"
+                      android:textAllCaps="true" />
+
+
+        </RelativeLayout>
+
+
+    </android.support.v7.widget.Toolbar>
+
+    <FrameLayout android:id="@+id/preference_fragment"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent" />
+</LinearLayout>

res/menu/conversation_muted.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/conversation_muted__unmute"
+          android:id="@+id/menu_unmute_notifications" />
+</menu>

res/menu/conversation_unmuted.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:title="@string/conversation_unmuted__mute_notifications"
+          android:id="@+id/menu_mute_notifications" />
+
+</menu>

res/values/arrays.xml

@@ -171,4 +171,23 @@
       <item>@string/arrays__use_custom</item>
   </string-array>
 
+  <string-array name="mute_durations">
+      <item>@string/arrays__mute_for_one_hour</item>
+      <item>@string/arrays__mute_for_two_hours</item>
+      <item>@string/arrays__mute_for_one_day</item>
+      <item>@string/arrays__mute_for_seven_days</item>
+  </string-array>
+
+  <string-array name="recipient_vibrate_entries">
+      <item>@string/arrays__settings_default</item>
+      <item>@string/arrays__enabled</item>
+      <item>@string/arrays__disabled</item>
+  </string-array>
+
+  <string-array name="recipient_vibrate_values">
+      <item>0</item>
+      <item>1</item>
+      <item>2</item>
+  </string-array>
+
 </resources>

res/values/attrs.xml

@@ -116,4 +116,6 @@
 
     <attr name="group_members_dialog_icon" format="reference"/>
     <attr name="lockscreen_watermark" format="reference" />
+
+    <attr name="recipient_preference_blocked" format="color"/>
 </resources>

res/values/strings.xml

@@ -56,6 +56,9 @@
     <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
     <string name="AttachmentTypeSelectorAdapter_contact">Contact info</string>
 
+    <!-- BlockedContactsActivity -->
+    <string name="BlockedContactsActivity_blocked_contacts">Blocked contacts</string>
+
     <!-- ConfirmIdentityDialog -->
     <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">The
         identifying key material for %1$s has changed. This could either mean that someone is trying to
@@ -118,6 +121,9 @@
     <string name="ConversationActivity_mms_not_supported_title">MMS not supported</string>
     <string name="ConversationActivity_mms_not_supported_message">This message cannot be sent since your carrier doesn\'t support MMS.</string>
     <string name="ConversationActivity_specify_recipient">Please choose a contact</string>
+    <string name="ConversationActivity_unblock_question">Unblock?</string>
+    <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Are you sure you want to unblock this contact?</string>
+    <string name="ConversationActivity_unblock">Unblock</string>
 
     <!-- ConversationFragment -->
     <string name="ConversationFragment_message_details">Message details</string>
@@ -294,6 +300,14 @@
     <string name="RatingManager_no_thanks">No thanks</string>
     <string name="RatingManager_later">Later</string>
 
+    <!-- RecipientPreferencesActivity -->
+    <string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string>
+    <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">You will no longer see messages sent from this user.</string>
+    <string name="RecipientPreferenceActivity_block">Block</string>
+    <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
+    <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Are you sure you want to unblock this contact?</string>
+    <string name="RecipientPreferenceActivity_unblock">Unblock</string>
+
     <!-- RegistrationActivity -->
     <string name="RegistrationActivity_connect_with_textsecure">Connect With TextSecure</string>
     <string name="RegistrationActivity_select_your_country">Select your country</string>
@@ -465,9 +479,15 @@
     <!-- ContactSelectionListFragment-->
     <string name="ContactSelectionlistFragment_select_for">Select for</string>
 
+    <!-- blocked_contacts_fragment -->
+    <string name="blocked_contacts_fragment__no_blocked_contacts">No blocked contacts...</string>
+
     <!-- contact_selection_recent_activity -->
     <string name="contact_selection_recent_activity__no_recent_calls">No recent calls.</string>
 
+    <!-- conversation_title_view -->
+    <string name="conversation_title_view__conversation_muted">Conversation muted</string>
+
     <!-- conversation_activity -->
     <string name="conversation_activity__type_message_push">Send TextSecure message</string>
     <string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
@@ -563,6 +583,16 @@
     <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure requires MMS settings to deliver media and group messages through your wireless carrier. Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
     <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">To send media and group messages, click \'OK\' and complete the requested settings. The MMS settings for your carrier can generally be located by searching for \'your carrier APN\'. You will only need to do this once.</string>
 
+    <!-- recipient_preferences_activity -->
+    <string name="recipient_preference_activity__blocked">BLOCKED</string>
+
+    <!-- recipient_preferences -->
+    <string name="recipient_preferences__mute_conversation">Mute conversation</string>
+    <string name="recipient_preferences__disable_notifications_for_this_conversation">Disable notifications for this conversation</string>
+    <string name="recipient_preferences__ringtone">Ringtone</string>
+    <string name="recipient_preferences__vibrate">Vibrate</string>
+    <string name="recipient_preferences__block">Block</string>
+
     <!-- registration_activity -->
     <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verify your phone number to connect with TextSecure.
@@ -684,6 +714,15 @@
     <string name="arrays__use_default">Use default</string>
     <string name="arrays__use_custom">Use custom</string>
 
+    <string name="arrays__mute_for_one_hour">Mute for 1 hour</string>
+    <string name="arrays__mute_for_two_hours">Mute for 2 hours</string>
+    <string name="arrays__mute_for_one_day">Mute for 1 day</string>
+    <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
+
+    <string name="arrays__settings_default">Settings default</string>
+    <string name="arrays__enabled">Enabled</string>
+    <string name="arrays__disabled">Disabled</string>
+
     <!-- plurals.xml -->
     <plurals name="hours_ago">
         <item quantity="one">%d hour</item>
@@ -787,6 +826,8 @@
     <string name="preferences__submit_debug_log">Submit debug log</string>
     <string name="preferences__support_wifi_calling">\'WiFi Calling\' compatibility mode</string>
     <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Enable if your device uses SMS/MMS delivery over WiFi (only enable when \'WiFi Calling\' is enabled on your device)</string>
+    <string name="preferences__privacy">Privacy</string>
+    <string name="preferences_app_protection__blocked_contacts">Blocked contacts</string>
 
     <!-- **************************************** -->
     <!-- menus -->
@@ -844,6 +885,12 @@
     <string name="conversation_secure_verified__menu_verify_identity">Verify identity</string>
     <string name="conversation_secure_verified__menu_abort_secure_session">End secure session</string>
 
+    <!-- conversation_muted -->
+    <string name="conversation_muted__unmute">Unmute</string>
+
+    <!-- conversation_unmuted -->
+    <string name="conversation_unmuted__mute_notifications">Mute notifications</string>
+
     <!-- conversation -->
     <string name="conversation__menu_add_attachment">Add attachment</string>
     <string name="conversation__menu_update_group">Update group</string>
@@ -900,6 +947,8 @@
 
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
+    <string name="MuteDialog_mute_notifications">Mute notifications</string>
+
 
     <!-- EOF -->
 

res/values/styles.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <style name="Theme.AppCompat.NoActionBar" parent="@style/Theme.AppCompat">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
     <style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@android:color/black</item>
@@ -32,7 +28,8 @@
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="android:popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
-
+        <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
+        <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
     </style>
 
     <style name="TextSecure.LightActionBar"
@@ -42,6 +39,9 @@
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
+        <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">#99ffffff</item>
     </style>
 
     <style name="TextSecure.DarkActionBar.TabBar"
@@ -58,10 +58,11 @@
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/white</item>
     </style>
 
     <style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
-        <item name="android:textColor">#ff555555</item>
+        <item name="android:textColor">#99ffffff</item>
     </style>
 
     <style name="TextSecure.IntroActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">

res/values/themes.xml

@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="TextSecure.LightNoActionBar" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="actionBarStyle">@style/TextSecure.LightActionBar</item>
+        <item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
+        <item name="colorPrimary">@color/textsecure_primary</item>
+        <item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
+        <item name="colorAccent">@color/textsecure_primary_dark</item>
+        <item name="recipient_preference_blocked">#8e0000</item>
+    </style>
+
+    <style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
+        <item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
+        <item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
+        <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="recipient_preference_blocked">#d00000</item>
+    </style>
+
     <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
         <!--<item name="colorPrimary">@android:color/transparent</item>-->
         <item name="actionBarStyle">@style/TextSecure.IntroActionBar</item>

res/xml/preferences.xml

@@ -10,7 +10,7 @@
                 android:icon="?pref_ic_notifications"/>
 
     <Preference android:key="preference_category_app_protection"
-                android:title="@string/preferences__app_protection"
+                android:title="@string/preferences__privacy"
                 android:icon="?pref_ic_app_protection"/>
 
     <Preference android:key="preference_category_appearance"
@@ -24,4 +24,5 @@
     <Preference android:key="preference_category_advanced"
                 android:title="@string/preferences__advanced"
                 android:icon="?pref_ic_advanced"/>
+
 </PreferenceScreen>

res/xml/preferences_app_protection.xml

@@ -27,4 +27,7 @@
                         android:key="pref_screen_security"
                         android:title="@string/preferences__screen_security"
                         android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
+
+    <Preference android:key="preference_category_blocked"
+                android:title="@string/preferences_app_protection__blocked_contacts" />
 </PreferenceScreen>

res/xml/recipient_preferences.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:key="pref_key_recipient_mute"
+            android:title="@string/recipient_preferences__mute_conversation"
+            android:summary="@string/recipient_preferences__disable_notifications_for_this_conversation"
+            android:defaultValue="false"
+            android:disableDependentsState="true"
+            android:persistent="false" />
+
+    <RingtonePreference android:dependency="pref_key_recipient_mute"
+                        android:key="pref_key_recipient_ringtone"
+                        android:title="@string/recipient_preferences__ringtone"
+                        android:ringtoneType="notification"
+                        android:showSilent="false"
+                        android:showDefault="true"
+                        android:persistent="false"/>
+
+    <ListPreference android:dependency="pref_key_recipient_mute"
+                    android:key="pref_key_recipient_vibrate"
+                    android:title="@string/recipient_preferences__vibrate"
+                    android:entries="@array/recipient_vibrate_entries"
+                    android:entryValues="@array/recipient_vibrate_values"
+                    android:defaultValue="0"
+                    android:persistent="false"/>
+
+    <Preference android:key="pref_key_recipient_block"
+                android:title="@string/recipient_preferences__block" />
+
+
+</PreferenceScreen>