Allow to change thumbnail for Playlists

New Crowdin updates

See merge request tom79/fedilab-tube!52

app/build.gradle

@@ -11,8 +11,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 27
-        versionName "1.8.0"
+        versionCode 29
+        versionName "1.9.0"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/acad/res/values/colors.xml

@@ -10,4 +10,5 @@
     <color name="negative_thumbs">#F44336</color>
     <color name="backgroundDark">#DD000000</color>
     <color name="red_1">#F44336</color>
+    <color name="gray_light">#80808080</color>
 </resources>

app/src/acad/res/values/strings.xml

@@ -18,6 +18,9 @@
     <string name="set_video_in_list">Vidéos dans une liste</string>
     <string name="set_video_in_list_description">Change la mise en page pour afficher les vidéos dans une liste</string>
 
+    <string name="_retry">Réessayer</string>
+    <string name="refresh_token_failed">Échec de rafraîchissement du jeton d\'accès</string>
+    <string name="refresh_token_failed_message">Vous pouvez réessayer de le rafraîchir ou simplement déconnecter le compte</string>
     <string name="export_list">Exporter</string>
     <string name="import_list">Importer</string>
     <string name="originally_published">Date de publication</string>
@@ -304,6 +307,14 @@
         <item>Moyenne</item>
         <item>Faible</item>
     </string-array>
+
+    <string name="unlimited">Illimité</string>
+    <string name="mb">Mo</string>
+    <string name="gb">Go</string>
+    <string name="total_video_quota">Total du quota vidéo</string>
+    <string name="daily_video_quota">Quota vidéo journalier</string>
+    <string name="nsfw_title_warning">Contenu explicite ou sensible</string>
+    <string name="nsfw_message_warning">Cette vidéo contient du contenu sensible. Êtes-vous sûr·e de vouloir la regarder ?</string>
     <string name="set_autoplay_next_video_settings">Lecture automatique</string>
     <string name="unfollow_confirm">Voulez-vous vous désabonner de ce compte ?</string>
     <string name="no_playlist">Aucune liste de lecture !</string>

app/src/fdroid_full/play/listings/fr/full-description.txt

@@ -12,7 +12,7 @@ C'est un mode limité où vous pouvez faire certaines actions:
 De nombreuses fonctionnalités sont disponibles avec ce mode:
 
 - Rédiger/supprimer des commentaires
-- Télécharger/supprimer/modifier des vidéos
+- Téléverser/supprimer/modifier des vidéos
 - Gérer (créer/modifier/supprimer) les chaînes et les listes de lecture
 - Suivre/ne pas suivre les canaux
 - Pouces vers le haut/vers le bas

app/src/fdroid_full/play/release-notes/en-US/default.txt

@@ -1,21 +1,15 @@
 Added:
-- playback speed
-- video attributes (clickable tags)
-- update channel photo
-- higher definition for video preview
+- Allow to search channels
+- Show storage quota
+- Warning on Playing NSFW videos
+- Swipe to change timelines
 
 Changed:
-- Improve player
-- Auto-play next video accessible in player
+- Improve comment threads
+- Comment composer in full-screen
+- Swipe to change timeline
 
 Fixed:
-- video upload error
-- screen lock is not working
-- url intent does not recognise url with current time
-- editing a video having long description shows only truncated description
-- pasting video url has a bug
-- sepia search visual bug in dark mode
-- 0p resolution for the low definition in settings
-- unlisted playlist error
-- resolution does not seem to change
-- Fix playing videos in notifications from remote accounts
+- Status bar for fullscreen not removed
+- Filter for subscriptions not working with remote accounts
+- Some crashes

app/src/full/res/values-ar/strings.xml

@@ -86,6 +86,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">موافق</string>
     <string name="no">لا</string>
     <string name="cancel">إلغاء</string>
@@ -126,6 +129,13 @@
     <string name="nothing_to_do">لا يمكن اتخاذ أي إجراء</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">كتم</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">البحث</string>
     <string name="delete">حذف</string>
     <string name="action_lists_confirm_delete">هل تود فعلا حذف هذه القائمة ؟</string>

app/src/full/res/values-de/strings.xml

@@ -14,17 +14,17 @@
     <string name="set_autoplay_description">Wenn aktiviert, werden Videos automatisch abgespielt</string>
     <string name="set_fullscreen">Vollbild</string>
     <string name="set_fullscreen_description">Videos automatisch im Vollbildmodus öffnen</string>
-    <string name="set_autoplay_next_video_settings">Autoplay</string>
+    <string name="set_autoplay_next_video_settings">Automatische Wiedergabe</string>
     <string name="set_autoplay_next_video">Automatisch nächstes Video starten</string>
     <string name="set_autoplay_next_video_description">Wenn ein Video endet, nächstes vorgeschlagene starten.</string>
     <string name="add_public_reply">Öffentliche Antwort hinzufügen</string>
-    <string name="originally_published">Originally published</string>
+    <string name="originally_published">Ursprünglich veröffentlicht</string>
     <string name="activity">Aktivität</string>
     <string name="app">Anwendung</string>
     <string name="notif_new_video">Neues Video aus deinen Abonnements</string>
     <string name="notif_new_comment">Neuer Kommentar zu deinem Video</string>
     <string name="notif_blocked">Eines deiner Videos ist blockiert/entsperrt</string>
-    <string name="notif_video_published">Video veröffentlicht (nach Umkodierung/geplantem Update)</string>
+    <string name="notif_video_published">Video veröffentlicht (nach Umkodierung/geplanter Aktualisierung)</string>
     <string name="notif_video_imported">Videoimport abgeschlossen</string>
     <string name="notif_new_followers">Du oder dein Kanal(e) haben einen neuen Follower</string>
     <string name="notif_video_mention">Jemand hat dich in einem Kommentar erwähnt</string>
@@ -58,13 +58,13 @@
     <string name="no_notifications">Keine Benachrichtigungen!</string>
     <string name="favicon">Favicon</string>
     <string name="open_with">Öffnen mit</string>
-    <string name="action_playlist_edit">Playlist bearbeiten</string>
+    <string name="action_playlist_edit">Wiedergabeliste bearbeiten</string>
     <string name="close">Schließen</string>
     <string name="upload_video">Hochladen</string>
     <string name="image_preview">Bildvorschau</string>
     <string name="file_to_upload">Datei zum Hochladen auswählen</string>
     <string name="new_video">Neues Video</string>
-    <string name="new_blacklist">Neue Blacklist Info</string>
+    <string name="new_blacklist">Neue Schwarze-Liste-Infos</string>
     <string name="new_my_video_published">Dein Video wurde veröffentlicht</string>
     <string name="new_my_video_error">Fehler bei Veröffentlichung deines Videos</string>
     <string name="new_comment">Neuer Kommentar</string>
@@ -82,13 +82,16 @@
         <item>6 Stunden</item>
         <item>12 Stunden</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="cancel">Abbrechen</string>
     <string name="download">Herunterladen</string>
     <string name="profile_picture">Profilbild</string>
     <string name="update_video">Video aktualisieren</string>
-    <string name="remove_from_playlist">Aus Playlist entfernen</string>
+    <string name="remove_from_playlist">Aus Wiedergabeliste entfernen</string>
     <string name="date_seconds">%d en</string>
     <string name="date_minutes">%d en</string>
     <string name="date_hours">%d en</string>
@@ -120,8 +123,15 @@
     <string name="toast_error_loading_account">Ein Fehler ist während des Kontowechsels aufgetreten!</string>
     <string name="toast_error_search">Ein Fehler ist während der Suche aufgetreten!</string>
     <string name="nothing_to_do">Keine Aktion möglich</string>
-    <string name="action_follow">Subscribe</string>
+    <string name="action_follow">Abonnieren</string>
     <string name="action_mute">Stummschalten</string>
+    <string name="unlimited">Unbegrenzt</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Suche</string>
     <string name="delete">Löschen</string>
     <string name="action_lists_confirm_delete">Möchtest du diese Liste wirklich dauerhaft löschen?</string>
@@ -176,7 +186,7 @@
     <string name="peertube_enable_comments">Videokommentare aktivieren</string>
     <string name="description">Beschreibung</string>
     <string name="toast_peertube_video_updated">Das Video wurde aktualisiert!</string>
-    <string name="register_account">Account erstellen</string>
+    <string name="register_account">Konto erstellen</string>
     <string name="email_address">E‐Mail‐Adresse</string>
     <string name="preview">Vorschau</string>
     <string name="change_preview">Vorschaubild ändern</string>
@@ -208,7 +218,7 @@
     <string name="share">Teilen</string>
     <string name="peertube_comment_on_video"><![CDATA[<b>%1$s</b> hat dein Video <b>%2$s</b> kommentiert]]></string>
     <string name="peertube_follow_channel"><![CDATA[<b>%1$s</b> folgt deinem Kanal <b>%2$s</b>]]></string>
-    <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> folgt deinem Account]]></string>
+    <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> folgt deinem Konto]]></string>
     <string name="peertube_video_published"><![CDATA[Dein Video <b>%1$s</b> wurde veröffentlicht]]></string>
     <string name="peertube_video_import_success"><![CDATA[Ihr Video <b>%1$s</b> wurde erfolgreich importiert]]></string>
     <string name="peertube_video_import_error"><![CDATA[Der Import Ihres Videos <b>%1$s</b> ist fehlgeschlagen]]></string>
@@ -221,20 +231,20 @@
     <string name="send_comment">Kommentar absenden</string>
     <string name="all">Alle</string>
     <!-- end languages -->
-    <string name="playback_speed">Playback speed</string>
+    <string name="playback_speed">Wiedergabegeschwindigkeit</string>
     <string name="normal">Normal</string>
-    <string name="delete_history">Delete videos history</string>
-    <string name="delete_history_confirm">Are you sure you want to delete all your videos history?</string>
-    <string name="export_list">Export</string>
-    <string name="import_list">Import</string>
-    <string name="export_notification_title">Successful export!</string>
-    <string name="export_notification_content">Tap here to send the export by email</string>
-    <string name="export_notification_subjet">New Playlist</string>
-    <string name="export_notification_body">Open the attached file with TubeLab</string>
+    <string name="delete_history">Videoverlauf löschen</string>
+    <string name="delete_history_confirm">Sind Sie sicher, dass Sie den gesamten Verlauf löschen wollen?</string>
+    <string name="export_list">Exportieren</string>
+    <string name="import_list">Importieren</string>
+    <string name="export_notification_title">Export erfolgreich!</string>
+    <string name="export_notification_content">Hier tippen, um den Export per E-Mail zu senden</string>
+    <string name="export_notification_subjet">Neue Wiedergabeliste</string>
+    <string name="export_notification_body">Die angehängte Datei mit TubeLab öffnen</string>
     <string name="playlists">Wiedergabelisten</string>
-    <string name="no_playlist">No playlists</string>
+    <string name="no_playlist">Keine Wiedergabelisten</string>
     <string name="display_name">Anzeigename</string>
-    <string name="action_playlist_add">Sie haben noch keine Wiedergabelisten. Klicken Sie auf das Symbol „➕”, um eine neue Wiedergabeliste hinzuzufügen.</string>
+    <string name="action_playlist_add">Sie haben noch keine Wiedergabelisten. Klicken Sie auf das Symbol „➕“, um eine neue Wiedergabeliste hinzuzufügen</string>
     <string name="error_display_name">Du musst einen Anzeigenamen angeben!</string>
     <string name="error_channel_mandatory">Ein Kanal wird benötigt, wenn es sich um eine öffentliche Wiedergabeliste handelt.</string>
     <string name="action_playlist_create">Wiedergabeliste erstellen</string>
@@ -251,14 +261,14 @@
     <string name="password_indicator">Verwende mindestens 8 Zeichen</string>
     <string name="password_too_short">Das Passwort muss mindestens 8 Zeichen lang sein</string>
     <string name="username_error">Der Benutzername darf nur Buchstaben, Ziffern und Unterstriche enthalten</string>
-    <string name="account_created">Account erfolgreich erstellt!</string>
-    <string name="account_created_message">        Dein Account wurde erfolgreich erstellt!\n\n
+    <string name="account_created">Konto erstellt!</string>
+    <string name="account_created_message">Dein Konto wurde erfolgreich erstellt!\n\n
         Denke daran, deine E-Mail-Adresse innerhalb der nächsten 48 Stunden zu bestätigen.\n\n
         Du kannst nun deinen Account verbinden, indem du <b>%1$s</b> in das erste Feld schreibst und auf <b>Verbinden</b>klickst.\n\n
         <b>Wichtig</b>: Wenn deine Instanz eine Bestätigung benötigt, erhältst du eine E-Mail, sobald sie geprüft wurde!
     </string>
     <string name="account">Benutzerkonto</string>
-    <string name="report_account">Account melden</string>
+    <string name="report_account">Konto melden</string>
     <string-array name="settings_video_mode">
         <item>Normal</item>
         <item>WebView</item>
@@ -281,27 +291,27 @@
     <string name="agreement_check_peertube">Ich bin mindestens 16 Jahre alt und stimme den %1$s dieser Instanz zu</string>
     <string name="edit_profile">Profil bearbeiten</string>
     <string name="make_an_action">Aktion ausführen</string>
-    <string name="action_unfollow">Unsubscribe</string>
+    <string name="action_unfollow">Abonnement abbestellen</string>
     <string name="display_nsfw_videos">Heikle Videos anzeigen</string>
     <string name="fullscreen">Vollbildmodus</string>
     <string name="bookmark_peertube_empty">Keine Videos in den Favoriten!</string>
     <string name="delete_channel">Kanal entfernen</string>
     <string name="action_channel_confirm_delete">Möchtest du diesen Kanal wirklich löschen?</string>
     <string name="modify_playlists">Video in Wiedergabelisten</string>
-    <string name="no_muted">Keine stummgeschalteten Accounts!</string>
+    <string name="no_muted">Keine stummgeschalteten Konten!</string>
     <string name="error_display_name_channel">Du musst einen Namen und einen Anzeigenamen für diesen Kanal definieren!</string>
     <string name="action_channel_create">Kanal erstellen</string>
     <string name="action_channel_edit">Kanal bearbeiten</string>
     <string name="email_error_domain">E-Mail-Adressen bei %1$s sind nicht erlaubt!</string>
     <string name="report_comment_size">Bitte gib einen Grund an</string>
     <string name="not_logged_in">Du musst authentifiziert sein, um diesen Vorgang auszuführen.</string>
-    <string name="successful_report">Der Account wurde gemeldet!</string>
+    <string name="successful_report">Das Konto wurde gemeldet!</string>
     <string name="successful_report_comment">Der Kommentar wurde gemeldet!</string>
     <string name="successful_video_report">Dieses Video wurde gemeldet!</string>
     <string name="password_length_error">Das Passwort muss mindestens 6 Zeichen lang sein!</string>
-    <string name="muted_done">Der Account wurde stummgeschaltet!</string>
+    <string name="muted_done">Das Konto wurde stummgeschaltet!</string>
     <string name="edit_video">Video bearbeiten</string>
-    <string name="create_an_account">Account erstellen</string>
+    <string name="create_an_account">Konto erstellen</string>
     <string name="followers_count">%1$s Abonnenten</string>
     <string name="developer">Entwickler</string>
     <string name="about_vesrion">Version %1$s</string>
@@ -320,8 +330,8 @@
     <string name="pickup_languages">Sprachen wählen</string>
     <string name="notification_channel_name">Information aktualisiert</string>
     <string name="fetch_notification_channel_name">Rufe Benachrichtigungen ab</string>
-    <string name="add_account">Füge einen Account hinzu</string>
-    <string name="list_of_accounts">Liste der Accounts</string>
+    <string name="add_account">Ein Konto hinzufügen</string>
+    <string name="list_of_accounts">Liste der Konten</string>
     <string name="pause">Pause</string>
     <string name="play">Abspielen</string>
     <string name="minimize">Verkleinern</string>

app/src/full/res/values-el/strings.xml

@@ -82,6 +82,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Ναι</string>
     <string name="no">Όχι</string>
     <string name="cancel">Ακύρωση</string>
@@ -122,6 +125,13 @@
     <string name="nothing_to_do">Δεν μπορεί να εκτελεστεί καμία ενέργεια</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Σίγαση</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Αναζήτηση</string>
     <string name="delete">Διαγραφή</string>
     <string name="action_lists_confirm_delete">Είστε βέβαιοι ότι θέλετε να διαγράψετε μόνιμα αυτή τη λίστα;</string>

app/src/full/res/values-es/strings.xml

@@ -82,6 +82,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Sí</string>
     <string name="no">No</string>
     <string name="cancel">Cancelar</string>
@@ -122,6 +125,13 @@
     <string name="nothing_to_do">No hay ninguna acción disponible</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Silenciar</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Buscar</string>
     <string name="delete">Eliminar</string>
     <string name="action_lists_confirm_delete">¿Estás seguro de que quieres eliminar definitivamente esta lista?</string>

app/src/full/res/values-fr/strings.xml

@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="set_video_in_list">Videos in list</string>
-    <string name="set_video_in_list_description">Change the layout for displaying videos in a list</string>
-    <string name="no_instances">No instances !</string>
-    <string name="show_more">Show more</string>
-    <string name="show_less">Show less</string>
-    <string name="set_play_screen_lock">Screen lock</string>
-    <string name="set_play_screen_lock_description">Keep playing videos when the screen is locked</string>
-    <string name="save">Save</string>
-    <string name="enable_history">Enable history</string>
-    <string name="change_profile_picture">Change profile picture</string>
-    <string name="set_autoplay">Automatic playback</string>
-    <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
-    <string name="set_fullscreen">Fullscreen</string>
-    <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
-    <string name="set_autoplay_next_video_settings">Autoplay</string>
-    <string name="set_autoplay_next_video">Automatically start playing the next video</string>
-    <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
+    <string name="set_video_in_list">Vidéos en liste</string>
+    <string name="set_video_in_list_description">Modifier la mise en page pour afficher les vidéos dans une liste</string>
+    <string name="no_instances">Aucune instance !</string>
+    <string name="show_more">Afficher plus</string>
+    <string name="show_less">Afficher moins</string>
+    <string name="set_play_screen_lock">Verrouillage de l\'écran</string>
+    <string name="set_play_screen_lock_description">Continuer à lire des vidéos quand l\'écran est verrouillé</string>
+    <string name="save">Enregistrer</string>
+    <string name="enable_history">Activer l\'historique</string>
+    <string name="change_profile_picture">Changer la photo de profil</string>
+    <string name="set_autoplay">Lecture automatique</string>
+    <string name="set_autoplay_description">Si activé, les vidéos seront lues automatiquement</string>
+    <string name="set_fullscreen">Plein écran</string>
+    <string name="set_fullscreen_description">Ouvrir automatiquement les vidéos en plein écran</string>
+    <string name="set_autoplay_next_video_settings">Lecture auto</string>
+    <string name="set_autoplay_next_video">Démarrer automatiquement la lecture de la prochaine vidéo</string>
+    <string name="set_autoplay_next_video_description">Quand une vidéo est finie, continuer avec la prochaine vidéo suggérée.</string>
     <string name="add_public_reply">Ajouter une réponse publique</string>
-    <string name="originally_published">Originally published</string>
-    <string name="activity">Activity</string>
-    <string name="app">App</string>
-    <string name="notif_new_video">New video from your subscriptions</string>
-    <string name="notif_new_comment">New comment on your video</string>
-    <string name="notif_blocked">One of your video is blocked/unblocked</string>
-    <string name="notif_video_published">Video published (after transcoding/scheduled update)</string>
-    <string name="notif_video_imported">Video import finished</string>
-    <string name="notif_new_followers">You or your channel(s) has a new follower</string>
-    <string name="notif_video_mention">Someone mentioned you in video comments</string>
-    <string name="notif_abuse_received">An abuse report received a new message</string>
-    <string name="notif_abuse_accepted">One of your abuse reports has been accepted or rejected by moderators</string>
+    <string name="originally_published">Publié originalement</string>
+    <string name="activity">Activité</string>
+    <string name="app">Appli</string>
+    <string name="notif_new_video">Nouvelle vidéo de vos abonnements</string>
+    <string name="notif_new_comment">Nouveau commentaire sur votre vidéo</string>
+    <string name="notif_blocked">Une de vos vidéos est bloquée/débloquée</string>
+    <string name="notif_video_published">Vidéo publiée (après transcodage/mise à jour planifiée)</string>
+    <string name="notif_video_imported">Importation de la vidéo terminée</string>
+    <string name="notif_new_followers">Vous ou votre/vos chaîne(s) avez un nouvel abonné</string>
+    <string name="notif_video_mention">Quelqu\'un vous a mentionné·e dans un commentaire</string>
+    <string name="notif_abuse_received">Un rapport d\'abus a reçu un nouveau message</string>
+    <string name="notif_abuse_accepted">Un de vos rapports d\'abus a été accepté ou rejeté par les modérateurs</string>
     <plurals name="number_of_replies">
         <item quantity="one">%d réponse</item>
         <item quantity="other">%d réponses</item>
@@ -62,26 +62,29 @@
     <string name="close">Fermer</string>
     <string name="upload_video">Téléverser</string>
     <string name="image_preview">Aperçu de l\'image</string>
-    <string name="file_to_upload">Sélectionnez un fichier à transférer</string>
-    <string name="new_video">New video</string>
-    <string name="new_blacklist">New blacklist info</string>
-    <string name="new_my_video_published">Your video is published</string>
-    <string name="new_my_video_error">Error when publishing your video</string>
-    <string name="new_comment">New comment</string>
-    <string name="new_follow">New follow</string>
+    <string name="file_to_upload">Sélectionnez un fichier à téléverser</string>
+    <string name="new_video">Nouvelle vidéo</string>
+    <string name="new_blacklist">Nouvelles infos sut la liste noire</string>
+    <string name="new_my_video_published">Votre vidéo est publiée</string>
+    <string name="new_my_video_error">Erreur lors de la publication de votre vidéo</string>
+    <string name="new_comment">Nouveau commentaire</string>
+    <string name="new_follow">Nouvel abonnement</string>
     <string name="channel">Chaîne</string>
     <string name="videos">Vidéos</string>
     <string name="channels">Chaînes</string>
-    <string name="refresh_every">Fetch every:</string>
+    <string name="refresh_every">Récupérer chaque :</string>
     <string-array name="refresh_time">
-        <item>Never</item>
+        <item>Jamais</item>
         <item>15 minutes</item>
         <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
+        <item>1 heure</item>
+        <item>2 heures</item>
+        <item>6 heures</item>
+        <item>12 heures</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
     <string name="cancel">Annuler</string>
@@ -95,13 +98,13 @@
     <string name="date_day">%d j</string>
     <string name="number_view_video">%s vues</string>
     <string name="title_instance_login">Domaine de l\'instance</string>
