Merge branch 'l10n_develop' into 'develop'

New Crowdin updates

See merge request tom79/fedilab-tube!24

README.md

@@ -70,7 +70,7 @@ Si vous connectez votre compte, vous pourrez interagir avec les vidéos :
 
 
 
-#### TubeLab (coming soon)
+#### TubeLab
 
 [Fdroid](https://f-droid.org/packages/app.fedilab.tubelab/)
 

app/build.gradle

@@ -10,8 +10,8 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 12
-        versionName "1.2.0"
+        versionCode 17
+        versionName "1.4.2"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -92,7 +92,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.navigation:navigation-fragment:2.3.0'
     implementation "androidx.fragment:fragment:1.2.5"
@@ -116,8 +116,11 @@ dependencies {
     implementation "net.gotev:uploadservice-okhttp:3.5.2"
     implementation "com.google.code.gson:gson:2.8.6"
     implementation 'androidx.media:media:1.2.0'
-
+    implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.github.mancj:MaterialSearchBar:0.8.5'
+
+    implementation "io.github.kobakei:ratethisapp:1.2.0"
 
 }

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

@@ -4,10 +4,6 @@
     <color name="colorPrimaryDark">#4527A0</color>
     <color name="colorAccent">#9C27B0</color>
 
-
-    <color name="colorPrimary_full">#212529</color>
-    <color name="colorPrimaryDark_full">#000000</color>
-    <color name="colorAccent_full">#F2690D</color>
     <color name="tag_color">#bbF2690D</color>
     <color name="tag_color_text">#FAFAFA</color>
     <color name="positive_thumbs">#2b90d9</color>

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

@@ -1,21 +1,47 @@
-<resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">TubeAcad</string>
+    <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
+    <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
+    <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
+    <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
+    <string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
+    <string name="set_theme_choice" translatable="false">set_theme_choice</string>
+
+    <string name="delete_account_comment">Supprimer tous les commentaires</string>
+    <string name="delete_account_comment_confirm">Etes-vous sûr de vouloir supprimer tous les commentaires de ce compte pour vos vidéos ?</string>
+    <string-array name="settings_theme">
+        <item>Clair</item>
+        <item>Sombre</item>
+        <item>Automatique</item>
+    </string-array>
+
+    <string name="set_theme">Thème</string>
+    <string name="set_theme_description">Permet de changer le thème de l\'application</string>
+    <string name="federation_issue">La vidéo ne peut pas être fédérée !</string>
     <string name="title_home">Locale</string>
     <string name="title_local">Locale</string>
     <string name="title_discover">Découvrir</string>
     <string name="title_notifications">Notifications</string>
-    <string name="title_instances">Instances</string>
     <string name="title_recently_added">Nouveautés</string>
     <string name="title_trending">Tendances</string>
-    <string name="title_account">Compte</string>
     <string name="title_most_liked">Plus aimées</string>
     <string name="toast_error">Une erreur s\'est produite !</string>
+    <string name="title_muted">Sourdine</string>
+    <string name="title_channel">Chaînes</string>
+    <string name="do_not_list">Ne pas lister</string>
+    <string name="blur">Estomper</string>
+    <string name="display">Afficher</string>
+    <string name="no_opinion">Pas d\'opinion</string>
+    <string name="instance_choice">Choisissez une instance</string>
+    <string name="not_valide_instance">Cette instance ne semble pas être valide !</string>
     <string name="no_videos">Aucune vidéo !</string>
+    <string name="no_notifications">Aucune notification !</string>
     <string name="favicon">Favicon</string>
     <string name="open_with">Ouvrir avec</string>
+    <string name="action_playlist_edit">Modifier une liste de lecture</string>
     <string name="close">Fermer</string>
     <string name="upload_video">Téléverser</string>
-    <string name="bookmark_peertube_empty">Il n’y a aucune vidéo Peertube dans vos favoris !</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="channel">Chaîne</string>
@@ -26,142 +52,120 @@
     <string name="cancel">Annuler</string>
     <string name="download">Télécharger</string>
     <string name="profile_picture">Photo du profil</string>
-
     <string name="update_video">Mettre à jour la vidéo</string>
-    <!-- Date -->
+    <string name="remove_from_playlist">Supprimer de la liste de lecture</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d min</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d j</string>
-
     <string name="number_view_video">%s vues</string>
-    <string name="duration_video">Durée : %s</string>
-
-    <string name="toot_select_image_error">Une erreur s’est produite lors de la sélection du média !</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">Sélectionnez un média</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="delete_video_confirmation">Êtes-vous sûr de vouloir supprimer cette vidéo ?</string>
-    <string name="toast_peertube_video_updated">La vidéo a été mise à jour !</string>
-
+    <string name="action_privacy">Confidentialité</string>
+    <string name="action_logout">Déconnexion</string>
+    <string name="login">Connexion</string>
+    <string name="password">Mot de passe</string>
+    <string name="email">Courriel</string>
+    <string name="tags">Étiquettes</string>
+    <string name="validate">Valider</string>
+    <string name="share_with">Partager avec</string>
+    <string name="shared_via">Partagé via TubeLab</string>
+    <string name="username">Nom d’utilisateur</string>
+    <string name="settings">Paramètres</string>
+    <string name="logout_account_confirmation">Voulez-vous vraiment déconnecter le compte @%1$s@%2$s ?</string>
+    <string name="following">Suit</string>
+    <string name="followers">Abonné·e·s</string>
+    <string name="client_error">Impossible d’obtenir l’id du client !</string>
+    <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">S\'abonner</string>
+    <string name="action_mute">Mettre en sourdine</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>
+    <string name="action_lists_delete">Supprimer la liste de lecture</string>
+    <string name="no_comments">Soyez le·a premier·ère à laisser un commentaire sur cette vidéo en utilisant le bouton supérieur droit !</string>
     <string name="comment_no_allowed_peertube">Les commentaires sur cette vidéos ont été désactivés !</string>
-
-
+    <string name="pickup_resolution">Choisissez une résolution</string>
     <string name="bookmark_add_peertube">La vidéo est rajoutée aux favoris !</string>
     <string name="bookmark_remove_peertube">La vidéo a été retirée de vos favoris !</string>
-
-    <string name="shared_via">Partagé via TubeLab</string>
-    <string name="share_with">Partager avec</string>
-
-    <string name="pickup_resolution">Choisissez une résolution</string>
-
-    <string name="fullscreen">Vidéo plein écran</string>
-
-    <string name="comment">Commenter</string>
-    <string name="validate">Valider</string>
+    <string name="information" tools:ignore="UnusedResources">Information</string>
+    <string name="app_logo">Logo de l’application</string>
+    <!-- languages not translated -->
+    <string name="subscriptions">Abonnements</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="toot_sent">Le message a été envoyé !</string>
-    <string name="reply">Répondre</string>
-    <string name="delete">Supprimer</string>
-    <string name="no_video_to_display">Aucune vidéo n’est disponible !</string>
-
+    <string name="set_video_mode">Mode pour les vidéos</string>
+    <string name="filter">Filtrer</string>
+    <string name="sepia_search">Recherche sépia</string>
+    <string name="sepia_element_nsfw">Afficher le contenu sensible</string>
+    <string name="sepia_element_published_date">Date de publication</string>
+    <string name="any">Toutes</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="last_7_days">Les 7 derniers jours</string>
+    <string name="last_30_days">Les 30 derniers jours</string>
+    <string name="last_365_days">Les 365 derniers jours</string>
+    <string name="sepia_element_duration">Durée</string>
+    <string name="duration_short"><![CDATA[Courte (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Moyenne (4-10 min)]]></string>
+    <string name="duration_long"><![CDATA[Longue (> 10 min)]]></string>
+    <string name="display_all_categories">Afficher toutes les catégories</string>
+    <string name="display_all_licenses">Afficher toutes les licences</string>
+    <string name="display_all_languages">Afficher toutes les langues</string>
+    <string name="all_of_these_tags">Tous ces labels</string>
+    <string name="one_of_these_tags">Un de ces labels</string>
+    <string name="apply_filter">Appliquer le filtre</string>
+    <string-array name="sort_by_array">
+        <item>Meilleurs résultats</item>
+        <item>Les plus récentes</item>
+        <item>Les moins récentes</item>
+    </string-array>
+    <string name="sort_by">Trier par</string>
+    <string name="sepia_search_hint">Mot-clé, chaîne, vidéo, etc.</string>
+    <string name="sepia_indication">La recherche Sepia affiche les vidéos et les chaînes qui correspondent à votre recherche mais qui n\'est pas l\'éditeur, ni le propriétaire. Si vous remarquez des problèmes avec une vidéo, signalez-la aux administrateurs sur le site Web de PeerTube où la vidéo est publiée.</string>
     <string name="my_videos">Mes vidéos</string>
     <string name="title">Titre</string>
     <string name="license">Licence</string>
     <string name="category">Catégorie</string>
     <string name="language">Langue</string>
-    <string name="description">Description</string>
-    <string name="tags">Étiquettes</string>
-    <string name="action_privacy">Confidentialité</string>
     <string name="peertube_nsfw">Cette vidéo contient du contenu pour adultes</string>
-    <string name="delete_video">Supprimer la vidéo</string>
     <string name="peertube_enable_comments">Activer les commentaires</string>
-    <string name="send_comment">Envoyer un commentaire</string>
-    <string name="add_public_comment">Ajouter un commentaire public</string>
-    <string name="share">Partager</string>
-    <string name="no_comments">Soyez le·a premier·ère à laisser un commentaire sur cette vidéo en utilisant le bouton supérieur droit !</string>
-    <string name="title_video_peertube">Titre de la vidéo</string>
-    <string name="set_video_mode">Mode pour les vidéos</string>
-    <string name="display_nsfw_videos">Afficher les vidéos sensibles</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="not_logged_in">Vous devez être connecté.e pour effectuer cette action !</string>
-    <string name="change_instance">Changer d\'instance</string>
-    <string name="account">Compte</string>
-    <string name="instance_choice">Choisissez une instance</string>
-    <string name="toast_error_loading_account">Une erreur s’est produite pendant le chargement du compte !</string>
-    <string name="profile_banner">Bannière du profil</string>
-    <string name="make_an_action">Faire une action</string>
-    <string name="go_back">Retour</string>
-    <string name="open_menu">Ouvrir le menu</string>
-    <string name="display_more">Afficher plus</string>
-    <string name="edit_profile">Éditer le profil</string>
-    <string name="followed_by">Vous suit</string>
-    <string name="no_channels">Aucune chaîne !</string>
-    <string name="following">Suit</string>
-    <string name="followers">Abonné·e·s</string>
-    <string name="title_instance_login">Domaine de l\'instance</string>
-    <string name="followers_count">%1$s Abonné·e·s</string>
-    <string name="nothing_to_do">Aucune action ne peut être réalisée</string>
-    <string name="unfollow_confirm">Voulez-vous vous désabonner de ce compte ?</string>
-    <string name="action_unfollow">Se désabonner</string>
-    <string name="action_follow">S\'abonner</string>
-    <string name="search">Chercher</string>
-    <string name="toast_error_search">Une erreur s’est produite lors de la recherche !</string>
-    <string name="no_result">Aucun résultat !</string>
-    <string name="app_logo">Logo de l’application</string>
-
-    <string name="join_peertube">Rejoignez Peertube</string>
-    <string name="username">Nom d’utilisateur</string>
+    <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="password">Mot de passe</string>
-    <string name="add_account">Ajouter un compte</string>
-    <string name="login">Connexion</string>
-    <string name="client_error">Impossible d’obtenir l’id du client !</string>
-    <string name="email">Email</string>
-    <string name="email_indicator">Vous recevrez un e-mail de confirmation</string>
-    <string name="password_indicator">Utilisez au moins 8 caractères</string>
-    <string name="password_confirm">Confirmer le mot de passe</string>
-    <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="sign_up">S’inscrire</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="all_field_filled">Veuillez remplir tous les champs !</string>
-    <string name="password_length_error">Le mot de passe doit contenir 6 caractères !</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="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="tos">conditions de service</string>
-    <string name="server_rules">règles du serveur</string>
-    <string name="agreement_check">J\'accepte les %1$s et les %2$s</string>
-    <string name="email_error_domain">Les adresses mails %1$s ne sont pas autorisées !</string>
-    <string name="create_an_account">Créer un compte</string>
-    <string name="action_logout">Déconnexion</string>
-    <string name="logout_account_confirmation">Voulez-vous vraiment déconnecter le compte @%1$s@%2$s ?</string>
-
-    <string name="action_lists_delete">Supprimer la liste de lecture</string>
-    <string name="action_lists_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette liste de lecture ?</string>
-    <string name="action_channel_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette chaîne ?</string>
-    <string name="action_playlist_create">Créer une liste de lecture</string>
-    <string name="action_playlist_edit">Modifier une liste de lecture</string>
-    <string name="display_name">Nom d\'affichage</string>
-    <string name="error_channel_mandatory">Une chaîne est requise lorsque la liste de lecture est publique.</string>
-    <string name="error_display_name">Vous devez fournir un nom d\'affichage !</string>
-    <string name="error_display_name_channel">Vous devez fournir un nom d\'affichage et un nom pour la chaîne!</string>
-    <string name="action_playlist_empty_content">Cette liste de lecture est vide.</string>
-    <string name="playlists">Listes de lecture</string>
-
-
+    <string name="preview">Aperçu</string>
+    <string name="change_preview">Modifier l\'aperçu</string>
+    <string name="name">Nom</string>
+    <string name="display_more">Afficher plus</string>
+    <string name="no_channels">Aucune chaîne !</string>
+    <string name="report_helper">Quelques explications concernant votre signalement…</string>
+    <string name="report_video">Signaler la vidéo</string>
+    <string name="report">Signaler</string>
+    <string name="change_instance">Changer d\'instance</string>
+    <string name="my_history">Historique</string>
+    <string name="edit">Modifier</string>
+    <string name="video_settings">Réglages des vidéos</string>
+    <string name="app_interface">Interface</string>
+    <string name="set_cache_mode">Cache</string>
+    <string name="set_video_cache_description">Définir le cache pour les vidéos (par défaut 100Mo)</string>
+    <string name="set_video_quality_description">Définir une qualité par défaut pour les vidéos</string>
+    <string name="set_quality_mode">Résolution pour les vidéos</string>
+    <string name="video_cache_value">Cache vidéo : %d Mo</string>
+    <string name="captions">Légendes</string>
+    <string name="pickup_captions">Options d\'envoi</string>
+    <string name="none">Aucune</string>
+    <string name="set_video_mode_description">Permet de changer le mode de lecture pour les vidéos (normal, streaming ou via un navigateur).</string>
+    <string name="delete_video">Supprimer la vidéo</string>
+    <string name="delete_video_confirmation">Êtes-vous sûr de vouloir supprimer cette vidéo ?</string>
+    <string name="no_video_to_display">Aucune vidéo n’est disponible !</string>
+    <string name="share">Partager</string>
     <string name="peertube_comment_on_video"><![CDATA[<b>%1$s</b> a commenté votre vidéo <b>%2$s</b>]]></string>
     <string name="peertube_follow_channel"><![CDATA[<b>%1$s</b> suit votre chaîne <b>%2$s</b>]]></string>
     <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> suit votre compte]]></string>
@@ -171,112 +175,97 @@
     <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_abuse"><![CDATA[Nouvelle modération sur la vidéo : <b>%1$s</b>]]></string>
-    <string name="toast_code_error">Une erreur s’est produite ! L’instance n’a retourné aucun code d\autorisation !</string>
-    <string name="subscriptions">Abonnements</string>
-    <string name="report">Signaler</string>
-    <string name="report_video">Signaler la vidéo</string>
-    <string name="report_account">Signaler le compte</string>
-    <string name="report_helper">Quelques explications concernant votre signalement…</string>
-    <string name="successful_report">Le compte a été signalé !</string>
-    <string name="successful_report_comment">Le commentaire a été signalé !</string>
-    <string name="successful_video_report">La vidéo a été signalée !</string>
-    <string name="report_comment_size">Veuillez préciser les raisons.</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>
-    <string name="my_history">Historique</string>
-    <string name="edit_video">Modifier une vidéo</string>
-    <string name="settings">Paramètres</string>
-
-
-    <string name="video_settings">Paramètres des vidéos</string>
-    <string name="app_interface">Interface</string>
-
-
+    <!-- end languages -->
+    <string name="playlists">Listes 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>
+    <string name="error_channel_mandatory">Une chaîne est requise lorsque la liste de lecture est publique.</string>
+    <string name="action_playlist_create">Créer une liste de lecture</string>
+    <string name="action_playlist_empty_content">Cette liste de lecture est vide.</string>
+    <string name="password_confirm">Confirmer le mot de passe</string>
+    <string name="agreement_check">J\'accepte les %1$s et les %2$s</string>
+    <string name="server_rules">règles du serveur</string>
+    <string name="tos">conditions de service</string>
+    <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="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">Compte</string>
+    <string name="report_account">Signaler le compte</string>
     <string-array name="settings_video_mode">
         <item>Normal</item>
         <item>Streaming</item>
-        <item>Navigateur</item>
+        <item>Flux direct</item>
     </string-array>
-
-    <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
-    <string name="video_cache_value">Cache pour les vidéos: %d Mo</string>
-    <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
-    <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
-    <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
-    <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
-    <string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
-
     <string-array name="settings_video_quality">
-        <item>Elevé</item>
-        <item>Moyen</item>
+        <item>Élevée</item>
+        <item>Moyenne</item>
         <item>Faible</item>
     </string-array>
-
-    <string name="set_video_quality_description">Permet de définir la qualité de la vidéo par défaut</string>
-    <string name="set_quality_mode">Résolution pour les vidéos</string>
-
-    <string name="set_video_mode_description">Permet de changer le mode de lecture pour les vidéos (normal, streaming ou via un navigateur).</string>
-    <string name="register_account">Créer un compte</string>
-    <string name="preview">Aperçu</string>
-    <string name="change_preview">Modifier l\'aperçu</string>
-    <string name="title_muted">Sourdine</string>
-    <string name="title_blocked">Bloqués</string>
+    <string name="unfollow_confirm">Voulez-vous vous désabonner de ce compte ?</string>
+    <string name="title_video_peertube">Titre de la vidéo</string>
+    <string name="join_peertube">Rejoignez Peertube</string>
+    <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">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>
+    <string name="delete_channel">Supprimer la chaîne</string>
+    <string name="action_channel_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette chaîne ?</string>
+    <string name="modify_playlists">Vidéo dans les listes de lecture</string>
     <string name="no_muted">Aucun compte en sourdine !</string>
-    <string name="no_notifications">Aucune notification !</string>
-    <string name="action_mute">Mettre en sourdine</string>
-    <string name="action_unmute">Réactiver le compte</string>
-    <string name="muted_done">Le compte a été mis en sourdine !</string>
-    <string name="title_channel">Chaînes</string>
-    <string name="captions">Sous-titres</string>
-    <string name="none">Aucun</string>
-    <string name="pickup_captions">Sélectionner des sous-titres</string>
-    <string name="name">Nom</string>
+    <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="delete_channel">Supprimer la chaîne</string>
-    <string name="display_list">Afficher la liste</string>
-    <string name="delete_list">Supprimer la liste de lecture</string>
-    <string name="edit">Modifier</string>
-
-    <string name="not_valide_instance">Cette instance ne semble pas être valide !</string>
-
+    <string name="email_error_domain">Les adresses mails %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>
+    <string name="successful_report_comment">Le commentaire a été signalé !</string>
+    <string name="successful_video_report">La vidéo a été signalée !</string>
+    <string name="password_length_error">Le mot de passe doit contenir 6 caractères !</string>
+    <string name="muted_done">Le compte a été mis en sourdine !</string>
+    <string name="edit_video">Modifier une vidéo</string>
+    <string name="create_an_account">Créer un compte</string>
+    <string name="followers_count">%1$s Abonné·e·s</string>
     <string name="developer">Développeur</string>
     <string name="about_vesrion">Version %1$s</string>
     <string name="about_the_app">À propos de l’application</string>
     <string name="Donate">Faire un don</string>
     <string name="source_code">Code source</string>
     <string name="issue_tracker">Suivi des tickets</string>
-
-    <string name="action_instance_empty_content">No instances match these criteria</string>
-    <string name="instances_picker">Instances picker</string>
-    <string name="pickup_instance">Pickup this instance</string>
-    <string name="sensitive_content">Sensitive content: %1$s</string>
-    <string name="followers_instance">%1$s instance followers</string>
-    <string name="help">Help</string>
-    <string name="sensitive_video"> Sensitive videos</string>
-    <string name="pickup_categories">Pickup categories</string>
-
-    <string name="do_not_list">Do not list</string>
-    <string name="blur">Blur</string>
-    <string name="display">Display</string>
-    <string name="no_opinion">No opinion</string>
-    <string name="pickup_languages">Pickup languages</string>
+    <string name="action_instance_empty_content">Aucune instance ne correspond à ces critères</string>
+    <string name="instances_picker">Sélecteur d\'instances</string>
+    <string name="pickup_instance">Choisissez une instance</string>
+    <string name="sensitive_video"> Vidéos sensibles</string>
+    <string name="sensitive_content">Contenu sensible : %1$s</string>
+    <string name="followers_instance">%1$s instances suiveuses</string>
+    <string name="help">Aide</string>
+    <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="add_account">Ajouter un compte</string>
     <string name="list_of_accounts">Liste des comptes</string>
