From 5f2b7799543060969826197991f11f6b287bb058 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 24 Jul 2019 19:51:31 +0200
Subject: [PATCH 1/8] New translations strings.xml (French)

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

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b79331190..16063c820 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1014,13 +1014,13 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="crash_message">Vous pouvez m’envoyer le rapport d’erreur par mail. Cela aidera à corriger le problème :)\n\nVous pouvez y ajouter des informations supplémentaires. Merci !</string>
     <string name="set_wysiwyg">Utiliser l\'éditeur visuel</string>
     <string name="set_wysiwyg_indication">Lorsque cette option est activée, vous serez en mesure de mettre en forme votre texte facilement avec des outils.</string>
-    <string name="action_stats">Statistics</string>
+    <string name="action_stats">Statistiques</string>
     <string name="total_statuses">Total statuses</string>
     <string name="number_boosts">Number of boosts</string>
     <string name="number_replies">Number of replies</string>
     <string name="number_statuses">Number of statuses</string>
     <string name="statuses">Statuses</string>
-    <string name="visibility">Visibility</string>
+    <string name="visibility">Visibilité</string>
     <string name="number_with_media">Number with media</string>
     <string name="number_with_sensitive_media">Number with sensitive media</string>
     <string name="number_with_cw">Number with CW</string>

From 1374095f99f5fe19f2b0b55a1005ab2d1234b293 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 24 Jul 2019 19:51:37 +0200
Subject: [PATCH 2/8] New translations strings.xml (German)

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

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 490fc5989..11a363835 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -510,7 +510,7 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
     <string name="hide_boost">Verstecke geteilte Beiträge von %s</string>
     <string name="endorse">Auf Profil hervorheben</string>
     <string name="hide_everything">Verberge alles von %s</string>
-    <string name="show_boost">Zeige geteilte Beiträge von %s</string>
+    <string name="show_boost">Geteilte Beiträge von %s anzeigen</string>
     <string name="unendorse">Nicht mehr im Profil hervorheben</string>
     <string name="show_everything">Alles von %s anzeigen</string>
     <string name="toast_endorse">Dieser Benutzer wird nun in deinem Profil hervorgehoben</string>
@@ -621,7 +621,7 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
     <string name="tags_renamed">Dieses Schlagwort wurde geändert!</string>
     <string name="tags_deleted">Dieses Schlagwort wurde gelöscht!</string>
     <string name="set_display_art">Kunst-Zeitlinie anzeigen</string>
-    <string name="schedule_boost">Plane teilen des Beitrags</string>
+    <string name="schedule_boost">Teilen des Beitrags planen</string>
     <string name="boost_scheduled">Teilen geplant!</string>
     <string name="no_scheduled_boosts">Nichts geplant!</string>
     <string name="no_scheduled_boosts_indications"><![CDATA[Öffne das Menü eines Toots und wähle <b>Teilen planen</b>.]]></string>

From 11cfd885ab06dbf7efafae52c5aea3bf99724e5b Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 24 Jul 2019 20:34:17 +0200
Subject: [PATCH 3/8] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 11a363835..37b9b74e7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -86,7 +86,7 @@
     <string name="profile">Profil</string>
     <string name="make_a_choice">Was möchten Sie tun?</string>
     <string name="delete_account_title">Konto löschen</string>
-    <string name="delete_account_message" formatted="false">Konto %1$s aus der Anwendung löschen?</string>
+    <string name="delete_account_message" formatted="false">Möchten Sie das Konto %1$s wirklich aus der App entfernen?</string>
     <string name="send_email">E-Mail senden</string>
     <string name="choose_file">Datei wählen</string>
     <string name="choose_file_error">Kein Dateimanager gefunden!</string>

From ab3e8562ecc8c01a27a62d16122ee4475f75f37e Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 24 Jul 2019 20:50:22 +0200
Subject: [PATCH 4/8] New translations strings.xml (Korean)

---
 app/src/main/res/values-ko/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ff9162aff..404e7bbee 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -145,7 +145,7 @@
     <string name="status_unbookmarked">게시물이 북마크에서 삭제 되었습니다!</string>
     <!-- Date -->
     <string name="date_seconds">%d 초</string>
-    <string name="date_minutes">%d 초</string>
+    <string name="date_minutes">%d 분</string>
     <string name="date_hours">%d 시</string>
     <string name="date_day">%d 초</string>
     <!-- TOOT -->

From aba277134396ea3a71dad1f39e96776b36c58b3f Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 24 Jul 2019 21:19:11 +0200
Subject: [PATCH 5/8] New translations strings.xml (German)