-    <string name="uploading">Transfert en cours, veuillez patienter …</string>
-    <string name="upload_video_success">La vidéo a été transférée !</string>
-    <string name="toast_cancelled">Transfert annulé !</string>
-    <string name="video_uploaded_action">Cliquez ici pour éditer les données de la vidéo.</string>
-    <string name="toot_select_image_error">Une erreur s’est produite lors de la sélection du média !</string>
+    <string name="uploading">Téléversement en cours, veuillez patienter…</string>
+    <string name="upload_video_success">La vidéo a été téléversée !</string>
+    <string name="toast_cancelled">Téléversement annulé !</string>
+    <string name="video_uploaded_action">Cliquez ici pour modifier les données de la vidéo.</string>
+    <string name="toot_select_image_error">Une erreur s\'est produite lors de la sélection du média !</string>
     <string name="download_file">Télécharger %1$s</string>
-    <string name="account_updated">The account has been updated!</string>
+    <string name="account_updated">Le compte a été mis à jour !</string>
     <string name="action_privacy">Confidentialité</string>
     <string name="action_logout">Déconnexion</string>
     <string name="login">Connexion</string>
@@ -120,8 +123,15 @@
     <string name="toast_error_loading_account">Une erreur s’est produite pendant le chargement du compte !</string>
     <string name="toast_error_search">Une erreur s’est produite lors de la recherche !</string>
     <string name="nothing_to_do">Aucune action ne peut être réalisée</string>
-    <string name="action_follow">Subscribe</string>
+    <string name="action_follow">S\'abonner</string>
     <string name="action_mute">Mettre en sourdine</string>
+    <string name="unlimited">Illimité</string>
+    <string name="mb">Mo</string>
+    <string name="gb">Go</string>
+    <string name="total_video_quota">Quota vidéo total</string>
+    <string name="daily_video_quota">Quota vidéo quotidien</string>
+    <string name="nsfw_title_warning">Contenu adulte ou vulgaire</string>
+    <string name="nsfw_message_warning">Cette vidéo contient du contenu adulte ou vulgaire. Êtes-vous sûr·e de vouloir la regarder ?</string>
     <string name="search">Chercher</string>
     <string name="delete">Supprimer</string>
     <string name="action_lists_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette liste de lecture ?</string>
@@ -135,8 +145,8 @@
     <string name="app_logo">Logo de l’application</string>
     <!-- languages not translated -->
     <string name="subscriptions">Abonnements</string>
-    <string name="delete_instance">Delete an instance</string>
-    <string name="delete_instance_confirm">Are you sure to delete this instance?</string>
+    <string name="delete_instance">Supprimer l\'instance</string>
+    <string name="delete_instance_confirm">Êtes-vous sûr·e de vouloir supprimer cette instance ?</string>
     <string name="delete_comment">Supprimer le commentaire</string>
     <string name="delete_comment_confirm">Etes-vous sûr de vouloir supprimer ce commentaire ?</string>
     <string name="set_video_mode">Mode pour les vidéos</string>
@@ -177,7 +187,7 @@
     <string name="description">Libellé</string>
     <string name="toast_peertube_video_updated">La vidéo a été mise à jour !</string>
     <string name="register_account">Créer un compte</string>
-    <string name="email_address">Adresse mèl</string>
+    <string name="email_address">Adresse courriel</string>
     <string name="preview">Aperçu</string>
     <string name="change_preview">Modifier l\'aperçu</string>
     <string name="name">Nom</string>
@@ -215,24 +225,24 @@
     <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> a publié une nouvelle vidéo : <b>%2$s</b>]]></string>
     <string name="peertube_video_blacklist"><![CDATA[Votre vidéo <b>%1$s</b> a été blacklisté]]></string>
     <string name="peertube_video_unblacklist"><![CDATA[Votre vidéo <b>%1$s</b> n’est plus blacklisté]]></string>
-    <string name="peertube_video_report_success"><![CDATA[Your abuse report <b>%1$s</b> has been accepted]]></string>
+    <string name="peertube_video_report_success"><![CDATA[Votre rapport d’abus <b>%1$s</b> a été accepté]]></string>
     <string name="peertube_video_abuse"><![CDATA[Nouveau signalement pour la vidéo : <b>%1$s</b>]]></string>
     <string name="add_public_comment">Ajouter un commentaire public</string>
     <string name="send_comment">Envoyer un commentaire</string>
     <string name="all">Tout</string>
     <!-- end languages -->
-    <string name="playback_speed">Playback speed</string>
-    <string name="normal">Normal</string>
-    <string name="delete_history">Delete videos history</string>
-    <string name="delete_history_confirm">Are you sure you want to delete all your videos history?</string>
-    <string name="export_list">Export</string>
-    <string name="import_list">Import</string>
-    <string name="export_notification_title">Successful export!</string>
-    <string name="export_notification_content">Tap here to send the export by email</string>
-    <string name="export_notification_subjet">New Playlist</string>
-    <string name="export_notification_body">Open the attached file with TubeLab</string>
+    <string name="playback_speed">Vitesse de lecture</string>
+    <string name="normal">Normale</string>
+    <string name="delete_history">Supprimer l\'historique des vidéos</string>
+    <string name="delete_history_confirm">Êtes-vous sûr·e de vouloir supprimer tout votre historique des vidéos ?</string>
+    <string name="export_list">Exporter</string>
+    <string name="import_list">Importer</string>
+    <string name="export_notification_title">Exportation réussie !</string>
+    <string name="export_notification_content">Appuyez ici pour envoyer l\'exportation par courriel</string>
+    <string name="export_notification_subjet">Nouvelle liste de lecture</string>
+    <string name="export_notification_body">Ouvrir le fichier joint avec TubeLab</string>
     <string name="playlists">Listes de lecture</string>
-    <string name="no_playlist">No playlists</string>
+    <string name="no_playlist">Aucune liste de lecture</string>
     <string name="display_name">Nom d\'affichage</string>
     <string name="action_playlist_add">Vous n\'avez aucune liste de lecture. Cliquez sur l\'icône « + » pour en ajouter une</string>
     <string name="error_display_name">Vous devez fournir un nom d\'affichage !</string>
@@ -246,13 +256,17 @@
     <string name="sign_up">S’inscrire</string>
     <string name="all_field_filled">Veuillez remplir tous les champs !</string>
     <string name="password_error">Les mots de passe ne sont pas identiques !</string>
-    <string name="email_error">L\'e-mail ne semble pas être valide !</string>
-    <string name="email_indicator">Vous recevrez un e-mail de confirmation</string>
+    <string name="email_error">Le courriel ne semble pas être valide !</string>
+    <string name="email_indicator">Vous recevrez un courriel de confirmation</string>
     <string name="password_indicator">Utilisez au moins 8 caractères</string>
     <string name="password_too_short">Le mot de passe doit contenir au moins 8 caractères</string>
     <string name="username_error">Le nom d\'utilisateur·rice doit être en minuscule, contenir uniquement des lettres, des chiffres, des points et des caractères de soulignement</string>
     <string name="account_created">Compte créé !</string>
-    <string name="account_created_message">Votre compte est créé !\n\nVous allez recevoir un email de confirmation à l\'adresse <b>%1$s</b>.\n\nCliquez sur le lien présent dans le mail pour valider votre compte.</string>
+    <string name="account_created_message">        Votre compte a été créé !\n\n
+        Pensez à valider votre courriel dans les 48 heures qui suivent.\n\n
+        Vous pouvez maintenant connecter votre compte en écrivant <b>%1$s</b> dans le premier champ et en appuyant sur <b>Connecter</b>.\n\n
+        <b>Important</b> : si votre instance a besoin de validation, vous recevrez un courriel une qu\'elle est fois validée !
+    </string>
     <string name="account">Compte</string>
     <string name="report_account">Signaler le compte</string>
     <string-array name="settings_video_mode">
@@ -277,7 +291,7 @@
     <string name="agreement_check_peertube">J\'ai au moins 16 ans et je suis d\'accord avec les %1$s de cette instance</string>
     <string name="edit_profile">Éditer le profil</string>
     <string name="make_an_action">Faire une action</string>
-    <string name="action_unfollow">Unsubscribe</string>
+    <string name="action_unfollow">Se désabonner</string>
     <string name="display_nsfw_videos">Afficher les vidéos sensibles</string>
     <string name="fullscreen">Vidéo plein écran</string>
     <string name="bookmark_peertube_empty">Il n’y a aucune vidéo Peertube dans vos favoris !</string>
@@ -288,7 +302,7 @@
     <string name="error_display_name_channel">Vous devez fournir un nom d\'affichage et un nom pour la chaîne!</string>
     <string name="action_channel_create">Créer une chaîne</string>
     <string name="action_channel_edit">Modifier une chaîne</string>
-    <string name="email_error_domain">Les adresses mails %1$s ne sont pas autorisées !</string>
+    <string name="email_error_domain">Les adresses courriel %1$s ne sont pas autorisées !</string>
     <string name="report_comment_size">Veuillez préciser les raisons.</string>
     <string name="not_logged_in">Vous devez être connecté.e pour effectuer cette action !</string>
     <string name="successful_report">Le compte a été signalé !</string>
@@ -315,7 +329,7 @@
     <string name="pickup_categories">Sélection des catégories</string>
     <string name="pickup_languages">Sélection des langues</string>
     <string name="notification_channel_name">Mise à jour des informations</string>
-    <string name="fetch_notification_channel_name">Fetch notifications</string>
+    <string name="fetch_notification_channel_name">Récupérer les notifications</string>
     <string name="add_account">Ajouter un compte</string>
     <string name="list_of_accounts">Liste des comptes</string>
     <string name="pause">Pause</string>

app/src/full/res/values-it/strings.xml

@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="set_video_in_list">Videos in list</string>
-    <string name="set_video_in_list_description">Change the layout for displaying videos in a list</string>
-    <string name="no_instances">No instances !</string>
-    <string name="show_more">Show more</string>
-    <string name="show_less">Show less</string>
-    <string name="set_play_screen_lock">Screen lock</string>
-    <string name="set_play_screen_lock_description">Keep playing videos when the screen is locked</string>
-    <string name="save">Save</string>
-    <string name="enable_history">Enable history</string>
-    <string name="change_profile_picture">Change profile picture</string>
-    <string name="set_autoplay">Automatic playback</string>
-    <string name="set_autoplay_description">If enabled, videos will be played automatically</string>
-    <string name="set_fullscreen">Fullscreen</string>
-    <string name="set_fullscreen_description">Automatically open videos in fullscreen</string>
-    <string name="set_autoplay_next_video_settings">Autoplay</string>
-    <string name="set_autoplay_next_video">Automatically start playing the next video</string>
-    <string name="set_autoplay_next_video_description">When a video ends, follow up with the next suggested video.</string>
+    <string name="set_video_in_list">Elenco di video</string>
+    <string name="set_video_in_list_description">Cambia la disposizione per visualizzare i video in un elenco</string>
+    <string name="no_instances">Nessuna istanza!</string>
+    <string name="show_more">Mostra di più</string>
+    <string name="show_less">Mostra meno</string>
+    <string name="set_play_screen_lock">Blocco schermo</string>
+    <string name="set_play_screen_lock_description">Mantieni la riproduzione dei video quando lo schermo è bloccato</string>
+    <string name="save">Salva</string>
+    <string name="enable_history">Abilita la cronologia</string>
+    <string name="change_profile_picture">Cambia l\'immagine profilo</string>
+    <string name="set_autoplay">Riproduzione automatica</string>
+    <string name="set_autoplay_description">Se abilitata, i video verranno riprodotti automaticamente</string>
+    <string name="set_fullscreen">Schermo intero</string>
+    <string name="set_fullscreen_description">Apri automaticamente i video a schermo intero</string>
+    <string name="set_autoplay_next_video_settings">Riproduzione automatica</string>
+    <string name="set_autoplay_next_video">Inizia automaticamente a riprodurre il video successivo</string>
+    <string name="set_autoplay_next_video_description">Quando un video finisce, continuare con il video successivo suggerito.</string>
     <string name="add_public_reply">Aggiungere una risposta pubblica</string>
-    <string name="originally_published">Originally published</string>
-    <string name="activity">Activity</string>
-    <string name="app">App</string>
-    <string name="notif_new_video">New video from your subscriptions</string>
-    <string name="notif_new_comment">New comment on your video</string>
-    <string name="notif_blocked">One of your video is blocked/unblocked</string>
-    <string name="notif_video_published">Video published (after transcoding/scheduled update)</string>
-    <string name="notif_video_imported">Video import finished</string>
-    <string name="notif_new_followers">You or your channel(s) has a new follower</string>
+    <string name="originally_published">Originariamente pubblicato</string>
+    <string name="activity">Attività</string>
+    <string name="app">Applicazione</string>
+    <string name="notif_new_video">Nuovo video dalle tue sottoscrizioni</string>
+    <string name="notif_new_comment">Nuovo commento sul tuo video</string>
+    <string name="notif_blocked">Uno dei tuoi video è bloccato/sbloccato</string>
+    <string name="notif_video_published">Video pubblicato (dopo la transcodifica/l\'aggiornamento programmato)</string>
+    <string name="notif_video_imported">Importazione video terminata</string>
+    <string name="notif_new_followers">Tu o i tuoi canali avete un nuovo abbonamento</string>
     <string name="notif_video_mention">Someone mentioned you in video comments</string>
     <string name="notif_abuse_received">An abuse report received a new message</string>
     <string name="notif_abuse_accepted">One of your abuse reports has been accepted or rejected by moderators</string>
@@ -63,25 +63,28 @@
     <string name="upload_video">Carica</string>
     <string name="image_preview">Anteprima immagine</string>
     <string name="file_to_upload">Seleziona il file da caricare</string>
-    <string name="new_video">New video</string>
-    <string name="new_blacklist">New blacklist info</string>
-    <string name="new_my_video_published">Your video is published</string>
-    <string name="new_my_video_error">Error when publishing your video</string>
-    <string name="new_comment">New comment</string>
-    <string name="new_follow">New follow</string>
+    <string name="new_video">Nuovo video</string>
+    <string name="new_blacklist">Nuove informazioni lista nera</string>
+    <string name="new_my_video_published">Il tuo video è stato pubblicato</string>
+    <string name="new_my_video_error">Errore durante la pubblicazione del video</string>
+    <string name="new_comment">Nuovo commento</string>
+    <string name="new_follow">Una nuova persona ti segue</string>
     <string name="channel">Canale</string>
     <string name="videos">Video</string>
     <string name="channels">Canali</string>
     <string name="refresh_every">Fetch every:</string>
     <string-array name="refresh_time">
-        <item>Never</item>
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
+        <item>Mai</item>
+        <item>15 minuti</item>
+        <item>30 minuti</item>
+        <item>1 ora</item>
+        <item>2 ore</item>
+        <item>6 ore</item>
+        <item>12 ore</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="cancel">Annulla</string>
@@ -101,7 +104,7 @@
     <string name="video_uploaded_action">Premi qui per modificare i dati del video.</string>
     <string name="toot_select_image_error">Si è verificato un errore durante la selezione del archivio!</string>
     <string name="download_file">Scarica %1$s</string>
-    <string name="account_updated">The account has been updated!</string>
+    <string name="account_updated">L\'account è stato aggiornato!</string>
     <string name="action_privacy">Privacy</string>
     <string name="action_logout">Disconnettiti</string>
     <string name="login">Accedi</string>
@@ -113,15 +116,22 @@
     <string name="shared_via">Condiviso tramite TubeLab</string>
     <string name="username">Nome utente</string>
     <string name="settings">Impostazioni</string>
-    <string name="logout_account_confirmation">Sei sicuro di voler fare il logout @%1$s@%2$s?</string>
+    <string name="logout_account_confirmation">Sei sicuro/a di voler uscire di @%1$s@%2$s?</string>
     <string name="following">Seguendo</string>
     <string name="followers">Seguaci</string>
     <string name="client_error">Impossibile ottenere il client id!</string>
     <string name="toast_error_loading_account">Si è verificato un errore durante il cambio tra gli account!</string>
     <string name="toast_error_search">Si è verificato un errore durante la ricerca!</string>
     <string name="nothing_to_do">Nessuna azione può essere intrapresa</string>
-    <string name="action_follow">Subscribe</string>
+    <string name="action_follow">Iscriviti</string>
     <string name="action_mute">Silenzia</string>
+    <string name="unlimited">Illimitato</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Cerca</string>
     <string name="delete">Elimina</string>
     <string name="action_lists_confirm_delete">Sei sicuro di voler eliminare definitivamente questa lista?</string>
@@ -135,7 +145,7 @@
     <string name="app_logo">Logo dell\'applicazione</string>
     <!-- languages not translated -->
     <string name="subscriptions">Abbonamenti</string>
-    <string name="delete_instance">Delete an instance</string>
+    <string name="delete_instance">Elimina un\'istanza</string>
     <string name="delete_instance_confirm">Are you sure to delete this instance?</string>
     <string name="delete_comment">Elimina il commento</string>
     <string name="delete_comment_confirm">Sei sicuro di voler eliminare questo commento?</string>
@@ -222,17 +232,17 @@
     <string name="all">Tutto</string>
     <!-- end languages -->
     <string name="playback_speed">Playback speed</string>
-    <string name="normal">Normal</string>
+    <string name="normal">Normale</string>
     <string name="delete_history">Delete videos history</string>
     <string name="delete_history_confirm">Are you sure you want to delete all your videos history?</string>
     <string name="export_list">Export</string>
     <string name="import_list">Import</string>
     <string name="export_notification_title">Successful export!</string>
     <string name="export_notification_content">Tap here to send the export by email</string>
-    <string name="export_notification_subjet">New Playlist</string>
+    <string name="export_notification_subjet">Nuova playlist</string>
     <string name="export_notification_body">Open the attached file with TubeLab</string>
     <string name="playlists">Playlist</string>
-    <string name="no_playlist">No playlists</string>
+    <string name="no_playlist">Nessuna playlist</string>
     <string name="display_name">Nome visualizzato</string>
     <string name="action_playlist_add">Non hai nessuna playlist. Premi l\'icona \"+\" per aggiungere una nuova playlist</string>
     <string name="error_display_name">È necessario fornire un nome da visualizzare!</string>

app/src/full/res/values-ja/strings.xml

@@ -81,6 +81,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
     <string name="cancel">キャンセル</string>
@@ -121,6 +124,13 @@
     <string name="nothing_to_do">何もすることはできません</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">ミュート</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">検索</string>
     <string name="delete">削除</string>
     <string name="action_lists_confirm_delete">このリストを完全に削除してもよろしいですか？</string>

app/src/full/res/values-ko/strings.xml

@@ -81,6 +81,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">예</string>
     <string name="no">아니</string>
     <string name="cancel">취소</string>
@@ -121,6 +124,13 @@
     <string name="nothing_to_do">아무 조치를 취할 수 없습니다</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">뮤트</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">검색</string>
     <string name="delete">삭제</string>
     <string name="action_lists_confirm_delete">이 리스트를 정말로 영원히 삭제하시겠습니까?</string>

app/src/full/res/values-nl/strings.xml

@@ -82,6 +82,9 @@
         <item>6 uren</item>
         <item>12 uren</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Ja</string>
     <string name="no">Geen</string>
     <string name="cancel">Annuleren</string>
@@ -122,6 +125,13 @@
     <string name="nothing_to_do">Er kan geen actie worden ondernomen</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Stomme</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Zoek</string>
     <string name="delete">Verwijder</string>
     <string name="action_lists_confirm_delete">Weet u zeker dat u deze lijst permanent wilt verwijderen?</string>

app/src/full/res/values-pl/strings.xml

@@ -14,11 +14,11 @@
     <string name="set_autoplay_description">Jeśli włączone, filmy będą odtwarzane automatycznie</string>
     <string name="set_fullscreen">Pełny ekran</string>
     <string name="set_fullscreen_description">Automatycznie otwieraj filmy w trybie pełnoekranowym</string>
-    <string name="set_autoplay_next_video_settings">Autoplay</string>
+    <string name="set_autoplay_next_video_settings">Autoodtwarzanie</string>
     <string name="set_autoplay_next_video">Automatycznie rozpocznij odtwarzanie następnego filmu</string>
     <string name="set_autoplay_next_video_description">Kiedy film się skończy, odtwórz następny sugerowany film.</string>
     <string name="add_public_reply">Dodaj publiczną odpowiedź</string>
-    <string name="originally_published">Originally published</string>
+    <string name="originally_published">Oryginalnie opublikowane</string>
     <string name="activity">Aktywność</string>
     <string name="app">Aplikacja</string>
     <string name="notif_new_video">Nowy film z twoich subskrypcji</string>
@@ -84,6 +84,9 @@
         <item>6 godzin</item>
         <item>12 godzin</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Tak</string>
     <string name="no">Nie</string>
     <string name="cancel">Anuluj</string>
@@ -122,8 +125,15 @@
     <string name="toast_error_loading_account">Wystąpił błąd podczas przełączania konta!</string>
     <string name="toast_error_search">Podczas wyszukiwania wystąpił błąd!</string>
     <string name="nothing_to_do">Nie można podjąć żadnych działań</string>
-    <string name="action_follow">Subscribe</string>
+    <string name="action_follow">Subskrybuj</string>
     <string name="action_mute">Wycisz</string>
+    <string name="unlimited">Bez ograniczeń</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Całkowity limit filmów</string>
+    <string name="daily_video_quota">Dzienny limit filmów</string>
+    <string name="nsfw_title_warning">Dojrzała lub jawna zawartość</string>
+    <string name="nsfw_message_warning">Ten film zawiera treści dojrzałe lub jawne. Czy na pewno chcesz go obejrzeć?</string>
     <string name="search">Szukaj</string>
     <string name="delete">Usuń</string>
     <string name="action_lists_confirm_delete">Czy na pewno chcesz na stałe usunąć tę listę?</string>
@@ -223,10 +233,10 @@
     <string name="send_comment">Prześlij komentarz</string>
     <string name="all">Wszystkie</string>
     <!-- end languages -->
-    <string name="playback_speed">Playback speed</string>
-    <string name="normal">Normal</string>
-    <string name="delete_history">Delete videos history</string>
-    <string name="delete_history_confirm">Are you sure you want to delete all your videos history?</string>
+    <string name="playback_speed">Szybkość odtwarzania</string>
+    <string name="normal">Normalny</string>
+    <string name="delete_history">Wyczyść historię</string>
+    <string name="delete_history_confirm">Czy na pewno chcesz usunąć całą historię filmów?</string>
     <string name="export_list">Eksportuj</string>
     <string name="import_list">Importuj</string>
     <string name="export_notification_title">Eksport zakończony sukcesem!</string>
@@ -283,7 +293,7 @@
     <string name="agreement_check_peertube">Mam co najmniej 16 lat i zgadzam się na %1$s w tym przypadku</string>
     <string name="edit_profile">Profil edycyjny</string>
     <string name="make_an_action">Podejmij działania</string>
-    <string name="action_unfollow">Unsubscribe</string>
+    <string name="action_unfollow">Anuluj subskrypcję</string>
     <string name="display_nsfw_videos">Wyświetlanie wrażliwych filmów wideo</string>
     <string name="fullscreen">Fullscreen</string>
     <string name="bookmark_peertube_empty">Nie ma żadnych filmów w twoich ulubionych!</string>

app/src/full/res/values-pt/strings.xml

@@ -82,6 +82,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Sim</string>
     <string name="no">Não</string>
     <string name="cancel">Cancelar</string>
@@ -122,6 +125,13 @@
     <string name="nothing_to_do">A ação não pode ser feita ou não é suportada</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Silenciar</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Pesquisa</string>
     <string name="delete">Remover</string>
     <string name="action_lists_confirm_delete">Tem certeza de que deseja excluir permanentemente esta lista?</string>

app/src/full/res/values-ro/strings.xml

@@ -83,6 +83,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Da</string>
     <string name="no">Nu</string>
     <string name="cancel">Anulare</string>
@@ -123,6 +126,13 @@
     <string name="nothing_to_do">Nu se poate efectua nici o acțiune</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Mod silențios</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Căutare</string>
     <string name="delete">Șterge</string>
     <string name="action_lists_confirm_delete">Are you sure you want to permanently delete this list?</string>

app/src/full/res/values-ru/strings.xml

@@ -84,6 +84,9 @@
         <item>6 часов</item>
         <item>12 часов</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Да</string>
     <string name="no">Нет</string>
     <string name="cancel">Отмена</string>
@@ -124,6 +127,13 @@
     <string name="nothing_to_do">Ничего нельзя сделать</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Игнорировать</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Поиск</string>
     <string name="delete">Удалить</string>
     <string name="action_lists_confirm_delete">Вы действительно хотите удалить этот список навсегда?</string>

app/src/full/res/values-sv/strings.xml

@@ -82,6 +82,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Ja</string>
     <string name="no">Nej</string>
     <string name="cancel">Avbryt</string>
@@ -122,6 +125,13 @@
     <string name="nothing_to_do">Inga åtgärder kan vidtas</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">Tysta</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Sök</string>
     <string name="delete">Ta bort</string>
     <string name="action_lists_confirm_delete">Är du säker du vill ta bort listan permanent?</string>

app/src/full/res/values-zh-rCN/strings.xml

@@ -81,6 +81,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="cancel">取消</string>
@@ -121,6 +124,13 @@
     <string name="nothing_to_do">无法进行任何操作</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">静音</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">搜索​​​​</string>
     <string name="delete">删除</string>
     <string name="action_lists_confirm_delete">您确定要永久删除此列表吗？</string>

app/src/full/res/values-zh-rTW/strings.xml

@@ -81,6 +81,9 @@
         <item>6 hours</item>
         <item>12 hours</item>
     </string-array>
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="cancel">取消</string>
@@ -121,6 +124,13 @@
     <string name="nothing_to_do">無法採取行動</string>
     <string name="action_follow">Subscribe</string>
     <string name="action_mute">靜音</string>
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">搜尋</string>
     <string name="delete">刪除</string>
     <string name="action_lists_confirm_delete">您確定您想要永久刪除此列表嗎？</string>

app/src/full/res/values/colors.xml

@@ -9,4 +9,5 @@
     <color name="negative_thumbs">#F44336</color>
     <color name="backgroundDark">#DD000000</color>
     <color name="red_1">#F44336</color>
+    <color name="gray_light">#80808080</color>
 </resources>

app/src/full/res/values/strings.xml

@@ -105,6 +105,9 @@
         <item>12 hours</item>
     </string-array>
 
+    <string name="_retry">Retry</string>
+    <string name="refresh_token_failed">Token refresh failed!</string>
+    <string name="refresh_token_failed_message">You can retry this action or simply disconnect the current account</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="cancel">Cancel</string>
@@ -160,6 +163,14 @@
 
     <string name="action_mute">Mute</string>
 
+    <string name="unlimited">Unlimited</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="total_video_quota">Total video quota</string>
+    <string name="daily_video_quota">Daily video quota</string>
+
+    <string name="nsfw_title_warning">Mature or explicit content</string>
+    <string name="nsfw_message_warning">This video contains mature or explicit content. Are you sure you want to watch it?</string>
     <string name="search">Search</string>
     <string name="delete">Delete</string>
 

app/src/main/java/app/fedilab/fedilabtube/AllPlaylistsActivity.java

@@ -14,7 +14,12 @@ package app.fedilab.fedilabtube;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import android.Manifest;
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -27,19 +32,19 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,11 +59,15 @@ import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
 import app.fedilab.fedilabtube.client.entities.Item;
 import app.fedilab.fedilabtube.client.entities.PlaylistParams;
+import app.fedilab.fedilabtube.databinding.ActivityAllPlaylistBinding;
+import app.fedilab.fedilabtube.databinding.AddPlaylistBinding;
 import app.fedilab.fedilabtube.drawer.PlaylistAdapter;
+import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import es.dmoral.toasty.Toasty;
 
+import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
 import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
 
@@ -66,40 +75,37 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
 
     PlaylistAdapter playlistAdapter;
-    private RelativeLayout mainLoader;
-    private RelativeLayout textviewNoAction;
     private HashMap<Integer, String> privacyToSend;
-    private Spinner set_upload_channel;
-    private Spinner set_upload_privacy;
     private String idChannel;
     private List<Playlist> playlists;
     private Playlist playlistToEdit;
     private List<ChannelData.Channel> myChannels;
     private ChannelData.Channel selectedChannel;
+    private static final int PICK_AVATAR = 467;
+    private AddPlaylistBinding bindingDialog;
+    private Uri inputData;
+    private ActivityAllPlaylistBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_all_playlist);
+        binding = ActivityAllPlaylistBinding.inflate(getLayoutInflater());
+        View viewRoot = binding.getRoot();
+        setContentView(viewRoot);
 
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle(R.string.playlists);
 
 
-        textviewNoAction = findViewById(R.id.no_action);
-        mainLoader = findViewById(R.id.loader);
-        RelativeLayout nextElementLoader = findViewById(R.id.loading_next_items);
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.loadingNextItems.setVisibility(View.GONE);
         idChannel = null;
 
         PlaylistsVM viewModel = new ViewModelProvider(AllPlaylistsActivity.this).get(PlaylistsVM.class);
         viewModel.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(AllPlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_PLAYLISTS, apiResponse));
 