-
     <string name="pause">Pause</string>
-    <string name="play">Lecture</string>
-    <string name="minimize">Réduire</string>
-    <string name="fast_rewind">Retour rapide</string>
+    <string name="play">Jouer</string>
+    <string name="minimize">Minimiser</string>
+    <string name="fast_rewind">Rembobinage rapide</string>
     <string name="fast_forward">Avance rapide</string>
-
-    <string name="set_video_minimize">Réduire la taille des vidéos</string>
-    <string name="set_video_minimize_description">Réduit la taille des vidéos quand l\'application est en arrière plan (Android N+)</string>
-
-
-    <string name="set_video_language">Filtrer les langues</string>
-    <string name="set_video_language_description">Filtrer les vidéos en fonction de la langue</string>
-
+    <string name="set_video_minimize">Minimiser la taille des vidéos</string>
+    <string name="set_video_minimize_description">Minimiser la taille des vidéos lorsque l\'application est en arrière-plan (Android N+)</string>
+    <string name="set_video_language">Filtre de langue</string>
+    <string name="set_video_language_description">Filtrer les vidéos avec différentes langues</string>
 </resources>

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

@@ -1,4 +1,3 @@
-- Force le mode paysage lors du passage en mode plein écran
-- Modifier la valeur du cache pour les vidéos
-- Définir la résolution par défaut pour les vidéos
-- Correction de bugs
+- Theme: Clair, Sombre et automatique
+- Supprimer tous les commentaires d'un compte sur vos vidéos
+- Mettre en sourdine un compte depuis les commentaires.

app/src/fdroid_full/play/listings/ar/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/de/short-description.txt

@@ -1 +1 @@
-TubeLab ist eine Peertube-App für akademische Instanzen.
+App for all Peertube instances

app/src/fdroid_full/play/listings/el/short-description.txt

@@ -1 +1 @@
-Το TubeLab είναι μια εφαρμογή για τις ακαδημαϊκές υποστάσεις Peertube.
+App for all Peertube instances

app/src/fdroid_full/play/listings/en-US/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/es/short-description.txt

@@ -1 +1 @@
-TubeLab es una aplicación de Peertube para instancias académicas.
+App for all Peertube instances

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

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/it/short-description.txt

@@ -1 +1 @@
-TubeLab è un'applicazione Peertube per le istanze accademiche.
+App per tutti i casi Peertube

app/src/fdroid_full/play/listings/ja/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/ko/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/nl/short-description.txt

@@ -1 +1 @@
-TubeLab is een Peertube-toepassing voor academische instanties.
+App for all Peertube instances

app/src/fdroid_full/play/listings/pl/short-description.txt

@@ -1 +1 @@
-TubeLab jest aplikacją Peertube dla instancji akademickich.
+App for all Peertube instances

app/src/fdroid_full/play/listings/pt/short-description.txt

@@ -1 +1 @@
-O TubeLab é uma aplicação Peertube para instâncias acadêmicas.
+App for all Peertube instances

app/src/fdroid_full/play/listings/ro/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/ru/short-description.txt

@@ -1 +1 @@
-TubeLab - это приложение Peertube для образовательных экземпляров.
+Приложение для всех серверов Peertube

app/src/fdroid_full/play/listings/sv/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/zh-rCN/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

app/src/fdroid_full/play/listings/zh-rTW/short-description.txt

@@ -1 +1 @@
-TubeLab est une application Peertube pour les instances académiques.
+App for all Peertube instances

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

@@ -1,5 +1,7 @@
-- Force landscape view when switching in full screen
-- Sync languages with the instance
-- Change default cache for videos (settings)
-- Set default resolution for videos (settings)
-- Some bug fixes.
+- Theme: Light, Dark and auto
+- Remove all comments of an account on your videos
+- Sepia search: Allow interactions when the video is federated
+- Mute accounts from comments
+- Links clickable in video descriptions
+- Fix all comments not displayed
+- Fix some minor other bugs

app/src/full/res/color/bottom_nav_color.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorAccent_full" android:state_checked="true" />
+    <item android:color="@color/colorAccent" android:state_checked="true" />
     <item android:color="@android:color/tab_indicator_text" />
 </selector>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Startseite</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Mehr erfahren</string>
@@ -34,6 +37,7 @@
     <string name="download">Herunterladen</string>
     <string name="profile_picture">Profilbild</string>
     <string name="update_video">Video aktualisieren</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d en</string>
     <string name="date_minutes">%d en</string>
     <string name="date_hours">%d en</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Kommentar löschen</string>
     <string name="delete_comment_confirm">Möchtest du diesen Kommentar wirklich löschen?</string>
     <string name="set_video_mode">Videomodus</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">Eigene Videos</string>
     <string name="title">Titel</string>
     <string name="license">Lizenz</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Untertitel abholen</string>
     <string name="none">Keine</string>
     <string name="set_video_mode_description">Erlaubt es, den Modus für das Abspielen von Videos zu ändern (Standard, Streaming oder über einen Browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Video löschen</string>
     <string name="delete_video_confirmation">Möchtest du dieses Video wirklich löschen?</string>
     <string name="no_video_to_display">Keine Videos zum Anzeigen!</string>
@@ -163,6 +196,12 @@
     <string-array name="settings_video_mode">
         <item>WebView</item>
         <item>Direkter Datenstrom</item>
+        <item>Direct stream</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
@@ -181,6 +220,7 @@
     <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 playlists</string>
     <string name="no_muted">Keine stummgeschalteten Accounts!</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>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Αρχική</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Ανακαλύψτε</string>
@@ -34,6 +37,7 @@
     <string name="download">Λήψη</string>
     <string name="profile_picture">Εικόνα προφίλ</string>
     <string name="update_video">Ενημέρωση του βίντεο</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d δευτ</string>
     <string name="date_minutes">%d λεπ</string>
     <string name="date_hours">%d ώρ</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Διαγραφή ενός σχόλιου</string>
     <string name="delete_comment_confirm">Θέλετε να διαγράψετε αυτό το σχόλιο, στα σίγουρα;</string>
     <string name="set_video_mode">Κατάσταση λειτουργίας για τα βίντεο</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">Τα βίντεο μου</string>
     <string name="title">Τίτλος</string>
     <string name="license">Άδεια</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Επιλογή υποτίτλων</string>
     <string name="none">Κανένας</string>
     <string name="set_video_mode_description">Επιτρέπει την εναλλαγή κατάστασης λειτουργίας για την αναπαραγωγή βίντεο (προεπιλεγμένη, ροή ή μέσω περιηγητή ιστού).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Διαγραφή βίντεο</string>
     <string name="delete_video_confirmation">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το βίντεο;</string>
     <string name="no_video_to_display">Δεν υπάρχουν βίντεο για προβολή!</string>
@@ -162,6 +195,12 @@
     <string-array name="settings_video_mode">
         <item>Webview</item>
         <item>Άμεση ροή</item>
+        <item>Direct stream</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
@@ -180,6 +219,7 @@
     <string name="bookmark_peertube_empty">Δεν υπάρχουν βίντεο στα αγαπημένα σας!</string>
     <string name="delete_channel">Αφαίρεση καναλιού</string>
     <string name="action_channel_confirm_delete">Θέλετε σίγουρα να διαγραφεί αυτό το κανάλι;</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">Δεν υπάρχουν σιγασμένοι λογαριασμοί!</string>
     <string name="error_display_name_channel">Πρέπει να ορίσετε ένα όνομα και ένα όνομα εμφάνισης για αυτό το κανάλι!</string>
     <string name="action_channel_create">Δημιουργία καναλιού</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Inicio</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Descubre</string>
@@ -34,6 +37,7 @@
     <string name="download">Descargar</string>
     <string name="profile_picture">Imagen del perfil</string>
     <string name="update_video">Actualizar vídeo</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Eliminar un comentario</string>
     <string name="delete_comment_confirm">¿Realmente deseas eliminar este comentario?</string>
     <string name="set_video_mode">Aplicar el modo de video</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">Mis videos</string>
     <string name="title">Título</string>
     <string name="license">Licencia</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pies de foto de la camioneta</string>
     <string name="none">Ninguno</string>
     <string name="set_video_mode_description">Permite cambiar el modo de reproducción de los vídeos (predeterminado, streaming o a través de un navegador).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Eliminar vídeo</string>
     <string name="delete_video_confirmation">¿Estás seguro de eliminar este video?</string>
     <string name="no_video_to_display">¡No hay videos para ver!</string>
@@ -163,6 +196,12 @@
     <string-array name="settings_video_mode">
         <item>Webview</item>
         <item>Corriente Directa</item>
+        <item>Direct stream</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">No hay videos en tus favoritos!</string>
     <string name="delete_channel">Quitar el canal</string>
     <string name="action_channel_confirm_delete">Estas seguro de borrar permanentemente este canal?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">Nada de cuentas mutables!</string>
     <string name="error_display_name_channel">Debes definir un nombre y un nombre de pantalla para este canal!</string>
     <string name="action_channel_create">Crear un canal</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Locale</string>
-    <string name="title_local">Local</string>
+    <string name="title_local">Locale</string>
     <string name="title_discover">Découvrir</string>
     <string name="title_notifications">Notifications</string>
     <string name="title_recently_added">Nouveautés</string>
@@ -34,6 +37,7 @@
     <string name="download">Télécharger</string>
     <string name="profile_picture">Photo du profil</string>
     <string name="update_video">Mettre à jour la vidéo</string>
+    <string name="remove_from_playlist">Supprimer de la liste de lecture</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d min</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <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>
+    <string name="filter">Filtrer</string>
+    <string name="sepia_search">Recherche sépia</string>
+    <string name="sepia_element_nsfw">Afficher le contenu sensible</string>
+    <string name="sepia_element_published_date">Date de publication</string>
+    <string name="any">Toutes</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="last_7_days">Les 7 derniers jours</string>
+    <string name="last_30_days">Les 30 derniers jours</string>
+    <string name="last_365_days">Les 365 derniers jours</string>
+    <string name="sepia_element_duration">Durée</string>
+    <string name="duration_short"><![CDATA[Courte (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Moyenne (4-10 min)]]></string>
+    <string name="duration_long"><![CDATA[Longue (> 10 min)]]></string>
+    <string name="display_all_categories">Afficher toutes les catégories</string>
+    <string name="display_all_licenses">Afficher toutes les licences</string>
+    <string name="display_all_languages">Afficher toutes les langues</string>
+    <string name="all_of_these_tags">Tous ces labels</string>
+    <string name="one_of_these_tags">Un de ces labels</string>
+    <string name="apply_filter">Appliquer le filtre</string>
+    <string-array name="sort_by_array">
+        <item>Meilleurs résultats</item>
+        <item>Les plus récentes</item>
+        <item>Les moins récentes</item>
+    </string-array>
+    <string name="sort_by">Trier par</string>
+    <string name="sepia_search_hint">Mot-clé, chaîne, vidéo, etc.</string>
+    <string name="sepia_indication">La recherche Sepia affiche les vidéos et les chaînes qui correspondent à votre recherche mais qui n\'est pas l\'éditeur, ni le propriétaire. Si vous remarquez des problèmes avec une vidéo, signalez-la aux administrateurs sur le site Web de PeerTube où la vidéo est publiée.</string>
     <string name="my_videos">Mes vidéos</string>
     <string name="title">Titre</string>
     <string name="license">Licence</string>
@@ -104,17 +135,19 @@
     <string name="change_instance">Changer d\'instance</string>
     <string name="my_history">Historique</string>
     <string name="edit">Modifier</string>
-    <string name="video_settings">Video settings</string>
+    <string name="video_settings">Réglages des vidéos</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
-    <string name="set_video_quality_description">Define a default quality for videos</string>
-    <string name="set_quality_mode">Resolution for videos</string>
-    <string name="video_cache_value">Video cache: %d Mb</string>
+    <string name="set_video_cache_description">Définir le cache pour les vidéos (par défaut 100Mo)</string>
+    <string name="set_video_quality_description">Définir une qualité par défaut pour les vidéos</string>
+    <string name="set_quality_mode">Résolution pour les vidéos</string>
+    <string name="video_cache_value">Cache vidéo : %d Mo</string>
     <string name="captions">Légendes</string>
     <string name="pickup_captions">Options d\'envoi</string>
     <string name="none">Aucune</string>
     <string name="set_video_mode_description">Permet de changer le mode de lecture pour les vidéos (normal, streaming ou via un navigateur).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Supprimer la vidéo</string>
     <string name="delete_video_confirmation">Êtes-vous sûr de vouloir supprimer cette vidéo ?</string>
     <string name="no_video_to_display">Aucune vidéo n’est disponible !</string>
@@ -128,7 +161,7 @@
     <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_abuse"><![CDATA[New abuse report for video: <b>%1$s</b>]]></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>
@@ -159,11 +192,17 @@
     <string-array name="settings_video_mode">
         <item>Normal</item>
         <item>Streaming</item>
+        <item>Flux direct</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
-        <item>High</item>
-        <item>Medium</item>
-        <item>Low</item>
+        <item>Élevée</item>
+        <item>Moyenne</item>
+        <item>Faible</item>
     </string-array>
     <string name="unfollow_confirm">Voulez-vous vous désabonner de ce compte ?</string>
     <string name="title_video_peertube">Titre de la vidéo</string>
@@ -177,6 +216,7 @@
     <string name="bookmark_peertube_empty">Il n’y a aucune vidéo Peertube dans vos favoris !</string>
     <string name="delete_channel">Supprimer la chaîne</string>
     <string name="action_channel_confirm_delete">Êtes-vous sûr de vouloir supprimer définitivement cette chaîne ?</string>
+    <string name="modify_playlists">Vidéo dans les listes de lecture</string>
     <string name="no_muted">Aucun compte en sourdine !</string>
     <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>
@@ -185,7 +225,7 @@
     <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>
-    <string name="successful_report_comment">The comment has been reported!</string>
+    <string name="successful_report_comment">Le commentaire a été signalé !</string>
     <string name="successful_video_report">La vidéo a été signalée !</string>
     <string name="password_length_error">Le mot de passe doit contenir 6 caractères !</string>
     <string name="muted_done">Le compte a été mis en sourdine !</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Inizio</string>
-    <string name="title_local">Local</string>
+    <string name="title_local">Locale</string>
     <string name="title_discover">Esplora</string>
     <string name="title_notifications">Notifiche</string>
     <string name="title_recently_added">Aggiunti di recente</string>
@@ -17,7 +20,7 @@
     <string name="instance_choice">Trova un\'istanza</string>
     <string name="not_valide_instance">Questa istanza non sembra essere valida!</string>
     <string name="no_videos">Nessun video!</string>
-    <string name="no_notifications">No notifications!</string>
+    <string name="no_notifications">Nessuna notifica!</string>
     <string name="favicon">Favicon</string>
     <string name="open_with">Apri con</string>
     <string name="action_playlist_edit">Modifica playlist</string>
@@ -34,6 +37,7 @@
     <string name="download">Scarica</string>
     <string name="profile_picture">Immagine di profilo</string>
     <string name="update_video">Aggiorna video</string>
+    <string name="remove_from_playlist">Rimuovere dalla playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Elimina il commento</string>
     <string name="delete_comment_confirm">Sei sicuro di voler eliminare questo commento?</string>
     <string name="set_video_mode">Modalità per i video</string>
+    <string name="filter">Filtro</string>
+    <string name="sepia_search">Ricerca Seppia</string>
+    <string name="sepia_element_nsfw">Visualizzare il contenuto sensibile</string>
+    <string name="sepia_element_published_date">Data di pubblicazione</string>
+    <string name="any">Qualsiasi</string>
+    <string name="today">Oggi</string>
+    <string name="last_7_days">Ultimi 7 giorni</string>
+    <string name="last_30_days">Ultimi 30 giorni</string>
+    <string name="last_365_days">Ultimi 365 giorni</string>
+    <string name="sepia_element_duration">Durata</string>
+    <string name="duration_short"><![CDATA[Breve (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medio (4-10 min)]]></string>
+    <string name="duration_long"><![CDATA[Lungo (> 10 min)]]></string>
+    <string name="display_all_categories">Visualizza tutte le categorie</string>
+    <string name="display_all_licenses">Visualizzare tutte le licenze</string>
+    <string name="display_all_languages">Visualizza tutte le lingue</string>
+    <string name="all_of_these_tags">Tutti questi tag</string>
+    <string name="one_of_these_tags">Uno di questi tag</string>
+    <string name="apply_filter">Applicare il filtro</string>
+    <string-array name="sort_by_array">
+        <item>Migliore partita</item>
+        <item>I più recenti</item>
+        <item>Meno recente</item>
+    </string-array>
+    <string name="sort_by">Ordina per</string>
+    <string name="sepia_search_hint">Parola chiave, canale, video, ecc.</string>
+    <string name="sepia_indication">Sepia Search visualizza video e canali che corrispondono alla tua ricerca, ma non è l\'editore, né il proprietario. Se si notano problemi con un video, segnalarlo agli amministratori sul sito web di PeerTube dove viene pubblicato il video.</string>
     <string name="my_videos">I miei video</string>
     <string name="title">Titolo</string>
     <string name="license">Licenza</string>
@@ -104,17 +135,19 @@
     <string name="change_instance">Prendi un\'altra istanza</string>
     <string name="my_history">Cronologia</string>
     <string name="edit">Modifica</string>
-    <string name="video_settings">Video settings</string>
-    <string name="app_interface">Interface</string>
+    <string name="video_settings">Impostazioni video</string>
+    <string name="app_interface">Interfaccia</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
-    <string name="set_video_quality_description">Define a default quality for videos</string>
-    <string name="set_quality_mode">Resolution for videos</string>
-    <string name="video_cache_value">Video cache: %d Mb</string>
+    <string name="set_video_cache_description">Impostare la cache per i video (default 100Mb)</string>
+    <string name="set_video_quality_description">Definire una qualità predefinita per i video</string>
+    <string name="set_quality_mode">Risoluzione per i video</string>
+    <string name="video_cache_value">Memoria video: %d Mb</string>
     <string name="captions">Didascalie</string>
     <string name="pickup_captions">Scegliere le didascalie</string>
     <string name="none">Nessuno</string>
     <string name="set_video_mode_description">Permette di cambiare la modalità di riproduzione dei video (di default, in streaming o tramite browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Elimina video</string>
     <string name="delete_video_confirmation">Sei sicuro di voler eliminare questo video?</string>
     <string name="no_video_to_display">Nessun video da mostrare!</string>
@@ -128,7 +161,7 @@
     <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> ha pubblicato un nuovo video: <b>%2$s</b>]]></string>
     <string name="peertube_video_blacklist"><![CDATA[Il tuo video <b>%1$s</b> è stato messo nella lista nera]]></string>
     <string name="peertube_video_unblacklist"><![CDATA[Il tuo video <b>%1$s</b> è stato rimosso dalla lista nera]]></string>
-    <string name="peertube_video_abuse"><![CDATA[New abuse report for video: <b>%1$s</b>]]></string>
+    <string name="peertube_video_abuse"><![CDATA[Nuovo rapporto di abuso per il video: <b>%1$s</b>]]></string>
     <string name="add_public_comment">Aggiungi un commento pubblico</string>
     <string name="send_comment">Invia commento</string>
     <string name="all">Tutto</string>
@@ -163,11 +196,17 @@
     <string-array name="settings_video_mode">
         <item>Webview</item>
         <item>Stream diretto</item>
+        <item>Flusso diretto</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
-        <item>High</item>
-        <item>Medium</item>
-        <item>Low</item>
+        <item>Alto</item>
+        <item>Medio</item>
+        <item>Basso</item>
     </string-array>
     <string name="unfollow_confirm">Vuoi smettere di seguire questo account?</string>
     <string name="title_video_peertube">Titolo per il video</string>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">Non c\'è nessun video nei tuoi favoriti!</string>
     <string name="delete_channel">Rimuovi Canale</string>
     <string name="action_channel_confirm_delete">Sei sicuro di voler eliminare definitivamente questo canale?</string>
+    <string name="modify_playlists">Video in playlist</string>
     <string name="no_muted">Nessun account silenziato!</string>
     <string name="error_display_name_channel">Devi definire un nome e un nome visualizzato per questo canale!</string>
     <string name="action_channel_create">Creare un canale</string>
@@ -189,7 +229,7 @@
     <string name="report_comment_size">Per favore, specifica una motivazione</string>
     <string name="not_logged_in">Per eseguire questa operazione, è necessario autenticarsi!</string>
     <string name="successful_report">L\'account è stato segnalato!</string>
-    <string name="successful_report_comment">The comment has been reported!</string>
+    <string name="successful_report_comment">Il commento è stato riportato!</string>
     <string name="successful_video_report">Il video è stato segnalato!</string>
     <string name="password_length_error">La password deve contenere almeno 6 caratteri!</string>
     <string name="muted_done">L\'account è stato silenziato!</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">ホーム</string>
     <string name="title_local">Local</string>
     <string name="title_discover">発見</string>
@@ -34,6 +37,7 @@
     <string name="download">ダウンロード</string>
     <string name="profile_picture">プロフィール画像</string>
     <string name="update_video">動画をアップロード</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d 秒</string>
     <string name="date_minutes">%d 分</string>
     <string name="date_hours">%d 時間</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">字幕を選択</string>
     <string name="none">なし</string>
     <string name="set_video_mode_description">動画再生モードの変更を許可する(デフォルト、ストリーミングまたはブラウザ経由)。</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">動画を削除</string>
     <string name="delete_video_confirmation">この動画を本当に削除しますか？</string>
     <string name="no_video_to_display">動画がありません！</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Ontdek</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profiel foto</string>
     <string name="update_video">Video bijwerken</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Een opmerking verwijderen</string>
     <string name="delete_comment_confirm">Weet u zeker dat u deze opmerking wilt verwijderen?</string>
     <string name="set_video_mode">Modus voor video\'s</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">Mijn video\'s</string>
     <string name="title">Titel</string>
     <string name="license">Licentie</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">Geen</string>
     <string name="set_video_mode_description">Maakt het mogelijk om van modus te veranderen voor het afspelen van video\'s (standaard, streaming of via een browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Video verwijderen</string>
     <string name="delete_video_confirmation">Weet u zeker dat u deze video wilt verwijderen?</string>
     <string name="no_video_to_display">Geen video\'s te tonen!</string>
@@ -163,6 +196,12 @@
     <string-array name="settings_video_mode">
         <item>Webview</item>
         <item>Directe stroom</item>
+        <item>Direct stream</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">Er zijn geen video\'s in uw favorieten!</string>
     <string name="delete_channel">Verwijder kanaal</string>
     <string name="action_channel_confirm_delete">Weet u zeker dat u dit kanaal permanent zult verwijderen?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">Geen gedempte rekeningen!</string>
     <string name="error_display_name_channel">U moet een naam en een weergavenaam voor dit kanaal definiëren!</string>
     <string name="action_channel_create">Creëer een kanaal</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Strona główna</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Odkryj</string>
@@ -34,6 +37,7 @@
     <string name="download">Pobierz</string>
     <string name="profile_picture">Zdjęcie profilowe</string>
     <string name="update_video">Aktualizacja wideo</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Usuń komentarz</string>
     <string name="delete_comment_confirm">Czy na pewno usuniesz ten komentarz?</string>
     <string name="set_video_mode">Tryb dla filmów wideo</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">Moje filmy</string>
     <string name="title">Tytuł</string>
     <string name="license">Licencja</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Wybierz podpisy</string>
     <string name="none">Brak</string>
     <string name="set_video_mode_description">Umożliwia zmianę trybu odtwarzania filmów (domyślnie, strumieniowo lub za pomocą przeglądarki).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Usuń video</string>
     <string name="delete_video_confirmation">Czy na pewno usuniesz ten film?</string>
     <string name="no_video_to_display">Brak filmów do wyświetlenia!</string>
@@ -163,6 +196,12 @@
     <string-array name="settings_video_mode">
         <item>Webview</item>
         <item>Strumień bezpośredni</item>
+        <item>Direct stream</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">Nie ma żadnych filmów w twoich ulubionych!</string>
     <string name="delete_channel">Usuń kanał</string>
     <string name="action_channel_confirm_delete">Czy na pewno na stałe usuniesz ten kanał?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">Nie ma wyciszonych kont!</string>
     <string name="error_display_name_channel">Musisz zdefiniować nazwę i nazwę wyświetlania dla tego kanału!</string>
     <string name="action_channel_create">Stwórz kanał</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="title_home">Главная страница</string>
-    <string name="title_local">Local</string>
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
+    <string name="title_home">Главная</string>
+    <string name="title_local">Локальные</string>
     <string name="title_discover">Подборка</string>
     <string name="title_notifications">Уведомления</string>
-    <string name="title_recently_added">Недавно добавленные</string>
+    <string name="title_recently_added">По добавлению</string>
     <string name="title_trending">Популярные</string>
     <string name="title_most_liked">Много лайков</string>
     <string name="toast_error">Упс! Произошла ошибка!</string>
     <string name="title_muted">Беззвучный</string>
     <string name="title_channel">Каналы</string>
-    <string name="do_not_list">Не показывать</string>
+    <string name="do_not_list">Скрыто</string>
     <string name="blur">Размыть</string>
     <string name="display">Показать</string>
     <string name="no_opinion">Не выбрано</string>
@@ -23,7 +26,7 @@
     <string name="action_playlist_edit">Редактировать плейлист</string>
     <string name="close">Закрыть</string>
     <string name="upload_video">Загрузить</string>
-    <string name="image_preview">Предпросмотр</string>
+    <string name="image_preview">Предпросмотр изображения</string>
     <string name="file_to_upload">Выберите файл для загрузки</string>
     <string name="channel">Канал</string>
     <string name="videos">Видео</string>
@@ -34,11 +37,12 @@
     <string name="download">Скачать</string>
     <string name="profile_picture">Изображение профиля</string>
     <string name="update_video">Обновить видео</string>
-    <string name="date_seconds">%d с</string>
-    <string name="date_minutes">%d м</string>
-    <string name="date_hours">%d ч</string>
-    <string name="date_day">%d д</string>
-    <string name="number_view_video">%s просмотров</string>
+    <string name="remove_from_playlist">Удалить из плейлиста</string>
+    <string name="date_seconds">%d сек.</string>
+    <string name="date_minutes">%d мин.</string>
+    <string name="date_hours">%d час.</string>
+    <string name="date_day">%d д.</string>
+    <string name="number_view_video">Просмотры: %s</string>
     <string name="title_instance_login">Хост экземпляра</string>
     <string name="uploading">Загрузка, пожалуйста, подождите…</string>
     <string name="upload_video_success">Видео было загружено!</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Удалить комментарий</string>
     <string name="delete_comment_confirm">Вы уверены, что хотите удалить этот комментарий?</string>
     <string name="set_video_mode">Режим для видео</string>
+    <string name="filter">Фильтр</string>
+    <string name="sepia_search">Поисковик Sepia</string>
+    <string name="sepia_element_nsfw">Показывать неприличные видео</string>
+    <string name="sepia_element_published_date">Дата публикации</string>
+    <string name="any">Любые</string>
+    <string name="today">Сегодня</string>
+    <string name="last_7_days">Последние 7 дней</string>
+    <string name="last_30_days">Последние 30 дней</string>
+    <string name="last_365_days">Последние 365 дней</string>
+    <string name="sepia_element_duration">Длительность</string>
+    <string name="duration_short"><![CDATA[Короткие (<4 мин)]]></string>
+    <string name="duration_medium"><![CDATA[Средние (4–10 мин)]]></string>
+    <string name="duration_long"><![CDATA[Длинные (> 10 мин)]]></string>
+    <string name="display_all_categories">Показать все категории</string>
+    <string name="display_all_licenses">Показать все лицензии</string>
+    <string name="display_all_languages">Показать все языки</string>
+    <string name="all_of_these_tags">Все с этими тегами</string>
+    <string name="one_of_these_tags">Один из этих тегов</string>
+    <string name="apply_filter">Применить фильтр</string>
+    <string-array name="sort_by_array">
+        <item>Лучшее совпадение</item>
+        <item>Последние</item>
+        <item>Ранние</item>
+    </string-array>
+    <string name="sort_by">Сортировать по</string>
+    <string name="sepia_search_hint">Ключевое слово, канал, видео и т. д.</string>
+    <string name="sepia_indication">Sepia Search отображает видео и каналы, которые соответствуют вашему поиску, но не являются ни издателем, ни владельцем. Если вы заметили какие-либо проблемы с видео, сообщите об этом администраторам на сайте PeerTube, где это видео опубликовано.</string>
     <string name="my_videos">Мои видео</string>
     <string name="title">Название</string>
     <string name="license">Лицензия</string>
@@ -104,17 +135,19 @@
     <string name="change_instance">Выберите другой экземпляр</string>
     <string name="my_history">История</string>
     <string name="edit">Редактировать</string>
-    <string name="video_settings">Video settings</string>
-    <string name="app_interface">Interface</string>
-    <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="video_settings">Настройки видео</string>
+    <string name="app_interface">Интерфейс</string>
+    <string name="set_cache_mode">Кэш</string>
+    <string name="set_video_cache_description">Определите кеш для видео (по умолчанию 100 Мб)</string>
     <string name="set_video_quality_description">Определить качество видео по умолчанию</string>
     <string name="set_quality_mode">Разрешение для видео</string>
-    <string name="video_cache_value">Video cache: %d Mb</string>
+    <string name="video_cache_value">Видео кэш: %d Мб</string>
     <string name="captions">Субтитры</string>
     <string name="pickup_captions">Выбрать субтитры</string>
     <string name="none">Ничто</string>
-    <string name="set_video_mode_description">Позволяет изменить режим воспроизведения видео (по умолчанию, потоковой или через браузер).</string>
+    <string name="set_video_mode_description">Позволяет изменить режим воспроизведения видео (по умолчанию потоковый или через браузер).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Удалить видео</string>
     <string name="delete_video_confirmation">Вы уверены, что хотите удалить это видео?</string>
     <string name="no_video_to_display">Нет видео для отображения!</string>
@@ -126,8 +159,8 @@
     <string name="peertube_video_import_success"><![CDATA[Ваше видео <b>%1$s</b> успешно импортировано]]></string>
     <string name="peertube_video_import_error"><![CDATA[При импорте вашего видео <b>%1$s</b> произошла ошибка]]></string>
     <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> опубликовал новое видео: <b>%2$s</b>]]></string>