---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 37b9b74e7..bfa2dd9d5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -132,7 +132,7 @@
     </string-array>
     <string-array name="more_action_owner_confirm">
         <item>Entferne diesen Toot?</item>
-        <item>Diesen Toot löschen &amp; neuentwerfen?</item>
+        <item>Diesen Toot löschen &amp; neu entwerfen?</item>
     </string-array>
     <plurals name="preview_replies">
         <item quantity="one">%d Antwort</item>

From 883e830e0d2423635ce62d4b464b1c946683695a Mon Sep 17 00:00:00 2001
From: Kasun <kasun@tuta.io>
Date: Thu, 25 Jul 2019 07:37:25 +0530
Subject: [PATCH 6/8] use a separate file for fedilab features panel

---
 .../res/layout/custom_fedilab_features.xml    |  97 ++++++++-------
 app/src/main/res/layout/drawer_status.xml     | 110 +-----------------
 .../main/res/layout/drawer_status_focused.xml | 108 +----------------
 3 files changed, 57 insertions(+), 258 deletions(-)

diff --git a/app/src/main/res/layout/custom_fedilab_features.xml b/app/src/main/res/layout/custom_fedilab_features.xml
index bf0458f08..392903da5 100644
--- a/app/src/main/res/layout/custom_fedilab_features.xml
+++ b/app/src/main/res/layout/custom_fedilab_features.xml
@@ -1,38 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
+    android:id="@+id/fedilab_features_panel"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:layout_marginStart="5dp"
+    android:background="@color/custom_features_panel_background"
+    android:paddingStart="2dp"
+    android:paddingTop="4dp"
+    android:paddingEnd="2dp"
+    android:paddingBottom="4dp"
+    android:visibility="gone"
+    app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
+    app:layout_constraintStart_toEndOf="@id/fedilab_features"
+    app:layout_constraintTop_toTopOf="@id/fedilab_features">
+
 
     <ImageButton
-        android:id="@+id/custom_feature_timed_mute"
+        android:id="@+id/custom_feature_bookmark"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_margin="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:background="@color/mastodonC4"
-        android:contentDescription="@string/timed_mute"
-        android:src="@drawable/ic_timelapse"
-        android:tooltipText="@string/timed_mute"
+        android:contentDescription="@string/bookmark_add"
+        android:src="@drawable/ic_bookmark_white"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/custom_feature_schedule"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageButton
-        android:id="@+id/custom_feature_schedule"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
-        android:layout_margin="5dp"
-        android:background="@color/mastodonC4"
-        android:contentDescription="@string/schedule"
-        android:src="@drawable/ic_schedule"
-        android:tooltipText="@string/schedule_boost"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/custom_feature_timed_mute"
-        app:layout_constraintRight_toLeftOf="@id/custom_feature_translate"
+        app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
@@ -40,29 +36,44 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_margin="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:background="@color/mastodonC4"
         android:contentDescription="@string/translate"
         android:src="@drawable/ic_translate_white"
-        android:tooltipText="@string/translate"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/custom_feature_schedule"
-        app:layout_constraintRight_toLeftOf="@id/custom_feature_bookmark"
+        app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
+        app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
-        android:id="@+id/custom_feature_bookmark"
+        android:id="@+id/custom_feature_timed_mute"
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_margin="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:background="@color/mastodonC4"
-        android:contentDescription="@string/bookmark_add"
-        android:src="@drawable/ic_bookmark_white"
-        android:tooltipText="@string/bookmark_add"
+        android:contentDescription="@string/timed_mute"
+        android:src="@drawable/ic_timed_mute"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/custom_feature_translate"
-        app:layout_constraintRight_toLeftOf="@id/custom_feature_mention"
+        app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
+        app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/custom_feature_schedule"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
+        android:background="@color/mastodonC4"
+        android:contentDescription="@string/schedule"
+        android:src="@drawable/ic_schedule_boost"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
+        app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
@@ -70,14 +81,14 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_margin="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:background="@color/mastodonC4"
         android:contentDescription="@string/mention_account"
         android:src="@drawable/ic_mention_white"
-        android:tooltipText="@string/mention_status"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/custom_feature_bookmark"
-        app:layout_constraintRight_toLeftOf="@id/custom_feature_cache"
+        app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
+        app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageButton
@@ -85,14 +96,14 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="35dp"
         android:layout_height="35dp"