-        FloatingActionButton add_new = findViewById(R.id.add_new);
-
 
         LinkedHashMap<Integer, String> privaciesInit = new LinkedHashMap<>(peertubeInformation.getPrivacies());
         if (privaciesInit.size() > 0) {
@@ -110,13 +116,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
 
         playlists = new ArrayList<>();
-        RecyclerView lv_playlist = findViewById(R.id.lv_playlist);
         playlistAdapter = new PlaylistAdapter(playlists, false);
         playlistAdapter.allPlaylistRemoved = this;
-        lv_playlist.setAdapter(playlistAdapter);
+        binding.lvPlaylist.setAdapter(playlistAdapter);
         LinearLayoutManager mLayoutManager = new LinearLayoutManager(AllPlaylistsActivity.this);
-        lv_playlist.setLayoutManager(mLayoutManager);
-        add_new.setOnClickListener(view -> manageAlert(null));
+        binding.lvPlaylist.setLayoutManager(mLayoutManager);
+        binding.addNew.setOnClickListener(view -> manageAlert(null));
     }
 
     @Override
@@ -135,7 +140,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
 
     public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
-        mainLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
         if (apiResponse.getError() != null) {
             Toasty.error(AllPlaylistsActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             return;
@@ -144,9 +149,9 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
                 playlists.addAll(apiResponse.getPlaylists());
                 playlistAdapter.notifyDataSetChanged();
-                textviewNoAction.setVisibility(View.GONE);
+                binding.noAction.setVisibility(View.GONE);
             } else {
-                textviewNoAction.setVisibility(View.VISIBLE);
+                binding.noAction.setVisibility(View.VISIBLE);
             }
         }
     }
@@ -155,37 +160,53 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         playlistToEdit = playlistParam;
         AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(AllPlaylistsActivity.this);
-        LayoutInflater inflater1 = getLayoutInflater();
-        View dialogView = inflater1.inflate(R.layout.add_playlist, new LinearLayout(AllPlaylistsActivity.this), false);
-        dialogBuilder.setView(dialogView);
-        EditText display_name = dialogView.findViewById(R.id.display_name);
-        EditText description = dialogView.findViewById(R.id.description);
-        set_upload_channel = dialogView.findViewById(R.id.set_upload_channel);
-        set_upload_privacy = dialogView.findViewById(R.id.set_upload_privacy);
+        bindingDialog = AddPlaylistBinding.inflate(LayoutInflater.from(AllPlaylistsActivity.this), null, false);
+        dialogBuilder.setView(bindingDialog.getRoot());
+
+        dialogBuilder.setView(bindingDialog.getRoot());
+
 
         ChannelsVM viewModelC = new ViewModelProvider(AllPlaylistsActivity.this).get(ChannelsVM.class);
         viewModelC.get(RetrofitPeertubeAPI.DataType.MY_CHANNELS, null).observe(AllPlaylistsActivity.this, this::manageVIewChannels);
 
-        display_name.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
-        description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
+        bindingDialog.displayName.setFilters(new InputFilter[]{new InputFilter.LengthFilter(120)});
+        bindingDialog.description.setFilters(new InputFilter[]{new InputFilter.LengthFilter(1000)});
 
         if (playlistToEdit != null) {
-            display_name.setText(playlistToEdit.getDisplayName());
-            description.setText(playlistToEdit.getDescription());
+            bindingDialog.displayName.setText(playlistToEdit.getDisplayName());
+            bindingDialog.description.setText(playlistToEdit.getDescription());
         }
         dialogBuilder.setPositiveButton(R.string.validate, null);
         dialogBuilder.setNegativeButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
 
         AlertDialog alertDialog = dialogBuilder.create();
+
+        bindingDialog.selectFile.setOnClickListener(v -> {
+            if (ContextCompat.checkSelfPermission(AllPlaylistsActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) !=
+                    PackageManager.PERMISSION_GRANTED) {
+                ActivityCompat.requestPermissions(AllPlaylistsActivity.this,
+                        new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
+                        MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE);
+                return;
+            }
+
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.addCategory(Intent.CATEGORY_OPENABLE);
+            intent.setType("*/*");
+            String[] mimetypes = {"image/*"};
+            intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
+            startActivityForResult(intent, PICK_AVATAR);
+        });
+        Helper.loadGiF(AllPlaylistsActivity.this, playlistParam.getThumbnailPath(), bindingDialog.profilePicture);
         alertDialog.setOnShowListener(dialogInterface -> {
 
             Button button = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
             button.setOnClickListener(view -> {
-                if (display_name.getText() != null && display_name.getText().toString().trim().length() > 0) {
+                if (bindingDialog.displayName.getText() != null && bindingDialog.displayName.getText().toString().trim().length() > 0) {
                     PlaylistParams playlistElement = new PlaylistParams();
-                    playlistElement.setDisplayName(display_name.getText().toString().trim());
-                    if (description.getText() != null && description.getText().toString().trim().length() > 0) {
-                        playlistElement.setDescription(description.getText().toString().trim());
+                    playlistElement.setDisplayName(bindingDialog.displayName.getText().toString().trim());
+                    if (bindingDialog.description.getText() != null && bindingDialog.description.getText().toString().trim().length() > 0) {
+                        playlistElement.setDescription(bindingDialog.description.getText().toString().trim());
                     }
                     playlistElement.setVideoChannelId(idChannel);
                     String label;
@@ -203,11 +224,11 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
                         new Thread(() -> {
                             String playlistId;
                             if (playlistToEdit == null) {
-                                APIResponse apiResponse = new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistElement, null);
+                                APIResponse apiResponse = new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.CREATE_PLAYLIST, null, playlistElement, inputData);
                                 playlistId = apiResponse.getActionReturn();
                             } else {
                                 playlistId = playlistToEdit.getId();
-                                new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.UPDATE_PLAYLIST, playlistId, playlistElement, null);
+                                new RetrofitPeertubeAPI(AllPlaylistsActivity.this).createOrUpdatePlaylist(PlaylistsVM.action.UPDATE_PLAYLIST, playlistId, playlistElement, inputData);
                             }
                             Handler mainHandler = new Handler(Looper.getMainLooper());
                             Runnable myRunnable = () -> {
@@ -247,7 +268,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             //Hide keyboard
             InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
             assert imm != null;
-            imm.hideSoftInputFromWindow(display_name.getWindowToken(), 0);
+            imm.hideSoftInputFromWindow(bindingDialog.displayName.getWindowToken(), 0);
         });
         if (alertDialog.getWindow() != null)
             alertDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
@@ -255,6 +276,24 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
     }
 
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == PICK_AVATAR && resultCode == Activity.RESULT_OK) {
+            if (data == null || data.getData() == null) {
+                Toasty.error(AllPlaylistsActivity.this, getString(R.string.toot_select_image_error), Toast.LENGTH_LONG).show();
+                return;
+            }
+            inputData = data.getData();
+            Glide.with(AllPlaylistsActivity.this)
+                    .load(inputData)
+                    .thumbnail(0.1f)
+                    .apply(new RequestOptions().transform(new CenterCrop(), new RoundedCorners(10)))
+                    .into(bindingDialog.profilePicture);
+
+        }
+    }
+
     public void manageVIewChannels(APIResponse apiResponse) {
         if (apiResponse.getError() != null || apiResponse.getChannels() == null || apiResponse.getChannels().size() == 0) {
             if (apiResponse.getError() != null && apiResponse.getError().getError() != null)
@@ -280,7 +319,7 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(AllPlaylistsActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, channelName);
-        set_upload_channel.setAdapter(adapterChannel);
+        bindingDialog.setUploadChannel.setAdapter(adapterChannel);
 
 
         LinkedHashMap<String, String> translations = null;
@@ -308,19 +347,19 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
 
         ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(AllPlaylistsActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, privaciesA);
-        set_upload_privacy.setAdapter(adapterPrivacies);
+        bindingDialog.setUploadPrivacy.setAdapter(adapterPrivacies);
 
         if (playlistToEdit != null) {
             Item privacy = playlistToEdit.getPrivacy();
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection(privacy.getId() - 1);
+                bindingDialog.setUploadPrivacy.setSelection(privacy.getId() - 1);
             }
         } else {
-            set_upload_privacy.setSelection(2);
+            bindingDialog.setUploadPrivacy.setSelection(2);
         }
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        bindingDialog.setUploadPrivacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
@@ -348,12 +387,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
             Item privacy = playlistToEdit.getPrivacy();
 
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection(privacy.getId() - 1);
+                bindingDialog.setUploadPrivacy.setSelection(privacy.getId() - 1);
             }
         }
 
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        bindingDialog.setUploadChannel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 idChannel = channelId[position];
@@ -378,12 +417,12 @@ public class AllPlaylistsActivity extends AppCompatActivity implements PlaylistA
                 }
                 k++;
             }
-            set_upload_channel.setSelection(position);
+            bindingDialog.setUploadChannel.setSelection(position);
         }
     }
 
     @Override
     public void onAllPlaylistRemoved() {
-        textviewNoAction.setVisibility(View.VISIBLE);
+        binding.noAction.setVisibility(View.VISIBLE);
     }
 }

app/src/main/java/app/fedilab/fedilabtube/MainActivity.java

@@ -39,6 +39,9 @@ import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.kobakei.ratethisapp.RateThisApp;
@@ -62,6 +65,7 @@ import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.client.entities.UserSettings;
 import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
+import app.fedilab.fedilabtube.databinding.ActivityMainBinding;
 import app.fedilab.fedilabtube.fragment.DisplayOverviewFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