-    <string name="peertube_video_blacklist"><![CDATA[Ваше видео <b>%1$s</b> занесено в черный список]]></string>
-    <string name="peertube_video_unblacklist"><![CDATA[Ваше видео <b>%1$s</b> удалено из черного списка]]></string>
+    <string name="peertube_video_blacklist"><![CDATA[Ваше видео <b>%1$s</b> занесено в чёрный список]]></string>
+    <string name="peertube_video_unblacklist"><![CDATA[Ваше видео <b>%1$s</b> удалено из чёрного списка]]></string>
     <string name="peertube_video_abuse"><![CDATA[Новый отчёт о нарушении для видео: <b>%1$s</b>]]></string>
     <string name="add_public_comment">Добавить публичный комментарий</string>
     <string name="send_comment">Оставить комментарий</string>
@@ -163,6 +196,12 @@
     <string-array name="settings_video_mode">
         <item>Веб-просмотр</item>
         <item>Прямой поток</item>
+        <item>Прямой поток</item>
+    </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
     </string-array>
     <string-array name="settings_video_quality">
         <item>Высокое</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">В избранном нет видео!</string>
     <string name="delete_channel">Удалить канал</string>
     <string name="action_channel_confirm_delete">Вы уверены что хотите безвозвратно удалить этот канал?</string>
+    <string name="modify_playlists">Видео в плейлисте</string>
     <string name="no_muted">Нет заблокированных аккаунтов!</string>
     <string name="error_display_name_channel">Вы должны указать имя и отображаемое имя для этого канала!</string>
     <string name="action_channel_create">Создать канал</string>
@@ -207,17 +247,17 @@
     <string name="pickup_instance">Выбрать этот экземпляр</string>
     <string name="sensitive_video"> Неприличные видео</string>
     <string name="sensitive_content">Неприличный контент: %1$s</string>
-    <string name="followers_instance">%1$s подписчиков у экземпляра</string>
+    <string name="followers_instance">Подписчиков у экземпляра: %1$s</string>
     <string name="help">Помощь</string>
     <string name="pickup_categories">Выбрать категории</string>
     <string name="pickup_languages">Выбрать языки</string>
-    <string name="notification_channel_name">Информация об обновлении</string>
+    <string name="notification_channel_name">Обновить данные</string>
     <string name="add_account">Добавление аккаунта</string>
     <string name="list_of_accounts">Список аккаунтов</string>
     <string name="pause">Пауза</string>
     <string name="play">Воспроизвести</string>
     <string name="minimize">Свернуть</string>
-    <string name="fast_rewind">Быстрое перемотка</string>
+    <string name="fast_rewind">Быстрая перемотка</string>
     <string name="fast_forward">Перемотка вперед</string>
     <string name="set_video_minimize">Вид свёрнутого видео</string>
     <string name="set_video_minimize_description">Уменьшить размер видео, когда приложение находится в фоновом режиме (Android N+)</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -148,6 +148,7 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -34,6 +37,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
+    <string name="remove_from_playlist">Remove from playlist</string>
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
@@ -82,6 +86,33 @@
     <string name="delete_comment">Delete a comment</string>
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -107,7 +138,7 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -115,6 +146,8 @@
     <string name="pickup_captions">Pick captions</string>
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
     <string name="no_video_to_display">No videos to display!</string>
@@ -161,9 +194,15 @@
     <string name="account">Account</string>
     <string name="report_account">Report account</string>
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -181,6 +220,7 @@
     <string name="bookmark_peertube_empty">There are no videos in your favourites!</string>
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>
     <string name="action_channel_create">Create a channel</string>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212529</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#F2690D</color>
+    <color name="tag_color">#bbF2690D</color>
+    <color name="tag_color_text">#FAFAFA</color>
+    <color name="positive_thumbs">#2b90d9</color>
+    <color name="negative_thumbs">#F44336</color>
+
+    <color name="red_1">#F44336</color>
+</resources>

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

@@ -1,5 +1,16 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Tubelab</string>
+    <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
+    <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
+    <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
+    <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
+    <string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
+    <string name="set_theme_choice" translatable="false">set_theme_choice</string>
+
+
+    <string name="set_theme">Theme</string>
+    <string name="set_theme_description">Allow to change app theme</string>
+    <string name="federation_issue">The video cannot be federated!</string>
     <string name="title_home">Home</string>
     <string name="title_local">Local</string>
     <string name="title_discover">Discover</string>
@@ -36,7 +47,7 @@
     <string name="download">Download</string>
     <string name="profile_picture">Profile picture</string>
     <string name="update_video">Update video</string>
-
+    <string name="remove_from_playlist">Remove from playlist</string>
 
     <string name="date_seconds">%d s</string>
     <string name="date_minutes">%d m</string>
@@ -110,6 +121,37 @@
     <string name="delete_comment_confirm">Are you sure to delete this comment?</string>
     <string name="set_video_mode">Mode for videos</string>
 
+    <string name="filter">Filter</string>
+    <string name="sepia_search">Sepia search</string>
+    <string name="sepia_element_nsfw">Display sensitive content</string>
+    <string name="sepia_element_published_date">Published date</string>
+    <string name="any">Any</string>
+    <string name="today">Today</string>
+    <string name="last_7_days">Last 7 days</string>
+    <string name="last_30_days">Last 30 days</string>
+    <string name="last_365_days">Last 365 days</string>
+
+    <string name="sepia_element_duration">Duration</string>
+    <string name="duration_short"><![CDATA[Short (<4 min)]]></string>
+    <string name="duration_medium"><![CDATA[Medium (4–10 min)]]></string>
+    <string name="duration_long"><![CDATA[Long (> 10 min)]]></string>
+
+    <string name="display_all_categories">Display all categories</string>
+    <string name="display_all_licenses">Display all licenses</string>
+    <string name="display_all_languages">Display all languages</string>
+
+    <string name="all_of_these_tags">All of these tags</string>
+    <string name="one_of_these_tags">One of these tags</string>
+    <string name="apply_filter">Apply filter</string>
+    <string-array name="sort_by_array">
+        <item>Best match</item>
+        <item>Most recent</item>
+        <item>Least recent</item>
+    </string-array>
+
+    <string name="sort_by">Sort by</string>
+    <string name="sepia_search_hint">Keyword, channel, video, etc.</string>
+    <string name="sepia_indication">Sepia Search displays videos and channels that match your search but is not the publisher, nor the owner. If you notice any problems with a video, report it to the administrators on the PeerTube website where the video is published.</string>
     <string name="my_videos">My videos</string>
     <string name="title">Title</string>
     <string name="license">License</string>
@@ -139,13 +181,9 @@
     <string name="video_settings">Video settings</string>
     <string name="app_interface">Interface</string>
 
-    <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
-    <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
-    <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
-    <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
-    <string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
+
     <string name="set_cache_mode">Cache</string>
-    <string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
+    <string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
     <string name="set_video_quality_description">Define a default quality for videos</string>
     <string name="set_quality_mode">Resolution for videos</string>
     <string name="video_cache_value">Video cache: %d Mb</string>
@@ -155,6 +193,8 @@
     <string name="none">None</string>
     <string name="set_video_mode_description">Allows to change mode for playing videos (default, streaming or via a browser).</string>
 
+    <string name="delete_account_comment">Delete account comments</string>
+    <string name="delete_account_comment_confirm">Are you sure you want to remove all the comments of this account?</string>
 
     <string name="delete_video">Delete video</string>
     <string name="delete_video_confirmation">Are you sure to delete this video?</string>
@@ -206,10 +246,19 @@
     <string name="report_account">Report account</string>
 
     <string-array name="settings_video_mode">
+        <item>Normal</item>
         <item>Webview</item>
         <item>Direct stream</item>
     </string-array>
 
+
+    <string-array name="settings_theme">
+        <item>Light</item>
+        <item>Dark</item>
+        <item>Automatic</item>
+    </string-array>
+
+
     <string-array name="settings_video_quality">
         <item>High</item>
         <item>Medium</item>
@@ -234,6 +283,7 @@
     <string name="delete_channel">Remove channel</string>
     <string name="action_channel_confirm_delete">Are you sure to permanently delete this channel?</string>
 
+    <string name="modify_playlists">Video in playlists</string>
     <string name="no_muted">No muted accounts!</string>
 
     <string name="error_display_name_channel">You must define a name and a display name for this channel!</string>

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

@@ -1,17 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary_full</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark_full</item>
-        <item name="colorAccent">@color/colorAccent_full</item>
-    </style>
-
-    <style name="AppThemeNoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary_full</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark_full</item>
-        <item name="colorAccent">@color/colorAccent_full</item>
-    </style>
-</resources>

app/src/main/AndroidManifest.xml

@@ -86,10 +86,15 @@
             android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name=".MyVideosActivity"
+            android:name=".VideosTimelineActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:windowSoftInputMode="stateAlwaysHidden" />
+        <activity
+            android:name=".SepiaSearchActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/sepia_search"
+            android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name=".WebviewActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

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

