From d6a66656deef9e9c0a1762f490fef203fb579a60 Mon Sep 17 00:00:00 2001
From: daycode <d.martin@openmailbox.org  Set as primary>
Date: Tue, 18 Apr 2017 12:59:42 +0200
Subject: [PATCH 1/3] Add Direct Message to visibility panel

---
 .../tusky/ComposeOptionsFragment.java         | 12 +++++++--
 .../color/drawer_visibility_panel_item.xml    |  5 ++++
 app/src/main/res/drawable/ic_email_24dp.xml   |  9 +++++++
 .../main/res/drawable/ic_lock_open_24dp.xml   |  9 +++++++
 .../res/drawable/ic_lock_outline_24dp.xml     |  9 +++++++
 .../res/layout/fragment_compose_options.xml   | 25 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  7 +++---
 7 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/color/drawer_visibility_panel_item.xml
 create mode 100644 app/src/main/res/drawable/ic_email_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_lock_open_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_lock_outline_24dp.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeOptionsFragment.java b/app/src/main/java/com/keylesspalace/tusky/ComposeOptionsFragment.java
index 25dbd4b8..3f3e1c0b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeOptionsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeOptionsFragment.java
@@ -73,10 +73,14 @@ public class ComposeOptionsFragment extends BottomSheetDialogFragment {
             radioCheckedId = R.id.radio_unlisted;
         }
         if (statusVisibility != null) {
-            if (statusVisibility.equals("unlisted")) {
-                radioCheckedId = R.id.radio_unlisted;
+            if (statusVisibility.equals("public")) {
+                radioCheckedId = R.id.radio_public;
             } else if (statusVisibility.equals("private")) {
                 radioCheckedId = R.id.radio_private;
+            } else if (statusVisibility.equals("unlisted")) {
+                radioCheckedId = R.id.radio_unlisted;
+            } else if (statusVisibility.equals("direct")) {
+                radioCheckedId = R.id.radio_direct;
             }
         }
         radio.check(radioCheckedId);
@@ -113,6 +117,10 @@ public class ComposeOptionsFragment extends BottomSheetDialogFragment {
                         visibility = "private";
                         break;
                     }
+                    case R.id.radio_direct: {
+                        visibility = "direct";
+                        break;
+                    }
                 }
                 listener.onVisibilityChanged(visibility);
             }
diff --git a/app/src/main/res/color/drawer_visibility_panel_item.xml b/app/src/main/res/color/drawer_visibility_panel_item.xml
new file mode 100644
index 00000000..56e4edca
--- /dev/null
+++ b/app/src/main/res/color/drawer_visibility_panel_item.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/button_dark" android:state_checked="true" />
+    <item android:color="@color/color_primary_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_email_24dp.xml b/app/src/main/res/drawable/ic_email_24dp.xml
new file mode 100644
index 00000000..a050d6f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_email_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_open_24dp.xml b/app/src/main/res/drawable/ic_lock_open_24dp.xml
new file mode 100644
index 00000000..72d7d123
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_open_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_outline_24dp.xml b/app/src/main/res/drawable/ic_lock_outline_24dp.xml
new file mode 100644
index 00000000..a0145706
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_outline_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/toolbar_icon_dark"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_compose_options.xml b/app/src/main/res/layout/fragment_compose_options.xml
index 986fc6e7..818cf656 100644
--- a/app/src/main/res/layout/fragment_compose_options.xml
+++ b/app/src/main/res/layout/fragment_compose_options.xml
@@ -15,23 +15,48 @@
 
         <RadioButton
             android:text="@string/visibility_public"
+            android:button="@drawable/ic_public_24dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:id="@+id/radio_public"
+            android:layout_marginBottom="5dp"
+            android:paddingLeft="10dp"
+            android:buttonTint="@color/drawer_visibility_panel_item"
             android:layout_weight="1" />
 
         <RadioButton
             android:text="@string/visibility_unlisted"