@@ -85,44 +89,11 @@ public class MainActivity extends AppCompatActivity {
     public static int PICK_INSTANCE = 5641;
     public static int PICK_INSTANCE_SURF = 5642;
     public static UserMe userMe;
+    public static InstanceData.InstanceConfig instanceConfig;
     public static TypeOfConnection typeOfConnection;
-    final FragmentManager fm = getSupportFragmentManager();
-    Fragment active;
     private DisplayVideosFragment recentFragment, locaFragment, trendingFragment, subscriptionFragment, mostLikedFragment;
     private DisplayOverviewFragment overviewFragment;
-    private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
-            = item -> {
-        DisplayVideosFragment displayVideosFragment = null;
-        int itemId = item.getItemId();
-        if (itemId == R.id.navigation_subscription) {
-            displayVideosFragment = subscriptionFragment;
-            setTitleCustom(R.string.subscriptions);
-        } else if (itemId == R.id.navigation_trending) {
-            setTitleCustom(R.string.title_trending);
-            displayVideosFragment = trendingFragment;
-        } else if (itemId == R.id.navigation_most_liked) {
-            setTitleCustom(R.string.title_most_liked);
-            displayVideosFragment = mostLikedFragment;
-        } else if (itemId == R.id.navigation_recently_added) {
-            setTitleCustom(R.string.title_recently_added);
-            displayVideosFragment = recentFragment;
-        } else if (itemId == R.id.navigation_local) {
-            setTitleCustom(R.string.title_local);
-            displayVideosFragment = locaFragment;
-        } else if (itemId == R.id.navigation_discover) {
-            setTitleCustom(R.string.title_discover);
-            fm.beginTransaction().hide(active).show(overviewFragment).commit();
-            active = overviewFragment;
-            return true;
-        }
-        if (displayVideosFragment != null) {
-            fm.beginTransaction().hide(active).show(displayVideosFragment).commit();
-            active = displayVideosFragment;
-            return true;
-        } else {
-            return false;
-        }
-    };
+    private ActivityMainBinding binding;
 
     @SuppressLint("ApplySharedPref")
     public static void showRadioButtonDialogFullInstances(Activity activity, boolean storeInDb) {
@@ -186,13 +157,46 @@ public class MainActivity extends AppCompatActivity {
     private void setTitleCustom(int titleRId) {
         Toolbar toolbar = findViewById(R.id.toolbar);
         TextView mTitle = toolbar.findViewById(R.id.toolbar_title);
-        mTitle.setText(getString(titleRId));
+        if (mTitle != null) {
+            mTitle.setText(getString(titleRId));
+        }
     }
 
+    private final BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
+            = item -> {
+        int itemId = item.getItemId();
+        if (itemId == R.id.navigation_discover) {
+            setTitleCustom(R.string.title_discover);
+            binding.viewpager.setCurrentItem(0);
+        } else if (itemId == R.id.navigation_subscription) {
+            binding.viewpager.setCurrentItem(1);
+            setTitleCustom(R.string.subscriptions);
+        } else if (itemId == R.id.navigation_trending) {
+            setTitleCustom(R.string.title_trending);
+            if (Helper.isLoggedIn(MainActivity.this)) {
+                binding.viewpager.setCurrentItem(2);
+            } else {
+                binding.viewpager.setCurrentItem(1);
+            }
+        } else if (itemId == R.id.navigation_most_liked) {
+            setTitleCustom(R.string.title_most_liked);
+            binding.viewpager.setCurrentItem(2);
+        } else if (itemId == R.id.navigation_recently_added) {
+            setTitleCustom(R.string.title_recently_added);
+            binding.viewpager.setCurrentItem(3);
+        } else if (itemId == R.id.navigation_local) {
+            setTitleCustom(R.string.title_local);
+            binding.viewpager.setCurrentItem(4);
+        }
+        return true;
+    };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
@@ -208,22 +212,6 @@ public class MainActivity extends AppCompatActivity {
         }
         checkIfConnectedUsers();
 
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag("5");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("4");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("3");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("2");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        fragment = getSupportFragmentManager().findFragmentByTag("1");
-        if (fragment != null)
-            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-
         recentFragment = new DisplayVideosFragment();
         Bundle bundle = new Bundle();
         bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.RECENT);
@@ -250,24 +238,37 @@ public class MainActivity extends AppCompatActivity {
         mostLikedFragment.setArguments(bundle);
 
         overviewFragment = new DisplayOverviewFragment();
-
-        if (active == null) {
-            active = overviewFragment;
-        }
-
-
         if (!Helper.isLoggedIn(MainActivity.this)) {
-            fm.beginTransaction().add(R.id.nav_host_fragment, locaFragment, "5").hide(locaFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, recentFragment, "4").hide(recentFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, mostLikedFragment, "3").hide(mostLikedFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, trendingFragment, "2").hide(trendingFragment).commit();
-            fm.beginTransaction().add(R.id.nav_host_fragment, overviewFragment, "1").commit();
+            PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+            binding.viewpager.setAdapter(mPagerAdapter);
         }
+        binding.viewpager.setOffscreenPageLimit(5);
+
+
+        binding.viewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                MenuItem item = binding.navView.getMenu().getItem(position);
+                binding.navView.setSelectedItemId(item.getItemId());
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+
         toolbar.setOnClickListener(v -> {
-            if (active instanceof DisplayVideosFragment) {
-                ((DisplayVideosFragment) active).scrollToTop();
-            } else if (active instanceof DisplayOverviewFragment) {
-                ((DisplayOverviewFragment) active).scrollToTop();
+            if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayVideosFragment) {
+                ((DisplayVideosFragment) binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem())).scrollToTop();
+            } else if (binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem()) instanceof DisplayOverviewFragment) {
+                ((DisplayOverviewFragment) binding.viewpager.getAdapter().instantiateItem(binding.viewpager, binding.viewpager.getCurrentItem())).scrollToTop();
             }
         });
 
@@ -276,73 +277,7 @@ public class MainActivity extends AppCompatActivity {
         if (Helper.isLoggedIn(MainActivity.this)) {
 
             navView.inflateMenu(R.menu.bottom_nav_menu_connected);
-            new Thread(() -> {
-                final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                String tokenStr = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                String instance = Helper.getLiveInstance(MainActivity.this);
-                SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                String instanceShar = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
-                String userIdShar = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-                Account account = new AccountDAO(MainActivity.this, db).getAccountByToken(tokenStr);
-                if (account == null) {
-                    account = new AccountDAO(MainActivity.this, db).getAccountByIdInstance(userIdShar, instanceShar);
-                }
-                if (account != null) {
-                    Account finalAccount = account;
-                    OauthParams oauthParams = new OauthParams();
-                    oauthParams.setGrant_type("refresh_token");
-                    oauthParams.setClient_id(account.getClient_id());
-                    oauthParams.setClient_secret(account.getClient_secret());
-                    oauthParams.setRefresh_token(account.getRefresh_token());
-                    oauthParams.setAccess_token(account.getToken());
-                    try {
-                        Token token = new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams);
-                        if (token == null && Helper.instanceOnline(instance)) {
-                            runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, finalAccount));
-                            return;
-                        } else if (token == null) {
-                            return;
-                        }
-                        runOnUiThread(() -> {
-                            //To avoid a token issue with subscriptions, adding fragment is done when the token is refreshed.
-                            new Handler().post(() -> {
-                                fm.beginTransaction().add(R.id.nav_host_fragment, locaFragment, "5").hide(locaFragment).commit();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, recentFragment, "4").hide(recentFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, trendingFragment, "3").hide(trendingFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, subscriptionFragment, "2").hide(subscriptionFragment).commitAllowingStateLoss();
-                                fm.beginTransaction().add(R.id.nav_host_fragment, overviewFragment, "1").commitAllowingStateLoss();
-                            });
-                        });
-
-                        userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
-                        if (userMe != null && userMe.getAccount() != null) {
-                            new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
-                            SharedPreferences.Editor editor = sharedpreferences.edit();
-                            editor.putString(Helper.PREF_KEY_ID, account.getId());
-                            editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
-                            editor.putBoolean(getString(R.string.set_autoplay_choice), userMe.isAutoPlayVideo());
-                            editor.putBoolean(getString(R.string.set_store_in_history), userMe.isVideosHistoryEnabled());
-                            editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), userMe.isAutoPlayNextVideo());
-                            editor.putString(getString(R.string.set_video_sensitive_choice), userMe.getNsfwPolicy());
-                            //Sync languages from server
-                            List<String> videoLanguageServer = userMe.getVideoLanguages();
-                            if (videoLanguageServer != null) {
-                                Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
-                                videoLanguageServerSet.addAll(videoLanguageServer);
-                                Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
-                                if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
-                                    videoLanguageServer.addAll(videoLanguageLocal);
-                                }
-                                editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
-                                editor.apply();
-                            }
-                        }
-                    } catch (Error error) {
-                        runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, finalAccount));
-                        error.printStackTrace();
-                    }
-                }
-            }).start();
+            refreshToken();
 
         } else {
             navView.inflateMenu(R.menu.bottom_nav_menu);
@@ -365,6 +300,10 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    public DisplayVideosFragment getSubscriptionFragment() {
+        return subscriptionFragment;
+    }
+
     private void startInForeground() {
         Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -374,6 +313,91 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    private void refreshToken() {
+        new Thread(() -> {
+            final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+            String tokenStr = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
+            String instance = Helper.getLiveInstance(MainActivity.this);
+            SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+            String instanceShar = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
+            String userIdShar = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+            Account account = new AccountDAO(MainActivity.this, db).getAccountByToken(tokenStr);
+            if (account == null) {
+                account = new AccountDAO(MainActivity.this, db).getAccountByIdInstance(userIdShar, instanceShar);
+            }
+            if (account != null) {
+                Account finalAccount = account;
+                OauthParams oauthParams = new OauthParams();
+                oauthParams.setGrant_type("refresh_token");
+                oauthParams.setClient_id(account.getClient_id());
+                oauthParams.setClient_secret(account.getClient_secret());
+                oauthParams.setRefresh_token(account.getRefresh_token());
+                oauthParams.setAccess_token(account.getToken());
+                try {
+                    Token token = new RetrofitPeertubeAPI(MainActivity.this).manageToken(oauthParams);
+                    if (token == null && Helper.instanceOnline(instance)) {
+                        runOnUiThread(() -> {
+                            AlertDialog.Builder alt_bld = new AlertDialog.Builder(this);
+                            alt_bld.setTitle(R.string.refresh_token_failed);
+                            alt_bld.setMessage(R.string.refresh_token_failed_message);
+                            alt_bld.setNegativeButton(R.string.action_logout, (dialog, id) -> {
+                                dialog.dismiss();
+                                Helper.logoutCurrentUser(MainActivity.this, finalAccount);
+                            });
+                            alt_bld.setPositiveButton(R.string._retry, (dialog, id) -> {
+                                dialog.dismiss();
+                                refreshToken();
+                            });
+                            AlertDialog alert = alt_bld.create();
+                            alert.show();
+
+                        });
+                        return;
+                    } else if (token == null) {
+                        return;
+                    }
+                    runOnUiThread(() -> {
+                        //To avoid a token issue with subscriptions, adding fragment is done when the token is refreshed.
+                        new Handler().post(() -> {
+                            if (Helper.isLoggedIn(MainActivity.this)) {
+                                PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+                                binding.viewpager.setAdapter(mPagerAdapter);
+                            }
+                        });
+                    });
+
+                    userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
+                    if (userMe != null && userMe.getAccount() != null) {
+                        new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
+                        SharedPreferences.Editor editor = sharedpreferences.edit();
+                        editor.putString(Helper.PREF_KEY_ID, account.getId());
+                        editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
+                        editor.putBoolean(getString(R.string.set_autoplay_choice), userMe.isAutoPlayVideo());
+                        editor.putBoolean(getString(R.string.set_store_in_history), userMe.isVideosHistoryEnabled());
+                        editor.putBoolean(getString(R.string.set_autoplay_next_video_choice), userMe.isAutoPlayNextVideo());
+                        editor.putString(getString(R.string.set_video_sensitive_choice), userMe.getNsfwPolicy());
+                        //Sync languages from server
+                        List<String> videoLanguageServer = userMe.getVideoLanguages();
+                        if (videoLanguageServer != null) {
+                            Set<String> videoLanguageServerSet = new TreeSet<>(videoLanguageServer);
+                            videoLanguageServerSet.addAll(videoLanguageServer);
+                            Set<String> videoLanguageLocal = sharedpreferences.getStringSet(getString(R.string.set_video_language_choice), null);
+                            if (videoLanguageServerSet.size() > 0 && videoLanguageLocal != null) {
+                                videoLanguageServer.addAll(videoLanguageLocal);
+                            }
+                            editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
+                            editor.apply();
+                        }
+                    }
+                    instanceConfig = new RetrofitPeertubeAPI(MainActivity.this).getConfigInstance();
+                } catch (Error error) {
+                    runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, finalAccount));
+                    error.printStackTrace();
+                }
+            }
+        }).start();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         getMenuInflater().inflate(R.menu.main_menu, menu);
@@ -601,13 +625,6 @@ public class MainActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    public void setActive(DisplayVideosFragment displayVideosFragment) {
-        this.active = displayVideosFragment;
-    }
-
-    public void setSubscriptionFragment(DisplayVideosFragment displayVideosFragment) {
-        this.subscriptionFragment = displayVideosFragment;
-    }
 
     @Override
     protected void onNewIntent(Intent intent) {
@@ -667,6 +684,50 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
+    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(final int position) {
+            if (Helper.isLoggedIn(MainActivity.this)) {
+                switch (position) {
+                    case 0:
+                        return overviewFragment;
+                    case 1:
+                        return subscriptionFragment;
+                    case 2:
+                        return trendingFragment;
+                    case 3:
+                        return recentFragment;
+                    case 4:
+                        return locaFragment;
+                }
+            } else {
+                switch (position) {
+                    case 0:
+                        return overviewFragment;
+                    case 1:
+                        return trendingFragment;
+                    case 2:
+                        return mostLikedFragment;
+                    case 3:
+                        return recentFragment;
+                    case 4:
+                        return locaFragment;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public int getCount() {
+            return 5;
+        }
+    }
 
     public enum TypeOfConnection {
         UNKNOWN,

app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java

@@ -193,6 +193,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private String currentResolution;
     private String currentCaption;
     private boolean isRemote;
+    private boolean willPlayFromIntent;
 
     public static void hideKeyboard(Activity activity) {
         if (activity != null && activity.getWindow() != null) {
@@ -219,7 +220,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
     @Override
     public void onStreamStarted(Torrent torrent) {
-        startStream(torrent.getVideoFile().getAbsolutePath(), null, autoPlay, -1, null, null);
+        startStream(torrent.getVideoFile().getAbsolutePath(), null, autoPlay, -1, null, null, true);
     }
 
     @Override
@@ -301,7 +302,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             peertube = b.getParcelable("video");
         }
 
-        manageIntentUrl(intent);
+        willPlayFromIntent = manageIntentUrl(intent);
 
         binding.peertubeDescriptionMore.setOnClickListener(v -> {
             if (show_more_content != null && peertube != null) {
@@ -325,6 +326,11 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             playInMinimized = false;
         }
 
+        if (peertube != null && peertube.isNsfw()) {
+            binding.videoSensitive.setVisibility(View.VISIBLE);
+        } else {
+            binding.videoSensitive.setVisibility(View.INVISIBLE);
+        }
         if (mode == Helper.VIDEO_MODE_WEBVIEW) {
             binding.webviewVideo.setVisibility(View.VISIBLE);
             binding.mediaVideo.setVisibility(View.GONE);
@@ -406,12 +412,13 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 }
             }
         });
-        if (peertube != null && sepiaSearch && peertube.getEmbedUrl() != null && Helper.isLoggedIn(PeertubeActivity.this)) {
+        if (!willPlayFromIntent && peertube != null && sepiaSearch && peertube.getEmbedUrl() != null && Helper.isLoggedIn(PeertubeActivity.this)) {
             SearchVM viewModelSearch = new ViewModelProvider(PeertubeActivity.this).get(SearchVM.class);
-            viewModelSearch.getVideos("0", peertube.getEmbedUrl()).observe(PeertubeActivity.this, this::manageVIewVideos);
+            viewModelSearch.getVideos("0", peertube.getUuid()).observe(PeertubeActivity.this, this::manageVIewVideos);
         } else {
             playVideo();
         }
+
         registBroadcastReceiver();
         if (autoFullscreen && autoPlay) {
             openFullscreenDialog();
@@ -436,7 +443,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             return;
         }
         peertube = apiResponse.getPeertubes().get(0);
-        if (peertube.getUserHistory() != null) {
+        if (peertube.isNsfw()) {
+            binding.videoSensitive.setVisibility(View.VISIBLE);
+        } else {
+            binding.videoSensitive.setVisibility(View.INVISIBLE);
+        }
+        if (player != null && peertube.getUserHistory() != null) {
             player.seekTo(peertube.getUserHistory().getCurrentTime() * 1000);
         }
         sepiaSearch = false;
@@ -511,7 +523,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             isRemote = false;
             peertubeInstance = b.getString("peertube_instance", Helper.getLiveInstance(PeertubeActivity.this));
             videoUuid = b.getString("video_uuid", null);
-            setRequestedOrientation(initialOrientation);
+            setRequestedOrientationCustom(initialOrientation);
             if (comments != null && comments.size() > 0) {
                 int number = comments.size();
                 comments.clear();
@@ -519,10 +531,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             }
             playVideo();
         }
-        manageIntentUrl(intent);
+        willPlayFromIntent = manageIntentUrl(intent);
     }
 
-    private void manageIntentUrl(Intent intent) {
+    private boolean manageIntentUrl(Intent intent) {
         if (intent.getData() != null) { //Comes from a link
             String url = intent.getData().toString();
             Pattern link = Pattern.compile("(https?://[\\da-z.-]+\\.[a-z.]{2,10})/videos/watch/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})(\\?start=(\\d+[hH])?(\\d+[mM])?(\\d+[sS])?)?$");
@@ -562,6 +574,17 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     }
                     TimelineVM viewModelTimeline = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
                     viewModelTimeline.getVideo(peertubeInstance, peertube.getUuid(), false).observe(PeertubeActivity.this, this::manageVIewVideo);
+                    if (player != null) {
+                        player.release();
+                    }
+                    if (comments != null && comments.size() > 0) {
+                        int number = comments.size();
+                        comments.clear();
+                        commentListAdapter.notifyItemRangeRemoved(0, number);
+                    }
+                    fetchComments();
+                    isRemote = true;
+                    return true;
                 } else {
                     Helper.forwardToAnotherApp(PeertubeActivity.this, intent);
                     finish();
@@ -571,6 +594,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 finish();
             }
         }
+        return false;
     }
 
     private void playVideo() {
@@ -595,7 +619,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             openFullscreenDialog();
         }
         binding.peertubePlaylist.setVisibility(View.VISIBLE);
-        binding.peertubeBookmark.setVisibility(View.GONE);
         TimelineVM feedsViewModel = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
         if (!isRemote) {
             feedsViewModel.getVideo(sepiaSearch ? peertubeInstance : null, videoUuid, isMyVideo).observe(PeertubeActivity.this, this::manageVIewVideo);
@@ -619,7 +642,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                             show_more_content = null;
                         } else {
                             if (!PeertubeActivity.this.isFinishing()) {
-                                if ((peertube.getDescription() == null && description.getDescription() != null && description.getDescription().trim().length() > 0) || (peertube.getDescription() != null && description.getDescription() != null && description.getDescription().compareTo(peertube.getDescription()) > 0)) {
+                                if (peertube != null && ((peertube.getDescription() == null && description.getDescription() != null && description.getDescription().trim().length() > 0) || (peertube.getDescription() != null && description.getDescription() != null
+                                        && description.getDescription().compareTo(peertube.getDescription()) > 0))) {
                                     binding.peertubeDescriptionMore.setVisibility(View.VISIBLE);
                                     show_more_content = description.getDescription();
                                 } else {
@@ -725,7 +749,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
+
     public void manageVIewVideo(APIResponse apiResponse) {
         if (!isRemote && apiResponse != null && apiResponse.getPeertubes() != null && apiResponse.getPeertubes().get(0).getErrorCode() == 1 && apiResponse.getPeertubes().get(0).getOriginUrl() != null) {
             String url = apiResponse.getPeertubes().get(0).getOriginUrl();
@@ -748,7 +772,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     totalSeconds += 60 * minInt;
                 }
                 if (sec != null) {
-                    secInt = Integer.parseInt(sec.replace("s", ""));
+                    secInt = Integer.parseInt(sec.replace("strue", ""));
                     totalSeconds += secInt;
                 }
 
@@ -809,6 +833,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             binding.writeCommentContainer.setVisibility(View.GONE);
         }
 
+        if (peertube.isNsfw()) {
+            binding.videoSensitive.setVisibility(View.VISIBLE);
+        } else {
+            binding.videoSensitive.setVisibility(View.INVISIBLE);
+        }
+
         binding.peertubePlaylist.setOnClickListener(v -> {
             PlaylistsVM viewModelOwnerPlaylist = new ViewModelProvider(PeertubeActivity.this).get(PlaylistsVM.class);
             viewModelOwnerPlaylist.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(PeertubeActivity.this, this::manageVIewPlaylists);
@@ -883,26 +913,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             alertDialog.show();
         });
 
-        if (peertube.isCommentsEnabled()) {
-            if (Helper.isLoggedIn(PeertubeActivity.this)) {
-                binding.postCommentButton.setVisibility(View.VISIBLE);
-            } else {
-                binding.postCommentButton.setVisibility(View.GONE);
-            }
-            CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
-            commentViewModel.getThread(sepiaSearch ? peertubeInstance : null, videoUuid, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
-            if (Helper.isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
-                binding.writeCommentContainer.setVisibility(View.VISIBLE);
-            }
-            binding.peertubeComments.setVisibility(View.VISIBLE);
-        } else {
-            binding.postCommentButton.setVisibility(View.GONE);
-            binding.peertubeComments.setVisibility(View.GONE);
-            binding.writeCommentContainer.setVisibility(View.GONE);
-            binding.noActionText.setText(getString(R.string.comment_no_allowed_peertube));
-            binding.noAction.setVisibility(View.VISIBLE);
-            binding.writeCommentContainer.setVisibility(View.GONE);
-        }
+        fetchComments();
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         setTitle(peertube.getName());
 
@@ -1000,7 +1011,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             startStream(
                     apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this),
                     apiResponse.getPeertubes().get(0).getStreamingPlaylists().size() > 0 ? apiResponse.getPeertubes().get(0).getStreamingPlaylists().get(0).getPlaylistUrl() : null,
-                    autoPlay, position, null, null);
+                    autoPlay, position, null, null, true);
             player.prepare();
             player.setPlayWhenReady(autoPlay);
             if (autoPlay) {
@@ -1087,7 +1098,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         });
     }
 
-    private void startStream(String videoURL, String streamingPlaylistsURLS, boolean autoPlay, long position, Uri subtitles, String lang) {
+
+    private void stream(String videoURL, String streamingPlaylistsURLS, boolean autoPlay, long position, Uri subtitles, String lang) {
         if (videoURL != null && !videoURL.endsWith("m3u8")) {
             if (videoURL.endsWith(".torrent")) {
                 torrentStream.startStream(videoURL);
@@ -1144,6 +1156,57 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
     }
 
+    private void fetchComments() {
+        if (peertube.isCommentsEnabled()) {
+            if (Helper.isLoggedIn(PeertubeActivity.this)) {
+                binding.postCommentButton.setVisibility(View.VISIBLE);
+            } else {
+                binding.postCommentButton.setVisibility(View.GONE);
+            }
+            CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
+            commentViewModel.getThread(sepiaSearch ? peertubeInstance : null, videoUuid, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
+            if (Helper.isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
+                binding.writeCommentContainer.setVisibility(View.VISIBLE);
+            }
+            binding.peertubeComments.setVisibility(View.VISIBLE);
+            binding.noAction.setVisibility(View.GONE);
+        } else {
+            binding.postCommentButton.setVisibility(View.GONE);
+            binding.peertubeComments.setVisibility(View.GONE);
+            binding.writeCommentContainer.setVisibility(View.GONE);
+            binding.noActionText.setText(getString(R.string.comment_no_allowed_peertube));
+            binding.noAction.setVisibility(View.VISIBLE);
+            binding.writeCommentContainer.setVisibility(View.GONE);
+        }
+    }
+
+    private void startStream(String videoURL, String streamingPlaylistsURLS, boolean autoPlay, long position, Uri subtitles, String lang, boolean promptNSFW) {
+
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+        String nsfwAction = sharedpreferences.getString(getString(R.string.set_video_sensitive_choice), Helper.BLUR);
+        if (promptNSFW && peertube != null && peertube.isNsfw() && (nsfwAction.compareTo(Helper.BLUR) == 0 || nsfwAction.compareTo(Helper.DO_NOT_LIST) == 0)) {
+            AlertDialog alertDialog;
+            AlertDialog.Builder dialogBuilder;
+            dialogBuilder = new AlertDialog.Builder(PeertubeActivity.this);
+            dialogBuilder.setTitle(R.string.nsfw_title_warning);
+            dialogBuilder.setCancelable(false);
+            dialogBuilder.setMessage(R.string.nsfw_message_warning);
+            dialogBuilder.setNegativeButton(R.string.no, (dialog, id) -> {
+                dialog.dismiss();
+                finish();
+            });
+            dialogBuilder.setPositiveButton(R.string.play, (dialog, id) -> {
+                stream(videoURL, streamingPlaylistsURLS, autoPlay, position, subtitles, lang);
+                dialog.dismiss();
+            });
+            alertDialog = dialogBuilder.create();
+            alertDialog.show();
+        } else {
+            stream(videoURL, streamingPlaylistsURLS, autoPlay, position, subtitles, lang);
+        }
+
+    }
+
     @Override
     public void onConfigurationChanged(@NotNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -1172,7 +1235,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 binding.videoContainer.setLayoutParams(param);
             }
         }
-        //change();
     }
 
     @Override
@@ -1258,6 +1320,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private void enterVideoMode() {
         if (playInMinimized && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && player != null) {
             isPlayInMinimized = true;
+            setRequestedOrientationCustom(initialOrientation);
             MediaSessionCompat mediaSession = new MediaSessionCompat(this, getPackageName());
             MediaSessionConnector mediaSessionConnector = new MediaSessionConnector(mediaSession);
             mediaSessionConnector.setPlayer(player);
@@ -1289,6 +1352,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             closeCommentThread();
             return;
         }
+
+        if (fullScreenMode && player != null && player.isPlaying()) {
+            player.setPlayWhenReady(false);
+            return;
+        }
+
         if (playInMinimized && player != null) {
             enterVideoMode();
         } else {
@@ -1310,20 +1379,24 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private void toogleFullscreen(boolean fullscreen) {
 
         if (fullscreen) {
-            WindowManager.LayoutParams attrs = getWindow().getAttributes();
-            attrs.flags &= ~WindowManager.LayoutParams.FLAG_FULLSCREEN;
-            attrs.flags &= ~WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-            getWindow().setAttributes(attrs);
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN |
+                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            Objects.requireNonNull(getSupportActionBar()).hide();
             binding.bottomVideo.setVisibility(View.GONE);
             Objects.requireNonNull(getSupportActionBar()).hide();
             if (videoOrientationType == videoOrientation.LANDSCAPE) {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                if (getResources().getConfiguration().orientation != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+                    setRequestedOrientationCustom(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+                }
             } else {
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                if (getResources().getConfiguration().orientation != ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+                    setRequestedOrientationCustom(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+                }
             }
         } else {
-            getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+                    WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+            Objects.requireNonNull(getSupportActionBar()).show();
             binding.bottomVideo.setVisibility(View.VISIBLE);
             Objects.requireNonNull(getSupportActionBar()).show();
         }
@@ -1465,7 +1538,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 }
                 break;
             case AUTONEXT:
-                binding.subMenuTitle.setText(R.string.set_autoplay);
+                binding.subMenuTitle.setText(R.string.set_autoplay_next_video_settings);
                 SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
                 boolean autoplayNextVideo = sharedpreferences.getBoolean(getString(R.string.set_autoplay_next_video_choice), true);
                 items.add(new MenuItemView(0, getString(R.string.no), !autoplayNextVideo));
@@ -1511,7 +1584,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     startStream(
                             peertube.getFileUrl(res, PeertubeActivity.this),
                             peertube.getStreamingPlaylists().size() > 0 ? peertube.getStreamingPlaylists().get(0).getPlaylistUrl() : null,
-                            true, position, null, null);
+                            true, position, null, null, false);
                 }
                 break;
             case SPEED:
@@ -1554,7 +1627,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                         true,
                         newPosition,
                         uri,
-                        item.getStrId()
+                        item.getStrId(),
+                        false
                 );
                 break;
             case AUTONEXT:
@@ -1806,10 +1880,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 openFullscreenDialog();
             } else {
                 closeFullscreenDialog();
-                setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-                Handler handler = new Handler();
-                handler.postDelayed(() -> setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR), 2000);
-
+                setRequestedOrientationCustom(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
             }
         });
 
@@ -1833,6 +1904,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         });
     }
 
+    private void setRequestedOrientationCustom(int orientationCustom) {
+        setRequestedOrientation(orientationCustom);
+        Handler handler = new Handler();
+        handler.postDelayed(() -> setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR), 2000);
+    }
+
     private void initResolution() {
         PlayerControlView controlView = binding.doubleTapPlayerView.findViewById(R.id.exo_controller);
         TextView resolution = controlView.findViewById(R.id.resolution);

app/src/main/java/app/fedilab/fedilabtube/PeertubeUploadActivity.java

@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
@@ -49,15 +50,19 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import app.fedilab.fedilabtube.client.APIResponse;
+import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.databinding.ActivityPeertubeUploadBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
 import es.dmoral.toasty.Toasty;
 
+import static app.fedilab.fedilabtube.MainActivity.userMe;
 import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.MY_CHANNELS;
 import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
 
@@ -86,6 +91,56 @@ public class PeertubeUploadActivity extends AppCompatActivity {
         setContentView(view);
 
 
+        new Thread(() -> {
+            UserMe.VideoQuota videoQuotaReply = new RetrofitPeertubeAPI(PeertubeUploadActivity.this).getVideoQuota();
+            runOnUiThread(() -> {
+                if (videoQuotaReply != null) {
+                    long videoQuota = videoQuotaReply.getVideoQuotaUsed();
+                    long dailyQuota = videoQuotaReply.getVideoQuotaUsedDaily();
+                    long instanceVideoQuota = userMe.getVideoQuota();
+                    long instanceDailyQuota = userMe.getVideoQuotaDaily();
+
+                    if (instanceVideoQuota != -1) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.totalQuota.setProgress((int) (videoQuota * 100 / instanceVideoQuota), true);
+                        } else {
+                            binding.totalQuota.setProgress((int) (videoQuota * 100 / instanceVideoQuota));
+                        }
+                    } else {
+                        int progress = videoQuota > 0 ? 30 : 0;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.totalQuota.setProgress(progress, true);
+                        } else {
+                            binding.totalQuota.setProgress(progress);
+                        }
+                    }
+                    if (instanceDailyQuota != -1) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.dailyQuota.setProgress((int) (dailyQuota * 100 / instanceDailyQuota), true);
+                        } else {
+                            binding.dailyQuota.setProgress((int) (dailyQuota * 100 / instanceDailyQuota));
+                        }
+                    } else {
+                        int progress = dailyQuota > 0 ? 30 : 0;
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            binding.dailyQuota.setProgress(progress, true);
+                        } else {
+                            binding.dailyQuota.setProgress(progress);
+                        }
+                    }
+                    binding.totalQuotaValue.setText(
+                            String.format(Locale.getDefault(), "%s/%s",
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, videoQuota),
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, instanceVideoQuota)));
+                    binding.dailyQuotaValue.setText(
+                            String.format(Locale.getDefault(), "%s/%s",
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, dailyQuota),
+                                    Helper.returnRoundedSize(PeertubeUploadActivity.this, instanceDailyQuota)));
+                }
+            });
+        }).start();
+
+
         ChannelsVM viewModelC = new ViewModelProvider(PeertubeUploadActivity.this).get(ChannelsVM.class);
         viewModelC.get(MY_CHANNELS, null).observe(PeertubeUploadActivity.this, this::manageVIewChannels);
         channels = new HashMap<>();