@@ -195,7 +195,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
                         Toasty.error(AllPlaylistsActivity.this, getString(R.string.error_channel_mandatory), Toast.LENGTH_LONG).show();
                     } else {
                         if (privacyToSend != null) {
-                            playlistElement.setPrivacy((int) privacyItem.getId());
+                            playlistElement.setPrivacy(privacyItem.getId());
                         }
                         new Thread(() -> {
                             String playlistId;
@@ -310,7 +310,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
         if (playlistToEdit != null) {
             Item privacy = playlistToEdit.getPrivacy();
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection((int) privacy.getId() - 1);
+                set_upload_privacy.setSelection(privacy.getId() - 1);
             }
         } else {
             set_upload_privacy.setSelection(2);
@@ -345,7 +345,7 @@ public class AllPlaylistsActivity extends AppCompatActivity {
             Item privacy = playlistToEdit.getPrivacy();
 
             if (privacy.getId() > 0) {
-                set_upload_privacy.setSelection((int) privacy.getId() - 1);
+                set_upload_privacy.setSelection(privacy.getId() - 1);
             }
         }
 

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

@@ -15,12 +15,16 @@ package app.fedilab.fedilabtube;
  * see <http://www.gnu.org/licenses>. */
 
 import android.content.Context;
+import android.content.SharedPreferences;
 
 import androidx.multidex.MultiDex;
 import androidx.multidex.MultiDexApplication;
 
 import net.gotev.uploadservice.UploadService;
 
+import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.helper.ThemeHelper;
+
 public class FedilabTube extends MultiDexApplication {
     @Override
     protected void attachBaseContext(Context base) {
@@ -29,7 +33,12 @@ public class FedilabTube extends MultiDexApplication {
         MultiDex.install(FedilabTube.this);
 
         UploadService.NAMESPACE = BuildConfig.APPLICATION_ID;
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        int themePref = sharedpreferences.getInt(Helper.SET_THEME, Helper.DEFAULT_MODE);
+        ThemeHelper.switchTo(themePref);
     }
 
 
+
+
 }

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

@@ -117,7 +117,6 @@ public class InstancePickerActivity extends AppCompatActivity {
             pickup_languages.setOnClickListener(v -> {
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(InstancePickerActivity.this);
 
-
                 int i = 0;
                 if (languages.size() > 0) {
                     Iterator<Map.Entry<String, String>> it = languages.entrySet().iterator();
@@ -175,7 +174,7 @@ public class InstancePickerActivity extends AppCompatActivity {
             });
         }
 
-        if (peertubeInformation != null && peertubeInformation.getLanguages() != null) {
+        if (peertubeInformation != null && peertubeInformation.getCategories() != null) {
             LinkedHashMap<Integer, String> categories = new LinkedHashMap<>(peertubeInformation.getCategories());
             checkedItemsCategory = new boolean[categories.size()];
             itemsLabelCategory = new String[categories.size()];

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

@@ -134,6 +134,7 @@ public class LoginActivity extends AppCompatActivity {
                 String[] emailArray = login_uid.getText().toString().split("@");
                 if (emailArray.length > 1 && !Arrays.asList(Helper.valideEmails).contains(emailArray[1])) {
                     Toasty.error(LoginActivity.this, getString(R.string.email_error_domain, emailArray[1])).show();
+                    connectionButton.setEnabled(true);
                     return;
                 }
                 host = emailArray[1];
@@ -141,6 +142,7 @@ public class LoginActivity extends AppCompatActivity {
             } else {
                 if (login_instance == null || login_instance.getText() == null || login_instance.getText().toString().trim().length() == 0) {
                     Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show();
+                    connectionButton.setEnabled(true);
                     return;
                 }
                 instance = host = login_instance.getText().toString().trim().toLowerCase();
@@ -215,6 +217,7 @@ public class LoginActivity extends AppCompatActivity {
                         } catch (Error error) {
                             Error.displayError(LoginActivity.this, error);
                             error.printStackTrace();
+                            runOnUiThread(() -> connectionButton.setEnabled(true));
                         }
                     }
                 }).start();

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

@@ -22,6 +22,7 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
@@ -32,15 +33,11 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
-import androidx.navigation.NavController;
-import androidx.navigation.NavGraph;
-import androidx.navigation.NavInflater;
-import androidx.navigation.Navigation;
-import androidx.navigation.fragment.NavHostFragment;
-import androidx.navigation.ui.AppBarConfiguration;
-import androidx.navigation.ui.NavigationUI;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.kobakei.ratethisapp.RateThisApp;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -56,6 +53,8 @@ import app.fedilab.fedilabtube.client.entities.PeertubeInformation;
 import app.fedilab.fedilabtube.client.entities.Token;
 import app.fedilab.fedilabtube.client.entities.UserMe;
 import app.fedilab.fedilabtube.client.entities.WellKnownNodeinfo;
+import app.fedilab.fedilabtube.fragment.DisplayOverviewFragment;
+import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
 import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.services.RetrieveInfoService;
 import app.fedilab.fedilabtube.sqlite.AccountDAO;
@@ -70,6 +69,49 @@ public class MainActivity extends AppCompatActivity {
     public static PeertubeInformation peertubeInformation;
 
     public static int PICK_INSTANCE = 5641;
+    final FragmentManager fm = getSupportFragmentManager();
+    Fragment active;
+    private DisplayVideosFragment recentFragment, locaFragment, trendingFragment, subscriptionFragment, mostLikedFragment;
+    private DisplayOverviewFragment overviewFragment;
+
+    private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
+            = item -> {
+        DisplayVideosFragment displayVideosFragment = null;
+        switch (item.getItemId()) {
+            case R.id.navigation_subscription:
+                displayVideosFragment = subscriptionFragment;
+                setTitle(R.string.subscriptions);
+                break;
+            case R.id.navigation_trending:
+                setTitle(R.string.title_trending);
+                displayVideosFragment = trendingFragment;
+                break;
+            case R.id.navigation_most_liked:
+                setTitle(R.string.title_most_liked);
+                displayVideosFragment = mostLikedFragment;
+                break;
+            case R.id.navigation_recently_added:
+                setTitle(R.string.title_recently_added);
+                displayVideosFragment = recentFragment;
+                break;
+            case R.id.navigation_local:
+                setTitle(R.string.title_local);
+                displayVideosFragment = locaFragment;
+                break;
+            case R.id.navigation_discover:
+                setTitle(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;
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -80,6 +122,73 @@ public class MainActivity extends AppCompatActivity {
         setSupportActionBar(toolbar);
 
         BottomNavigationView navView = findViewById(R.id.nav_view);
+
+        navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+
+        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);
+        recentFragment.setArguments(bundle);
+
+        locaFragment = new DisplayVideosFragment();
+        bundle = new Bundle();
+        bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.LOCAL);
+        locaFragment.setArguments(bundle);
+
+        trendingFragment = new DisplayVideosFragment();
+        bundle = new Bundle();
+        bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.TRENDING);
+        trendingFragment.setArguments(bundle);
+
+        subscriptionFragment = new DisplayVideosFragment();
+        bundle = new Bundle();
+        bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.SUBSCRIBTIONS);
+        subscriptionFragment.setArguments(bundle);
+
+        mostLikedFragment = new DisplayVideosFragment();
+        bundle = new Bundle();
+        bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.MOST_LIKED);
+        mostLikedFragment.setArguments(bundle);
+
+        overviewFragment = new DisplayOverviewFragment();
+
+        if( active == null) {
+            active = overviewFragment;
+        }
+        fm.beginTransaction().add(R.id.nav_host_fragment, locaFragment, "5").hide(locaFragment).commit();
+
+        if (!Helper.isLoggedIn(MainActivity.this)) {
+            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();
+        }
+        toolbar.setOnClickListener(v->{
+            if(active instanceof DisplayVideosFragment) {
+                ((DisplayVideosFragment) active).scrollToTop();
+            }else if(active instanceof DisplayOverviewFragment) {
+                ((DisplayOverviewFragment) active).scrollToTop();
+            }
+        });
+
+        setTitle(R.string.title_discover);
+
         if (Helper.isLoggedIn(MainActivity.this)) {
             navView.inflateMenu(R.menu.bottom_nav_menu_connected);
             final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -102,6 +211,17 @@ public class MainActivity extends AppCompatActivity {
                             runOnUiThread(() -> Helper.logoutCurrentUser(MainActivity.this, account));
                             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, 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 userMe = new RetrofitPeertubeAPI(MainActivity.this, instance, token.getAccess_token()).verifyCredentials();
                         if (userMe != null && userMe.getAccount() != null) {
                             new AccountDAO(MainActivity.this, db).updateAccount(userMe.getAccount());
@@ -110,14 +230,16 @@ public class MainActivity extends AppCompatActivity {
                             editor.putString(Helper.PREF_KEY_NAME, account.getUsername());
                             //Sync languages from server
                             List<String> videoLanguageServer = userMe.getVideoLanguages();
-                            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);
+                            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();
                             }
-                            editor.putStringSet(getString(R.string.set_video_language_choice), videoLanguageServerSet);
-                            editor.apply();
                         }
                     } catch (Error error) {
                         error.printStackTrace();
@@ -128,41 +250,14 @@ public class MainActivity extends AppCompatActivity {
         } else {
             navView.inflateMenu(R.menu.bottom_nav_menu);
         }
-
-        // Passing each menu ID as a set of Ids because each
-        // menu should be considered as top level destinations.
-        AppBarConfiguration appBarConfiguration;
-        //Bottom menu won't be the same if the user is authenticated
-        //When the user is authenticated, the subscription entry will be added and the local one removed.
-        if (Helper.isLoggedIn(MainActivity.this)) {
-            appBarConfiguration = new AppBarConfiguration.Builder(
-                    R.id.navigation_discover, R.id.navigation_subscription, R.id.navigation_trending, R.id.navigation_local, R.id.navigation_recently_added)
-                    .build();
-        } else {
-            appBarConfiguration = new AppBarConfiguration.Builder(
-                    R.id.navigation_discover, R.id.navigation_trending, R.id.navigation_most_liked, R.id.navigation_recently_added, R.id.navigation_home)
-                    .build();
-        }
-
-
         startInForeground();
-        NavHostFragment navHostFragment = (NavHostFragment) getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment);
-        if (navHostFragment != null) {
-            NavInflater inflater = navHostFragment.getNavController().getNavInflater();
-            NavGraph graph;
-            //the menu is inflated for authenticated or not authenticated account
-            if (Helper.isLoggedIn(MainActivity.this)) {
-                graph = inflater.inflate(R.navigation.mobile_navigation_connected);
-            } else {
-                graph = inflater.inflate(R.navigation.mobile_navigation);
-            }
-            navHostFragment.getNavController().setGraph(graph);
-            NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
-            NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
-            NavigationUI.setupWithNavController(navView, navController);
-        }
-    }
 
+        if(BuildConfig.google_restriction && BuildConfig.full_instances) {
+            RateThisApp.onCreate(this);
+            RateThisApp.showRateDialogIfNeeded(this);
+        }
+
+    }
 
     private void startInForeground() {
         Intent notificationIntent = new Intent(this, RetrieveInfoService.class);
@@ -207,6 +302,7 @@ public class MainActivity extends AppCompatActivity {
         MenuItem historyItem = menu.findItem(R.id.action_history);
         MenuItem mostLikedItem = menu.findItem(R.id.action_most_liked);
         MenuItem settingsItem = menu.findItem(R.id.action_settings);
+        MenuItem sepiaSearchItem = menu.findItem(R.id.action_sepia_search);
         if (Helper.isLoggedIn(MainActivity.this)) {
             instanceItem.setVisible(false);
             uploadItem.setVisible(true);
@@ -224,6 +320,9 @@ public class MainActivity extends AppCompatActivity {
             settingsItem.setVisible(true);
             mostLikedItem.setVisible(false);
         }
+        if( !BuildConfig.full_instances) {
+            sepiaSearchItem.setVisible(false);
+        }
         return true;
     }
 
@@ -254,21 +353,21 @@ public class MainActivity extends AppCompatActivity {
             startActivity(intent);
             return true;
         } else if (item.getItemId() == R.id.action_myvideos) {
-            Intent intent = new Intent(MainActivity.this, MyVideosActivity.class);
+            Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.MY_VIDEOS);
             intent.putExtras(bundle);
             startActivity(intent);
             return true;
         } else if (item.getItemId() == R.id.action_history) {
-            Intent intent = new Intent(MainActivity.this, MyVideosActivity.class);
+            Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.HISTORY);
             intent.putExtras(bundle);
             startActivity(intent);
             return true;
         } else if (item.getItemId() == R.id.action_most_liked) {
-            Intent intent = new Intent(MainActivity.this, MyVideosActivity.class);
+            Intent intent = new Intent(MainActivity.this, VideosTimelineActivity.class);
             Bundle bundle = new Bundle();
             bundle.putSerializable("type", TimelineVM.TimelineType.MOST_LIKED);
             intent.putExtras(bundle);
@@ -278,7 +377,11 @@ public class MainActivity extends AppCompatActivity {
             Intent intent = new Intent(MainActivity.this, AllPlaylistsActivity.class);
             startActivity(intent);
             return true;
-        } else if (item.getItemId() == R.id.action_about) {
+        }else if(item.getItemId() == R.id.action_sepia_search) {
+            Intent intent = new Intent(MainActivity.this, SepiaSearchActivity.class);
+            startActivity(intent);
+            return true;
+        }else if (item.getItemId() == R.id.action_about) {
             Intent intent = new Intent(MainActivity.this, AboutActivity.class);
             startActivity(intent);
             return true;
@@ -286,6 +389,14 @@ 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) {
         super.onNewIntent(intent);

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

@@ -15,6 +15,7 @@ package app.fedilab.fedilabtube;
  * see <http://www.gnu.org/licenses>. */
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
@@ -32,7 +33,6 @@ import android.os.Handler;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.text.Html;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
@@ -46,7 +46,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -59,6 +58,7 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.NestedScrollView;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -72,6 +72,7 @@ import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.SingleSampleMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
@@ -80,13 +81,14 @@ import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
 
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -96,7 +98,7 @@ import app.fedilab.fedilabtube.client.RetrofitPeertubeAPI;
 import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.data.CaptionData.Caption;
 import app.fedilab.fedilabtube.client.data.CommentData.Comment;
-import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
+import app.fedilab.fedilabtube.client.data.PlaylistData;
 import app.fedilab.fedilabtube.client.data.VideoData;
 import app.fedilab.fedilabtube.client.entities.File;
 import app.fedilab.fedilabtube.client.entities.ItemStr;
@@ -112,6 +114,7 @@ import app.fedilab.fedilabtube.viewmodel.CaptionsVM;
 import app.fedilab.fedilabtube.viewmodel.CommentVM;
 import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
 import app.fedilab.fedilabtube.viewmodel.PostActionsVM;
+import app.fedilab.fedilabtube.viewmodel.SearchVM;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import app.fedilab.fedilabtube.webview.CustomWebview;
 import app.fedilab.fedilabtube.webview.MastalabWebChromeClient;
@@ -125,17 +128,16 @@ import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.REPO
 import static app.fedilab.fedilabtube.helper.Helper.getAttColor;
 import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance;
 import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
-import static app.fedilab.fedilabtube.viewmodel.PlaylistsVM.action.GET_PLAYLISTS;
 
 
 public class PeertubeActivity extends AppCompatActivity implements CommentListAdapter.AllCommentRemoved {
 
     public static String video_id;
-    private String peertubeInstance, videoId;
+    private String peertubeInstance, videoUuid;
     private FullScreenMediaController.fullscreen fullscreen;
     private RelativeLayout loader;
     private TextView peertube_view_count, peertube_playlist, peertube_bookmark, peertube_like_count, peertube_dislike_count, peertube_description, peertube_title, more_actions;
-    private ScrollView peertube_information_container;
+    private NestedScrollView peertube_information_container;
     private VideoData.Video peertube;
     private PlayerView playerView;
     private SimpleExoPlayer player;
@@ -148,9 +150,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private ImageView send;
     private TextView add_comment_read;
     private EditText add_comment_write;
-    private List<String> playlistForVideo;
-    private List<Playlist> playlists;
-    private PlaylistsVM playlistsViewModel;
+    private Map<String, List<PlaylistExist>> playlists;
     private boolean playInMinimized;
     private boolean onStopCalled;
     private List<Caption> captions;
@@ -158,9 +158,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private String max_id;
     private RecyclerView lv_comments;
     private boolean flag_loading;
-
+    private boolean isMyVideo;
     private List<Comment> comments;
     private CommentListAdapter commentListAdapter;
+    private boolean sepiaSearch;
 
     public static void hideKeyboard(Activity activity) {
         if (activity != null && activity.getWindow() != null) {
@@ -199,7 +200,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-        if (Helper.isLoggedIn(PeertubeActivity.this)) {
+        if (Helper.isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
             Account account = new AccountDAO(PeertubeActivity.this, db).getAccountByToken(token);
             Helper.loadGiF(PeertubeActivity.this, account.getAvatar() != null ? account.getAvatar().getPath() : null, my_pp);
         }
@@ -220,25 +221,22 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
         mode = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL);
 
-        playlistForVideo = new ArrayList<>();
-        playlistsViewModel = new ViewModelProvider(PeertubeActivity.this).get(PlaylistsVM.class);
-        if (Helper.isLoggedIn(PeertubeActivity.this)) {
-            playlistsViewModel.manage(GET_PLAYLISTS, null, null).observe(PeertubeActivity.this, apiResponse -> manageVIewPlaylists(GET_PLAYLISTS, apiResponse));
-        }
         Bundle b = getIntent().getExtras();
         if (b != null) {
             peertubeInstance = b.getString("peertube_instance", Helper.getLiveInstance(PeertubeActivity.this));
-            videoId = b.getString("video_id", null);
+            videoUuid = b.getString("video_uuid", null);
+            isMyVideo =  b.getBoolean("isMyVideo", false);
+            sepiaSearch =  b.getBoolean("sepia_search", false);
+            peertube = b.getParcelable("video");
         }
 
+
         playInMinimized = sharedpreferences.getBoolean(getString(R.string.set_video_minimize_choice), true);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N
                 && !getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
             playInMinimized = false;
         }
 
-        if (mode != Helper.VIDEO_MODE_WEBVIEW && mode != Helper.VIDEO_MODE_NORMAL)
-            mode = Helper.VIDEO_MODE_NORMAL;
         if (mode == Helper.VIDEO_MODE_WEBVIEW) {
             webview_video.setVisibility(View.VISIBLE);
             playerView.setVisibility(View.GONE);
@@ -274,7 +272,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             webview_video.getSettings().setAppCacheEnabled(true);
             webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false);
             webview_video.setWebViewClient(new MastalabWebViewClient(PeertubeActivity.this));
-            webview_video.loadUrl("https://" + peertubeInstance + "/videos/embed/" + videoId);
+            webview_video.loadUrl("https://" + peertubeInstance + "/videos/embed/" + videoUuid);
         } else {
             webview_video.setVisibility(View.GONE);
             playerView.setVisibility(View.VISIBLE);
@@ -290,7 +288,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         flag_loading = true;
         comments = new ArrayList<>();
         lv_comments = findViewById(R.id.peertube_comments);
-        commentListAdapter = new CommentListAdapter(comments);
+        commentListAdapter = new CommentListAdapter(comments, Helper.isVideoOwner(PeertubeActivity.this, peertube));
         commentListAdapter.allCommentRemoved = PeertubeActivity.this;
         LinearLayoutManager mLayoutManager = new LinearLayoutManager(PeertubeActivity.this);
         lv_comments.setLayoutManager(mLayoutManager);
@@ -305,15 +303,29 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     if (firstVisibleItem + visibleItemCount == totalItemCount) {
                         if (!flag_loading) {
                             CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
-                            commentViewModel.getThread(videoId, max_id).observe(PeertubeActivity.this, apiresponse -> manageVIewComment(apiresponse));
+                            commentViewModel.getThread(sepiaSearch?peertubeInstance:null, videoUuid, max_id).observe(PeertubeActivity.this, apiresponse -> manageVIewComment(apiresponse));
                         }
                     }
                 }
             }
         });
-        playVideo();
+        if( 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);
+        }else {
+            playVideo();
+        }
     }
 
+    private void manageVIewVideos(APIResponse apiResponse) {
+        if( apiResponse == null || apiResponse.getPeertubes() == null || apiResponse.getPeertubes().size() == 0) {
+            playVideo();
+            return;
+        }
+        peertube = apiResponse.getPeertubes().get(0);
+        sepiaSearch = false;
+        playVideo();
+    }
 
     public void manageVIewComment(APIResponse apiResponse) {
         flag_loading = false;
@@ -344,7 +356,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         Bundle b = intent.getExtras();
         if (b != null) {
             peertubeInstance = b.getString("peertube_instance", Helper.getLiveInstance(PeertubeActivity.this));
-            videoId = b.getString("video_id", null);
+            videoUuid = b.getString("video_uuid", null);
             playVideo();
         }
     }
@@ -366,9 +378,9 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         peertube_playlist.setVisibility(View.VISIBLE);
         peertube_bookmark.setVisibility(View.GONE);
         TimelineVM feedsViewModel = new ViewModelProvider(PeertubeActivity.this).get(TimelineVM.class);
-        feedsViewModel.getVideo(videoId).observe(PeertubeActivity.this, this::manageVIewVideo);
+        feedsViewModel.getVideo(sepiaSearch?peertubeInstance:null, videoUuid, isMyVideo).observe(PeertubeActivity.this, this::manageVIewVideo);
         CaptionsVM captionsViewModel = new ViewModelProvider(PeertubeActivity.this).get(CaptionsVM.class);
-        captionsViewModel.getCaptions(videoId).observe(PeertubeActivity.this, this::manageCaptions);
+        captionsViewModel.getCaptions(sepiaSearch?peertubeInstance:null, videoUuid).observe(PeertubeActivity.this, this::manageCaptions);
     }
 
     public void change() {
@@ -407,11 +419,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         return super.dispatchTouchEvent(ev);
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(@NotNull Menu menu) {
-        getMenuInflater().inflate(R.menu.main_peertube, menu);
-        return true;
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -422,19 +429,6 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 finish();
             }
             return true;
-        } else if (item.getItemId() == R.id.action_report) {
-            androidx.appcompat.app.AlertDialog.Builder dialogBuilder = new androidx.appcompat.app.AlertDialog.Builder(PeertubeActivity.this);
-            LayoutInflater inflater1 = getLayoutInflater();
-            View dialogView = inflater1.inflate(R.layout.popup_report_choice, new LinearLayout(PeertubeActivity.this), false);
-            dialogBuilder.setView(dialogView);
-            Button report_video = dialogView.findViewById(R.id.report_video);
-            Button report_account = dialogView.findViewById(R.id.report_account);
-            dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
-            androidx.appcompat.app.AlertDialog alertDialog = dialogBuilder.create();
-            alertDialog.show();
-            report_video.setOnClickListener(v -> reportAlert(REPORT_VIDEO, alertDialog));
-            report_account.setOnClickListener(v -> reportAlert(REPORT_ACCOUNT, alertDialog));
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -493,6 +487,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     }
 
 
+    @SuppressLint("ClickableViewAccessibility")
     public void manageVIewVideo(APIResponse apiResponse) {
 
         if (apiResponse == null || (apiResponse.getError() != null) || apiResponse.getPeertubes() == null || apiResponse.getPeertubes().size() == 0) {
@@ -508,26 +503,37 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
 
         peertube = apiResponse.getPeertubes().get(0);
+        if( sepiaSearch) {
+            peertubeInstance = peertube.getAccount().getHost();
+        }
+        List<String> videoIds = new ArrayList<>();
+        videoIds.add(peertube.getId());
+        PlaylistsVM viewModel = new ViewModelProvider(this).get(PlaylistsVM.class);
+        viewModel.videoExists(videoIds).observe(this, this::manageVIewPlaylist);
 
 
         add_comment_read.setOnClickListener(v -> {
-            if (isLoggedIn(PeertubeActivity.this)) {
+            if (isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
                 add_comment_read.setVisibility(View.GONE);
                 add_comment_write.setVisibility(View.VISIBLE);
                 send.setVisibility(View.VISIBLE);
                 add_comment_write.requestFocus();
                 add_comment_write.setSelection(add_comment_write.getText().length());
             } else {
-                Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                if( sepiaSearch) {
+                    Toasty.info(PeertubeActivity.this, getString(R.string.federation_issue), Toasty.LENGTH_SHORT).show();
+                }else {
+                    Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                }
             }
 
         });
         send.setOnClickListener(v -> {
-            if (isLoggedIn(PeertubeActivity.this)) {
+            if (isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
                 String comment = add_comment_write.getText().toString();
                 if (comment.trim().length() > 0) {
-                    PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                    viewModel.comment(ADD_COMMENT, peertube.getId(), null, comment).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(ADD_COMMENT, apiResponse1));
+                    PostActionsVM viewModelComment = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
+                    viewModelComment.comment(ADD_COMMENT, peertube.getId(), null, comment).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(ADD_COMMENT, apiResponse1));
                     add_comment_write.setText("");
                     add_comment_read.setVisibility(View.VISIBLE);
                     add_comment_write.setVisibility(View.GONE);
@@ -535,67 +541,24 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                     add_comment_read.requestFocus();
                 }
             } else {
-                Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                if( sepiaSearch) {
+                    Toasty.info(PeertubeActivity.this, getString(R.string.federation_issue), Toasty.LENGTH_SHORT).show();
+                }else {
+                    Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                }
             }
         });
 
 
         peertube_playlist.setOnClickListener(v -> {
-            if (playlists != null && videoId != null) {
-                PopupMenu popup = new PopupMenu(PeertubeActivity.this, peertube_playlist);
-
-                for (Playlist playlist : playlists) {
-                    String title = null;
-                    boolean isPresent = false;
-                    String elementId = null;
-                    for (String playlistId : playlistForVideo) {
-                        if (playlist.getId().compareTo(playlistId) == 0) {
-                            title = "✔ " + playlist.getDisplayName();
-                            isPresent = true;
-                            elementId = playlistId;
-                            break;
-                        }
-                    }
-                    if (title == null) {
-                        title = playlist.getDisplayName();
-                    }
-                    MenuItem item = popup.getMenu().add(0, 0, Menu.NONE, title);
-                    boolean finalIsPresent = isPresent;
-                    String finalElementId = elementId;
-                    item.setOnMenuItemClickListener(item1 -> {
-                        item1.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
-                        item1.setActionView(new View(PeertubeActivity.this));
-                        item1.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
-                            @Override
-                            public boolean onMenuItemActionExpand(MenuItem item1) {
-                                return false;
-                            }
-
-                            @Override
-                            public boolean onMenuItemActionCollapse(MenuItem item1) {
-                                return false;
-                            }
-                        });
-                        if (finalIsPresent) {
-                            item1.setTitle(playlist.getDisplayName());
-                            playlistsViewModel.manage(PlaylistsVM.action.DELETE_VIDEOS, playlist, finalElementId).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.DELETE_VIDEOS, apiResponse3));
-                            playlistForVideo.remove(playlist.getId());
-                        } else {
-                            item1.setTitle("✔ " + playlist.getDisplayName());
-                            playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, playlist, videoId).observe(PeertubeActivity.this, apiResponse3 -> manageVIewPlaylists(PlaylistsVM.action.ADD_VIDEOS, apiResponse3));
-                            playlistForVideo.add(playlist.getId());
-                        }
-                        return false;
-                    });
-                    popup.show();
-                }
-            }
+            PlaylistsVM viewModelOwnerPlaylist = new ViewModelProvider(PeertubeActivity.this).get(PlaylistsVM.class);
+            viewModelOwnerPlaylist.manage(PlaylistsVM.action.GET_PLAYLISTS, null, null).observe(PeertubeActivity.this, this::manageVIewPlaylists);
         });
         no_action_text = findViewById(R.id.no_action_text);
 
         if (peertube.isCommentsEnabled()) {
             CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
-            commentViewModel.getThread(videoId, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
+            commentViewModel.getThread(sepiaSearch?peertubeInstance:null, videoUuid, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
             write_comment_container.setVisibility(View.VISIBLE);
 
         } else {
@@ -607,7 +570,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         }
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         setTitle(peertube.getName());
+
         peertube_description.setText(peertube.getDescription());
+
+
         peertube_title.setText(peertube.getName());
         peertube_dislike_count.setText(String.valueOf(peertube.getDislikes()));
         peertube_like_count.setText(String.valueOf(peertube.getLikes()));
@@ -618,10 +584,10 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         initResolution();
 
         peertube_like_count.setOnClickListener(v -> {
-            if (isLoggedIn(PeertubeActivity.this)) {
+            if (isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
                 String newState = peertube.getMyRating().equals("like") ? "none" : "like";
-                PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                viewModel.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
+                PostActionsVM viewModelLike = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
+                viewModelLike.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
                 peertube.setMyRating(newState);
                 int count = Integer.parseInt(peertube_like_count.getText().toString());
                 if (newState.compareTo("none") == 0) {
@@ -635,14 +601,18 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 peertube_like_count.setText(String.valueOf(count));
                 changeColor();
             } else {
-                Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                if( sepiaSearch) {
+                    Toasty.info(PeertubeActivity.this, getString(R.string.federation_issue), Toasty.LENGTH_SHORT).show();
+                }else {
+                    Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                }
             }
         });
         peertube_dislike_count.setOnClickListener(v -> {
-            if (isLoggedIn(PeertubeActivity.this)) {
+            if (isLoggedIn(PeertubeActivity.this) && !sepiaSearch) {
                 String newState = peertube.getMyRating().equals("dislike") ? "none" : "dislike";
-                PostActionsVM viewModel = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
-                viewModel.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
+                PostActionsVM viewModelLike = new ViewModelProvider(PeertubeActivity.this).get(PostActionsVM.class);
+                viewModelLike.post(RATEVIDEO, peertube.getId(), newState).observe(PeertubeActivity.this, apiResponse1 -> manageVIewPostActions(RATEVIDEO, apiResponse1));
                 peertube.setMyRating(newState);
                 int count = Integer.parseInt(peertube_dislike_count.getText().toString());
                 if (newState.compareTo("none") == 0) {
@@ -656,7 +626,11 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                 peertube_dislike_count.setText(String.valueOf(count));
                 changeColor();
             } else {
-                Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                if( sepiaSearch) {
+                    Toasty.info(PeertubeActivity.this, getString(R.string.federation_issue), Toasty.LENGTH_SHORT).show();
+                }else {
+                    Toasty.error(PeertubeActivity.this, getString(R.string.not_logged_in), Toast.LENGTH_SHORT).show();
+                }
             }
         });
 
@@ -665,21 +639,28 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
             int video_cache = sharedpreferences.getInt(Helper.SET_VIDEO_CACHE, Helper.DEFAULT_VIDEO_CACHE_MB);
             ProgressiveMediaSource videoSource;
-            if (video_cache == 0) {
-                DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
-                        Util.getUserAgent(PeertubeActivity.this, null), null);
-                videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory)
-                        .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
-            } else {
-                CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
-                videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
-                        .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
-            }
 
             player = ExoPlayerFactory.newSimpleInstance(PeertubeActivity.this);
             playerView.setPlayer(player);
             loader.setVisibility(View.GONE);
-            player.prepare(videoSource);
+
+            if (apiResponse.getPeertubes().get(0).getFiles() != null && apiResponse.getPeertubes().get(0).getFiles().size() > 0) {
+                if (video_cache == 0) {
+                    DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
+                            Util.getUserAgent(PeertubeActivity.this, null), null);
+                    videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory)
+                            .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
+                } else {
+                    CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
+                    videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
+                            .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
+                }
+                player.prepare(videoSource);
+            } else {
+                HlsMediaSource hlsMediaSource = new HlsMediaSource.Factory(new DefaultHttpDataSourceFactory(System.getProperty("http.agent")))
+                        .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getStreamingPlaylists().get(0).getPlaylistUrl()));
+                player.prepare(hlsMediaSource);
+            }
             player.setPlayWhenReady(true);
         }
 