-        android:layout_margin="5dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
         android:background="@color/mastodonC4"
         android:contentDescription="@string/refresh_cache"
         android:src="@drawable/ic_refresh"
-        android:tooltipText="@string/refresh_cache"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/custom_feature_mention"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index e99d9d1bb..7ee9a12e1 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -277,9 +277,9 @@
                     android:id="@+id/status_account_username"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginStart="5dp"
                     android:layout_marginLeft="5dp"
-                    android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:maxLines="1"
@@ -960,113 +960,7 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/fedilab_features_panel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:background="@color/custom_features_panel_background"
-            android:paddingStart="2dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="2dp"
-            android:paddingBottom="4dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
-            app:layout_constraintStart_toEndOf="@id/fedilab_features"
-            app:layout_constraintTop_toTopOf="@id/fedilab_features">
-
-            <ImageButton
-                android:id="@+id/custom_feature_bookmark"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/bookmark_add"
-                android:src="@drawable/ic_bookmark_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_translate"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/translate"
-                android:src="@drawable/ic_translate_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_timed_mute"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/timed_mute"
-                android:src="@drawable/ic_timed_mute"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_schedule"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/schedule"
-                android:src="@drawable/ic_schedule_boost"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-            <ImageButton
-                android:id="@+id/custom_feature_mention"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/mention_account"
-                android:src="@drawable/ic_mention_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_cache"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/refresh_cache"
-                android:src="@drawable/ic_refresh"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <include layout="@layout/custom_fedilab_features" />
 
         <include
             layout="@layout/layout_quick_reply"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 84f693a47..f4545132d 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -635,113 +635,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/status_toot_date" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/fedilab_features_panel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:background="@color/custom_features_panel_background"
-            android:paddingStart="2dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="2dp"
-            android:paddingBottom="4dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
-            app:layout_constraintStart_toEndOf="@id/fedilab_features"
-            app:layout_constraintTop_toTopOf="@id/fedilab_features">
-
-            <ImageButton
-                android:id="@+id/custom_feature_bookmark"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/bookmark_add"
-                android:src="@drawable/ic_bookmark_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_translate"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/translate"
-                android:src="@drawable/ic_translate_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_timed_mute"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/timed_mute"
-                android:src="@drawable/ic_timed_mute"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_schedule"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/schedule"
-                android:src="@drawable/ic_schedule_boost"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
-                app:layout_constraintTop_toTopOf="parent" />
-
-
-            <ImageButton
-                android:id="@+id/custom_feature_mention"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/mention_account"
-                android:src="@drawable/ic_mention_white"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageButton
-                android:id="@+id/custom_feature_cache"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_marginStart="2dp"
-                android:layout_marginEnd="2dp"
-                android:background="@color/mastodonC4"
-                android:contentDescription="@string/refresh_cache"
-                android:src="@drawable/ic_refresh"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        <include layout="@layout/custom_fedilab_features" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

From 654798641e37b4c1549212ce38dcdb207caa53b5 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Thu, 25 Jul 2019 04:28:10 +0200
Subject: [PATCH 7/8] New translations strings.xml (Chinese Traditional)

---
 app/src/main/res/values-zh-rTW/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ac98bb9b6..fdb478ee1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1028,8 +1028,8 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="frequency">頻率</string>
     <string name="toot_per_day">每日狀態數</string>
     <string name="date_range">日期範圍</string>
-    <string name="action_groups">Groups</string>
-    <string name="no_messages">No groups!</string>
+    <string name="action_groups">群組</string>
+    <string name="no_messages">沒有群組！</string>
     <plurals name="number_of_vote">
         <item quantity="other">%d 人投票</item>
     </plurals>

From 2a6c7ec6252424c5033acbcc40405f8210cf6cb1 Mon Sep 17 00:00:00 2001
From: Kasun <kasun@tuta.io>
Date: Thu, 25 Jul 2019 10:51:32 +0530
Subject: [PATCH 8/8] change colors of fedilab features buttons with theme

---
 .../android/drawers/StatusListAdapter.java    | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index c172152f8..0b50f2842 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -1330,6 +1330,32 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     }
                 });
 
+                if (theme == Helper.THEME_BLACK) {
+                    holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                    holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
+                } else if (theme == Helper.THEME_DARK) {
+                    holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                    holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
+                } else {
+                    holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                    holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
+                }
+
                 if (status.isCustomFeaturesDisplayed()) {
                     holder.fedilab_features_panel.setVisibility(View.VISIBLE);
                 } else {