app/src/main/java/app/fedilab/fedilabtube/SearchActivity.java

@@ -16,11 +16,22 @@ package app.fedilab.fedilabtube;
 
 import android.os.Bundle;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.tabs.TabLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
+import app.fedilab.fedilabtube.fragment.DisplayChannelsFragment;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import es.dmoral.toasty.Toasty;
 
@@ -29,12 +40,15 @@ public class SearchActivity extends AppCompatActivity {
 
 
     private String search;
+    private ActivitySearchResultBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
-        setContentView(R.layout.activity_search_result);
         Bundle b = getIntent().getExtras();
         if (b != null) {
             search = b.getString("search");
@@ -46,15 +60,64 @@ public class SearchActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         setTitle(search);
 
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.videos)));
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.channels)));
+        binding.searchPager.setOffscreenPageLimit(2);
+
+        PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+        binding.searchPager.setAdapter(mPagerAdapter);
+        binding.searchPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                TabLayout.Tab tab = binding.searchTabLayout.getTabAt(position);
+                if (tab != null)
+                    tab.select();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+        binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.searchPager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                Fragment fragment = null;
+                if (binding.searchPager.getAdapter() != null)
+                    fragment = (Fragment) binding.searchPager.getAdapter().instantiateItem(binding.searchPager, tab.getPosition());
+                switch (tab.getPosition()) {
+                    case 0:
+                        if (fragment != null) {
+                            DisplayVideosFragment displayVideosFragment = ((DisplayVideosFragment) fragment);
+                            displayVideosFragment.scrollToTop();
+                        }
+                        break;
+                    case 1:
+                        if (fragment != null) {
+                            DisplayChannelsFragment displayChannelsFragment = ((DisplayChannelsFragment) fragment);
+                            displayChannelsFragment.scrollToTop();
+                        }
+                        break;
+                }
+            }
+        });
 
-        if (savedInstanceState == null) {
-            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
-            Bundle bundle = new Bundle();
-            bundle.putString("search_peertube", search);
-            displayVideosFragment.setArguments(bundle);
-            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-            ft.add(R.id.container, displayVideosFragment).commit();
-        }
     }
 
 
@@ -67,4 +130,37 @@ public class SearchActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+
+    /**
+     * Pager adapter for the 2 fragments
+     */
+    private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(int position) {
+            Bundle bundle = new Bundle();
+            if (position == 0) {
+                DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
+                bundle.putString("search_peertube", search);
+                displayVideosFragment.setArguments(bundle);
+                return displayVideosFragment;
+            }
+            DisplayChannelsFragment displayChannelsFragment = new DisplayChannelsFragment();
+            bundle.putString("search_peertube", search);
+            displayChannelsFragment.setArguments(bundle);
+            return displayChannelsFragment;
+        }
+
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+    }
+
 }

app/src/main/java/app/fedilab/fedilabtube/SepiaSearchActivity.java

@@ -21,12 +21,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.RadioGroup;
-import android.widget.Spinner;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
@@ -42,9 +38,9 @@ import java.util.List;
 import java.util.Map;
 
 import app.fedilab.fedilabtube.client.entities.SepiaSearch;
+import app.fedilab.fedilabtube.databinding.ActivitySepiaSearchBinding;
 import app.fedilab.fedilabtube.fragment.DisplaySepiaSearchFragment;
 import app.fedilab.fedilabtube.helper.Helper;
-import mabbas007.tagsedittext.TagsEditText;
 
 import static app.fedilab.fedilabtube.PeertubeActivity.hideKeyboard;
 import static app.fedilab.fedilabtube.helper.Helper.peertubeInformation;
@@ -54,15 +50,17 @@ public class SepiaSearchActivity extends AppCompatActivity {
 
 
     private SepiaSearch sepiaSearchVideo, sepiaSearchChannel;
-    private TagsEditText sepia_element_all_of_tags, sepia_element_one_of_tags;
-    private MaterialSearchBar searchBar;
-    private ConstraintLayout filter_elements;
+
+    private ActivitySepiaSearchBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_sepia_search);
+        binding = ActivitySepiaSearchBinding.inflate(getLayoutInflater());
+        View rootView = binding.getRoot();
+        setContentView(rootView);
+
 
         sepiaSearchVideo = new SepiaSearch();
         sepiaSearchChannel = new SepiaSearch();
@@ -76,21 +74,18 @@ public class SepiaSearchActivity extends AppCompatActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
 