@@ -753,7 +734,11 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
                             Uri uri = null;
                             if (which > 0) {
-                                uri = Uri.parse("https://" + getLiveInstance(PeertubeActivity.this) + captions.get(which - 1).getCaptionPath());
+                                if( !sepiaSearch) {
+                                    uri = Uri.parse("https://" + getLiveInstance(PeertubeActivity.this) + captions.get(which - 1).getCaptionPath());
+                                }else{
+                                    uri = Uri.parse("https://" + peertubeInstance + captions.get(which - 1).getCaptionPath());
+                                }
                             }
 
                             int video_cache = sharedpreferences.getInt(Helper.SET_VIDEO_CACHE, Helper.DEFAULT_VIDEO_CACHE_MB);
@@ -773,34 +758,35 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                                     Format.NO_VALUE,
                                     itemsKeyLanguage[which]);
 
-                            if (video_cache == 0) {
-                                DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
-                                        Util.getUserAgent(PeertubeActivity.this, null), null);
-                                videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory)
-                                        .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
-                                if (uri != null)
-                                    subtitleSource = new SingleSampleMediaSource.Factory(dataSourceFactory).createMediaSource(uri, subtitleFormat, C.TIME_UNSET);
-                                // subtitleSource = new SingleSampleMediaSource(uri, dataSourceFactory, subtitleFormat, C.TIME_UNSET);
 
-                            } else {
-                                CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
-                                videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
-                                        .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
-                                if (uri != null)
-                                    subtitleSource = new SingleSampleMediaSource.Factory(cacheDataSourceFactory).createMediaSource(uri, subtitleFormat, C.TIME_UNSET);
-                                //  subtitleSource = new SingleSampleMediaSource(uri, cacheDataSourceFactory, subtitleFormat, C.TIME_UNSET);
+                            if (apiResponse.getPeertubes().get(0).getFiles() != null && apiResponse.getPeertubes().get(0).getFiles().size() > 0) {
+                                if (video_cache == 0) {
+                                    DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(PeertubeActivity.this,
+                                            Util.getUserAgent(PeertubeActivity.this, null), null);
+                                    videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory)
+                                            .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
+                                    if (uri != null)
+                                        subtitleSource = new SingleSampleMediaSource.Factory(dataSourceFactory).createMediaSource(uri, subtitleFormat, C.TIME_UNSET);
+
+                                } else {
+                                    CacheDataSourceFactory cacheDataSourceFactory = new CacheDataSourceFactory(PeertubeActivity.this);
+                                    videoSource = new ProgressiveMediaSource.Factory(cacheDataSourceFactory)
+                                            .createMediaSource(Uri.parse(apiResponse.getPeertubes().get(0).getFileUrl(null, PeertubeActivity.this)));
+                                    if (uri != null)
+                                        subtitleSource = new SingleSampleMediaSource.Factory(cacheDataSourceFactory).createMediaSource(uri, subtitleFormat, C.TIME_UNSET);
+                                }
+                                playerView.setPlayer(player);
+                                if (which > 0 && subtitleSource != null) {
+                                    MergingMediaSource mergedSource =
+                                            new MergingMediaSource(videoSource, subtitleSource);
+                                    player.prepare(mergedSource);
+                                } else {
+                                    player.prepare(videoSource);
+                                }
+                                player.seekTo(0, position);
+                                player.setPlayWhenReady(true);
                             }
 
-                            playerView.setPlayer(player);
-                            if (which > 0 && subtitleSource != null) {
-                                MergingMediaSource mergedSource =
-                                        new MergingMediaSource(videoSource, subtitleSource);
-                                player.prepare(mergedSource);
-                            } else {
-                                player.prepare(videoSource);
-                            }
-                            player.seekTo(0, position);
-                            player.setPlayWhenReady(true);
 
                             dialog.dismiss();
                         });
@@ -815,6 +801,20 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
                         alertDialog.show();
 
                         break;
+
+                    case R.id.action_report:
+                        dialogBuilder = new androidx.appcompat.app.AlertDialog.Builder(PeertubeActivity.this);
+                        LayoutInflater inflater1 = getLayoutInflater();
+                        View dialogView = inflater1.inflate(R.layout.popup_report_choice, new LinearLayout(PeertubeActivity.this), false);
+                        dialogBuilder.setView(dialogView);
+                        Button report_video = dialogView.findViewById(R.id.report_video);
+                        Button report_account = dialogView.findViewById(R.id.report_account);
+                        dialogBuilder.setNeutralButton(R.string.cancel, (dialog, id) -> dialog.dismiss());
+                        alertDialog = dialogBuilder.create();
+                        alertDialog.show();
+                        report_video.setOnClickListener(v -> reportAlert(REPORT_VIDEO, alertDialog));
+                        report_account.setOnClickListener(v -> reportAlert(REPORT_ACCOUNT, alertDialog));
+                        break;
                 }
                 return true;
             });
@@ -874,6 +874,8 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
             MediaSessionCompat mediaSession = new MediaSessionCompat(this, getPackageName());
             MediaSessionConnector mediaSessionConnector = new MediaSessionConnector(mediaSession);
             mediaSessionConnector.setPlayer(player);
+            PlayerControlView controlView = playerView.findViewById(R.id.exo_controller);
+            controlView.hide();
             playerView.setControllerAutoShow(false);
             mediaSession.setActive(true);
             enterPictureInPictureMode();
@@ -974,7 +976,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
 
         if (peertube.isCommentsEnabled() && statusAction == ADD_COMMENT) {
             CommentVM commentViewModel = new ViewModelProvider(PeertubeActivity.this).get(CommentVM.class);
-            commentViewModel.getThread(videoId, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
+            commentViewModel.getThread(sepiaSearch?peertubeInstance:null, videoUuid, max_id).observe(PeertubeActivity.this, this::manageVIewComment);
         } else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_ACCOUNT) {
             Toasty.success(PeertubeActivity.this, getString(R.string.successful_report), Toasty.LENGTH_LONG).show();
         } else if (statusAction == RetrofitPeertubeAPI.ActionType.REPORT_VIDEO) {
@@ -1035,8 +1037,12 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
     private void initResolution() {
         PlayerControlView controlView = playerView.findViewById(R.id.exo_controller);
         resolution = controlView.findViewById(R.id.resolution);
-        resolution.setText(String.format("%s", Helper.defaultFile(PeertubeActivity.this, peertube.getFiles()).getResolutions().getLabel()));
-        resolution.setOnClickListener(v -> displayResolution());
+        if (peertube.getFiles() != null && peertube.getFiles().size() > 0) {
+            resolution.setText(String.format("%s", Helper.defaultFile(PeertubeActivity.this, peertube.getFiles()).getResolutions().getLabel()));
+            resolution.setOnClickListener(v -> displayResolution());
+        } else {
+            resolution.setVisibility(View.GONE);
+        }
     }
 
     private void changeColor() {
@@ -1068,27 +1074,86 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
         peertube_dislike_count.setCompoundDrawablesWithIntrinsicBounds(null, thumbDown, null, null);
     }
 
-    public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
-        if (actionType == GET_PLAYLISTS && apiResponse != null) {
-            playlists = apiResponse.getPlaylists();
-            playlistsViewModel.videoExists(videoId).observe(PeertubeActivity.this, this::manageVIewVideosExist);
+    public void manageVIewPlaylists(APIResponse apiResponse) {
+        if (apiResponse.getError() != null) {
+            return;
+        }
+        if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {
+            androidx.appcompat.app.AlertDialog.Builder builder = new androidx.appcompat.app.AlertDialog.Builder(PeertubeActivity.this);
+            builder.setTitle(R.string.modify_playlists);
+
+            List<PlaylistData.Playlist> ownerPlaylists = apiResponse.getPlaylists();
+            if( ownerPlaylists == null){
+                return;
+            }
+            String[] label = new String[ownerPlaylists.size()];
+            boolean[] checked = new boolean[ownerPlaylists.size()];
+            int i = 0;
+            List<PlaylistExist> playlistsForVideo = playlists.get(peertube.getId());
+
+
+            for (PlaylistData.Playlist playlist : ownerPlaylists) {
+                checked[i] = false;
+                if (playlistsForVideo != null) {
+                    for (PlaylistExist playlistExist : playlistsForVideo) {
+                        if (playlistExist != null && playlistExist.getPlaylistId().compareTo(playlist.getId()) == 0) {
+                            checked[i] = true;
+                            break;
+                        }
+                    }
+                }
+                label[i] = playlist.getDisplayName();
+                i++;
+            }
+
+            builder.setMultiChoiceItems(label, checked, (dialog, which, isChecked) -> {
+                PlaylistsVM playlistsViewModel = new ViewModelProvider(PeertubeActivity.this).get(PlaylistsVM.class);
+                if (isChecked) { //Add to playlist
+                    playlistsViewModel.manage(PlaylistsVM.action.ADD_VIDEOS, ownerPlaylists.get(which), peertube.getUuid()).observe(PeertubeActivity.this, apiResponse3 -> addElement(ownerPlaylists.get(which).getId(), peertube.getId(), apiResponse3));
+                } else { //Remove from playlist
+                    String elementInPlaylistId = null;
+                    for (PlaylistExist playlistExist : peertube.getPlaylistExists()) {
+                        if (playlistExist.getPlaylistId().compareTo(ownerPlaylists.get(which).getId()) == 0) {
+                            elementInPlaylistId = playlistExist.getPlaylistElementId();
+                        }
+                    }
+                    playlistsViewModel.manage(PlaylistsVM.action.DELETE_VIDEOS, ownerPlaylists.get(which), elementInPlaylistId);
+                    playlists.remove(peertube.getId());
+                }
+            });
+            builder.setPositiveButton(R.string.close, (dialog, which) -> dialog.dismiss());
+            androidx.appcompat.app.AlertDialog dialog = builder.create();
+            dialog.show();
+        }
+    }
+    public void manageVIewPlaylist(APIResponse apiResponse) {
+        if (apiResponse.getError() != null || apiResponse.getVideoExistPlaylist() == null) {
+            return;
+        }
+        if (playlists == null) {
+            playlists = new HashMap<>();
+        }
+        playlists.putAll(apiResponse.getVideoExistPlaylist());
+        peertube.setPlaylistExists(playlists.get(peertube.getId()));
+
+    }
+
+
+    public void addElement(String playlistId, String videoId, APIResponse apiResponse) {
+        if (apiResponse != null && apiResponse.getActionReturn() != null) {
+
+            PlaylistExist playlistExist = new PlaylistExist();
+            playlistExist.setPlaylistId(playlistId);
+            playlistExist.setPlaylistElementId(apiResponse.getActionReturn());
+            List<PlaylistExist> playlistExistList = playlists.get(videoId);
+            if (playlistExistList == null) {
+                playlistExistList = new ArrayList<>();
+            }
+            playlistExistList.add(playlistExist);
+            playlists.put(videoId, playlistExistList);
         }
     }
 
-    public void manageVIewVideosExist(APIResponse apiResponse) {
-        if (apiResponse.getError() == null && apiResponse.getVideoExistPlaylist() != null) {
-            Map<String, List<PlaylistExist>> videoIds = apiResponse.getVideoExistPlaylist();
-            Iterator<Map.Entry<String, List<PlaylistExist>>> it = videoIds.entrySet().iterator();
-            while (it.hasNext()) {
-                Map.Entry<String, List<PlaylistExist>> pair = it.next();
-                List<PlaylistExist> playlistExistVideo = pair.getValue();
-                for (PlaylistExist playlistExist : playlistExistVideo) {
-                    playlistForVideo.add(playlistExist.getPlaylistId());
-                }
-                it.remove();
-            }
-        }
-    }
 
     @Override
     public void onAllCommentRemoved() {

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

@@ -224,7 +224,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
 
 
         TimelineVM feedsViewModel = new ViewModelProvider(PeertubeEditUploadActivity.this).get(TimelineVM.class);
-        feedsViewModel.getMyVideo(videoId).observe(PeertubeEditUploadActivity.this, this::manageVIewVideo);
+        feedsViewModel.getMyVideo(null, videoId).observe(PeertubeEditUploadActivity.this, this::manageVIewVideo);
         channels = new LinkedHashMap<>();
 
         setTitle(R.string.edit_video);
@@ -457,12 +457,12 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
             videoParams.setDescription(description);
             videoParams.setNsfw(isNSFW1);
             videoParams.setCommentsEnabled(commentEnabled1);
-            videoParams.setCategory((int) finalCategoryToSend.getId());
+            videoParams.setCategory(finalCategoryToSend.getId());
             videoParams.setLicence(String.valueOf(finalLicenseToSend.getId()));
             videoParams.setLanguage(finalLanguageToSend.getId());
 
             videoParams.setChannelId(channelToSendId);
-            videoParams.setPrivacy((int) finalPrivacyToSend.getId());
+            videoParams.setPrivacy(finalPrivacyToSend.getId());
             List<String> tags = p_video_tags.getTags();
             videoParams.setTags(tags);
             set_upload_submit.setEnabled(false);
@@ -671,7 +671,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity {
         set_upload_submit.setEnabled(true);
     }
 
-    @SuppressWarnings("unused")
+    @SuppressWarnings({"unused", "RedundantSuppression"})
     public void manageVIewPostActions(RetrofitPeertubeAPI.ActionType statusAction, APIResponse apiResponse) {
         Intent intent = new Intent(PeertubeEditUploadActivity.this, MainActivity.class);
         intent.putExtra(Helper.INTENT_ACTION, Helper.RELOAD_MYVIDEOS);

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

@@ -16,46 +16,21 @@ package app.fedilab.fedilabtube;
 
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.fragment.app.FragmentTransaction;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import app.fedilab.fedilabtube.client.APIResponse;
-import app.fedilab.fedilabtube.client.data.PlaylistData.Playlist;
-import app.fedilab.fedilabtube.client.data.VideoData.Video;
-import app.fedilab.fedilabtube.client.data.VideoPlaylistData;
-import app.fedilab.fedilabtube.drawer.PeertubeAdapter;
-import app.fedilab.fedilabtube.viewmodel.PlaylistsVM;
+import app.fedilab.fedilabtube.client.data.PlaylistData;
+import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
+import app.fedilab.fedilabtube.helper.Helper;
+import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 import es.dmoral.toasty.Toasty;
 
-import static app.fedilab.fedilabtube.viewmodel.PlaylistsVM.action.GET_LIST_VIDEOS;
-
 
 public class PlaylistsActivity extends AppCompatActivity {
 
 
-    LinearLayoutManager mLayoutManager;
-    private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
-    private SwipeRefreshLayout swipeRefreshLayout;
-    private boolean swiped;
-    private List<Video> peertubes;
-    private String max_id;
-    private Playlist playlist;
-    private boolean firstLoad;
-    private boolean flag_loading;
-    private PeertubeAdapter peertubeAdapter;
-    private PlaylistsVM viewModel;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -65,72 +40,30 @@ public class PlaylistsActivity extends AppCompatActivity {
 
 
         setContentView(R.layout.activity_playlists);
-        peertubes = new ArrayList<>();
-
-        RecyclerView lv_playlist = findViewById(R.id.lv_playlist);
-        mainLoader = findViewById(R.id.loader);
-        nextElementLoader = findViewById(R.id.loading_next_status);
-        textviewNoAction = findViewById(R.id.no_action);
-        mainLoader.setVisibility(View.VISIBLE);
-        swipeRefreshLayout = findViewById(R.id.swipeContainer);
 
 
-        max_id = null;
-        flag_loading = true;
-        firstLoad = true;
-        swiped = false;
-
-
-        mainLoader.setVisibility(View.VISIBLE);
-        nextElementLoader.setVisibility(View.GONE);
-
-        peertubeAdapter = new PeertubeAdapter(this.peertubes);
-
-        lv_playlist.setAdapter(peertubeAdapter);
-        mLayoutManager = new LinearLayoutManager(PlaylistsActivity.this);
-        lv_playlist.setLayoutManager(mLayoutManager);
-
+        PlaylistData.Playlist playlist;
         Bundle b = getIntent().getExtras();
         if (b != null) {
             playlist = b.getParcelable("playlist");
+            if (playlist == null) {
+                return;
+            }
         } else {
             Toasty.error(PlaylistsActivity.this, getString(R.string.toast_error), Toast.LENGTH_LONG).show();
             return;
         }
-        if (getSupportActionBar() != null)
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         setTitle(playlist.getDisplayName());
+        if (savedInstanceState == null) {
+            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
+            Bundle bundle = new Bundle();
+            bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.VIDEOS_IN_PLAYLIST);
+            bundle.putSerializable("playlistId", playlist.getId());
+            displayVideosFragment.setArguments(bundle);
+            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+            ft.add(R.id.nav_host_fragment, displayVideosFragment).commit();
+        }
 
-        viewModel = new ViewModelProvider(PlaylistsActivity.this).get(PlaylistsVM.class);
-        lv_playlist.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();
-                if (dy > 0) {
-                    int visibleItemCount = mLayoutManager.getChildCount();
-                    int totalItemCount = mLayoutManager.getItemCount();
-                    if (firstVisibleItem + visibleItemCount == totalItemCount) {
-                        if (!flag_loading) {
-                            flag_loading = true;
-                            viewModel.manage(GET_LIST_VIDEOS, playlist, null).observe(PlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_LIST_VIDEOS, apiResponse));
-                            nextElementLoader.setVisibility(View.VISIBLE);
-                        }
-                    } else {
-                        nextElementLoader.setVisibility(View.GONE);
-                    }
-                }
-            }
-        });
-
-
-        swipeRefreshLayout.setOnRefreshListener(() -> {
-            max_id = null;
-            firstLoad = true;
-            flag_loading = true;
-            swiped = true;
-            viewModel.manage(GET_LIST_VIDEOS, playlist, null).observe(PlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_LIST_VIDEOS, apiResponse));
-        });
-        viewModel.manage(GET_LIST_VIDEOS, playlist, null).observe(PlaylistsActivity.this, apiResponse -> manageVIewPlaylists(PlaylistsVM.action.GET_LIST_VIDEOS, apiResponse));
     }
 
 