+            android:button="@drawable/ic_lock_open_24dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:id="@+id/radio_unlisted"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:paddingLeft="10dp"
+            android:buttonTint="@color/drawer_visibility_panel_item"
             android:layout_weight="1" />
 
         <RadioButton
             android:text="@string/visibility_private"
+            android:button="@drawable/ic_lock_outline_24dp"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:id="@+id/radio_private"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:paddingLeft="10dp"
+            android:buttonTint="@color/drawer_visibility_panel_item"
+            android:layout_weight="1" />
+
+        <RadioButton
+            android:text="@string/visibility_direct"
+            android:button="@drawable/ic_email_24dp"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:id="@+id/radio_direct"
+            android:layout_marginTop="5dp"
+            android:paddingLeft="10dp"
+            android:buttonTint="@color/drawer_visibility_panel_item"
             android:layout_weight="1" />
 
     </RadioGroup>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d053474..c9b7b65e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,9 +111,10 @@
     <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
     <string name="dialog_message_uploading_media">Uploading…</string>
 
-    <string name="visibility_public">Everyone can view</string>
-    <string name="visibility_unlisted">Everyone can view, but not on public timelines</string>
-    <string name="visibility_private">Only followers and mentions can view</string>
+    <string name="visibility_public">Public: Post to public timelines</string>
+    <string name="visibility_unlisted">Unlisted: Do not show in public timelines</string>
+    <string name="visibility_private">Private: Post to followers only</string>
+    <string name="visibility_direct">Direct: Post to mentioned users only</string>
 
     <string name="pref_title_notification_settings">Notifications</string>
     <string name="pref_title_edit_notification_settings">Edit Notifications</string>

From 2b584249e3a1c0545d95809a2fb2174005661bd0 Mon Sep 17 00:00:00 2001
From: daycode <d.martin@openmailbox.org  Set as primary>
Date: Tue, 18 Apr 2017 14:27:47 +0200
Subject: [PATCH 2/3] French translation for the visibility panel

---
 app/src/main/res/values-fr/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 05fa8750..55e58bb6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -100,9 +100,10 @@
     <string name="dialog_title_finishing_media_upload">Média uploadé avec succès</string>
     <string name="dialog_message_uploading_media">Téléversement…</string>
 
-    <string name="visibility_public">Tout le monde peut voir</string>
-    <string name="visibility_unlisted">Tout le monde peut voir, mais cela ne sera pas listé sur votre timeline public</string>
-    <string name="visibility_private">Uniquement les followers et les mentionnés peuvent voir</string>
+    <string name="visibility_public">Public: Afficher dans les fils publics</string>
+    <string name="visibility_unlisted">Non-listé: Ne pas afficher dans les fils publics</string>
+    <string name="visibility_private">Privé: N\'afficher que pour vos abonné⋅e⋅s</string>
+    <string name="visibility_direct">Direct: N\'afficher que pour les personnes mentionnées</string>
 
     <string name="pref_title_notification_settings">Notifications</string>
     <string name="pref_title_notifications_enabled">Notifications push</string>

From 6c385120914c45b92b33ad1eaa8a503583f647da Mon Sep 17 00:00:00 2001
From: daycode <d.martin@openmailbox.org  Set as primary>
Date: Tue, 18 Apr 2017 22:21:34 +0200
Subject: [PATCH 3/3] fix color icon for both themes

---
 app/src/main/res/color/drawer_visibility_panel_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/color/drawer_visibility_panel_item.xml b/app/src/main/res/color/drawer_visibility_panel_item.xml
index 56e4edca..9849dfa9 100644
--- a/app/src/main/res/color/drawer_visibility_panel_item.xml
+++ b/app/src/main/res/color/drawer_visibility_panel_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/button_dark" android:state_checked="true" />
-    <item android:color="@color/color_primary_dark" />
+    <item android:color="?material_drawer_primary_icon" />
 </selector>
\ No newline at end of file