-        Button filter = findViewById(R.id.filter);
-        filter_elements = findViewById(R.id.filter_elements);
-        filter.setOnClickListener(view -> {
-            if (filter_elements.getVisibility() == View.VISIBLE) {
-                filter_elements.setVisibility(View.GONE);
+        binding.filter.setOnClickListener(view -> {
+            if (binding.filterElements.getVisibility() == View.VISIBLE) {
+                binding.filterElements.setVisibility(View.GONE);
             } else {
-                filter_elements.setVisibility(View.VISIBLE);
+                binding.filterElements.setVisibility(View.VISIBLE);
             }
         });
 
-        RadioGroup sepia_element_nsfw = findViewById(R.id.sepia_element_nsfw);
-        sepia_element_nsfw.setOnCheckedChangeListener((group, checkedId) -> sepiaSearchVideo.setNsfw(checkedId != R.id.sepia_element_nsfw_no));
 
-        RadioGroup radio_date = findViewById(R.id.radio_date);
-        radio_date.setOnCheckedChangeListener((group, checkedId) -> {
+        binding.sepiaElementNsfw.setOnCheckedChangeListener((group, checkedId) -> sepiaSearchVideo.setNsfw(checkedId != R.id.sepia_element_nsfw_no));
+
+        binding.radioDate.setOnCheckedChangeListener((group, checkedId) -> {
             if (checkedId == R.id.sepia_element_published_date_today) {
                 Calendar cal = GregorianCalendar.getInstance();
                 cal.set(Calendar.HOUR_OF_DAY, 0);
@@ -122,8 +117,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        RadioGroup duration = findViewById(R.id.duration);
-        duration.setOnCheckedChangeListener((group, checkedId) -> {
+        binding.duration.setOnCheckedChangeListener((group, checkedId) -> {
             if (checkedId == R.id.sepia_element_duration_short) {
                 sepiaSearchVideo.setDurationMin(0);
                 sepiaSearchVideo.setDurationMax(240);
@@ -140,11 +134,10 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        Spinner sort_by = findViewById(R.id.sort_by);
         ArrayAdapter<String> adapterSortBy = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, getResources().getStringArray(R.array.sort_by_array));
-        sort_by.setAdapter(adapterSortBy);
-        sort_by.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sortBy.setAdapter(adapterSortBy);
+        binding.sortBy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 String orderby, channelOrderBy;
@@ -171,12 +164,6 @@ public class SepiaSearchActivity extends AppCompatActivity {
             }
         });
 
-        Spinner sepia_element_category = findViewById(R.id.sepia_element_category);
-        Spinner sepia_element_license = findViewById(R.id.sepia_element_license);
-        Spinner sepia_element_language = findViewById(R.id.sepia_element_language);
-
-        sepia_element_all_of_tags = findViewById(R.id.sepia_element_all_of_tags);
-        sepia_element_one_of_tags = findViewById(R.id.sepia_element_one_of_tags);
 
         LinkedHashMap<Integer, String> categories = new LinkedHashMap<>(peertubeInformation.getCategories());
         LinkedHashMap<Integer, String> licences = new LinkedHashMap<>(peertubeInformation.getLicences());
@@ -203,7 +190,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterCatgories = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, categoriesA);
-        sepia_element_category.setAdapter(adapterCatgories);
+        binding.sepiaElementCategory.setAdapter(adapterCatgories);
 
 
         //Populate licenses
@@ -222,7 +209,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLicenses = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, licensesA);
-        sepia_element_license.setAdapter(adapterLicenses);
+        binding.sepiaElementLicense.setAdapter(adapterLicenses);
 
         //Populate languages
         String[] languagesA = new String[languages.size() + 1];
@@ -240,10 +227,10 @@ public class SepiaSearchActivity extends AppCompatActivity {
         }
         ArrayAdapter<String> adapterLanguages = new ArrayAdapter<>(SepiaSearchActivity.this,
                 android.R.layout.simple_spinner_dropdown_item, languagesA);
-        sepia_element_language.setAdapter(adapterLanguages);
+        binding.sepiaElementLanguage.setAdapter(adapterLanguages);
 
 
-        sepia_element_license.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementLicense.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLicensePosition(position);
@@ -255,7 +242,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
             }
         });
         //Manage categories
-        sepia_element_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementCategory.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateCategoryPosition(position);
@@ -268,7 +255,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
         //Manage languages
-        sepia_element_language.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        binding.sepiaElementLanguage.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 updateLanguagesPosition(position);
@@ -281,9 +268,7 @@ public class SepiaSearchActivity extends AppCompatActivity {
         });
 
 
-        searchBar = findViewById(R.id.searchBar);
-
-        searchBar.setOnSearchActionListener(new MaterialSearchBar.OnSearchActionListener() {
+        binding.searchBar.setOnSearchActionListener(new MaterialSearchBar.OnSearchActionListener() {
             @Override
             public void onSearchStateChanged(boolean enabled) {
 
@@ -299,22 +284,21 @@ public class SepiaSearchActivity extends AppCompatActivity {
                 makeSearch();
             }
         });
-        Button apply_filter = findViewById(R.id.apply_filter);
-        apply_filter.setOnClickListener(v -> makeSearch());
+        binding.applyFilter.setOnClickListener(v -> makeSearch());
 
-        searchBar.openSearch();
+        binding.searchBar.openSearch();
     }
 
     private void makeSearch() {
         hideKeyboard(SepiaSearchActivity.this);
         sepiaSearchVideo.setStart("0");
-        if (sepia_element_one_of_tags.getTags().size() > 0) {
-            sepiaSearchVideo.setTagsOneOf(sepia_element_one_of_tags.getTags());
+        if (binding.sepiaElementOneOfTags.getTags().size() > 0) {
+            sepiaSearchVideo.setTagsOneOf(binding.sepiaElementOneOfTags.getTags());
         } else {
             sepiaSearchVideo.setTagsOneOf(null);
         }
-        if (sepia_element_all_of_tags.getTags().size() > 0) {
-            sepiaSearchVideo.setTagsAllOf(sepia_element_all_of_tags.getTags());
+        if (binding.sepiaElementAllOfTags.getTags().size() > 0) {
+            sepiaSearchVideo.setTagsAllOf(binding.sepiaElementAllOfTags.getTags());
         } else {
             sepiaSearchVideo.setTagsAllOf(null);
         }
@@ -322,8 +306,8 @@ public class SepiaSearchActivity extends AppCompatActivity {
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("SEPIA_SEARCH");
         if (fragment != null)
             getSupportFragmentManager().beginTransaction().remove(fragment).commit();
-        filter_elements.setVisibility(View.GONE);
-        sepiaSearchVideo.setSearch(searchBar.getText());
+        binding.filterElements.setVisibility(View.GONE);
+        sepiaSearchVideo.setSearch(binding.searchBar.getText());
         DisplaySepiaSearchFragment displaySepiaSearchFragment = new DisplaySepiaSearchFragment();
         Bundle bundle = new Bundle();
         bundle.putParcelable("sepiaSearchVideo", sepiaSearchVideo);

app/src/main/java/app/fedilab/fedilabtube/ShowAccountActivity.java

@@ -288,13 +288,12 @@ public class ShowAccountActivity extends AppCompatActivity {
             if (position == 0) {
                 DisplayChannelsFragment displayChannelsFragment = new DisplayChannelsFragment();
                 bundle.putString("name", account.getAcct());
-                bundle.putBoolean("myChannels", false);
                 displayChannelsFragment.setArguments(bundle);
                 return displayChannelsFragment;
             }
             DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.ACCOUNT_VIDEOS);
-            bundle.putString("channelId", account.getAcct());
+            bundle.putParcelable("account", account);
             bundle.putString("peertube_instance", account.getHost());
             displayVideosFragment.setArguments(bundle);
             return displayVideosFragment;

app/src/main/java/app/fedilab/fedilabtube/ShowChannelActivity.java

@@ -493,7 +493,7 @@ public class ShowChannelActivity extends AppCompatActivity {
             DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
             bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.CHANNEL_VIDEOS);
-            bundle.putString("channelId", channel.getAcct());
+            bundle.putParcelable("channel", channel);
             bundle.putString("peertube_instance", channel.getHost());
             bundle.putBoolean("sepia_search", sepiaSearch);
             displayVideosFragment.setArguments(bundle);

app/src/main/java/app/fedilab/fedilabtube/VideosTimelineActivity.java

@@ -33,7 +33,7 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 
 import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.databinding.ActivitySearchResultBinding;
+import app.fedilab.fedilabtube.databinding.ActivityVideosTimelineBinding;
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
@@ -50,7 +50,7 @@ public class VideosTimelineActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivitySearchResultBinding binding = ActivitySearchResultBinding.inflate(getLayoutInflater());
+        ActivityVideosTimelineBinding binding = ActivityVideosTimelineBinding.inflate(getLayoutInflater());
         View mainView = binding.getRoot();
         setContentView(mainView);
 

app/src/main/java/app/fedilab/fedilabtube/client/PeertubeService.java

@@ -70,6 +70,10 @@ public interface PeertubeService {
     @GET("config/about")
     Call<InstanceData.InstanceInfo> configAbout();
 
+    //Instance config
+    @GET("config")
+    Call<InstanceData.InstanceConfig> config();
+
     @GET("{nodeInfoPath}")
     Call<WellKnownNodeinfo.NodeInfo> getNodeinfo(@Path(value = "nodeInfoPath", encoded = true) String nodeInfoPath);
 
@@ -120,6 +124,9 @@ public interface PeertubeService {
     Call<UserMe> verifyCredentials(@Header("Authorization") String credentials);
 
 
+    @GET("users/me/video-quota-used")
+    Call<UserMe.VideoQuota> getVideoQuota(@Header("Authorization") String credentials);
+
     @FormUrlEncoded
     @PUT("videos/{id}/watching")
     Call<String> addToHistory(
@@ -194,7 +201,7 @@ public interface PeertubeService {
     Call<String> deleteHistory(
             @Header("Authorization") String credentials);
 
-    //Search
+    //Search videos
     @GET("search/videos")
     Call<VideoData> searchVideos(
             @Header("Authorization") String credentials,
@@ -202,6 +209,14 @@ public interface PeertubeService {
             @Query("start") String maxId,
             @Query("count") String count);
 
+    //Search channels
+    @GET("search/video-channels")
+    Call<ChannelData> searchChannels(
+            @Header("Authorization") String credentials,
+            @Query("search") String search,
+            @Query("searcharget") String searchTarget,
+            @Query("start") String maxId,
+            @Query("count") String count);
 
     //Search
     @GET("search/videos")

app/src/main/java/app/fedilab/fedilabtube/client/RetrofitPeertubeAPI.java

@@ -31,7 +31,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -677,6 +676,47 @@ public class RetrofitPeertubeAPI {
         return null;
     }
 
+    /**
+     * Config  of the instance
+     *
+     * @return InstanceConfig
+     */
+    public InstanceData.InstanceConfig getConfigInstance() {
+
+        PeertubeService peertubeService = init();
+        Call<InstanceData.InstanceConfig> config = peertubeService.config();
+        try {
+            Response<InstanceData.InstanceConfig> response = config.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                return response.body();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * Get video quota
+     *
+     * @return UserMe.VideoQuota
+     */
+    public UserMe.VideoQuota getVideoQuota() {
+
+        PeertubeService peertubeService = init();
+        Call<UserMe.VideoQuota> videoQuotaCall = peertubeService.getVideoQuota(getToken());
+        try {
+            Response<UserMe.VideoQuota> response = videoQuotaCall.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                return response.body();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     /**
      * Returns informations about Peertube such privacies, licenses, etc.
      *
@@ -891,6 +931,7 @@ public class RetrofitPeertubeAPI {
         APIResponse apiResponse = new APIResponse();
         try {
             Response<VideoData> response = searchVideosCall.execute();
+
             if (response.isSuccessful() && response.body() != null) {
                 apiResponse.setPeertubes(response.body().data);
             } else {
@@ -905,6 +946,34 @@ public class RetrofitPeertubeAPI {
         return apiResponse;
     }
 
+
+    /**
+     * Retrieves channels search *synchronously*
+     *
+     * @param query String search
+     * @return APIResponse
+     */
+    public APIResponse searchChannels(String query, String max_id) {
+        PeertubeService peertubeService = init();
+        Call<ChannelData> searchChannelsCall = peertubeService.searchChannels(getToken(), query, "local", max_id, count);
+        APIResponse apiResponse = new APIResponse();
+        try {
+            Response<ChannelData> response = searchChannelsCall.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                apiResponse.setChannels(response.body().data);
+            } else {
+                setError(apiResponse, response.code(), response.errorBody());
+            }
+        } catch (IOException e) {
+            Error error = new Error();
+            error.setError(_context.getString(R.string.toast_error));
+            apiResponse.setError(error);
+            e.printStackTrace();
+        }
+        return apiResponse;
+    }
+
+
     /***
      * Verifiy credential of the authenticated user *synchronously*
      * @return Account
@@ -1376,21 +1445,31 @@ public class RetrofitPeertubeAPI {
      * @param playlistParams PlaylistParams
      * @return APIResponse
      */
-    public APIResponse createOrUpdatePlaylist(PlaylistsVM.action apiAction, String playlistId, PlaylistParams playlistParams, File thumbnail) {
+    public APIResponse createOrUpdatePlaylist(PlaylistsVM.action apiAction, String playlistId, PlaylistParams playlistParams, Uri thumbnail) {
         PeertubeService peertubeService = init();
 
         APIResponse apiResponse = new APIResponse();
         MultipartBody.Part body = null;
+
+        MultipartBody.Part bodyThumbnail = null;
         if (thumbnail != null) {
-            RequestBody requestFile = RequestBody.create(thumbnail, MediaType.parse("multipart/form-data"));
-            body = MultipartBody.Part.createFormData("image", thumbnail.getName(), requestFile);
+            DocumentFile documentFile = DocumentFile.fromSingleUri(_context, thumbnail);
+            String avatarfileName = null;
+            if (documentFile != null) {
+                avatarfileName = documentFile.getName();
+            }
+            try {
+                bodyThumbnail = createFile("thumbnailfile", thumbnail, avatarfileName);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
         try {
             RequestBody displayName = RequestBody.create(playlistParams.getDisplayName(), MediaType.parse("text/plain"));
             RequestBody description = RequestBody.create(playlistParams.getDescription(), MediaType.parse("text/plain"));
             RequestBody channelId = RequestBody.create(playlistParams.getVideoChannelId(), MediaType.parse("text/plain"));
             if (apiAction == PlaylistsVM.action.CREATE_PLAYLIST) {
-                Call<VideoPlaylistData.VideoPlaylistCreation> stringCall = peertubeService.addPlaylist(getToken(), displayName, description, playlistParams.getPrivacy(), channelId, body);
+                Call<VideoPlaylistData.VideoPlaylistCreation> stringCall = peertubeService.addPlaylist(getToken(), displayName, description, playlistParams.getPrivacy(), channelId, bodyThumbnail);
                 Response<VideoPlaylistData.VideoPlaylistCreation> response = stringCall.execute();
                 if (response.isSuccessful() && response.body() != null) {
                     apiResponse.setActionReturn(response.body().getVideoPlaylist().getId());
@@ -1399,7 +1478,7 @@ public class RetrofitPeertubeAPI {
                 }
 
             } else if (apiAction == PlaylistsVM.action.UPDATE_PLAYLIST) {
-                Call<String> stringCall = peertubeService.updatePlaylist(getToken(), playlistId, displayName, description, playlistParams.getPrivacy(), channelId, body);
+                Call<String> stringCall = peertubeService.updatePlaylist(getToken(), playlistId, displayName, description, playlistParams.getPrivacy(), channelId, bodyThumbnail);
                 Response<String> response = stringCall.execute();
                 if (response.isSuccessful()) {
                     apiResponse.setActionReturn(response.body());

app/src/main/java/app/fedilab/fedilabtube/client/data/InstanceData.java

@@ -343,5 +343,42 @@ public class InstanceData {
             parcel.writeString(host);
         }
     }
+
+
+    public static class InstanceConfig {
+        @SerializedName("user")
+        private User user;
+
+        public User getUser() {
+            return user;
+        }
+
+        public void setUser(User user) {
+            this.user = user;
+        }
+    }
+
+    public static class User {
+        @SerializedName("videoQuota")
+        private long videoQuota;
+        @SerializedName("videoQuotaDaily")
+        private long videoQuotaDaily;
+
+        public long getVideoQuota() {
+            return videoQuota;
+        }
+
+        public void setVideoQuota(long videoQuota) {
+            this.videoQuota = videoQuota;
+        }
+
+        public long getVideoQuotaDaily() {
+            return videoQuotaDaily;
+        }
+
+        public void setVideoQuotaDaily(long videoQuotaDaily) {
+            this.videoQuotaDaily = videoQuotaDaily;
+        }
+    }
 }
 

app/src/main/java/app/fedilab/fedilabtube/client/entities/UserMe.java

@@ -66,9 +66,9 @@ public class UserMe {
     @SerializedName("videoLanguages")
     private List<String> videoLanguages;
     @SerializedName("videoQuota")
-    private String videoQuota;
+    private long videoQuota;
     @SerializedName("videoQuotaDaily")
-    private String videoQuotaDaily;
+    private long videoQuotaDaily;
     @SerializedName("videosHistoryEnabled")
     private boolean videosHistoryEnabled;
     @SerializedName("webTorrentEnabled")
@@ -226,19 +226,19 @@ public class UserMe {
         this.videoLanguages = videoLanguages;
     }
 
-    public String getVideoQuota() {
+    public long getVideoQuota() {
         return videoQuota;
     }
 
-    public void setVideoQuota(String videoQuota) {
+    public void setVideoQuota(long videoQuota) {
         this.videoQuota = videoQuota;
     }
 
-    public String getVideoQuotaDaily() {
+    public long getVideoQuotaDaily() {
         return videoQuotaDaily;
     }
 
-    public void setVideoQuotaDaily(String videoQuotaDaily) {
+    public void setVideoQuotaDaily(long videoQuotaDaily) {
         this.videoQuotaDaily = videoQuotaDaily;
     }
 
@@ -279,4 +279,27 @@ public class UserMe {
             this.avatar = avatar;
         }
     }
+
+    public static class VideoQuota {
+        @SerializedName("videoQuotaUsed")
+        private long videoQuotaUsed;
+        @SerializedName("videoQuotaUsedDaily")
+        private long videoQuotaUsedDaily;
+
+        public long getVideoQuotaUsed() {
+            return videoQuotaUsed;
+        }
+
+        public void setVideoQuotaUsed(long videoQuotaUsed) {
+            this.videoQuotaUsed = videoQuotaUsed;
+        }
+
+        public long getVideoQuotaUsedDaily() {
+            return videoQuotaUsedDaily;
+        }
+
+        public void setVideoQuotaUsedDaily(long videoQuotaUsedDaily) {
+            this.videoQuotaUsedDaily = videoQuotaUsedDaily;
+        }
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/drawer/AccountsHorizontalListAdapter.java

@@ -19,19 +19,13 @@ import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.ColorUtils;
 import androidx.recyclerview.widget.RecyclerView;
-
 import java.util.List;
-
-import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.databinding.DrawerHorizontalAccountBinding;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
@@ -50,8 +44,8 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
     @Override
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         context = parent.getContext();
-        LayoutInflater layoutInflater = LayoutInflater.from(context);
-        return new ViewHolder(layoutInflater.inflate(R.layout.drawer_horizontal_account, parent, false));
+        DrawerHorizontalAccountBinding itemBinding = DrawerHorizontalAccountBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new ViewHolder(itemBinding);
     }
 
     @Override
@@ -60,17 +54,17 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
         final ChannelData.Channel channel = channels.get(position);
 
         if (channel.getDisplayName() != null && !channel.getDisplayName().trim().equals(""))
-            holder.account_dn.setText(channel.getDisplayName());
+            holder.binding.accountDn.setText(channel.getDisplayName());
         else
-            holder.account_dn.setText(channel.getName().replace("@", ""));
+            holder.binding.accountDn.setText(channel.getName().replace("@", ""));
 
         //Profile picture
-        Helper.loadGiF(context, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, holder.account_pp, 270);
+        Helper.loadGiF(context, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, holder.binding.accountPp, 270);
 
         if (channel.isSelected()) {
-            holder.main_container.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, Helper.getColorAccent()), 50));
+            holder.binding.mainContainer.setBackgroundColor(ColorUtils.setAlphaComponent(ContextCompat.getColor(context, Helper.getColorAccent()), 50));
         } else {
-            holder.main_container.setBackgroundColor(Color.TRANSPARENT);
+            holder.binding.mainContainer.setBackgroundColor(Color.TRANSPARENT);
         }
 
     }
@@ -87,27 +81,24 @@ public class AccountsHorizontalListAdapter extends RecyclerView.Adapter<Recycler
 
 
     public interface EventListener {
-        void click(String forAccount);
+        void click(ChannelData.Channel channel);
     }
 
 
     private class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        ImageView account_pp;
-        TextView account_dn;
-        LinearLayout main_container;
+        DrawerHorizontalAccountBinding binding;
+
+        ViewHolder(DrawerHorizontalAccountBinding itemView) {
+            super(itemView.getRoot());
+            binding = itemView;
+            itemView.getRoot().setOnClickListener(this);
 
-        ViewHolder(View itemView) {
-            super(itemView);
-            itemView.setOnClickListener(this);
-            account_pp = itemView.findViewById(R.id.account_pp);
-            account_dn = itemView.findViewById(R.id.account_dn);
-            main_container = itemView.findViewById(R.id.main_container);
         }
 
         @Override
         public void onClick(View v) {
             ChannelData.Channel channel = channels.get(getAdapterPosition());
-            listener.click(channel.getAcct());
+            listener.click(channel);
             for (ChannelData.Channel acc : channels) {
                 acc.setSelected(acc.getId().compareTo(channel.getId()) == 0);
             }

app/src/main/java/app/fedilab/fedilabtube/drawer/ChannelListAdapter.java

@@ -17,6 +17,7 @@ package app.fedilab.fedilabtube.drawer;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -45,15 +46,13 @@ import app.fedilab.fedilabtube.helper.Helper;
 public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private final List<Channel> channels;
-    private final boolean myChannel;
     public AllChannelRemoved allChannelRemoved;
     public EditAlertDialog editAlertDialog;
     private Context context;
 
 
-    public ChannelListAdapter(List<Channel> channels, boolean myChannel) {
+    public ChannelListAdapter(List<Channel> channels) {
         this.channels = channels;
-        this.myChannel = myChannel;
     }
 
     @NonNull
@@ -77,7 +76,7 @@ public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         //Profile picture
         Helper.loadGiF(context, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, holder.account_pp);
 
-        if (!this.myChannel) {
+        if (!isMyChannel(channel)) {
             holder.more_actions.setVisibility(View.GONE);
         }
         holder.more_actions.setOnClickListener(view -> {
@@ -132,6 +131,20 @@ public class ChannelListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
     }
 
+
+    private boolean isMyChannel(Channel channel) {
+        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        String channeIdOwner = channel.getOwnerAccount().getId();
+        String channeInstanceOwner = channel.getOwnerAccount().getHost();
+        String instanceShar = sharedpreferences.getString(Helper.PREF_INSTANCE, null);
+        String userIdShar = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+        if (channeIdOwner != null && channeInstanceOwner != null && instanceShar != null && userIdShar != null) {
+            return channeIdOwner.compareTo(userIdShar) == 0 && channeInstanceOwner.compareTo(instanceShar) == 0;
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public long getItemId(int position) {
         return position;

app/src/main/java/app/fedilab/fedilabtube/drawer/CommentListAdapter.java

@@ -33,9 +33,7 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -59,6 +57,7 @@ import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.CommentData.Comment;
 import app.fedilab.fedilabtube.client.entities.Report;
+import app.fedilab.fedilabtube.databinding.DrawerCommentBinding;
 import app.fedilab.fedilabtube.helper.CommentDecorationHelper;
 import app.fedilab.fedilabtube.helper.EmojiHelper;
 import app.fedilab.fedilabtube.helper.Helper;
@@ -104,10 +103,11 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
 
         context = parent.getContext();
-        LayoutInflater layoutInflater = LayoutInflater.from(this.context);
-        return new ViewHolder(layoutInflater.inflate(R.layout.drawer_comment, parent, false));
+        DrawerCommentBinding itemBinding = DrawerCommentBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false);
+        return new ViewHolder(itemBinding);
     }
 
+
     @SuppressLint({"SetJavaScriptEnabled", "ClickableViewAccessibility"})
     @Override
     public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder, int i) {
@@ -121,23 +121,23 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
         if (comment == null)
             return;
-        holder.main_container.setTag(i);
+        holder.binding.mainContainer.setTag(i);
 
-        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT
-        );
+
+        holder.binding.decorationContainer.removeAllViews();
         if (comment.isReply()) {
             int ident = CommentDecorationHelper.getIndentation(comment.getInReplyToCommentId(), comments);
-            holder.decoration.setVisibility(View.VISIBLE);
-            params.setMargins((int) Helper.convertDpToPixel(ident * 10, context), 0, 0, 0);
-        } else {
-            holder.decoration.setVisibility(View.GONE);
-            params.setMargins(0, 0, 0, 0);
+            for (int j = 0; j <= ident; j++) {
+                View view = new View(context);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(1, LinearLayout.LayoutParams.MATCH_PARENT);
+                params.setMargins((int) Helper.convertDpToPixel(5, context), 0, 0, 0);
+                view.setBackgroundResource(R.color.colorAccent);
+                view.setLayoutParams(params);
+                holder.binding.decorationContainer.addView(view, 0);
+            }
         }
-        holder.main_container.setLayoutParams(params);
-        holder.more_actions.setOnClickListener(view -> {
-            PopupMenu popup = new PopupMenu(context, holder.more_actions);
+        holder.binding.moreActions.setOnClickListener(view -> {
+            PopupMenu popup = new PopupMenu(context, holder.binding.moreActions);
             popup.getMenuInflater()
                     .inflate(R.menu.comment_menu, popup.getMenu());
             if (!Helper.isOwner(context, comment.getAccount())) {
@@ -219,7 +219,7 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             });
             popup.show();
         });
-        holder.comment_content.setOnTouchListener((view, motionEvent) -> {
+        holder.binding.commentContent.setOnTouchListener((view, motionEvent) -> {
             if (motionEvent.getAction() == MotionEvent.ACTION_UP && !view.hasFocus()) {
                 try {
                     view.requestFocus();
@@ -234,22 +234,22 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             commentSpan = Html.fromHtml(EmojiHelper.shortnameToUnicode(comment.getText()), Html.FROM_HTML_MODE_COMPACT);
         else
             commentSpan = Html.fromHtml(EmojiHelper.shortnameToUnicode(comment.getText()));
-        holder.comment_content.setText(commentSpan, TextView.BufferType.SPANNABLE);
+        holder.binding.commentContent.setText(commentSpan, TextView.BufferType.SPANNABLE);
 
-        holder.comment_content.setMovementMethod(LinkMovementMethod.getInstance());
+        holder.binding.commentContent.setMovementMethod(LinkMovementMethod.getInstance());
 
-        holder.comment_account_displayname.setText(comment.getAccount().getDisplayName());
+        holder.binding.commentAccountDisplayname.setText(comment.getAccount().getDisplayName());
 
 
         if (context instanceof PeertubeActivity && !isThread) {
-            holder.main_container.setOnClickListener(v -> ((PeertubeActivity) context).openCommentThread(comment));
-            holder.comment_content.setOnClickListener(v -> ((PeertubeActivity) context).openCommentThread(comment));
+            holder.binding.mainContainer.setOnClickListener(v -> ((PeertubeActivity) context).openCommentThread(comment));
+            holder.binding.commentContent.setOnClickListener(v -> ((PeertubeActivity) context).openCommentThread(comment));
         }
         if (comment.getTotalReplies() > 0) {
-            holder.number_of_replies.setVisibility(View.VISIBLE);
-            holder.number_of_replies.setText(context.getResources().getQuantityString(R.plurals.number_of_replies, comment.getTotalReplies(), comment.getTotalReplies()));
+            holder.binding.numberOfReplies.setVisibility(View.VISIBLE);
+            holder.binding.numberOfReplies.setText(context.getResources().getQuantityString(R.plurals.number_of_replies, comment.getTotalReplies(), comment.getTotalReplies()));
         } else {
-            holder.number_of_replies.setVisibility(View.GONE);
+            holder.binding.numberOfReplies.setVisibility(View.GONE);
         }
 
         if (comment.getAccount() != null) {
@@ -265,10 +265,10 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                     wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, android.R.color.darker_gray)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
                 }
             }
-            holder.comment_account_username.setText(wordtoSpan);
+            holder.binding.commentAccountUsername.setText(wordtoSpan);
         }
 
-        holder.comment_date.setText(Helper.dateDiff(context, comment.getCreatedAt()));
+        holder.binding.commentDate.setText(Helper.dateDiff(context, comment.getCreatedAt()));
 
         String avatarUrl;
         if (instance != null) {
@@ -276,9 +276,9 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         } else {
             avatarUrl = comment.getAccount().getAvatar() != null ? comment.getAccount().getAvatar().getPath() : null;
         }
-        Helper.loadGiF(context, avatarUrl, holder.comment_account_profile);
+        Helper.loadGiF(context, avatarUrl, holder.binding.commentAccountProfile);
 
-        holder.comment_account_profile.setOnClickListener(v -> {
+        holder.binding.commentAccountProfile.setOnClickListener(v -> {
             Bundle b = new Bundle();
             Intent intent = new Intent(context, ShowAccountActivity.class);
             b.putParcelable("account", comment.getAccount());
@@ -287,17 +287,17 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             context.startActivity(intent);
         });
         if (comment.isReply()) {
-            holder.replyButton.setVisibility(View.VISIBLE);
+            holder.binding.replyButton.setVisibility(View.VISIBLE);
         } else {
-            holder.replyButton.setVisibility(View.GONE);
+            holder.binding.replyButton.setVisibility(View.GONE);
         }
         if (i == 0 && isThread) {
-            holder.post_reply_button.setVisibility(View.VISIBLE);
+            holder.binding.postReplyButton.setVisibility(View.VISIBLE);
         } else {
-            holder.post_reply_button.setVisibility(View.GONE);
+            holder.binding.postReplyButton.setVisibility(View.GONE);
         }
-        holder.post_reply_button.setOnClickListener(v -> ((PeertubeActivity) context).openPostComment(comment, i));
-        holder.replyButton.setOnClickListener(v -> ((PeertubeActivity) context).openPostComment(comment, i));
+        holder.binding.postReplyButton.setOnClickListener(v -> ((PeertubeActivity) context).openPostComment(comment, i));
+        holder.binding.replyButton.setOnClickListener(v -> ((PeertubeActivity) context).openPostComment(comment, i));
     }
 
     public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, int i, APIResponse apiResponse) {
@@ -358,40 +358,15 @@ public class CommentListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         void onAllCommentRemoved();
     }
 
+
     static class ViewHolder extends RecyclerView.ViewHolder {
+        DrawerCommentBinding binding;
 
-        TextView comment_content;
-        TextView comment_account_username;
-        TextView comment_account_displayname;
-        ImageView comment_account_profile;
-        TextView comment_date, replyButton;
-        LinearLayout main_container;
-        TextView more_actions, number_of_replies;
-        Button post_reply_button;
-        View decoration;
-
-        @SuppressLint("SetJavaScriptEnabled")
-        ViewHolder(View itemView) {
-            super(itemView);
-            comment_content = itemView.findViewById(R.id.comment_content);
-            comment_account_username = itemView.findViewById(R.id.comment_account_username);
-            comment_account_profile = itemView.findViewById(R.id.comment_account_profile);
-            comment_account_displayname = itemView.findViewById(R.id.comment_account_displayname);
-            comment_date = itemView.findViewById(R.id.comment_date);
-            main_container = itemView.findViewById(R.id.main_container);
-            more_actions = itemView.findViewById(R.id.more_actions);
-            number_of_replies = itemView.findViewById(R.id.number_of_replies);
-            replyButton = itemView.findViewById(R.id.replyButton);
-            decoration = itemView.findViewById(R.id.decoration);
-            post_reply_button = itemView.findViewById(R.id.post_reply_button);
-
+        ViewHolder(DrawerCommentBinding itemView) {
+            super(itemView.getRoot());
+            binding = itemView;
         }
-
-        public View getView() {
-            return itemView;
-        }
-
-
     }
 
+
 }

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayAccountsFragment.java

@@ -177,13 +177,14 @@ public class DisplayAccountsFragment extends Fragment implements AccountsListAda
                 accounts.add(block.getBlockedAccount());
             }
         }
-
+        if (max_id == null) {
+            max_id = "0";
+        }
         if (firstLoad && (accounts == null || accounts.size() == 0))
             textviewNoAction.setVisibility(View.VISIBLE);
         else
             textviewNoAction.setVisibility(View.GONE);
-
-        max_id = apiResponse.getMax_id();
+        max_id = String.valueOf(Integer.parseInt(max_id) + 20);
         if (accounts != null && accounts.size() > 0) {
             int previousPosition = this.accounts.size();
             int currentPosition = this.accounts.size();

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayChannelsFragment.java

@@ -29,7 +29,6 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
-import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -60,6 +59,7 @@ import app.fedilab.fedilabtube.databinding.FragmentRecyclerviewBinding;
 import app.fedilab.fedilabtube.drawer.ChannelListAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.ChannelsVM;
+import app.fedilab.fedilabtube.viewmodel.SearchVM;
 import es.dmoral.toasty.Toasty;
 
 import static app.fedilab.fedilabtube.PeertubeUploadActivity.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
@@ -71,14 +71,14 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
     private static final int PICK_AVATAR = 467;
     private ChannelListAdapter channelListAdapter;
     private List<ChannelData.Channel> channels;
-    private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private String name;
     private View rootView;
-    private boolean myChannels;
     private FloatingActionButton action_button;
     private FragmentRecyclerviewBinding binding;
     private AddChannelBinding bindingDialog;
     private Uri inputData;
+    private String search_peertube;
+    private String max_id;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -89,14 +89,12 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
         context = getContext();
         Bundle bundle = this.getArguments();
         channels = new ArrayList<>();
-        myChannels = true;
+        max_id = "0";
         if (bundle != null) {
             name = bundle.getString("name", null);
-            myChannels = bundle.getBoolean("myChannels", true);
+            search_peertube = bundle.getString("search_peertube", null);
         }
 
-
-
         if (getActivity() != null) {
             action_button = getActivity().findViewById(R.id.action_button);
             if (action_button != null) {
@@ -106,12 +104,7 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
         }
 
         binding.lvElements.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
-        mainLoader = rootView.findViewById(R.id.loader);
-        nextElementLoader = rootView.findViewById(R.id.loading_next);
-        textviewNoAction = rootView.findViewById(R.id.no_action);
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
-        channelListAdapter = new ChannelListAdapter(this.channels, myChannels);
+        channelListAdapter = new ChannelListAdapter(this.channels);
         channelListAdapter.allChannelRemoved = this;
         channelListAdapter.editAlertDialog = this;
         binding.lvElements.setAdapter(channelListAdapter);
@@ -121,15 +114,24 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
         binding.lvElements.setLayoutManager(mLayoutManager);
 
         binding.swipeContainer.setOnRefreshListener(this::pullToRefresh);
-        ChannelsVM viewModel = new ViewModelProvider(this).get(ChannelsVM.class);
-        if (name != null) {
-            viewModel.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, name).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
-        } else {
-            viewModel.get(RetrofitPeertubeAPI.DataType.MY_CHANNELS, null).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
-        }
+
+        loadChannels(max_id);
         return rootView;
     }
 
+    private void loadChannels(String max_id) {
+        if (search_peertube == null) {
+            ChannelsVM viewModel = new ViewModelProvider(this).get(ChannelsVM.class);
+            if (name != null) {
+                viewModel.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, name).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
+            } else {
+                viewModel.get(RetrofitPeertubeAPI.DataType.MY_CHANNELS, null).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
+            }
+        } else {
+            SearchVM viewModelSearch = new ViewModelProvider(this).get(SearchVM.class);
+            viewModelSearch.getChannels(max_id, search_peertube).observe(this.requireActivity(), this::manageViewChannels);
+        }
+    }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -187,24 +189,25 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
     }
 
     private void manageViewChannels(APIResponse apiResponse) {
-        mainLoader.setVisibility(View.GONE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
+        binding.loadingNext.setVisibility(View.GONE);
         if (apiResponse.getError() != null) {
             Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             binding.swipeContainer.setRefreshing(false);
             return;
         }
         List<ChannelData.Channel> channels = apiResponse.getChannels();
-        if ((channels == null || channels.size() == 0))
-            textviewNoAction.setVisibility(View.VISIBLE);
-        else
-            textviewNoAction.setVisibility(View.GONE);
 
+        if ((channels == null || channels.size() == 0))
+            binding.noAction.setVisibility(View.VISIBLE);
+        else
+            binding.noAction.setVisibility(View.GONE);
+        max_id = String.valueOf(Integer.parseInt(max_id) + 20);
         if (channels != null && channels.size() > 0) {
             int currentPosition = this.channels.size();
             this.channels.addAll(channels);
             if (currentPosition == 0) {
-                channelListAdapter = new ChannelListAdapter(this.channels, myChannels);
+                channelListAdapter = new ChannelListAdapter(this.channels);
                 channelListAdapter.allChannelRemoved = DisplayChannelsFragment.this;
                 channelListAdapter.editAlertDialog = DisplayChannelsFragment.this;
                 binding.lvElements.setAdapter(channelListAdapter);
@@ -217,19 +220,13 @@ public class DisplayChannelsFragment extends Fragment implements ChannelListAdap
 
     public void pullToRefresh() {
         channels = new ArrayList<>();
-
         binding.swipeContainer.setRefreshing(true);
-        ChannelsVM viewModel = new ViewModelProvider(this).get(ChannelsVM.class);
-        if (name != null) {
-            viewModel.get(RetrofitPeertubeAPI.DataType.CHANNELS_FOR_ACCOUNT, name).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
-        } else {
-            viewModel.get(RetrofitPeertubeAPI.DataType.MY_CHANNELS, null).observe(DisplayChannelsFragment.this.requireActivity(), this::manageViewChannels);
-        }
+        loadChannels("0");
     }
 
     @Override
     public void onAllChannelRemoved() {
-        textviewNoAction.setVisibility(View.VISIBLE);
+        binding.noAction.setVisibility(View.VISIBLE);
     }
 
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplaySepiaSearchFragment.java

@@ -22,17 +22,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -41,8 +39,10 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.BuildConfig;
 import app.fedilab.fedilabtube.R;
+import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.entities.SepiaSearch;
+import app.fedilab.fedilabtube.databinding.FragmentVideoBinding;
 import app.fedilab.fedilabtube.drawer.AccountsHorizontalListAdapter;
 import app.fedilab.fedilabtube.drawer.PeertubeAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
@@ -61,23 +61,24 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
     private Context context;
     private PeertubeAdapter peertubeAdapater;
     private List<VideoData.Video> peertubes;
-    private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private boolean firstLoad;
-    private SwipeRefreshLayout swipeRefreshLayout;
     private SharedPreferences sharedpreferences;
-    private TextView textviewNoActionText;
-    private View rootView;
-    private RecyclerView lv_status;
     private SepiaSearchVM viewModelSearch;
     private SepiaSearch sepiaSearchVideo;
+    private FragmentVideoBinding binding;
 
     public DisplaySepiaSearchFragment() {
     }
 
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        rootView = inflater.inflate(R.layout.fragment_video, container, false);
+        binding = FragmentVideoBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
 
         peertubes = new ArrayList<>();
         context = getContext();
@@ -85,40 +86,35 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
         if (bundle != null) {
             sepiaSearchVideo = bundle.getParcelable("sepiaSearchVideo");
         }
-        lv_status = rootView.findViewById(R.id.lv_status);
         flag_loading = true;
         firstLoad = true;
 
         assert context != null;
         sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        swipeRefreshLayout = rootView.findViewById(R.id.swipeContainer);
 
-        mainLoader = rootView.findViewById(R.id.loader);
-        nextElementLoader = rootView.findViewById(R.id.loading_next_status);
-        textviewNoAction = rootView.findViewById(R.id.no_action);
-        textviewNoActionText = rootView.findViewById(R.id.no_action_text);
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
+
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.loadingNextVideos.setVisibility(View.GONE);
 
         peertubeAdapater = new PeertubeAdapter(this.peertubes, SEPIA_SEARCH, true);
-        lv_status.setAdapter(peertubeAdapater);
+        binding.lvVideos.setAdapter(peertubeAdapater);
 
 
         if (!Helper.isTablet(context)) {
             mLayoutManager = new LinearLayoutManager(context);
-            lv_status.setLayoutManager(mLayoutManager);
+            binding.lvVideos.setLayoutManager(mLayoutManager);
         } else {
             gLayoutManager = new GridLayoutManager(context, 2);
             int spanCount = (int) Helper.convertDpToPixel(2, context);
             int spacing = (int) Helper.convertDpToPixel(5, context);
-            lv_status.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true));
-            lv_status.setLayoutManager(gLayoutManager);
+            binding.lvVideos.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true));
+            binding.lvVideos.setLayoutManager(gLayoutManager);
         }
         viewModelSearch = new ViewModelProvider(DisplaySepiaSearchFragment.this).get(SepiaSearchVM.class);
-        swipeRefreshLayout.setOnRefreshListener(this::pullToRefresh);
+        binding.swipeContainer.setOnRefreshListener(this::pullToRefresh);
 
 
-        lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        binding.lvVideos.addOnScrollListener(new RecyclerView.OnScrollListener() {
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 if (mLayoutManager != null) {
                     int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();
@@ -129,10 +125,10 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
                             if (!flag_loading) {
                                 flag_loading = true;
                                 loadTimeline();
-                                nextElementLoader.setVisibility(View.VISIBLE);
+                                binding.loadingNextVideos.setVisibility(View.VISIBLE);
                             }
                         } else {
-                            nextElementLoader.setVisibility(View.GONE);
+                            binding.loadingNextVideos.setVisibility(View.GONE);
                         }
                     }
                 } else if (gLayoutManager != null) {
@@ -144,27 +140,26 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
                             if (!flag_loading) {
                                 flag_loading = true;
                                 loadTimeline();
-                                nextElementLoader.setVisibility(View.VISIBLE);
+                                binding.loadingNextVideos.setVisibility(View.VISIBLE);
                             }
                         } else {
-                            nextElementLoader.setVisibility(View.GONE);
+                            binding.loadingNextVideos.setVisibility(View.GONE);
                         }
                     }
                 }
             }
         });
         loadTimeline();
-        return rootView;
     }
 
 
     @Override
     public void onPause() {
         super.onPause();
-        if (swipeRefreshLayout != null) {
-            swipeRefreshLayout.setEnabled(false);
-            swipeRefreshLayout.setRefreshing(false);
-            swipeRefreshLayout.clearAnimation();
+        if (binding.swipeContainer != null) {
+            binding.swipeContainer.setEnabled(false);
+            binding.swipeContainer.setRefreshing(false);
+            binding.swipeContainer.clearAnimation();
         }
         if (getActivity() != null) {
             InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -201,12 +196,12 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
 
     private void manageVIewVideos(VideoData videoData) {
         //hide loaders
-        mainLoader.setVisibility(View.GONE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
+        binding.loadingNextVideos.setVisibility(View.GONE);
         //handle other API error
         if (videoData == null || videoData.data == null) {
             Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
-            swipeRefreshLayout.setRefreshing(false);
+            binding.swipeContainer.setRefreshing(false);
             flag_loading = false;
             return;
         }
@@ -227,16 +222,16 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
         //If no item were inserted previously the adapter is created
         if (previousPosition == 0) {
             peertubeAdapater = new PeertubeAdapter(this.peertubes, SEPIA_SEARCH, true);
-            lv_status.setAdapter(peertubeAdapater);
+            binding.lvVideos.setAdapter(peertubeAdapater);
         } else
             peertubeAdapater.notifyItemRangeInserted(previousPosition, videoData.data.size());
 
         //remove handlers
-        swipeRefreshLayout.setRefreshing(false);
-        textviewNoAction.setVisibility(View.GONE);
+        binding.swipeContainer.setRefreshing(false);
+        binding.noAction.setVisibility(View.GONE);
         if (firstLoad && (videoData.data == null || videoData.data.size() == 0)) {
-            textviewNoActionText.setText(R.string.no_video_to_display);
-            textviewNoAction.setVisibility(View.VISIBLE);
+            binding.noActionText.setText(R.string.no_video_to_display);
+            binding.noAction.setVisibility(View.VISIBLE);
         }
         flag_loading = false;
         firstLoad = false;
@@ -244,20 +239,19 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
 
     @Override
     public void onDestroyView() {
-        if (lv_status != null) {
+        if (binding.lvVideos != null) {
             try {
-                lv_status.setAdapter(null);
+                binding.lvVideos.setAdapter(null);
             } catch (Exception ignored) {
             }
         }
         super.onDestroyView();
-        rootView = null;
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        swipeRefreshLayout.setEnabled(true);
+        binding.swipeContainer.setEnabled(true);
     }
 
 
@@ -279,7 +273,7 @@ public class DisplaySepiaSearchFragment extends Fragment implements AccountsHori
     }
 
     @Override
-    public void click(String forAccount) {
+    public void click(ChannelData.Channel forChannel) {
         pullToRefresh();
     }
 

app/src/main/java/app/fedilab/fedilabtube/fragment/DisplayVideosFragment.java

@@ -23,21 +23,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -51,10 +46,12 @@ import app.fedilab.fedilabtube.MainActivity;
 import app.fedilab.fedilabtube.R;
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData;
 import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.data.VideoPlaylistData;
 import app.fedilab.fedilabtube.client.entities.PlaylistExist;
+import app.fedilab.fedilabtube.databinding.FragmentVideoBinding;
 import app.fedilab.fedilabtube.drawer.AccountsHorizontalListAdapter;
 import app.fedilab.fedilabtube.drawer.PeertubeAdapter;
 import app.fedilab.fedilabtube.helper.Helper;
@@ -81,27 +78,23 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
     private List<VideoData.Video> peertubes;
     private List<ChannelData.Channel> channels;
     private TimelineVM.TimelineType type;
-    private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private boolean firstLoad;
-    private SwipeRefreshLayout swipeRefreshLayout;
-    private SharedPreferences sharedpreferences;
     private String search_peertube;
-    private TextView textviewNoActionText;
-    private View rootView;
-    private RecyclerView lv_status;
     private boolean check_ScrollingUp;
-    private String forAccount;
-    private ConstraintLayout top_account_container;
+    private ChannelData.Channel forChannel;
     private TimelineVM viewModelFeeds;
     private SearchVM viewModelSearch;
     private AccountsVM viewModelAccounts;
-    private String channelId;
+    private ChannelData.Channel channel;
+    private AccountData.Account account;
     private Map<String, Boolean> relationship;
     private Map<String, List<PlaylistExist>> playlists;
     private String playlistId;
     private String remoteInstance;
     private boolean sepiaSearch;
     private String startDate, endDate;
+    private FragmentVideoBinding binding;
+    private String channelId;
 
     public DisplayVideosFragment() {
     }
@@ -109,9 +102,14 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        rootView = inflater.inflate(R.layout.fragment_video, container, false);
+        binding = FragmentVideoBinding.inflate(inflater, container, false);
+        return binding.getRoot();
+    }
 
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+
         peertubes = new ArrayList<>();
         channels = new ArrayList<>();
         context = getContext();
@@ -120,7 +118,8 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
         Bundle bundle = this.getArguments();
         if (bundle != null) {
             search_peertube = bundle.getString("search_peertube", null);
-            channelId = bundle.getString("channelId", null);
+            channel = bundle.getParcelable("channel");
+            account = bundle.getParcelable("account");
             remoteInstance = bundle.getString("peertube_instance", null);
             sepiaSearch = bundle.getBoolean("sepia_search", false);
             type = (TimelineVM.TimelineType) bundle.get(Helper.TIMELINE_TYPE);
@@ -128,54 +127,47 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             startDate = bundle.getString("startDate", null);
             endDate = bundle.getString("endDate", null);
         }
+        if (channel != null) {
+            channelId = channel.getAcct();
+        } else if (account != null) {
+            channelId = account.getAcct();
+        }
         max_id = "0";
-        forAccount = type == TimelineVM.TimelineType.ACCOUNT_VIDEOS ? channelId : null;
-        lv_status = rootView.findViewById(R.id.lv_status);
-        RecyclerView lv_accounts = rootView.findViewById(R.id.lv_accounts);
-        Button display_all = rootView.findViewById(R.id.display_all);
-        top_account_container = rootView.findViewById(R.id.top_account_container);
+        //forChannel = type == TimelineVM.TimelineType.ACCOUNT_VIDEOS ? channelId : null;
         max_id_accounts = null;
         flag_loading = true;
         firstLoad = true;
         check_ScrollingUp = false;
 
-        assert context != null;
-        sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        swipeRefreshLayout = rootView.findViewById(R.id.swipeContainer);
-
-        mainLoader = rootView.findViewById(R.id.loader);
-        nextElementLoader = rootView.findViewById(R.id.loading_next_status);
-        textviewNoAction = rootView.findViewById(R.id.no_action);
-        textviewNoActionText = rootView.findViewById(R.id.no_action_text);
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.VISIBLE);
+        binding.loadingNextVideos.setVisibility(View.GONE);
 
         peertubeAdapater = new PeertubeAdapter(this.peertubes, type, sepiaSearch);
         peertubeAdapater.playlistListener = this;
         peertubeAdapater.relationShipListener = this;
-        lv_status.setAdapter(peertubeAdapater);
+        binding.lvVideos.setAdapter(peertubeAdapater);
 
         accountsHorizontalListAdapter = new AccountsHorizontalListAdapter(this.channels, this);
         LinearLayoutManager layoutManager
                 = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
-        lv_accounts.setLayoutManager(layoutManager);
-        lv_accounts.setAdapter(accountsHorizontalListAdapter);
+        binding.lvAccounts.setLayoutManager(layoutManager);
+        binding.lvAccounts.setAdapter(accountsHorizontalListAdapter);
         if (!Helper.isTablet(context)) {
             mLayoutManager = new LinearLayoutManager(context);
-            lv_status.setLayoutManager(mLayoutManager);
+            binding.lvVideos.setLayoutManager(mLayoutManager);
         } else {
             gLayoutManager = new GridLayoutManager(context, 2);
             int spanCount = (int) Helper.convertDpToPixel(2, context);
             int spacing = (int) Helper.convertDpToPixel(5, context);
-            lv_status.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true));
-            lv_status.setLayoutManager(gLayoutManager);
+            binding.lvVideos.addItemDecoration(new GridSpacingItemDecoration(spanCount, spacing, true));
+            binding.lvVideos.setLayoutManager(gLayoutManager);
         }
         viewModelAccounts = new ViewModelProvider(DisplayVideosFragment.this).get(AccountsVM.class);
         viewModelFeeds = new ViewModelProvider(DisplayVideosFragment.this).get(TimelineVM.class);
         viewModelSearch = new ViewModelProvider(DisplayVideosFragment.this).get(SearchVM.class);
-        swipeRefreshLayout.setOnRefreshListener(() -> pullToRefresh(true));
+        binding.swipeContainer.setOnRefreshListener(() -> pullToRefresh(true));
 
-        lv_accounts.addOnScrollListener(new RecyclerView.OnScrollListener() {
+        binding.lvAccounts.addOnScrollListener(new RecyclerView.OnScrollListener() {
             public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                 int firstVisibleItem = layoutManager.findFirstVisibleItemPosition();
                 if (dy > 0) {
@@ -190,19 +182,19 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
 
         if (type != VIDEOS_IN_LOCAL_PLAYLIST) {
-            lv_status.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            binding.lvVideos.addOnScrollListener(new RecyclerView.OnScrollListener() {
                 public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
                     if (type == TimelineVM.TimelineType.SUBSCRIBTIONS) {
                         if (dy > 0) {
                             if (check_ScrollingUp) {
-                                top_account_container.setVisibility(View.GONE);
+                                binding.topAccountContainer.setVisibility(View.GONE);
                                 final Handler handler = new Handler();
                                 handler.postDelayed(() -> check_ScrollingUp = false, 300);
 
                             }
                         } else {
                             if (!check_ScrollingUp) {
-                                top_account_container.setVisibility(View.VISIBLE);
+                                binding.topAccountContainer.setVisibility(View.VISIBLE);
                                 final Handler handler = new Handler();
                                 handler.postDelayed(() -> check_ScrollingUp = true, 300);
                             }
@@ -217,10 +209,10 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
                                 if (!flag_loading) {
                                     flag_loading = true;
                                     loadTimeline(max_id);
-                                    nextElementLoader.setVisibility(View.VISIBLE);
+                                    binding.loadingNextVideos.setVisibility(View.VISIBLE);
                                 }
                             } else {
-                                nextElementLoader.setVisibility(View.GONE);
+                                binding.loadingNextVideos.setVisibility(View.GONE);
                             }
                         }
                     } else if (gLayoutManager != null) {
@@ -232,10 +224,10 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
                                 if (!flag_loading) {
                                     flag_loading = true;
                                     loadTimeline(max_id);
-                                    nextElementLoader.setVisibility(View.VISIBLE);
+                                    binding.loadingNextVideos.setVisibility(View.VISIBLE);
                                 }
                             } else {
-                                nextElementLoader.setVisibility(View.GONE);
+                                binding.loadingNextVideos.setVisibility(View.GONE);
                             }
                         }
                     }
@@ -247,27 +239,26 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             viewModel.getAccounts(RetrofitPeertubeAPI.DataType.SUBSCRIBER, max_id).observe(DisplayVideosFragment.this.requireActivity(), this::manageViewAccounts);
         }
         loadTimeline(max_id);
-        display_all.setOnClickListener(v -> {
-            forAccount = null;
+        binding.displayAll.setOnClickListener(v -> {
+            forChannel = null;
             pullToRefresh(false);
         });
-        return rootView;
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        swipeRefreshLayout.setEnabled(true);
+        binding.swipeContainer.setEnabled(true);
     }
 
 
     @Override
     public void onPause() {
         super.onPause();
-        if (swipeRefreshLayout != null) {
-            swipeRefreshLayout.setEnabled(false);
-            swipeRefreshLayout.setRefreshing(false);
-            swipeRefreshLayout.clearAnimation();
+        if (binding.swipeContainer != null) {
+            binding.swipeContainer.setEnabled(false);
+            binding.swipeContainer.setRefreshing(false);
+            binding.swipeContainer.clearAnimation();
         }
         if (getActivity() != null) {
             InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
@@ -304,8 +295,8 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
     private void manageViewAccounts(APIResponse apiResponse) {
         if (apiResponse != null && apiResponse.getChannels() != null && apiResponse.getChannels().size() > 0) {
-            if (top_account_container.getVisibility() == View.GONE) {
-                top_account_container.setVisibility(View.VISIBLE);
+            if (binding.topAccountContainer.getVisibility() == View.GONE) {
+                binding.topAccountContainer.setVisibility(View.VISIBLE);
             }
             int previousPosition = channels.size();
             channels.addAll(apiResponse.getChannels());
@@ -313,6 +304,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             if (max_id_accounts == null) {
                 max_id_accounts = "0";
             }
+            final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
             //max_id_accounts needs to work like an offset
             int tootPerPage = sharedpreferences.getInt(Helper.SET_VIDEOS_PER_PAGE, Helper.VIDEOS_PER_PAGE);
             max_id_accounts = String.valueOf(Integer.parseInt(max_id_accounts) + tootPerPage);
@@ -322,8 +314,8 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
     private void manageVIewVideos(APIResponse apiResponse) {
         //hide loaders
-        mainLoader.setVisibility(View.GONE);
-        nextElementLoader.setVisibility(View.GONE);
+        binding.loader.setVisibility(View.GONE);
+        binding.loadingNextVideos.setVisibility(View.GONE);
         //handle other API error
         if (this.peertubes == null || apiResponse == null || (apiResponse.getError() != null)) {
             if (apiResponse == null)
@@ -331,7 +323,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             else {
                 Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
             }
-            swipeRefreshLayout.setRefreshing(false);
+            binding.swipeContainer.setRefreshing(false);
             flag_loading = false;
             return;
         }
@@ -339,6 +331,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
         if (max_id == null)
             max_id = "0";
         //max_id needs to work like an offset
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         int videoPerPage = sharedpreferences.getInt(Helper.SET_VIDEOS_PER_PAGE, Helper.VIDEOS_PER_PAGE);
         max_id = String.valueOf(Integer.parseInt(max_id) + videoPerPage);
         if (apiResponse.getPeertubes() == null && apiResponse.getVideoPlaylist() == null) {
@@ -366,15 +359,15 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             peertubeAdapater = new PeertubeAdapter(this.peertubes, type, sepiaSearch);
             peertubeAdapater.playlistListener = DisplayVideosFragment.this;
             peertubeAdapater.relationShipListener = DisplayVideosFragment.this;
-            lv_status.setAdapter(peertubeAdapater);
+            binding.lvVideos.setAdapter(peertubeAdapater);
         } else
             peertubeAdapater.notifyItemRangeInserted(previousPosition, apiResponse.getPeertubes().size());
         //remove handlers
-        swipeRefreshLayout.setRefreshing(false);
-        textviewNoAction.setVisibility(View.GONE);
+        binding.swipeContainer.setRefreshing(false);
+        binding.noAction.setVisibility(View.GONE);
         if (firstLoad && (apiResponse.getPeertubes() == null || apiResponse.getPeertubes().size() == 0)) {
-            textviewNoActionText.setText(R.string.no_video_to_display);
-            textviewNoAction.setVisibility(View.VISIBLE);
+            binding.noActionText.setText(R.string.no_video_to_display);
+            binding.noAction.setVisibility(View.VISIBLE);
         }
         flag_loading = false;
         firstLoad = false;
@@ -439,14 +432,13 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
     @Override
     public void onDestroyView() {
-        if (lv_status != null) {
+        if (binding.lvVideos != null) {
             try {
-                lv_status.setAdapter(null);
+                binding.lvVideos.setAdapter(null);
             } catch (Exception ignored) {
             }
         }
         super.onDestroyView();
-        rootView = null;
     }
 
 
@@ -461,28 +453,18 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
 
     public void pullToRefresh(boolean reload) {
         if (type == TimelineVM.TimelineType.SUBSCRIBTIONS && reload) {
-            Fragment fragment = ((AppCompatActivity) context).getSupportFragmentManager().findFragmentByTag("2");
-            if (fragment != null) {
-                if (context instanceof MainActivity) {
-                    FragmentManager fm = ((MainActivity) context).getSupportFragmentManager();
-                    fm.beginTransaction().remove(fragment).commit();
-                    DisplayVideosFragment subscriptionFragment = new DisplayVideosFragment();
-                    Bundle bundle = new Bundle();
-                    bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.SUBSCRIBTIONS);
-                    subscriptionFragment.setArguments(bundle);
-                    ((MainActivity) context).setActive(subscriptionFragment);
-                    ((MainActivity) context).setSubscriptionFragment(subscriptionFragment);
-                    fm.beginTransaction().add(R.id.nav_host_fragment, subscriptionFragment, "2").commit();
-                }
+            DisplayVideosFragment subscriptionFragment = ((MainActivity) context).getSubscriptionFragment();
+            if (subscriptionFragment != null) {
+                FragmentTransaction ft = ((MainActivity) context).getSupportFragmentManager().beginTransaction();
+                ft.detach(subscriptionFragment).attach(subscriptionFragment).commit();
             }
-
         } else {
             int size = peertubes.size();
             peertubes.clear();
             peertubes = new ArrayList<>();
             max_id = "0";
             peertubeAdapater.notifyItemRangeRemoved(0, size);
-            if (forAccount == null) {
+            if (forChannel == null) {
                 for (ChannelData.Channel channel : channels) {
                     channel.setSelected(false);
                 }
@@ -494,8 +476,8 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
     }
 
     @Override
-    public void click(String forAccount) {
-        this.forAccount = forAccount;
+    public void click(ChannelData.Channel forChannel) {
+        this.forChannel = forChannel;
         pullToRefresh(false);
     }
 
@@ -515,7 +497,7 @@ public class DisplayVideosFragment extends Fragment implements AccountsHorizonta
             } else if (type == TimelineVM.TimelineType.HISTORY) {
                 viewModelFeeds.getVideoHistory(max_id, startDate, endDate).observe(this.requireActivity(), this::manageVIewVideos);
             } else {
-                viewModelFeeds.getVideos(type, max_id, forAccount).observe(this.requireActivity(), this::manageVIewVideos);
+                viewModelFeeds.getVideos(type, max_id, forChannel, account).observe(this.requireActivity(), this::manageVIewVideos);
             }
         } else {
             viewModelSearch.getVideos(max_id, search_peertube).observe(this.requireActivity(), this::manageVIewVideos);

app/src/main/java/app/fedilab/fedilabtube/helper/CommentDecorationHelper.java

@@ -14,8 +14,8 @@ package app.fedilab.fedilabtube.helper;
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
 
-import java.util.List;
 
+import java.util.List;
 import app.fedilab.fedilabtube.client.data.CommentData;
 
 public class CommentDecorationHelper {
@@ -24,6 +24,7 @@ public class CommentDecorationHelper {
         return numberOfIndentation(0, replyToCommentId, comments);
     }
 
+
     private static int numberOfIndentation(int currentIdentation, String replyToCommentId, List<CommentData.Comment> comments) {
 
         String targetedComment = null;
@@ -37,7 +38,8 @@ public class CommentDecorationHelper {
             currentIdentation++;
             return numberOfIndentation(currentIdentation, targetedComment, comments);
         } else {
-            return Math.min(currentIdentation, 5);
+            return Math.min(currentIdentation, 15);
         }
     }
+
 }

app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java

@@ -53,6 +53,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import java.net.InetAddress;
 import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -123,7 +124,6 @@ public class Helper {
     public static final String PREF_KEY_ID = "userID";
     public static final String PREF_KEY_NAME = "my_user_name";
     public static final String PREF_INSTANCE = "instance";
-    public static final String PREF_INSTANCE_SURF = "instance_surf";
     public static final int EXTERNAL_STORAGE_REQUEST_CODE = 84;
     public static final String SET_VIDEOS_PER_PAGE = "set_videos_per_page";
     public static final String VIDEO_ID = "video_id_update";
@@ -794,4 +794,18 @@ public class Helper {
             return false;
         }
     }
+
+    public static String returnRoundedSize(Context context, long size) {
+        if (size == -1) {
+            return context.getString(R.string.unlimited);
+        } else if (size > 1000000000) {
+            float rounded = (float) size / 1000000000;
+            DecimalFormat df = new DecimalFormat("#.#");
+            return String.format(Locale.getDefault(), "%s%s", df.format(rounded), context.getString(R.string.gb));
+        } else {
+            float rounded = (float) size / 1000000;
+            DecimalFormat df = new DecimalFormat("#.#");
+            return String.format(Locale.getDefault(), "%s%s", df.format(rounded), context.getString(R.string.mb));
+        }
+    }
 }

app/src/main/java/app/fedilab/fedilabtube/viewmodel/SearchVM.java

@@ -43,12 +43,35 @@ public class SearchVM extends AndroidViewModel {
         return apiResponseMutableLiveData;
     }
 
+
+    public LiveData<APIResponse> getChannels(String max_id, String query) {
+        apiResponseMutableLiveData = new MutableLiveData<>();
+        loadChannels(max_id, query);
+        return apiResponseMutableLiveData;
+    }
+
     public LiveData<APIResponse> searchNextVideos(List<String> tags) {
         apiResponseMutableLiveData = new MutableLiveData<>();
         loadNextVideos(tags);
         return apiResponseMutableLiveData;
     }
 
+
+    private void loadChannels(String max_id, String query) {
+        Context _mContext = getApplication().getApplicationContext();
+        new Thread(() -> {
+            try {
+                RetrofitPeertubeAPI api = new RetrofitPeertubeAPI(_mContext);
+                APIResponse apiResponse = api.searchChannels(query, max_id);
+                Handler mainHandler = new Handler(Looper.getMainLooper());
+                Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
+                mainHandler.post(myRunnable);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }).start();
+    }
+
     private void loadVideos(String max_id, String query) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {

app/src/main/java/app/fedilab/fedilabtube/viewmodel/TimelineVM.java

@@ -30,6 +30,8 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.client.APIResponse;
 import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
+import app.fedilab.fedilabtube.client.data.AccountData;
+import app.fedilab.fedilabtube.client.data.ChannelData;
 import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.sqlite.ManagePlaylistsDAO;
@@ -45,9 +47,9 @@ public class TimelineVM extends AndroidViewModel {
         super(application);
     }
 
-    public LiveData<APIResponse> getVideos(TimelineType action, String max_id, String forAccount) {
+    public LiveData<APIResponse> getVideos(TimelineType action, String max_id, ChannelData.Channel forChannel, AccountData.Account forAccount) {
         apiResponseMutableLiveData = new MutableLiveData<>();
-        loadVideos(action, max_id, forAccount);
+        loadVideos(action, max_id, forChannel, forAccount);
         return apiResponseMutableLiveData;
     }
 
@@ -189,15 +191,25 @@ public class TimelineVM extends AndroidViewModel {
         }).start();
     }
 
-    private void loadVideos(TimelineType timeline, String max_id, String forAccount) {
+    private void loadVideos(TimelineType timeline, String max_id, ChannelData.Channel forChannel, AccountData.Account forAccount) {
         Context _mContext = getApplication().getApplicationContext();
         new Thread(() -> {
             try {
-                RetrofitPeertubeAPI retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
+                RetrofitPeertubeAPI retrofitPeertubeAPI;
+                String acct = null;
+                if (forChannel != null) {
+                    retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext, forChannel.getHost(), null);
+                    acct = forChannel.getAcct();
+                } else if (forAccount != null) {
+                    retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext, forAccount.getHost(), null);
+                    acct = forAccount.getAcct();
+                } else {
+                    retrofitPeertubeAPI = new RetrofitPeertubeAPI(_mContext);
+                }
                 if (timeline == null)
                     return;
                 APIResponse apiResponse;
-                apiResponse = retrofitPeertubeAPI.getTL(timeline, max_id, forAccount);
+                apiResponse = retrofitPeertubeAPI.getTL(timeline, max_id, acct);
                 Handler mainHandler = new Handler(Looper.getMainLooper());
                 Runnable myRunnable = () -> apiResponseMutableLiveData.setValue(apiResponse);
                 mainHandler.post(myRunnable);

app/src/main/res/drawable/ic_sensitive_content.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/red_1"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z" />
+</vector>

app/src/main/res/drawable/progress_bar.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="8dp" />
+            <solid android:color="@color/gray_light" />
+        </shape>
+    </item>
+
+    <item
+        android:id="@android:id/progress"
+        android:bottom="1dp"
+        android:left="1dp"
+        android:right="1dp"
+        android:top="1dp">
+
+        <scale android:scaleWidth="100%">
+            <shape>
+                <corners android:radius="8dp" />
+                <solid android:color="@color/colorAccent" />
+            </shape>
+        </scale>
+    </item>
+</layer-list>

app/src/main/res/drawable/rounded_decoration_bottom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate
+            android:fromDegrees="180"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="270">
+            <shape android:shape="rectangle">
+                <size
+                    android:width="30dp"
+                    android:height="30dp" />
+                <solid android:color="@color/colorAccent" />
+                <corners android:bottomLeftRadius="30dp" />
+            </shape>
+        </rotate>
+
+    </item>
+    <item
+        android:right="1.5dp"
+        android:top="1.5dp">
+        <rotate
+            android:fromDegrees="180"
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:toDegrees="270">
+            <shape android:shape="rectangle">
+                <size
+                    android:width="30dp"
+                    android:height="30dp" />
+                <solid android:color="?attr/backgroundView" />
+                <corners android:bottomLeftRadius="30dp" />
+            </shape>
+        </rotate>
+    </item>
+
+</layer-list>

app/src/main/res/drawable/rounded_decoration_top.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <size
+                android:width="30dp"
+                android:height="30dp" />
+            <solid android:color="@color/colorAccent" />
+            <corners android:bottomLeftRadius="30dp" />
+        </shape>
+    </item>
+    <item
+        android:bottom="1.5dp"
+        android:left="1.5dp">
+        <shape android:shape="rectangle">
+            <size
+                android:width="30dp"
+                android:height="30dp" />
+            <solid android:color="?attr/backgroundView" />
+            <corners android:bottomLeftRadius="30dp" />
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/layout/activity_main.xml

@@ -63,13 +63,12 @@
         </com.google.android.material.appbar.AppBarLayout>
 
 
-        <FrameLayout
+        <androidx.viewpager.widget.ViewPager
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:id="@+id/nav_host_fragment"
+            android:id="@+id/viewpager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="?attr/actionBarSize"
-            />
+            android:layout_marginBottom="?attr/actionBarSize" />
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/nav_view"
             android:layout_gravity="bottom"

app/src/main/res/layout/activity_peertube.xml

@@ -122,11 +122,33 @@
                             android:orientation="vertical"
                             android:padding="10dp">
 
-                            <TextView
-                                android:id="@+id/peertube_title"
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="5dp" />
+                                android:orientation="horizontal"
+                                tools:ignore="UseCompoundDrawables">
+
+                                <TextView
+                                    android:id="@+id/peertube_title"
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="5dp"
+                                    android:layout_weight="1" />
+
+                                <ImageView
+                                    android:id="@+id/video_sensitive"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_horizontal"
+                                    android:layout_marginStart="10dp"
+                                    android:layout_marginLeft="10dp"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_marginRight="10dp"
+                                    android:contentDescription="@string/sensitive_content"
+                                    android:gravity="center_horizontal"
+                                    android:src="@drawable/ic_sensitive_content"
+                                    android:visibility="invisible" />
+                            </LinearLayout>
 
                             <LinearLayout
                                 android:layout_width="match_parent"
@@ -189,21 +211,8 @@
                                     app:drawableTopCompat="@drawable/ic_baseline_thumb_down_alt_24"
                                     tools:ignore="HardcodedText" />
 
-                                <TextView
-                                    android:id="@+id/peertube_bookmark"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center_horizontal"
-                                    android:layout_marginStart="10dp"
-                                    android:layout_marginLeft="10dp"
-                                    android:layout_marginEnd="10dp"
-                                    android:layout_marginRight="10dp"
-                                    android:drawablePadding="5dp"
-                                    android:gravity="center_horizontal"
-                                    android:text=""
-                                    app:drawableTopCompat="@drawable/ic_baseline_bookmark_border_24" />
 
-                                <TextView
+                                <ImageView
                                     android:id="@+id/peertube_playlist"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
@@ -214,11 +223,11 @@
                                     android:layout_marginRight="10dp"
                                     android:drawablePadding="5dp"
                                     android:gravity="center_horizontal"
-                                    android:text=""
+                                    android:contentDescription="@string/playlists"
                                     android:visibility="gone"
-                                    app:drawableTopCompat="@drawable/ic_baseline_list_24" />
+                                    android:src="@drawable/ic_baseline_list_24" />
 
-                                <TextView
+                                <ImageView
                                     android:id="@+id/video_information"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
@@ -227,10 +236,10 @@
                                     android:layout_marginLeft="10dp"
                                     android:layout_marginEnd="10dp"
                                     android:layout_marginRight="10dp"
-                                    android:drawablePadding="5dp"
                                     android:gravity="center_horizontal"
-                                    android:text=""
-                                    app:drawableTopCompat="@drawable/ic_baseline_info_24" />
+                                    android:contentDescription="@string/information"
+                                    android:src="@drawable/ic_baseline_info_24" />
+
 
                                 <LinearLayout
                                     android:layout_width="0dp"
@@ -317,7 +326,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <LinearLayout
-                    android:layout_margin="10dp"
                     android:id="@+id/main_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -341,165 +349,8 @@
                 </LinearLayout>
 
             </androidx.core.widget.NestedScrollView>
-            <androidx.core.widget.NestedScrollView
-                android:background="?android:colorBackground"
-                android:visibility="gone"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:id="@+id/post_comment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-                <LinearLayout
-                    android:layout_margin="10dp"
-                    android:id="@+id/post_main_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="?android:dividerHorizontal"
-                    android:orientation="vertical"
-                    android:showDividers="end">
 
-                    <ImageView
-                        android:layout_margin="5dp"
-                        android:layout_gravity="end|center_vertical"
-                        android:id="@+id/close_post"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:contentDescription="@string/close"
-                        android:src="@drawable/ic_baseline_close_24" />
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/reply_content"
-                        android:visibility="gone"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <ImageView
-                            android:id="@+id/comment_account_profile"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_marginTop="5dp"
-                            android:contentDescription="@string/profile_picture"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
 
-                        <TextView
-                            android:id="@+id/comment_account_displayname"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="5dp"
-                            android:singleLine="true"
-                            android:textStyle="bold"
-                            app:layout_constraintEnd_toStartOf="@+id/comment_date"
-                            app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/comment_account_username"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="2dp"
-                            android:layout_marginStart="5dp"
-                            android:ellipsize="end"
-                            android:singleLine="true"
-                            android:textSize="12sp"
-                            app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
-                            app:layout_constraintTop_toBottomOf="@+id/comment_account_displayname" />
-
-                        <TextView
-                            android:id="@+id/comment_date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="end"
-                            android:layout_marginStart="2dp"
-                            android:layout_weight="0"
-                            android:gravity="end"
-                            android:maxLines="1"
-                            android:textSize="12sp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/comment_content"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="5dp"
-                            android:textIsSelectable="true"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/comment_account_profile" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/write_comment_container"
-                        android:layout_margin="10dp"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-                        <View
-                            android:id="@+id/separator_top"
-                            android:layout_margin="5dp"
-                            app:layout_constraintTop_toTopOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintBottom_toTopOf="@+id/write_container"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:background="@android:color/darker_gray"/>
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            app:layout_constraintTop_toBottomOf="@+id/separator_top"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintBottom_toTopOf="@+id/separator_bottom"
-                            android:id="@+id/write_container"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content">
-                            <ImageView
-                                android:id="@+id/my_pp"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintStart_toStartOf="parent"
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
-                                android:contentDescription="@string/profile_picture" />
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/text_field_boxes"
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                app:layout_constraintTop_toTopOf="parent"
-                                app:layout_constraintStart_toEndOf="@+id/my_pp"
-                                app:layout_constraintEnd_toEndOf="parent">
-
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/add_comment_write"
-                                    android:gravity="top"
-                                    android:inputType="textMultiLine"
-                                    android:hint="@string/add_public_reply"
-                                    android:minLines="4"
-                                    android:maxLines="8"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <Button
-                                app:layout_constraintTop_toBottomOf="@+id/text_field_boxes"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                                android:id="@+id/send"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/send_comment"/>
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <View
-                            android:id="@+id/separator_bottom"
-                            android:layout_margin="5dp"
-                            app:layout_constraintTop_toBottomOf="@+id/write_container"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            android:layout_width="match_parent"
-                            android:layout_height="1px"
-                            android:background="@android:color/darker_gray"/>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-
-            </androidx.core.widget.NestedScrollView>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <!-- View where the video will be shown when video goes fullscreen -->
@@ -524,13 +375,181 @@
         app:layout_constraintStart_toStartOf="parent">
 
         <androidx.recyclerview.widget.RecyclerView
-            android:layout_gravity="center"
             android:id="@+id/main_options_video"
-            android:layout_margin="30dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="30dp" />
     </RelativeLayout>
 
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/post_comment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:id="@+id/post_main_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:divider="?android:dividerHorizontal"
+            android:orientation="vertical"
+            android:showDividers="end">
+
+            <ImageView
+                android:id="@+id/close_post"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_margin="5dp"
+                android:contentDescription="@string/close"
+                android:src="@drawable/ic_baseline_close_24" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/reply_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
+
+                <ImageView
+                    android:id="@+id/comment_account_profile"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="5dp"
+                    android:contentDescription="@string/profile_picture"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/comment_account_displayname"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:singleLine="true"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toStartOf="@+id/comment_date"
+                    app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/comment_account_username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:layout_marginTop="2dp"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:textSize="12sp"
+                    app:layout_constraintStart_toEndOf="@+id/comment_account_profile"
+                    app:layout_constraintTop_toBottomOf="@+id/comment_account_displayname" />
+
+                <TextView
+                    android:id="@+id/comment_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_marginStart="2dp"
+                    android:layout_weight="0"
+                    android:gravity="end"
+                    android:maxLines="1"
+                    android:textSize="12sp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/comment_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:textIsSelectable="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/comment_account_profile" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/write_comment_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp">
+
+                <View
+                    android:id="@+id/separator_top"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_margin="5dp"
+                    android:background="@android:color/darker_gray"
+                    app:layout_constraintBottom_toTopOf="@+id/write_container"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/write_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintBottom_toTopOf="@+id/separator_bottom"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/separator_top">
+
+                    <ImageView
+                        android:id="@+id/my_pp"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:contentDescription="@string/profile_picture"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/text_field_boxes"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/my_pp"
+                        app:layout_constraintTop_toTopOf="parent">
+
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/add_comment_write"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="top"
+                            android:hint="@string/add_public_reply"
+                            android:inputType="textMultiLine"
+                            android:maxLines="8"
+                            android:minLines="4" />
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <Button
+                        android:id="@+id/send"
+                        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/send_comment"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/text_field_boxes" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <View
+                    android:id="@+id/separator_bottom"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:layout_margin="5dp"
+                    android:background="@android:color/darker_gray"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/write_container" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
     <androidx.core.widget.NestedScrollView
         android:id="@+id/video_params_submenu"
         android:layout_width="match_parent"

app/src/main/res/layout/activity_peertube_upload.xml

@@ -14,7 +14,7 @@
     You should have received a copy of the GNU General Public License along with TubeLab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -26,7 +26,70 @@
         android:layout_marginTop="50dp"
         android:orientation="vertical">
 
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:labelFor="@+id/total_quota"
+                android:text="@string/total_video_quota" />
+
+            <TextView
+                android:id="@+id/total_quota_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp" />
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/total_quota"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="300dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:indeterminate="false"
+            android:max="100"
+            android:progressDrawable="@drawable/progress_bar" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:labelFor="@+id/daily_quota"
+                android:text="@string/daily_video_quota" />
+
+            <TextView
+                android:id="@+id/daily_quota_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="20dp" />
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/daily_quota"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="300dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:indeterminate="false"
+            android:max="100"
+            android:progressDrawable="@drawable/progress_bar" />
+
         <Button
+            android:layout_marginTop="20dp"
             android:id="@+id/set_upload_file"
             style="@style/Base.Widget.AppCompat.Button.Colored"
             android:layout_width="wrap_content"
@@ -124,4 +187,4 @@
             android:text="@string/upload_video"
             android:textSize="18sp" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>

app/src/main/res/layout/activity_search_result.xml

@@ -14,72 +14,45 @@
     You should have received a copy of the GNU General Public License along with TubeLab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ShowChannelActivity">
 
-    <HorizontalScrollView
-        android:id="@+id/history_filter"
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:fitsSystemWindows="true"
+        app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:fitsSystemWindows="true"
+            app:contentScrim="?attr/colorPrimary"
+            app:expandedTitleMarginEnd="64dp"
+            app:expandedTitleMarginStart="48dp"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-            <TextView
-                android:id="@+id/history_filter_all"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/background_rounded_item"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="@string/all"
-                android:textColor="?attr/colorAccent" />
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/search_tabLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabGravity="fill"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="?colorAccent"
+            app:tabTextColor="@android:color/white" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-            <TextView
-                android:id="@+id/history_filter_today"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:background="@drawable/background_rounded_item"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="@string/today"
-                android:textColor="?attr/colorAccent" />
-
-            <TextView
-                android:id="@+id/history_filter_last_7_days"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:background="@drawable/background_rounded_item"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:text="@string/last_7_days"
-                android:textColor="?attr/colorAccent" />
-        </LinearLayout>
-
-    </HorizontalScrollView>
-
-    <RelativeLayout
-        android:id="@+id/container"
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/search_pager"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/history_filter">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-
-    </RelativeLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_videos_timeline.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2020 Thomas Schneider
+
+    This file is a part of TubeLab
+
+    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.
+
+    TubeLab 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 TubeLab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<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:layout_height="match_parent">
+
+    <HorizontalScrollView
+        android:id="@+id/history_filter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/history_filter_all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/all"
+                android:textColor="?attr/colorAccent" />
+
+            <TextView
+                android:id="@+id/history_filter_today"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/today"
+                android:textColor="?attr/colorAccent" />
+
+            <TextView
+                android:id="@+id/history_filter_last_7_days"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:background="@drawable/background_rounded_item"
+                android:paddingStart="5dp"
+                android:paddingEnd="5dp"
+                android:text="@string/last_7_days"
+                android:textColor="?attr/colorAccent" />
+        </LinearLayout>
+
+    </HorizontalScrollView>
+
+    <RelativeLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/history_filter">
+
+
+    </RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/add_playlist.xml

@@ -20,6 +20,30 @@
     android:orientation="vertical"
     android:padding="15dp">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/profile_picture"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_marginStart="20dp"
+            android:contentDescription="@string/profile_picture" />
+
+        <Button
+            android:id="@+id/select_file"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="10dp"
+            android:singleLine="true"
+            android:text="@string/change_profile_picture"
+            android:textColor="?attr/colorAccent" />
+    </LinearLayout>
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/layout/drawer_comment.xml

@@ -20,31 +20,34 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:divider="?android:dividerHorizontal"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:clickable="true"
     android:showDividers="end"
     android:focusable="true">
 
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:id="@+id/decoration_container"
+        android:layout_width="wrap_content"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_height="wrap_content"
+        android:id="@+id/sub_comment_container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <View
-            android:id="@+id/decoration"
-            android:layout_width="2dp"
-            android:layout_height="0dp"
-            android:background="?attr/colorAccent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        android:layout_marginStart="10dp">
 
         <ImageView
             android:id="@+id/comment_account_profile"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginTop="5dp"
-            android:layout_marginStart="10dp"
+            android:src="@drawable/missing_peertube"
             android:contentDescription="@string/profile_picture"
-            app:layout_constraintStart_toStartOf="@id/decoration"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
@@ -108,7 +111,7 @@
         <TextView
             android:id="@+id/number_of_replies"
             app:layout_constraintTop_toBottomOf="@+id/comment_content"
-            app:layout_constraintStart_toStartOf="@id/decoration"
+            app:layout_constraintStart_toStartOf="@id/comment_account_profile"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="?attr/colorAccent"/>
@@ -139,4 +142,5 @@
             app:layout_constraintTop_toBottomOf="@+id/comment_content" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+
 </LinearLayout>

app/src/main/res/layout/fragment_video.xml

@@ -68,7 +68,7 @@
                 android:layout_height="match_parent">
 
                 <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/lv_status"
+                    android:id="@+id/lv_videos"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scrollbars="none" />
@@ -109,7 +109,7 @@
         </RelativeLayout>
         <!-- Loader for next videos -->
         <RelativeLayout
-            android:id="@+id/loading_next_status"
+            android:id="@+id/loading_next_videos"
             android:layout_width="match_parent"
             android:layout_height="20dp"
             android:layout_alignParentBottom="true"

app/src/main/res/values-night/styles.xml

@@ -9,6 +9,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColor">?attr/colorOnBackground</item>
         <item name="backgroundView">@color/backgroundDark</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
     </style>
 
     <style name="AppThemeNoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
@@ -18,6 +20,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <item name="backgroundView">@color/backgroundDark</item>
         <item name="android:textColor">?attr/colorOnBackground</item>
+        <item name="android:windowBackground">@android:color/black</item>
+        <item name="android:colorBackground">@android:color/black</item>
     </style>
 
     <style name="theme" parent="@style/ThemeOverlay.AppCompat.Dark" />