@@ -143,45 +76,4 @@ public class PlaylistsActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
-
-    public void manageVIewPlaylists(PlaylistsVM.action actionType, APIResponse apiResponse) {
-        mainLoader.setVisibility(View.GONE);
-        nextElementLoader.setVisibility(View.GONE);
-        if (apiResponse.getError() != null) {
-            Toasty.error(PlaylistsActivity.this, apiResponse.getError().getError(), Toast.LENGTH_LONG).show();
-            swipeRefreshLayout.setRefreshing(false);
-            swiped = false;
-            flag_loading = false;
-            return;
-        }
-        if (actionType == GET_LIST_VIDEOS) {
-
-            int previousPosition = this.peertubes.size();
-            List<VideoPlaylistData.VideoPlaylist> videoPlaylists = apiResponse.getVideoPlaylist();
-            List<Video> videos = new ArrayList<>();
-            for (VideoPlaylistData.VideoPlaylist v : videoPlaylists) {
-                videos.add(v.getVideo());
-            }
-            max_id = apiResponse.getMax_id();
-            flag_loading = (max_id == null);
-            if (!swiped && firstLoad && videos.size() == 0)
-                textviewNoAction.setVisibility(View.VISIBLE);
-            else
-                textviewNoAction.setVisibility(View.GONE);
-
-            if (swiped) {
-                if (previousPosition > 0) {
-                    this.peertubes.subList(0, previousPosition).clear();
-                    peertubeAdapter.notifyItemRangeRemoved(0, previousPosition);
-                }
-                swiped = false;
-            }
-            if (videos.size() > 0) {
-                this.peertubes.addAll(videos);
-                peertubeAdapter.notifyItemRangeInserted(previousPosition, videos.size());
-            }
-            swipeRefreshLayout.setRefreshing(false);
-            firstLoad = false;
-        }
-    }
 }

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

@@ -0,0 +1,412 @@
+package app.fedilab.fedilabtube;
+/* 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>. */
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+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;
+
+import com.mancj.materialsearchbar.MaterialSearchBar;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import app.fedilab.fedilabtube.client.entities.SepiaSearch;
+import app.fedilab.fedilabtube.fragment.DisplaySepiaSearchFragment;
+import app.fedilab.fedilabtube.helper.Helper;
+import mabbas007.tagsedittext.TagsEditText;
+
+import static app.fedilab.fedilabtube.MainActivity.peertubeInformation;
+import static app.fedilab.fedilabtube.PeertubeActivity.hideKeyboard;
+
+
+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;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_sepia_search);
+
+        sepiaSearchVideo = new SepiaSearch();
+        sepiaSearchChannel = new SepiaSearch();
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        sepiaSearchVideo.setCount(String.valueOf(sharedpreferences.getInt(Helper.SET_VIDEOS_PER_PAGE, Helper.VIDEOS_PER_PAGE)));
+        sepiaSearchVideo.setDurationMin(0);
+        sepiaSearchVideo.setDurationMax(9999999);
+        sepiaSearchVideo.setStart("0");
+        sepiaSearchVideo.setSort("-match");
+        if (getSupportActionBar() != null)
+            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);
+            }else{
+                filter_elements.setVisibility(View.VISIBLE);
+            }
+        });
+
+        RadioGroup sepia_element_nsfw = findViewById(R.id.sepia_element_nsfw);
+        sepia_element_nsfw.setOnCheckedChangeListener((group, checkedId) -> {
+            if (checkedId == R.id.sepia_element_nsfw_no) {
+                sepiaSearchVideo.setNsfw(false);
+            } else {
+                sepiaSearchVideo.setNsfw(true);
+            }
+        });
+
+        RadioGroup radio_date = findViewById(R.id.radio_date);
+        radio_date.setOnCheckedChangeListener((group, checkedId) -> {
+            switch(checkedId){
+                case R.id.sepia_element_published_date_today:
+                    Calendar cal = GregorianCalendar.getInstance();
+                    cal.set(Calendar.HOUR_OF_DAY, 0);
+                    cal.set(Calendar.MINUTE, 0);
+                    cal.set(Calendar.SECOND, 0);
+                    cal.set(Calendar.MILLISECOND, 0);
+                    sepiaSearchVideo.setStartDate(cal.getTime());
+                    break;
+                case R.id.sepia_element_published_date_last_7_days:
+                    cal = GregorianCalendar.getInstance();
+                    cal.setTime(new Date());
+                    cal.add(Calendar.DAY_OF_YEAR, -7);
+                    sepiaSearchVideo.setStartDate(cal.getTime());
+                    break;
+                case R.id.sepia_element_published_date_last_30_days:
+                    cal = GregorianCalendar.getInstance();
+                    cal.setTime(new Date());
+                    cal.add(Calendar.DAY_OF_YEAR, -30);
+                    sepiaSearchVideo.setStartDate(cal.getTime());
+                    break;
+                case R.id.sepia_element_published_date_last_365_days:
+                    cal = GregorianCalendar.getInstance();
+                    cal.setTime(new Date());
+                    cal.add(Calendar.DAY_OF_YEAR, -365);
+                    sepiaSearchVideo.setStartDate(cal.getTime());
+                    break;
+                default:
+                    sepiaSearchVideo.setStartDate(null);
+            }
+        });
+
+
+        RadioGroup duration = findViewById(R.id.duration);
+        duration.setOnCheckedChangeListener((group, checkedId) -> {
+            switch(checkedId){
+                case R.id.sepia_element_duration_short:
+                    sepiaSearchVideo.setDurationMin(0);
+                    sepiaSearchVideo.setDurationMax(240);
+                    break;
+                case R.id.sepia_element_duration_medium:
+                    sepiaSearchVideo.setDurationMin(240);
+                    sepiaSearchVideo.setDurationMax(600);
+                    break;
+                case R.id.sepia_element_duration_long:
+                    sepiaSearchVideo.setDurationMin(600);
+                    sepiaSearchVideo.setDurationMax(999999999);
+                    break;
+                default:
+                    sepiaSearchVideo.setDurationMin(0);
+                    sepiaSearchVideo.setDurationMax(999999999);
+                    break;
+            }
+        });
+
+
+
+        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() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                String orderby, channelOrderBy;
+                switch (position){
+                    case 1:
+                        orderby = "-publishedAt";
+                        channelOrderBy = "-createdAt";
+                        break;
+                    case 2:
+                        orderby = "publishedAt";
+                        channelOrderBy = "createdAt";
+                        break;
+                    default:
+                        orderby = "-match";
+                        channelOrderBy = null;
+                }
+                sepiaSearchVideo.setSort(orderby);
+                sepiaSearchChannel.setSort(channelOrderBy);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        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());
+        LinkedHashMap<String, String> languages = new LinkedHashMap<>(peertubeInformation.getLanguages());
+        LinkedHashMap<String, String> translations = new LinkedHashMap<>(peertubeInformation.getTranslations());
+
+        //Populate catgories
+        String[] categoriesA = new String[categories.size()+1];
+        categoriesA[0] = getString(R.string.display_all_categories);
+        Iterator<Map.Entry<Integer, String>> it = categories.entrySet().iterator();
+        int i = 1;
+        while (it.hasNext()) {
+            Map.Entry<Integer, String> pair = it.next();
+            if (translations.size() == 0 || !translations.containsKey(pair.getValue()))
+                categoriesA[i] = pair.getValue();
+            else
+                categoriesA[i] = translations.get(pair.getValue());
+            it.remove();
+            i++;
+        }
+        ArrayAdapter<String> adapterCatgories = new ArrayAdapter<>(SepiaSearchActivity.this,
+                android.R.layout.simple_spinner_dropdown_item, categoriesA);
+        sepia_element_category.setAdapter(adapterCatgories);
+
+
+        //Populate licenses
+        String[] licensesA = new String[licences.size()+1];
+        licensesA[0] = getString(R.string.display_all_licenses);
+        it = licences.entrySet().iterator();
+        i = 1;
+        while (it.hasNext()) {
+            Map.Entry<Integer, String> pair = it.next();
+            if (translations.size() == 0 || !translations.containsKey(pair.getValue()))
+                licensesA[i] = pair.getValue();
+            else
+                licensesA[i] = translations.get(pair.getValue());
+            it.remove();
+            i++;
+        }
+        ArrayAdapter<String> adapterLicenses = new ArrayAdapter<>(SepiaSearchActivity.this,
+                android.R.layout.simple_spinner_dropdown_item, licensesA);
+        sepia_element_license.setAdapter(adapterLicenses);
+
+        //Populate languages
+        String[] languagesA = new String[languages.size()+1];
+        languagesA[0] = getString(R.string.display_all_languages);
+        Iterator<Map.Entry<String, String>> itl = languages.entrySet().iterator();
+        i = 1;
+        while (itl.hasNext()) {
+            Map.Entry<String, String> pair = itl.next();
+            if (translations.size() == 0 || !translations.containsKey(pair.getValue()))
+                languagesA[i] = pair.getValue();
+            else
+                languagesA[i] = translations.get(pair.getValue());
+            itl.remove();
+            i++;
+        }
+        ArrayAdapter<String> adapterLanguages = new ArrayAdapter<>(SepiaSearchActivity.this,
+                android.R.layout.simple_spinner_dropdown_item, languagesA);
+        sepia_element_language.setAdapter(adapterLanguages);
+
+
+        sepia_element_license.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                updateLicensePosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        //Manage categories
+        sepia_element_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                updateCategoryPosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        //Manage languages
+        sepia_element_language.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                updateLanguagesPosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+
+
+        searchBar = findViewById(R.id.searchBar);
+
+        searchBar.setOnSearchActionListener(new MaterialSearchBar.OnSearchActionListener() {
+            @Override
+            public void onSearchStateChanged(boolean enabled) {
+
+            }
+
+            @Override
+            public void onSearchConfirmed(CharSequence text) {
+                makeSearch();
+            }
+
+            @Override
+            public void onButtonClicked(int buttonCode) {
+                makeSearch();
+            }
+        });
+        Button apply_filter = findViewById(R.id.apply_filter);
+        apply_filter.setOnClickListener(v-> makeSearch());
+
+        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());
+        }else{
+            sepiaSearchVideo.setTagsOneOf(null);
+        }
+        if( sepia_element_all_of_tags.getTags().size() > 0 ) {
+            sepiaSearchVideo.setTagsAllOf(sepia_element_all_of_tags.getTags());
+        }else{
+            sepiaSearchVideo.setTagsAllOf(null);
+        }
+
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("SEPIA_SEARCH");
+        if(fragment != null)
+            getSupportFragmentManager().beginTransaction().remove(fragment).commit();
+        filter_elements.setVisibility(View.GONE);
+        sepiaSearchVideo.setSearch(searchBar.getText());
+        DisplaySepiaSearchFragment displaySepiaSearchFragment = new DisplaySepiaSearchFragment();
+        Bundle bundle = new Bundle();
+        bundle.putParcelable("sepiaSearchVideo", sepiaSearchVideo);
+        displaySepiaSearchFragment.setArguments(bundle);
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.add(R.id.container, displaySepiaSearchFragment,"SEPIA_SEARCH").commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void updateLanguagesPosition(int position) {
+        LinkedHashMap<String, String> languagesCheck = new LinkedHashMap<>(peertubeInformation.getLanguages());
+        Iterator<Map.Entry<String, String>> it = languagesCheck.entrySet().iterator();
+        int i = 0;
+        while (it.hasNext()) {
+            Map.Entry<String, String> pair = it.next();
+            if (i == position && position > 0) {
+                List<String> languages = new ArrayList<>();
+                languages.add(pair.getKey());
+                sepiaSearchVideo.setBoostLanguages(languages);
+                break;
+            }else {
+                sepiaSearchVideo.setBoostLanguages(null);
+            }
+            it.remove();
+            i++;
+        }
+    }
+
+    private void updateCategoryPosition(int position) {
+        LinkedHashMap<Integer, String> categoriesCheck = new LinkedHashMap<>(peertubeInformation.getCategories());
+        Iterator<Map.Entry<Integer, String>> it = categoriesCheck.entrySet().iterator();
+        int i = 0;
+        while (it.hasNext()) {
+            Map.Entry<Integer, String> pair = it.next();
+            if (i == position && position > 0 ) {
+                List<Integer> categories = new ArrayList<>();
+                categories.add(pair.getKey());
+                sepiaSearchVideo.setCategoryOneOf(categories);
+                break;
+            }else {
+                sepiaSearchVideo.setCategoryOneOf(null);
+            }
+            it.remove();
+            i++;
+        }
+    }
+
+    private void updateLicensePosition(int position) {
+        LinkedHashMap<Integer, String> licensesCheck = new LinkedHashMap<>(peertubeInformation.getLicences());
+        Iterator<Map.Entry<Integer, String>> it = licensesCheck.entrySet().iterator();
+        int i = 0;
+        while (it.hasNext()) {
+            Map.Entry<Integer, String> pair = it.next();
+            if (i == position && position > 0) {
+                List<Integer> licenses = new ArrayList<>();
+                licenses.add(pair.getKey());
+                sepiaSearchVideo.setLicenceOneOf(licenses);
+                break;
+            }else {
+                sepiaSearchVideo.setLicenceOneOf(null);
+            }
+            it.remove();
+            i++;
+        }
+    }
+
+}

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

