Slim down some preference screens

// FREEBIE

res/layout/preference_right_summary_widget.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView android:id="@+id/right_summary"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="right|center_vertical"
+              android:gravity="right|center_vertical"
+              android:textSize="16sp"
+              android:textColor="@color/signal_primary_dark"/>
+
+</FrameLayout>

res/values/strings.xml

@@ -1199,6 +1199,8 @@
     <string name="preferences_chats__chats">Chats</string>
     <string name="preferences_notifications__message_notifications">Message notifications</string>
     <string name="preferences_notifications__events">Events</string>
+    <string name="preferences_notifications__in_chat_sounds">In-chat sounds</string>
+    <string name="preferences_notifications__show">Show</string>
     <string name="preferences_chats__show_invitation_prompts">Show invitation prompts</string>
     <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Display invitation prompts for contacts without Signal</string>
     <string name="preferences_chats__message_text_size">Message font size</string>

res/xml/preferences_app_protection.xml

@@ -13,11 +13,12 @@
                     android:summary="@string/preferences__change_your_passphrase"
                     android:dependency="pref_enable_passphrase_temporary"/>
 
-        <CheckBoxPreference android:defaultValue="false"
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                            android:key="pref_timeout_passphrase"
+                android:defaultValue="false"
-                            android:title="@string/preferences__inactivity_timeout_passphrase"
+                android:key="pref_timeout_passphrase"
-                            android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
+                android:title="@string/preferences__inactivity_timeout_passphrase"
-                            android:dependency="pref_enable_passphrase_temporary"/>
+                android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
+                android:dependency="pref_enable_passphrase_temporary"/>
 
         <Preference android:title="@string/preferences__inactivity_timeout_interval"
                     android:key="pref_timeout_interval"

res/xml/preferences_appearance.xml

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <ListPreference android:key="pref_theme"
+    <org.thoughtcrime.securesms.preferences.SignalListPreference
-                    android:title="@string/preferences__theme"
+            android:key="pref_theme"
-                    android:entries="@array/pref_theme_entries"
+            android:title="@string/preferences__theme"
-                    android:entryValues="@array/pref_theme_values"
+            android:entries="@array/pref_theme_entries"
-                    android:defaultValue="light">
+            android:entryValues="@array/pref_theme_values"
-    </ListPreference>
+            android:defaultValue="light">
+    </org.thoughtcrime.securesms.preferences.SignalListPreference>
 
-    <ListPreference android:key="pref_language"
+    <org.thoughtcrime.securesms.preferences.SignalListPreference
-                    android:title="@string/preferences__language"
+            android:key="pref_language"
-                    android:entries="@array/language_entries"
+            android:title="@string/preferences__language"
-                    android:entryValues="@array/language_values"
+            android:entries="@array/language_entries"
-                    android:defaultValue="zz"/>
+            android:entryValues="@array/language_values"
+            android:defaultValue="zz"/>
 </PreferenceScreen>

res/xml/preferences_chats.xml

@@ -30,12 +30,13 @@
     <PreferenceCategory android:layout="@layout/preference_divider"/>
 
     <PreferenceCategory android:title="@string/preferences_chats__chats">
-        <ListPreference android:key="pref_message_body_text_size"
+        <org.thoughtcrime.securesms.preferences.SignalListPreference
-                        android:title="@string/preferences_chats__message_text_size"
+                android:key="pref_message_body_text_size"
-                        android:entries="@array/pref_message_font_size_entries"
+                android:title="@string/preferences_chats__message_text_size"
-                        android:entryValues="@array/pref_message_font_size_values"
+                android:entries="@array/pref_message_font_size_entries"
-                        android:defaultValue="16">
+                android:entryValues="@array/pref_message_font_size_values"
-        </ListPreference>
+                android:defaultValue="16">
+        </org.thoughtcrime.securesms.preferences.SignalListPreference>
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                 android:defaultValue="true"

res/xml/preferences_notifications.xml

@@ -7,21 +7,20 @@
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                             android:key="pref_key_enable_notifications"
                             android:title="@string/preferences__notifications"
-                            android:summary="@string/preferences__enable_message_notifications"
                             android:defaultValue="true" />
 
-        <RingtonePreference android:dependency="pref_key_enable_notifications"
+        <org.thoughtcrime.securesms.preferences.SignalRingtonePreference
-                            android:key="pref_key_ringtone"
+                android:dependency="pref_key_enable_notifications"
-                            android:title="@string/preferences__sound"
+                android:key="pref_key_ringtone"
-                            android:ringtoneType="notification"
+                android:title="@string/preferences__sound"
-                            android:defaultValue="content://settings/system/notification_sound" />
+                android:ringtoneType="notification"
+                android:defaultValue="content://settings/system/notification_sound" />
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                             android:dependency="pref_key_enable_notifications"
                             android:key="pref_key_vibrate"
                             android:defaultValue="true"
