Merge branch 'develop'3.14.2

11 files changed, 155 insertions, 27 deletions

diff --git a/app/src/main/res/drawable/ic_baseline_android_24.xml b/app/src/main/res/drawable/ic_baseline_android_24.xml
new file mode 100644
index 000000000..b812e1ed0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_android_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17.6,9.48l1.84,-3.18c0.16,-0.31 0.04,-0.69 -0.26,-0.85c-0.29,-0.15 -0.65,-0.06 -0.83,0.22l-1.88,3.24c-2.86,-1.21 -6.08,-1.21 -8.94,0L5.65,5.67c-0.19,-0.29 -0.58,-0.38 -0.87,-0.2C4.5,5.65 4.41,6.01 4.56,6.3L6.4,9.48C3.3,11.25 1.28,14.44 1,18h22C22.72,14.44 20.7,11.25 17.6,9.48zM7,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25S8.25,13.31 8.25,14C8.25,14.69 7.69,15.25 7,15.25zM17,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25s1.25,0.56 1.25,1.25C18.25,14.69 17.69,15.25 17,15.25z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml b/app/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml
new file mode 100644
index 000000000..ea5ff25ad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,18L6,18v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_directory.xml b/app/src/main/res/layout/activity_directory.xml
new file mode 100644
index 000000000..c56531852
--- /dev/null
+++ b/app/src/main/res/layout/activity_directory.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2022 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment_directory"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index f98dcda65..79f8910ce 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -341,6 +341,44 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/info" />
+
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/familiar_followers"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="6dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:padding="10dp"
+                    android:visibility="gone"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/fields_container"
+                    tools:visibility="visible">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/type_of_concat"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:text="@string/also_followed_by" />
+
+                    <HorizontalScrollView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="10dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical">
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:id="@+id/related_accounts"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal" />
+                    </HorizontalScrollView>
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
                 <!-- End Fields container -->
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/warning_container"
@@ -350,7 +388,7 @@
                     android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/fields_container"
+                    app:layout_constraintTop_toBottomOf="@+id/familiar_followers"
                     tools:visibility="visible">
 
                     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index d28cfe2bb..443a3e57d 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -119,23 +119,6 @@
                         app:layout_constraintTop_toTopOf="parent"
                         tools:src="@tools:sample/avatars" />
 
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/reply_icon"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:src="@drawable/ic_baseline_reply_16"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/bot_icon"
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:src="@drawable/ic_baseline_reply_16"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -147,8 +130,31 @@
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
                         android:orientation="horizontal">
 
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/reply_icon"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginStart="6dp"
+                            android:src="@drawable/ic_baseline_reply_16"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            tools:visibility="visible" />
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/bot_icon"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            android:layout_marginStart="6dp"
+                            android:src="@drawable/ic_baseline_android_24"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            tools:visibility="visible" />
+
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/display_name"
                             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/popup_release_notes.xml b/app/src/main/res/layout/popup_release_notes.xml
index 1d251813a..b6ca774fa 100644
--- a/app/src/main/res/layout/popup_release_notes.xml
+++ b/app/src/main/res/layout/popup_release_notes.xml
@@ -72,20 +72,19 @@
         </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-        <androidx.appcompat.widget.AppCompatImageButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/account_follow"
-            style="@style/Widget.AppCompat.Button.Colored"
+            style="@style/Widget.Material3.Button.Icon"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:layout_margin="10dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="6dp"
             android:contentDescription="@string/make_an_action"
             android:scaleType="fitCenter"
             android:visibility="gone"
-            app:layout_constraintStart_toEndOf="@id/avatar_container"
-            app:layout_constraintTop_toBottomOf="@id/banner_container"
-            tools:src="@drawable/ic_baseline_person_add_24"
+            tools:icon="@drawable/ic_baseline_person_add_24"
             tools:visibility="visible" />
-
     </androidx.appcompat.widget.LinearLayoutCompat>
 
     <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 63e6efefa..d415eb68c 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -64,6 +64,11 @@
                         android:title="@string/Suggestions"
                         android:visible="true" />
                     <item
+                        android:id="@+id/nav_directory"
+                        android:icon="@drawable/ic_baseline_perm_contact_calendar_24"
+                        android:title="@string/Directory"
+                        android:visible="true" />
+                    <item
                         android:id="@+id/nav_about_instance"
                         android:icon="@drawable/ic_info_outline_white_24dp"
                         android:title="@string/action_about_instance"
diff --git a/app/src/main/res/menu/menu_directory.xml b/app/src/main/res/menu/menu_directory.xml
new file mode 100644
index 000000000..00a9bf19f
--- /dev/null
+++ b/app/src/main/res/menu/menu_directory.xml
@@ -0,0 +1,23 @@
+<?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">
+    <group
+        android:id="@+id/order"
+        android:checkableBehavior="single">
+        <item
+            android:id="@+id/order_active"
+            android:checked="true"
+            android:title="@string/active"
+            app:showAsAction="never" />
+        <item
+            android:id="@+id/order_new"
+            android:title="@string/_new"
+            app:showAsAction="never" />
+    </group>
+    <item
+        android:id="@+id/action_local"
+        android:checkable="true"
+        android:title="@string/local"
+        app:actionViewClass="android.widget.CheckBox"
+        app:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 67ecae103..d4df276b9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -973,4 +973,7 @@
     <string name="silenced">Ztišen(a)</string>
     <string name="set_display_compact_buttons">Kompaktní tlačítka akcí</string>
     <string name="set_display_compact_buttons_description">Tlačítka v dolní části zpráv nezaberou celou šířku</string>
+    <string name="reply_visibility">Viditelnost odpovědí</string>
+    <string name="exclude_visibility">Viditelnost vyloučení</string>
+    <string name="also_followed_by">Sledován(a):</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 2e549a744..6f2dbf56a 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -13,7 +13,7 @@
     <string name="download">Baixar</string>
     <string name="download_file">Baixar %1$s</string>
     <string name="save_over">Mídia salva</string>
-    <string name="download_from" formatted="false">Arquivo: %1$s</string>
+    <string name="download_from" formatted="false">Ficheiro: %1$s</string>
     <string name="password">Senha</string>
     <string name="email">E-mail</string>
     <string name="accounts">Contas</string>
@@ -547,7 +547,7 @@
     <string name="import_theme_title">Toque aqui para importar um tema exportado previamente</string>
     <string name="export_theme">Exportar o tema</string>
     <string name="export_theme_title">Toque aqui para exportar o tema atual</string>
-    <string name="theme_file_error">Ocorreu um erro ao selecionar o arquivo do tema</string>
+    <string name="theme_file_error">Ocorreu um erro ao selecionar o ficheiro do tema</string>
     <string name="user_count">Número de usuários</string>
     <string name="status_count">Número de status</string>
     <string name="instance_count">Número de instâncias</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e83cc5cc7..3567f9442 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -486,6 +486,7 @@
     <string name="unresolved">Unresolved</string>
     <string name="remote">Remote</string>
     <string name="active">Active</string>
+    <string name="_new">New</string>
     <string name="pending">Pending</string>
     <string name="disabled">Disabled</string>
     <string name="suspended">Suspended</string>
@@ -2205,4 +2206,6 @@
     <string name="set_pixelfed_presentation">Pixelfed presentation for media</string>
     <string name="set_display_compact_buttons">Compact action buttons</string>
     <string name="set_display_compact_buttons_description">Buttons at the bottom of messages will not take the whole width</string>
+    <string name="also_followed_by">Followed by:</string>
+    <string name="Directory">Directory</string>
 </resources>
\ No newline at end of file