@@ -81,7 +81,7 @@ public class ShowAccountActivity extends AppCompatActivity {
     private ViewPager mPager;
     private TabLayout tabLayout;
     private TextView account_note, subscriber_count;
-    private List<Map<String, Boolean>> relationship;
+    private Map<String, Boolean> relationship;
     private ImageView account_pp;
     private TextView account_dn;
     private Channel channel;
@@ -312,7 +312,7 @@ public class ShowAccountActivity extends AppCompatActivity {
         }
         account_follow.setEnabled(true);
 
-        boolean isFollowing = relationship.get(0).get(channel.getAcct());
+        boolean isFollowing = relationship.get(channel.getAcct());
         if (isFollowing) {
             account_follow.setText(R.string.action_unfollow);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

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

@@ -72,6 +72,7 @@ import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.ActionType.UNFO
 import static app.fedilab.fedilabtube.client.RetrofitPeertubeAPI.DataType.CHANNEL;
 import static app.fedilab.fedilabtube.helper.Helper.getLiveInstance;
 import static app.fedilab.fedilabtube.helper.Helper.isLoggedIn;
+import static app.fedilab.fedilabtube.viewmodel.TimelineVM.TimelineType.SEPIA_SEARCH;
 
 
 public class ShowChannelActivity extends AppCompatActivity {
@@ -81,12 +82,14 @@ public class ShowChannelActivity extends AppCompatActivity {
     private ViewPager mPager;
     private TabLayout tabLayout;
     private TextView account_note, subscriber_count;
-    private List<Map<String, Boolean>> relationship;
+    private Map<String, Boolean> relationship;
     private ImageView account_pp;
     private TextView account_dn;
     private Channel channel;
     private action doAction;
     private String channelAcct;
+    private boolean sepiaSearch;
+    private String peertubeInstance;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -103,6 +106,9 @@ public class ShowChannelActivity extends AppCompatActivity {
         if (b != null) {
             channel = b.getParcelable("channel");
             channelAcct = b.getString("channelId");
+            sepiaSearch = b.getBoolean("sepia_search", false);
+            peertubeInstance = b.getString("peertube_instance", null);
+
         } else {
             Toasty.error(ShowChannelActivity.this, getString(R.string.toast_error_loading_account), Toast.LENGTH_LONG).show();
         }
@@ -116,14 +122,14 @@ public class ShowChannelActivity extends AppCompatActivity {
 
 
         ChannelsVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(ChannelsVM.class);
-        viewModel.get(CHANNEL, channelAcct == null ? channel.getAcct() : channelAcct).observe(ShowChannelActivity.this, this::manageViewAccounts);
+        viewModel.get(sepiaSearch?peertubeInstance:null, CHANNEL, channelAcct == null ? channel.getAcct() : channelAcct).observe(ShowChannelActivity.this, this::manageViewAccounts);
         manageChannel();
     }
 
     @Override
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         getMenuInflater().inflate(R.menu.main_account, menu);
-        if (!Helper.isLoggedIn(ShowChannelActivity.this)) {
+        if (!Helper.isLoggedIn(ShowChannelActivity.this) || sepiaSearch) {
             menu.findItem(R.id.action_mute).setVisible(false);
         }
         return true;
@@ -163,7 +169,7 @@ public class ShowChannelActivity extends AppCompatActivity {
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
 
         String accountIdRelation = channel.getAcct();
-        if (isLoggedIn(ShowChannelActivity.this)) {
+        if (isLoggedIn(ShowChannelActivity.this) && !sepiaSearch) {
             RelationshipVM viewModel = new ViewModelProvider(ShowChannelActivity.this).get(RelationshipVM.class);
             List<String> uids = new ArrayList<>();
             uids.add(accountIdRelation);
@@ -239,7 +245,7 @@ public class ShowChannelActivity extends AppCompatActivity {
 
 
         manageNotes(channel);
-        Helper.loadGiF(ShowChannelActivity.this, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, account_pp);
+        Helper.loadGiF(ShowChannelActivity.this, sepiaSearch?peertubeInstance:null, channel.getAvatar() != null ? channel.getAvatar().getPath() : null, account_pp);
         //Follow button
         String target = channel.getAcct();
 
@@ -311,7 +317,7 @@ public class ShowChannelActivity extends AppCompatActivity {
         }
         account_follow.setEnabled(true);
 
-        boolean isFollowing = relationship.get(0).get(channel.getAcct());
+        boolean isFollowing = relationship.get(channel.getAcct());
         if (isFollowing) {
             account_follow.setText(R.string.action_unfollow);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
@@ -412,21 +418,14 @@ public class ShowChannelActivity extends AppCompatActivity {
         @NotNull
         @Override
         public Fragment getItem(int position) {
+            DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
-            if (position == 0) {
-                DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
-                bundle = new Bundle();
-                bundle.putSerializable("timelineType", TimelineVM.TimelineType.USER_VIDEOS);
-                bundle.putString("channelId", channel.getAcct());
-                displayVideosFragment.setArguments(bundle);
-                return displayVideosFragment;
-            }
-            DisplayAccountsFragment displayAccountsFragment = new DisplayAccountsFragment();
-            bundle.putString("targetedid", channel.getId());
-            bundle.putString("instance", getLiveInstance(ShowChannelActivity.this));
-            bundle.putString("name", channel.getAcct());
-            displayAccountsFragment.setArguments(bundle);
-            return displayAccountsFragment;
+            bundle.putSerializable(Helper.TIMELINE_TYPE, TimelineVM.TimelineType.USER_VIDEOS);
+            bundle.putString("channelId", channel.getAcct());
+            bundle.putString("peertube_instance", channel.getHost());
+            bundle.putBoolean("sepia_search", sepiaSearch);
+            displayVideosFragment.setArguments(bundle);
+            return displayVideosFragment;
         }
 
 

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

@@ -21,10 +21,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentTransaction;
 
 import app.fedilab.fedilabtube.fragment.DisplayVideosFragment;
+import app.fedilab.fedilabtube.helper.Helper;
 import app.fedilab.fedilabtube.viewmodel.TimelineVM;
 
 
-public class MyVideosActivity extends AppCompatActivity {
+public class VideosTimelineActivity extends AppCompatActivity {
 
     private TimelineVM.TimelineType type;
 
@@ -43,8 +44,6 @@ public class MyVideosActivity extends AppCompatActivity {
 
         if (type == TimelineVM.TimelineType.MY_VIDEOS) {
             setTitle(R.string.my_videos);
-        } else if (type == TimelineVM.TimelineType.SUBSCRIBTIONS) {
-            setTitle(R.string.subscriptions);
         } else if (type == TimelineVM.TimelineType.HISTORY) {
             setTitle(R.string.my_history);
         } else if (type == TimelineVM.TimelineType.MOST_LIKED) {
@@ -54,7 +53,7 @@ public class MyVideosActivity extends AppCompatActivity {
         if (savedInstanceState == null) {
             DisplayVideosFragment displayVideosFragment = new DisplayVideosFragment();
             Bundle bundle = new Bundle();
-            bundle.putSerializable("type", type);
+            bundle.putSerializable(Helper.TIMELINE_TYPE, type);
             displayVideosFragment.setArguments(bundle);
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
             ft.add(R.id.container, displayVideosFragment).commit();

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

@@ -49,7 +49,7 @@ public class APIResponse {
     private List<NotificationData.Notification> peertubeNotifications = null;
     private List<PlaylistData.Playlist> playlists = null;
     private List<String> domains = null;
-    private List<Map<String, Boolean>> relationships = null;
+    private Map<String, Boolean> relationships = null;
     private List<CaptionData.Caption> captions = null;
     private Error error = null;
     private String since_id, max_id;
@@ -152,11 +152,11 @@ public class APIResponse {
         this.statusCode = statusCode;
     }
 
-    public List<Map<String, Boolean>> getRelationships() {
+    public Map<String, Boolean> getRelationships() {
         return relationships;
     }
 
-    public void setRelationships(List<Map<String, Boolean>> relationships) {
+    public void setRelationships(Map<String, Boolean> relationships) {
         this.relationships = relationships;
     }
 

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

@@ -55,8 +55,9 @@ import retrofit2.http.Path;
 import retrofit2.http.Query;
 import retrofit2.http.QueryMap;
 
-
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public interface PeertubeService {
+
     @GET("instances")
     Call<InstanceData> getInstances(@QueryMap Map<String, String> params, @Query("nsfwPolicy[]") String nsfwPolicy, @Query("categoriesOr[]") List<Integer> categories, @Query("languagesOr[]") List<String> languages);
 
@@ -65,7 +66,7 @@ public interface PeertubeService {
     Call<WellKnownNodeinfo> getWellKnownNodeinfo();
 
     @GET("{nodeInfoPath}")
-    Call<WellKnownNodeinfo.NodeInfo> getNodeinfo(@Path("nodeInfoPath") String nodeInfoPath);
+    Call<WellKnownNodeinfo.NodeInfo> getNodeinfo(@Path(value = "nodeInfoPath", encoded = true) String nodeInfoPath);
 
     @GET("{captionContent}")
     Call<String> getCaptionContent(@Path("captionContent") String captionContent);
@@ -116,7 +117,7 @@ public interface PeertubeService {
     //Timelines Authenticated
     //Subscriber timeline
     @GET("users/me/subscriptions/videos?sort=-publishedAt")
-    Call<VideoData> getSubscriptionVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getSubscriptionVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
 
     //Overview videos
     @GET("overviews/videos")
@@ -124,31 +125,31 @@ public interface PeertubeService {
 
     //Most liked videos
     @GET("videos?sort=-likes")
-    Call<VideoData> getMostLikedVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getMostLikedVideos(@Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
 
     //Most liked videos
     @GET("videos?sort=-trending")
-    Call<VideoData> getTrendingVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getTrendingVideos(@Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
 
     //Recently added videos
     @GET("videos?sort=-publishedAt")
-    Call<VideoData> getRecentlyAddedVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getRecentlyAddedVideos(@Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
 
     //Local videos
     @GET("videos?sort=-publishedAt&filter=local")
-    Call<VideoData> getLocalVideos(@Query("start") String maxId, @Query("languageOneOf") List<String> languageOneOf);
+    Call<VideoData> getLocalVideos(@Query("start") String maxId, @Query("count") String count, @Query("languageOneOf") List<String> languageOneOf);
 
     //History
     @GET("users/me/history/videos")
-    Call<VideoData> getHistory(@Header("Authorization") String credentials, @Query("start") String maxId);
+    Call<VideoData> getHistory(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count);
 
     //Search
     @GET("search/videos")
-    Call<VideoData> searchVideos(@Query("search") String search, @Query("start") String maxId);
+    Call<VideoData> searchVideos(@Query("search") String search, @Query("start") String maxId, @Query("count") String count);
 
     //Get notifications
     @GET("users/me/notifications")
-    Call<NotificationData> getNotifications(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("since_id") String sinceId);
+    Call<NotificationData> getNotifications(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count, @Query("since_id") String sinceId);
 
     //Get/Post/Update/Delete video
     //Get a video
@@ -160,11 +161,11 @@ public interface PeertubeService {
 
     //Get my video
     @GET("users/me/videos?sort=-publishedAt")
-    Call<VideoData> getMyVideos(@Header("Authorization") String credentials, @Query("start") String maxId);
+    Call<VideoData> getMyVideos(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count);
 
     //Get my video
     @GET("accounts/{name}/videos?sort=-publishedAt")
-    Call<VideoData.Video> getVideosForAccount(@Query("start") String maxId);
+    Call<VideoData.Video> getVideosForAccount(@Query("start") String maxId, @Query("count") String count);
 
     @Multipart
     @PUT("videos/{id}")
@@ -211,7 +212,7 @@ public interface PeertubeService {
     Call<ChannelData> getAllChannels();
 
     @GET("video-channels/{channelHandle}/videos")
-    Call<VideoData> getChannelVideos(@Path("channelHandle") String channelHandle, @Query("start") String maxId);
+    Call<VideoData> getChannelVideos(@Path("channelHandle") String channelHandle, @Query("start") String maxId, @Query("count") String count);
 
     @POST("video-channels")
     Call<ChannelData.ChannelCreation> addChannel(@Header("Authorization") String credentials, @Body ChannelParams channelParams);
@@ -235,10 +236,10 @@ public interface PeertubeService {
     Call<PlaylistData.Playlist> getPlaylist(@Path("id") String id);
 
     @GET("video-playlists/{id}/videos")
-    Call<VideoPlaylistData> getVideosPlayList(@Header("Authorization") String credentials, @Path("id") String id);
+    Call<VideoPlaylistData> getVideosPlayList(@Header("Authorization") String credentials, @Path("id") String id, @Query("start") String maxId, @Query("count") String count);
 
     @GET("users/me/video-playlists/videos-exist")
-    Call<Map<String, List<PlaylistExist>>> getVideoExistsInPlaylist(@Header("Authorization") String credentials, @Query("videoIds") String videoIds);
+    Call<Map<String, List<PlaylistExist>>> getVideoExistsInPlaylist(@Header("Authorization") String credentials, @Query("videoIds") List<String> videoIds);
 
     @Multipart
     @POST("video-playlists")
@@ -287,13 +288,10 @@ public interface PeertubeService {
     //Subscribe/Unsubscribe
     //subscribers
     @GET("users/me/subscriptions")
-    Call<AccountData> getSubscription(@Header("Authorization") String credentials, @Query("start") String maxId);
+    Call<ChannelData> getSubscription(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count);
 
     @GET("users/me/subscriptions/exist")
-    Call<List<Map<String, Boolean>>> getSubscriptionsExist(@Header("Authorization") String credentials, @Query("uris") List<String> uris);
-
-    @GET("users/me/subscriptions/exist")
-    Call<Map<String, Boolean>> getSubscriptionExists(@Header("Authorization") String credentials, @Query("uris") String uris);
+    Call<Map<String, Boolean>> getSubscriptionsExist(@Header("Authorization") String credentials, @Query("uris") List<String> uris);
 
     @FormUrlEncoded
     @POST("users/me/subscriptions")
@@ -305,7 +303,7 @@ public interface PeertubeService {
     //Mute/Unmute
     //Muted accounts
     @GET("users/me/blocklist/accounts")
-    Call<BlockData> getMuted(@Header("Authorization") String credentials, @Query("start") String maxId);
+    Call<BlockData> getMuted(@Header("Authorization") String credentials, @Query("start") String maxId, @Query("count") String count);
 
     @FormUrlEncoded
     @POST("users/me/blocklist/accounts")
@@ -327,7 +325,7 @@ public interface PeertubeService {
 
     //Comment
     @GET("videos/{id}/comment-threads")
-    Call<CommentData> getComments(@Path("id") String id, @Query("start") String maxId);
+    Call<CommentData> getComments(@Path("id") String id, @Query("start") String maxId, @Query("count") String count);
 
     @GET("videos/{id}/comment-threads/{threadId}")
     Call<CommentData> getReplies(@Path("id") String id, @Path("threadId") String threadId);
@@ -343,9 +341,12 @@ public interface PeertubeService {
     @DELETE("videos/{id}/comments/{commentId}")
     Call<String> deleteComment(@Header("Authorization") String credentials, @Path("id") String id, @Path("commentId") String commentId);
 
+    @POST("bulk/remove-comments-of")
+    Call<String> deleteAllCommentForAccount(@Header("Authorization") String credentials, @Field("accountName") String accountName, @Field("scope") String scope);
+
     @Headers({"Content-Type: application/json", "Cache-Control: max-age=640000"})
     @POST("abuses")
-    Call<String> report(
+    Call<Report.ReportReturn> report(
             @Header("Authorization") String credentials,
             @Body Report report);
 

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

@@ -25,6 +25,7 @@ import android.os.Looper;
 import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URL;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -78,6 +79,7 @@ import retrofit2.Response;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class RetrofitPeertubeAPI {
 
     private String finalUrl;
@@ -85,11 +87,14 @@ public class RetrofitPeertubeAPI {
     private String instance;
     private String token;
     private Set<String> selection;
+    private String count;
 
     public RetrofitPeertubeAPI(Context context) {
         _context = context;
         instance = Helper.getLiveInstance(context);
         finalUrl = "https://" + Helper.getLiveInstance(context) + "/api/v1/";
+        SharedPreferences sharedpreferences = _context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        count = String.valueOf(sharedpreferences.getInt(Helper.SET_VIDEOS_PER_PAGE, Helper.VIDEOS_PER_PAGE));
     }
 
     public RetrofitPeertubeAPI(Context context, String instance, String token) {
@@ -97,6 +102,8 @@ public class RetrofitPeertubeAPI {
         this.instance = instance;
         this.token = token;
         finalUrl = "https://" + instance + "/api/v1/";
+        SharedPreferences sharedpreferences = _context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        count = String.valueOf(sharedpreferences.getInt(Helper.SET_VIDEOS_PER_PAGE, Helper.VIDEOS_PER_PAGE));
     }
 
     public static void updateCredential(Activity activity, String token, String client_id, String client_secret, String refresh_token, String host) {
@@ -231,7 +238,8 @@ public class RetrofitPeertubeAPI {
     public APIResponse getNotifications(String max_id, String since_id) {
         APIResponse apiResponse = new APIResponse();
         PeertubeService peertubeService = init();
-        Call<NotificationData> notificationsCall = peertubeService.getNotifications("Bearer " + token, max_id, since_id);
+
+        Call<NotificationData> notificationsCall = peertubeService.getNotifications("Bearer " + token, max_id, "20", since_id);
         try {
             Response<NotificationData> response = notificationsCall.execute();
             if (response.isSuccessful() && response.body() != null) {
@@ -284,7 +292,7 @@ public class RetrofitPeertubeAPI {
     public APIResponse getVideosForChannel(String channelId, String max_id) {
         APIResponse apiResponse = new APIResponse();
         PeertubeService peertubeService = init();
-        Call<VideoData> videoCall = peertubeService.getChannelVideos(channelId, max_id);
+        Call<VideoData> videoCall = peertubeService.getChannelVideos(channelId, max_id, count);
         if (videoCall != null) {
             try {
                 Response<VideoData> response = videoCall.execute();
@@ -303,32 +311,36 @@ public class RetrofitPeertubeAPI {
         return apiResponse;
     }
 
-    public APIResponse getTL(TimelineVM.TimelineType timelineType, String max_id) {
+    public APIResponse getTL(TimelineVM.TimelineType timelineType, String max_id, String forAccount) {
         APIResponse apiResponse = new APIResponse();
         PeertubeService peertubeService = init();
         Call<VideoData> videoCall = null;
         ArrayList<String> filter = selection != null ? new ArrayList<>(selection) : null;
         switch (timelineType) {
             case MY_VIDEOS:
-                videoCall = peertubeService.getMyVideos(getToken(), max_id);
+                videoCall = peertubeService.getMyVideos(getToken(), max_id, count);
                 break;
             case SUBSCRIBTIONS:
-                videoCall = peertubeService.getSubscriptionVideos(getToken(), max_id, filter);
+                if (forAccount == null) {
+                    videoCall = peertubeService.getSubscriptionVideos(getToken(), max_id, count, filter);
+                } else {
+                    videoCall = peertubeService.getChannelVideos(forAccount, max_id, count);
+                }
                 break;
             case MOST_LIKED:
-                videoCall = peertubeService.getMostLikedVideos(max_id, filter);
+                videoCall = peertubeService.getMostLikedVideos(max_id, count, filter);
                 break;
             case LOCAL:
-                videoCall = peertubeService.getLocalVideos(max_id, filter);
+                videoCall = peertubeService.getLocalVideos(max_id, count, filter);
                 break;
             case TRENDING:
-                videoCall = peertubeService.getTrendingVideos(max_id, filter);
+                videoCall = peertubeService.getTrendingVideos(max_id, count, filter);
                 break;
             case HISTORY:
-                videoCall = peertubeService.getHistory(getToken(), max_id);
+                videoCall = peertubeService.getHistory(getToken(), max_id, count);
                 break;
             case RECENT:
-                videoCall = peertubeService.getRecentlyAddedVideos(max_id, filter);
+                videoCall = peertubeService.getRecentlyAddedVideos(max_id, count, filter);
                 break;
         }
         if (videoCall != null) {
@@ -378,21 +390,19 @@ public class RetrofitPeertubeAPI {
 
 
     /**
-     * Check if users via their uris are following the authenticated user
+     * Retrieves playlists for a video *synchronously*
      *
-     * @param uris List<String>
+     * @param videoIds List<String> ids of videos
      * @return APIResponse
      */
-    public APIResponse isFollowing(String uris) {
-        APIResponse apiResponse = new APIResponse();
+    public APIResponse getVideosExist(List<String> videoIds) {
         PeertubeService peertubeService = init();
-        Call<Map<String, Boolean>> followingCall = peertubeService.getSubscriptionExists(getToken(), uris);
+        APIResponse apiResponse = new APIResponse();
         try {
-            Response<Map<String, Boolean>> response = followingCall.execute();
-            if (response.isSuccessful()) {
-                List<Map<String, Boolean>> relations = new ArrayList<>();
-                relations.add(response.body());
-                apiResponse.setRelationships(relations);
+            Call<Map<String, List<PlaylistExist>>> videoExistsInPlaylist = peertubeService.getVideoExistsInPlaylist(getToken(), videoIds);
+            Response<Map<String, List<PlaylistExist>>> response = videoExistsInPlaylist.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                apiResponse.setVideoExistPlaylist(response.body());
             } else {
                 setError(apiResponse, response.code(), response.errorBody());
             }
@@ -402,6 +412,7 @@ public class RetrofitPeertubeAPI {
         return apiResponse;
     }
 
+
     /**
      * Check if users via their uris are following the authenticated user
      *
@@ -411,9 +422,9 @@ public class RetrofitPeertubeAPI {
     public APIResponse areFollowing(List<String> uris) {
         APIResponse apiResponse = new APIResponse();
         PeertubeService peertubeService = init();
-        Call<List<Map<String, Boolean>>> followingCall = peertubeService.getSubscriptionsExist(getToken(), uris);
+        Call<Map<String, Boolean>> followingCall = peertubeService.getSubscriptionsExist(getToken(), uris);
         try {
-            Response<List<Map<String, Boolean>>> response = followingCall.execute();
+            Response<Map<String, Boolean>> response = followingCall.execute();
             if (response.isSuccessful()) {
                 apiResponse.setRelationships(response.body());
             } else {
@@ -543,10 +554,14 @@ public class RetrofitPeertubeAPI {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        String lang = null;
-        if (PeertubeInformation.langueMapped.containsKey(Locale.getDefault().getLanguage()))
-            lang = PeertubeInformation.langueMapped.get(Locale.getDefault().getLanguage());
-
+        String lang = Locale.getDefault().getLanguage();
+        if (lang.contains("-")) {
+            if (!lang.split("-")[0].trim().toLowerCase().startsWith("zh")) {
+                lang = lang.split("-")[0];
+            } else {
+                lang = lang.split("-")[0] + "-" + lang.split("-")[1].toUpperCase();
+            }
+        }
         Call<Map<String, String>> translations = initTranslation().getTranslations(lang);
         try {
             Response<Map<String, String>> response = translations.execute();
@@ -556,7 +571,23 @@ public class RetrofitPeertubeAPI {
                 Error error = new Error();
                 error.setStatusCode(response.code());
                 if (response.errorBody() != null) {
-                    error.setError(response.errorBody().string());
+                    translations = initTranslation().getTranslations("en");
+                    try {
+                        response = translations.execute();
+                        if (response.isSuccessful()) {
+                            peertubeInformation.setTranslations(response.body());
+                        } else {
+                            error = new Error();
+                            error.setStatusCode(response.code());
+                            if (response.errorBody() != null) {
+                                error.setError(response.errorBody().string());
+                            } else {
+                                error.setError(_context.getString(R.string.toast_error));
+                            }
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                 } else {
                     error.setError(_context.getString(R.string.toast_error));
                 }
@@ -610,7 +641,7 @@ public class RetrofitPeertubeAPI {
      */
     public APIResponse searchPeertube(String query, String max_id) {
         PeertubeService peertubeService = init();
-        Call<VideoData> searchVideosCall = peertubeService.searchVideos(query, max_id);
+        Call<VideoData> searchVideosCall = peertubeService.searchVideos(query, max_id, count);
         APIResponse apiResponse = new APIResponse();
         try {
             Response<VideoData> response = searchVideosCall.execute();
@@ -661,12 +692,12 @@ public class RetrofitPeertubeAPI {
 
     public APIResponse report(Report report) {
         PeertubeService peertubeService = init();
-        Call<String> report1 = peertubeService.report(getToken(), report);
+        Call<Report.ReportReturn> report1 = peertubeService.report(getToken(), report);
         APIResponse apiResponse = new APIResponse();
         try {
-            Response<String> response = report1.execute();
-            if (response.isSuccessful()) {
-                apiResponse.setActionReturn(response.body());
+            Response<Report.ReportReturn> response = report1.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                apiResponse.setActionReturn(response.body().getItemStr().getLabel());
             } else {
                 setError(apiResponse, response.code(), response.errorBody());
             }
@@ -785,6 +816,9 @@ public class RetrofitPeertubeAPI {
             case PEERTUBEDELETECOMMENT:
                 postCall = peertubeService.deleteComment(getToken(), id, element);
                 break;
+            case PEERTUBE_DELETE_ALL_COMMENT_FOR_ACCOUNT:
+                postCall = peertubeService.deleteAllCommentForAccount(getToken(), id, element);
+                break;
             case DELETE_CHANNEL:
                 postCall = peertubeService.deleteChannel(getToken(), id);
                 break;
@@ -815,7 +849,7 @@ public class RetrofitPeertubeAPI {
      */
     public APIResponse getMuted(String maxId) {
         PeertubeService peertubeService = init();
-        Call<BlockData> accountDataCall = peertubeService.getMuted("Bearer " + token, maxId);
+        Call<BlockData> accountDataCall = peertubeService.getMuted("Bearer " + token, maxId, count);
         APIResponse apiResponse = new APIResponse();
         if (accountDataCall != null) {
             try {
@@ -843,13 +877,13 @@ public class RetrofitPeertubeAPI {
      */
     public APIResponse getSubscribtions(String maxId) {
         PeertubeService peertubeService = init();
-        Call<AccountData> accountDataCall = peertubeService.getSubscription("Bearer " + token, maxId);
+        Call<ChannelData> channelDataCall = peertubeService.getSubscription("Bearer " + token, maxId, count);
         APIResponse apiResponse = new APIResponse();
-        if (accountDataCall != null) {
+        if (channelDataCall != null) {
             try {
-                Response<AccountData> response = accountDataCall.execute();
+                Response<ChannelData> response = channelDataCall.execute();
                 if (response.isSuccessful() && response.body() != null) {
-                    apiResponse.setAccounts(response.body().data);
+                    apiResponse.setChannels(response.body().data);
                 } else {
                     setError(apiResponse, response.code(), response.errorBody());
                 }
@@ -933,13 +967,18 @@ public class RetrofitPeertubeAPI {
      * @return APIResponse
      */
     public WellKnownNodeinfo.NodeInfo getNodeInfo() {
-        PeertubeService peertubeService = init();
+        PeertubeService peertubeService = initTranslation();
         try {
             Call<WellKnownNodeinfo> wellKnownNodeinfoCall = peertubeService.getWellKnownNodeinfo();
             Response<WellKnownNodeinfo> response = wellKnownNodeinfoCall.execute();
             if (response.isSuccessful() && response.body() != null) {
-                if (response.body().getHref() != null) {
-                    Call<WellKnownNodeinfo.NodeInfo> nodeinfo = peertubeService.getNodeinfo(response.body().getHref());
+                int size = response.body().getLinks().size();
+                String url = response.body().getLinks().get(size - 1).getHref();
+                if (size > 0 && url != null) {
+                    peertubeService = initTranslation();
+                    String path = new URL(url).getPath();
+                    path = path.replaceFirst("/", "").trim();
+                    Call<WellKnownNodeinfo.NodeInfo> nodeinfo = peertubeService.getNodeinfo(path);
                     Response<WellKnownNodeinfo.NodeInfo> responseNodeInfo = nodeinfo.execute();
                     return responseNodeInfo.body();
                 }
@@ -968,7 +1007,6 @@ public class RetrofitPeertubeAPI {
                 try {
                     Response<ChannelData> response = channelDataCall.execute();
                     if (response.isSuccessful() && response.body() != null) {
-
                         apiResponse.setChannels(response.body().data);
                     } else {
                         setError(apiResponse, response.code(), response.errorBody());
@@ -1054,30 +1092,6 @@ public class RetrofitPeertubeAPI {
     }
 
 
-    /**
-     * Retrieves playlists for a video *synchronously*
-     *
-     * @param videoIds List<String> ids of videos
-     * @return APIResponse
-     */
-    public APIResponse getVideosExist(String videoIds) {
-        PeertubeService peertubeService = init();
-        APIResponse apiResponse = new APIResponse();
-        try {
-            Call<Map<String, List<PlaylistExist>>> videoExistsInPlaylist = peertubeService.getVideoExistsInPlaylist(getToken(), videoIds);
-            Response<Map<String, List<PlaylistExist>>> response = videoExistsInPlaylist.execute();
-            if (response.isSuccessful() && response.body() != null) {
-                apiResponse.setVideoExistPlaylist(response.body());
-            } else {
-                setError(apiResponse, response.code(), response.errorBody());
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return apiResponse;
-    }
-
-
     /**
      * Retrieves playlist  *synchronously*
      *
@@ -1086,12 +1100,11 @@ public class RetrofitPeertubeAPI {
      * @param videoId    String id of the video
      * @return APIResponse
      */
-    public APIResponse playlistAction(PlaylistsVM.action type, String playlistId, String videoId, String acct) {
+    public APIResponse playlistAction(PlaylistsVM.action type, String playlistId, String videoId, String acct, String max_id) {
         PeertubeService peertubeService = init();
 
         APIResponse apiResponse = new APIResponse();
         try {
-
             if (type == PlaylistsVM.action.GET_PLAYLIST_INFO) {
                 Call<PlaylistData.Playlist> playlistCall = peertubeService.getPlaylist(playlistId);
                 Response<PlaylistData.Playlist> response = playlistCall.execute();
@@ -1109,10 +1122,11 @@ public class RetrofitPeertubeAPI {
                 if (response.isSuccessful() && response.body() != null) {
                     apiResponse.setPlaylists(response.body().data);
                 } else {
+
                     setError(apiResponse, response.code(), response.errorBody());
                 }
             } else if (type == PlaylistsVM.action.GET_LIST_VIDEOS) {
-                Call<VideoPlaylistData> videosPlayList = peertubeService.getVideosPlayList(getToken(), playlistId);
+                Call<VideoPlaylistData> videosPlayList = peertubeService.getVideosPlayList(getToken(), playlistId, max_id, count);
                 Response<VideoPlaylistData> response = videosPlayList.execute();
                 if (response.isSuccessful() && response.body() != null) {
                     apiResponse.setVideoPlaylist(response.body().data);
@@ -1178,7 +1192,7 @@ public class RetrofitPeertubeAPI {
         APIResponse apiResponse = new APIResponse();
         try {
             if (type == CommentVM.action.GET_THREAD) {
-                Call<CommentData> commentsCall = peertubeService.getComments(videoId, max_id);
+                Call<CommentData> commentsCall = peertubeService.getComments(videoId, max_id, count);
                 Response<CommentData> response = commentsCall.execute();
                 if (response.isSuccessful() && response.body() != null) {
                     apiResponse.setComments(response.body().data);
@@ -1332,6 +1346,7 @@ public class RetrofitPeertubeAPI {
         APIResponse apiResponse = new APIResponse();
         try {
             Response<VideoData.Video> response = video.execute();
+
             if (response.isSuccessful()) {
                 List<VideoData.Video> videos = new ArrayList<>();
                 videos.add(response.body());
@@ -1372,6 +1387,7 @@ public class RetrofitPeertubeAPI {
         UNMUTE,
         RATEVIDEO,
         PEERTUBEDELETECOMMENT,
+        PEERTUBE_DELETE_ALL_COMMENT_FOR_ACCOUNT,
         PEERTUBEDELETEVIDEO,
         REPORT_VIDEO,
         REPORT_ACCOUNT,

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

@@ -0,0 +1,86 @@
+package app.fedilab.fedilabtube.client;
+/* 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>. */
+
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+import app.fedilab.fedilabtube.client.data.VideoData;
+import app.fedilab.fedilabtube.client.entities.SepiaSearch;
+import app.fedilab.fedilabtube.helper.Helper;
+import retrofit2.Call;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+public class RetrofitSepiaSearchAPI {
+
+
+    private String finalUrl;
+
+
+    public RetrofitSepiaSearchAPI() {
+        finalUrl = "https://search.joinpeertube.org/api/v1/";
+    }
+
+    private SepiaSearchService init() {
+        Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl(finalUrl)
+                .addConverterFactory(GsonConverterFactory.create())
+                .build();
+        return retrofit.create(SepiaSearchService.class);
+    }
+
+    /**
+     * Return videos for a sepia search
+     * @param sepiaSearch SepiaSearch
+     * @return VideoData
+     */
+    public VideoData getVideos(SepiaSearch sepiaSearch) {
+        SepiaSearchService sepiaSearchService = init();
+        SimpleDateFormat fmtOut = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH);
+        String startDate = null;
+        if(sepiaSearch.getStartDate() != null) {
+            startDate = fmtOut.format(sepiaSearch.getStartDate());
+        }
+        Call<VideoData> videoDataCall = sepiaSearchService.getVideos(
+                sepiaSearch.getStart(),
+                sepiaSearch.getCount(),
+                sepiaSearch.getSearch(),
+                sepiaSearch.getDurationMin(),
+                sepiaSearch.getDurationMax(),
+                startDate,
+                sepiaSearch.getBoostLanguages(),
+                sepiaSearch.getCategoryOneOf(),
+                sepiaSearch.getLicenceOneOf(),
+                sepiaSearch.getTagsOneOf(),
+                sepiaSearch.getTagsAllOf(),
+                sepiaSearch.isNsfw(),
+                sepiaSearch.getSort());
+
+        try {
+            Response<VideoData> response = videoDataCall.execute();
+            if (response.isSuccessful() && response.body() != null) {
+                return  response.body();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+}

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

@@ -0,0 +1,54 @@
+package app.fedilab.fedilabtube.client;
+/* 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>. */
+
+import java.util.Date;
+import java.util.List;
+
+import app.fedilab.fedilabtube.client.data.ChannelData;
+import app.fedilab.fedilabtube.client.data.VideoData;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+interface SepiaSearchService {
+
+    @GET("search/videos")
+    Call<VideoData> getVideos(
+            @Query("start") String maxId,
+            @Query("count") String count,
+            @Query("search") String search,
+            @Query("durationMin") int durationMin,
+            @Query("durationMax") int durationMax,
+            @Query("startDate") String startDate,
+            @Query("boostLanguages") List<String> languageOneOf,
+            @Query("categoryOneOf") List<Integer> categoryOneOf,
+            @Query("licenceOneOf") List<Integer> licenceOneOf,
+            @Query("tagsOneOf") List<String> tagsOneOf,
+            @Query("tagsAllOf") List<String> tagsAllOf,
+            @Query("nsfw") boolean nsfw,
+            @Query("sort") String sort
+
+
+    );
+
+    @GET("search/channels")
+    Call<ChannelData> getChannels(
+            @Query("search") String search,
+            @Query("start") String maxId,
+            @Query("count") String count
+    );
+
+}

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

@@ -25,7 +25,7 @@ import java.util.List;
 import app.fedilab.fedilabtube.client.entities.Avatar;
 
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class AccountData {
 
     @SerializedName("total")
@@ -77,7 +77,7 @@ public class AccountData {
         private String client_id;
         private String client_secret;
         private String refresh_token;
-        private boolean selected;
+
 
         public Account() {
         }
@@ -197,14 +197,6 @@ public class AccountData {
             this.url = url;
         }
 
-        public boolean isSelected() {
-            return selected;
-        }
-
-        public void setSelected(boolean selected) {
-            this.selected = selected;
-        }
-
         public String getAcct() {
             return name + "@" + host;
         }

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

@@ -19,6 +19,7 @@ import com.google.gson.annotations.SerializedName;
 import java.util.Date;
 import java.util.List;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class BlockData {
 
     @SerializedName("total")

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

@@ -20,7 +20,7 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.client.entities.ItemStr;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class CaptionData {
 
     @SerializedName("total")

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

@@ -27,7 +27,7 @@ import app.fedilab.fedilabtube.client.entities.Avatar;
 import app.fedilab.fedilabtube.client.entities.ItemStr;
 import app.fedilab.fedilabtube.client.entities.ViewsPerDay;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class ChannelData {
 
     @SerializedName("total")
@@ -80,6 +80,7 @@ public class ChannelData {
         @SerializedName("viewsPerDay")
         private List<ViewsPerDay> viewsPerDays;
         private String acct;
+        private boolean selected;
 
         public Channel() {
         }
@@ -243,6 +244,14 @@ public class ChannelData {
             this.viewsPerDays = viewsPerDays;
         }
 
+        public boolean isSelected() {
+            return selected;
+        }
+
+        public void setSelected(boolean selected) {
+            this.selected = selected;
+        }
+
         @Override
         public int describeContents() {
             return 0;

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

@@ -19,7 +19,7 @@ import com.google.gson.annotations.SerializedName;
 import java.util.Date;
 import java.util.List;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class CommentData {
 
     @SerializedName("total")

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

@@ -7,7 +7,7 @@ import com.google.gson.annotations.SerializedName;
 import java.util.Date;
 import java.util.List;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class InstanceData {
 
     @SerializedName("total")

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

@@ -23,7 +23,7 @@ import app.fedilab.fedilabtube.client.entities.VideoBlacklist;
  *
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class NotificationData {
 
     @SerializedName("total")

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

@@ -24,7 +24,7 @@ import java.util.List;
 
 import app.fedilab.fedilabtube.client.entities.Item;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class PlaylistData {
 
     @SerializedName("total")

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

@@ -30,11 +30,12 @@ import app.fedilab.fedilabtube.client.data.AccountData.Account;
 import app.fedilab.fedilabtube.client.entities.File;
 import app.fedilab.fedilabtube.client.entities.Item;
 import app.fedilab.fedilabtube.client.entities.ItemStr;
+import app.fedilab.fedilabtube.client.entities.PlaylistExist;
 import app.fedilab.fedilabtube.client.entities.StreamingPlaylists;
 import app.fedilab.fedilabtube.helper.Helper;
 
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class VideoData {
 
     @SerializedName("total")
@@ -80,6 +81,8 @@ public class VideoData {
         private int duration;
         @SerializedName("embedPath")
         private String embedPath;
+        @SerializedName("embedUrl")
+        private String embedUrl;
         @SerializedName("files")
         private List<File> files;
         @SerializedName("id")
@@ -129,6 +132,7 @@ public class VideoData {
         private boolean hasTitle = false;
         private String title;
         private titleType titleType;
+        private List<PlaylistExist> playlistExists;
 
         public Video() {
         }
@@ -149,6 +153,7 @@ public class VideoData {
             this.downloadEnabled = in.readByte() != 0;
             this.duration = in.readInt();
             this.embedPath = in.readString();
+            this.embedUrl = in.readString();
             this.files = new ArrayList<>();
             in.readList(this.files, File.class.getClassLoader());
             this.id = in.readString();
@@ -182,24 +187,34 @@ public class VideoData {
         public String getFileUrl(String resolution, Context context) {
             SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
             boolean streamService = sharedpreferences.getInt(Helper.SET_VIDEO_MODE, Helper.VIDEO_MODE_NORMAL) == Helper.VIDEO_MODE_STREAMING;
-            if (resolution != null) {
-                for (File file : files) {
-                    if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
-                        if (streamService) {
-                            return file.getMagnetUri();
-                        } else {
-                            return file.getFileUrl();
+            if (files != null && files.size() > 0) {
+                if (resolution != null) {
+                    for (File file : files) {
+                        if (file.getResolutions().getLabel().compareTo(resolution) == 0) {
+                            if (streamService) {
+                                return file.getMagnetUri();
+                            } else {
+                                return file.getFileUrl();
 
+                            }
                         }
                     }
                 }
-            }
-            if (streamService) {
-                return Helper.defaultFile(context, files).getMagnetUri();
-            } else {
-                return Helper.defaultFile(context, files).getFileUrl();
+                File file = Helper.defaultFile(context, files);
+                if (file != null) {
+                    if (streamService) {
+                        return file.getMagnetUri();
+                    } else {
+                        return file.getFileUrl();
 
+                    }
+                } else {
+                    return null;
+                }
+            } else if (streamingPlaylists != null && streamingPlaylists.size() > 0) {
+                return streamingPlaylists.get(0).getPlaylistUrl();
             }
+            return null;
         }
 
         public String getTorrentUrl(String resolution, Context context) {
@@ -337,6 +352,14 @@ public class VideoData {
             this.embedPath = embedPath;
         }
 
+        public String getEmbedUrl() {
+            return embedUrl;
+        }
+
+        public void setEmbedUrl(String embedUrl) {
+            this.embedUrl = embedUrl;
+        }
+
         public List<File> getFiles() {
             return files;
         }
@@ -545,6 +568,14 @@ public class VideoData {
             this.titleType = titleType;
         }
 
+        public List<PlaylistExist> getPlaylistExists() {
+            return playlistExists;
+        }
+
+        public void setPlaylistExists(List<PlaylistExist> playlistExists) {
+            this.playlistExists = playlistExists;
+        }
+
         @Override
         public int describeContents() {
             return 0;
@@ -565,6 +596,7 @@ public class VideoData {
             dest.writeByte(this.downloadEnabled ? (byte) 1 : (byte) 0);
             dest.writeInt(this.duration);
             dest.writeString(this.embedPath);
+            dest.writeString(this.embedUrl);
             dest.writeList(this.files);
             dest.writeString(this.id);
             dest.writeByte(this.isLocal ? (byte) 1 : (byte) 0);

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

@@ -20,7 +20,7 @@ import com.google.gson.annotations.SerializedName;
 import java.util.List;
 
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class VideoPlaylistData {
 
     @SerializedName("total")

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

@@ -14,7 +14,7 @@ package app.fedilab.fedilabtube.client.entities;
  *
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class AccountCreation {
 
     private String username;

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

@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class Actor {
     @SerializedName("type")
     private String type;

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

@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class ActorFollow {
 
     @SerializedName("id")

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

@@ -21,7 +21,7 @@ import java.util.Date;
  *
  * You should have received a copy of the GNU General Public License along with TubeLab; if not,
  * see <http://www.gnu.org/licenses>. */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class Avatar implements Parcelable {
 
 

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

@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class CaptionsParams {
 
     @SerializedName("captionLanguage")

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

@@ -16,7 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class ChannelParams {
 
     @SerializedName("displayName")

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

@@ -22,6 +22,7 @@ import android.widget.Toast;
 import app.fedilab.fedilabtube.R;
 import es.dmoral.toasty.Toasty;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class Error extends Throwable {
 
     private String error = null;

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

@@ -3,7 +3,7 @@ package app.fedilab.fedilabtube.client.entities;
 import com.google.gson.annotations.SerializedName;
 
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class File {
 
     @SerializedName("fileDownloadUrl")

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

@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import java.util.List;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class InstanceParams {
 
     private boolean healthy = true;

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

@@ -19,6 +19,7 @@ import android.os.Parcelable;
 
 import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class Item implements Parcelable {
 
     public static final Parcelable.Creator<Item> CREATOR = new Parcelable.Creator<Item>() {

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

@@ -19,7 +19,7 @@ import android.os.Parcelable;
 
 import com.google.gson.annotations.SerializedName;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class ItemStr implements Parcelable {
 
     public static final Creator<ItemStr> CREATOR = new Creator<ItemStr>() {

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

@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class NotificationSettings {
 
     @SerializedName("abuseAsModerator")

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

@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class Oauth {
 
     @SerializedName("client_id")

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

@@ -16,6 +16,7 @@ package app.fedilab.fedilabtube.client.entities;
 
 import com.google.gson.annotations.SerializedName;
 
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class OauthParams {
 
 

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

@@ -21,7 +21,7 @@ import java.util.List;
 import app.fedilab.fedilabtube.client.data.ChannelData.Channel;
 import app.fedilab.fedilabtube.client.data.VideoData.Video;
 
-@SuppressWarnings({"unused"})
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class OverviewVideo {
 
     @SerializedName("categories")

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

@@ -14,33 +14,11 @@ package app.fedilab.fedilabtube.client.entities;
  * 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.LinkedHashMap;
 import java.util.Map;
 
-
+@SuppressWarnings({"unused", "RedundantSuppression"})
 public class PeertubeInformation {
 
-
-    public static final Map<String, String> langueMapped;
-
-    static {
-        Map<String, String> aMap = new LinkedHashMap<>();
-        aMap.put("ca", "ca-ES");
-        aMap.put("de", "de-DE");
-        aMap.put("en", "en-US");
-        aMap.put("es", "es-ES");
-        aMap.put("eo", "eo");
-        aMap.put("eu", "eu-ES");
-        aMap.put("fr", "fr-FR");
-        aMap.put("oc", "oc");
-        aMap.put("pt", "pt-BR");
-        aMap.put("sv", "sv-SE");
-        aMap.put("cs", "cs-CZ");
-        aMap.put("zh-CN", "zh-Hans-CN");
-        aMap.put("zh-TW", "zh-Hans-TW");
-        langueMapped = aMap;
-    }
-
     private Map<Integer, String> categories;
     private Map<String, String> languages;
     private Map<Integer, String> licences;