-                            android:title="@string/preferences__vibrate"
+                            android:title="@string/preferences__vibrate"/>
-                            android:summary="@string/preferences__also_vibrate_when_notified" />
 
         <org.thoughtcrime.securesms.preferences.LEDColorListPreference
             android:key="pref_led_color"
@@ -41,12 +40,11 @@
 
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
                             android:key="pref_key_inthread_notifications"
-                            android:title="@string/preferences__in_conversation_notifications"
+                            android:title="@string/preferences_notifications__in_chat_sounds"
-                            android:summary="@string/preferences__play_inthread_notifications"
                             android:dependency="pref_key_enable_notifications"
                             android:defaultValue="true" />
 
-        <ListPreference
+        <org.thoughtcrime.securesms.preferences.SignalListPreference
                 android:key="pref_repeat_alerts"
                 android:defaultValue="0"
                 android:title="@string/preferences__repeat_alerts"
@@ -54,12 +52,13 @@
                 android:entries="@array/pref_repeat_alerts_entries"
                 android:entryValues="@array/pref_repeat_alerts_values" />
 
-        <ListPreference android:key="pref_notification_privacy"
+        <org.thoughtcrime.securesms.preferences.SignalListPreference
-                        android:title="@string/preferences_notifications__display_in_notifications"
+                android:key="pref_notification_privacy"
-                        android:dependency="pref_key_enable_notifications"
+                android:title="@string/preferences_notifications__show"
-                        android:defaultValue="all"
+                android:dependency="pref_key_enable_notifications"
-                        android:entries="@array/pref_notification_privacy_entries"
+                android:defaultValue="all"
-                        android:entryValues="@array/pref_notification_privacy_values"/>
+                android:entries="@array/pref_notification_privacy_entries"
+                android:entryValues="@array/pref_notification_privacy_values"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>
@@ -68,7 +67,6 @@
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:key="pref_enable_new_contacts_notifications"
             android:title="@string/preferences_events__contact_joined_signal"
-            android:summary="@string/preferences__show_a_notification_for_new_signal_contacts"
             android:defaultValue="true" />
     </PreferenceCategory>
 

src/org/thoughtcrime/securesms/preferences/LedBlinkPatternListPreference.java

@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
  * @author Moxie Marlinspike
  */
 
-public class LedBlinkPatternListPreference extends ListPreference implements OnSeekBarChangeListener {
+public class LedBlinkPatternListPreference extends SignalListPreference implements OnSeekBarChangeListener {
 
   private Context context;
   private SeekBar seekBarOn;

src/org/thoughtcrime/securesms/preferences/SignalListPreference.java

@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms.preferences;
+
+
+import android.content.Context;
+import android.os.Build;
+import android.preference.ListPreference;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+public class SignalListPreference extends ListPreference {
+
+  private TextView rightSummary;
+  private CharSequence summary;
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public SignalListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    initialize();
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public SignalListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    initialize();
+  }
+
+  public SignalListPreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initialize();
+  }
+
+  public SignalListPreference(Context context) {
+    super(context);
+    initialize();
+  }
+
+  private void initialize() {
+    setWidgetLayoutResource(R.layout.preference_right_summary_widget);
+  }
+
+  @Override
+  protected void onBindView(View view) {
+    super.onBindView(view);
+
+    this.rightSummary = (TextView)view.findViewById(R.id.right_summary);
+    setSummary(this.summary);
+  }
+
+  @Override
+  public void setSummary(CharSequence summary) {
+    super.setSummary(null);
+
+    this.summary = summary;
+
+    if (this.rightSummary != null) {
+      this.rightSummary.setText(summary);
+    }
+  }
+}

src/org/thoughtcrime/securesms/preferences/SignalRingtonePreference.java

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.preferences;
+
+
+import android.content.Context;
+import android.os.Build;
+import android.preference.RingtonePreference;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.R;
+
+public class SignalRingtonePreference extends RingtonePreference {
+
+  private TextView rightSummary;
+  private CharSequence summary;
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  public SignalRingtonePreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    initialize();
+  }
+
+  public SignalRingtonePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    initialize();
+  }
+
+  public SignalRingtonePreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initialize();
+  }
+
+  public SignalRingtonePreference(Context context) {
+    super(context);
+    initialize();
+  }
+
+  private void initialize() {
+    setWidgetLayoutResource(R.layout.preference_right_summary_widget);
+  }
+
+  @Override
+  protected void onBindView(View view) {
+    super.onBindView(view);
+
+    this.rightSummary = (TextView)view.findViewById(R.id.right_summary);
+    setSummary(summary);
+  }
+
+  @Override
+  public void setSummary(CharSequence summary) {
+    this.summary = summary;
+
+    super.setSummary(null);
+
+    if (rightSummary != null) {
+      rightSummary.setText(summary);
+    }
+  }
+
+}