Merge pull request #10 from sschueller/develop

synching up
2020-07-04 07:35:26 -07:00 · 2020-07-04 07:35:26 -07:00 · d6d2f4a9ca
commit d6d2f4a9ca
parent d4b4f3f023 555db86072
16 changed files with 157 additions and 76 deletions
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@ -21,11 +21,16 @@ package net.schueller.peertube.activity;

 import android.annotation.SuppressLint;
 import android.app.AppOpsManager;
+import android.app.PendingIntent;
 import android.app.PictureInPictureParams;
+import android.app.RemoteAction;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.os.Bundle;

@ -49,12 +54,18 @@ import net.schueller.peertube.fragment.VideoMetaDataFragment;
 import net.schueller.peertube.fragment.VideoPlayerFragment;
 import net.schueller.peertube.service.VideoPlayerService;

+
+import java.util.ArrayList;
 import java.util.Objects;

 import androidx.fragment.app.FragmentManager;


 //import static net.schueller.peertube.helper.Constants.BACKGROUND_PLAY_PREF_KEY;
+import static com.google.android.exoplayer2.ui.PlayerNotificationManager.ACTION_PAUSE;
+import static com.google.android.exoplayer2.ui.PlayerNotificationManager.ACTION_PLAY;
+import static com.google.android.exoplayer2.ui.PlayerNotificationManager.ACTION_STOP;
+import static net.schueller.peertube.helper.Constants.BACKGROUND_AUDIO;
 import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
 import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;

@ -62,7 +73,108 @@ public class VideoPlayActivity extends AppCompatActivity {

    private static final String TAG = "VideoPlayActivity";

+    private static boolean floatMode = false;
+    private static final int REQUEST_CODE = 101;
+    private BroadcastReceiver receiver;
+    //This can only be called when in entering pip mode which can't happen if the device doesn't support pip mode.
+    @SuppressLint("NewApi")
+    public void makePipControls() {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);

+        ArrayList<RemoteAction> actions = new ArrayList<>();
+
+        Intent actionIntent = new Intent(BACKGROUND_AUDIO);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(getApplicationContext(), REQUEST_CODE, actionIntent, 0);
+        @SuppressLint({"NewApi", "LocalSuppress"}) Icon icon = Icon.createWithResource(getApplicationContext(), android.R.drawable.stat_sys_speakerphone);
+        @SuppressLint({"NewApi", "LocalSuppress"}) RemoteAction remoteAction = new RemoteAction(icon, "close pip", "from pip window custom command", pendingIntent);
+        actions.add(remoteAction);
+
+        actionIntent = new Intent(ACTION_STOP);
+        pendingIntent = PendingIntent.getBroadcast(getApplicationContext(), REQUEST_CODE, actionIntent, 0);
+        icon = Icon.createWithResource(getApplicationContext(), com.google.android.exoplayer2.ui.R.drawable.exo_notification_stop);
+        remoteAction = new RemoteAction(icon, "play", "stop the media", pendingIntent);
+        actions.add(remoteAction);
+
+        if (videoPlayerFragment.isPaused()){
+            Log.e(TAG,"setting actions with play button");
+            actionIntent = new Intent(ACTION_PLAY);
+            pendingIntent = PendingIntent.getBroadcast(getApplicationContext(), REQUEST_CODE, actionIntent, 0);
+            icon = Icon.createWithResource(getApplicationContext(), com.google.android.exoplayer2.ui.R.drawable.exo_notification_play);
+            remoteAction = new RemoteAction(icon, "play", "play the media", pendingIntent);
+            actions.add(remoteAction);
+        } else {
+            Log.e(TAG,"setting actions with pause button");
+            actionIntent = new Intent(ACTION_PAUSE);
+            pendingIntent = PendingIntent.getBroadcast(getApplicationContext(), REQUEST_CODE, actionIntent, 0);
+            icon = Icon.createWithResource(getApplicationContext(), com.google.android.exoplayer2.ui.R.drawable.exo_notification_pause);
+            remoteAction = new RemoteAction(icon, "pause", "pause the media", pendingIntent);
+            actions.add(remoteAction);
+        }
+
+
+        //add custom actions to pip window
+        PictureInPictureParams params =
+                new PictureInPictureParams.Builder()
+                        .setActions(actions)
+                        .build();
+        setPictureInPictureParams(params);
+
+    }
+    public void changedToPipMode() {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);
+
+        videoPlayerFragment.showControls(false);
+        //create custom actions
+        makePipControls();
+
+        //setup receiver to handle customer actions
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_STOP);
+        filter.addAction(ACTION_PAUSE);
+        filter.addAction(ACTION_PLAY);
+        filter.addAction((BACKGROUND_AUDIO));
+        receiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                String action = intent.getAction();
+                if (action.equals(ACTION_PAUSE)) {
+                    videoPlayerFragment.pauseVideo();
+                    makePipControls();
+                }
+                if (action.equals(ACTION_PLAY)) {
+                    videoPlayerFragment.unPauseVideo();
+                    makePipControls();
+                }
+
+                if (action.equals(BACKGROUND_AUDIO)) {
+                    unregisterReceiver(receiver);
+                    finish();
+                }
+                if (action.equals(ACTION_STOP)) {
+                    unregisterReceiver(receiver);
+                    finishAndRemoveTask();
+                }
+            }
+        };
+        registerReceiver(receiver, filter);
+
+        Log.v(TAG, "switched to pip ");
+        floatMode=true;
+        videoPlayerFragment.showControls(false);
+    }
+    public void changedToNormalMode(){
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);
+
+        videoPlayerFragment.showControls(true);
+        if (receiver != null) {
+            unregisterReceiver(receiver);
+        }
+        Log.v(TAG,"switched to normal");
+        floatMode=false;
+    }
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@ -357,9 +469,11 @@ public class VideoPlayActivity extends AppCompatActivity {
        VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);

        if (isInPictureInPictureMode) {
+            changedToPipMode();
            Log.v(TAG,"switched to pip ");
            videoPlayerFragment.useController(false);
        } else {
+            changedToNormalMode();
            Log.v(TAG,"switched to normal");
            videoPlayerFragment.useController(true);
        }
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@ -268,6 +268,17 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
            mService.player.setPlayWhenReady(!mService.player.getPlayWhenReady());
        }
    }
+    public void unPauseVideo() {
+        if (mBound) {
+            mService.player.setPlayWhenReady(true);
+        }
+    }
+    public boolean isPaused(){
+        return !mService.player.getPlayWhenReady();
+    }
+    public void showControls(boolean value){
+        simpleExoPlayerView.setUseController(value);
+    }
    public void stopVideo() {

        if (mBound) {
--- a/app/src/main/java/net/schueller/peertube/helper/Constants.java
+++ b/app/src/main/java/net/schueller/peertube/helper/Constants.java
@ -21,4 +21,5 @@ public class Constants {
    public static final String THEME_PREF_KEY = "pref_theme";
    public static final String DEFAULT_THEME = "AppTheme.BLUE";
    public static final String BACKGROUND_PLAY_PREF_KEY = "pref_background_play";
+    public static final String BACKGROUND_AUDIO = "BACKGROUND_AUDIO";
 }
--- a/app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.java
+++ b/app/src/main/java/net/schueller/peertube/helper/MetaDataHelper.java
@ -28,10 +28,9 @@ import java.util.Date;
 public class MetaDataHelper {

    public static String getMetaString(Date getCreatedAt, Integer viewCount, Context context) {
-        return DateUtils.
-                getRelativeTimeSpanString(getCreatedAt.getTime()).toString() +
+        return (DateUtils.getRelativeTimeSpanString(context,getCreatedAt.getTime(),false).toString() +
                context.getResources().getString(R.string.meta_data_seperator) +
-                viewCount + context.getResources().getString(R.string.meta_data_views);
+                viewCount + context.getResources().getString(R.string.meta_data_views));
    }

    public static String getOwnerString(String accountName, String serverHost, Context context) {
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@ -64,6 +64,7 @@ import net.schueller.peertube.model.Video;

 import static android.media.session.PlaybackState.ACTION_PAUSE;
 import static android.media.session.PlaybackState.ACTION_PLAY;
+import static com.google.android.exoplayer2.ui.PlayerNotificationManager.ACTION_STOP;
 import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;

 public class VideoPlayerService extends Service {
@ -107,6 +108,7 @@ public class VideoPlayerService extends Service {
                if (playbackState == ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped
                    Log.v(TAG, "ACTION_PAUSE: " + playbackState);
                    unregisterReceiver(myNoisyAudioStreamReceiver);
+                    myNoisyAudioStreamReceiver=null;
                }
            }
        } );
@ -243,6 +245,7 @@ public class VideoPlayerService extends Service {

        // don't show skip buttons in notification
        playerNotificationManager.setUseNavigationActions(false);
+        playerNotificationManager.setUseStopAction(true);

        playerNotificationManager.setNotificationListener(
                new PlayerNotificationManager.NotificationListener() {
@ -254,9 +257,18 @@ public class VideoPlayerService extends Service {
                    @Override
                    public void onNotificationCancelled(int notificationId) {
                        Log.v(TAG, "onNotificationCancelled...");
+                        stopForeground(true);
+                        Intent killFloat = new Intent(ACTION_STOP);
+                        sendBroadcast(killFloat);
+                   /*
+                        Intent killFloat = new Intent(BROADCAST_ACTION);
+                        Intent killFloatingWindow = new Intent(getApplicationContext(),VideoPlayActivity.class);
+                        killFloatingWindow.putExtra("killFloat",true);

+                        startActivity(killFloatingWindow);
                        // TODO: only kill the notification if we no longer have a bound activity
                        stopForeground(true);
+                    */
                    }
                }
        );
--- a/app/src/main/res/layout/row_video.xml
+++ b/app/src/main/res/layout/row_video.xml
@ -3,6 +3,7 @@
    xmlns:card_view="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
+    android:focusable="true"
    card_view:cardCornerRadius="0dp"
    card_view:cardElevation="0dp"
    card_view:contentPadding="0dp"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Thorium</string>
-    <string name="title_activity_video_play">نشاط تشغيل الفيديو</string>
    <string name="title_activity_settings">الإعدادات</string>
    <string name="title_activity_login">تسجيل الدخول</string>
    <!-- Strings related to login -->
@ -24,13 +22,9 @@
    <string name="bottom_nav_title_subscriptions">الإشتراكات</string>
    <string name="bottom_nav_title_account">الحساب</string>
    <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
-    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
    <string name="pref_title_peertube_server">خادوم PeerTube</string>
    <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator">\u0020-\u0020</string>
    <string name="meta_data_views">\u0020 مشاهدات</string>
-    <string name="meta_data_owner_seperator">\@</string>
    <string name="video_row_video_thumbnail">الصورة المصغرة للفيديو</string>
    <string name="video_row_account_avatar">الصورة الرمزية للحساب</string>
    <string name="pref_title_show_nsfw">عرض NSFW</string>
@ -51,7 +45,6 @@
    <string name="no_data_available">لاتوجد نتائج</string>
    <string name="descr_overflow_button">المزيد</string>
    <string name="menu_share">مشاركة</string>
-    <string name="playback_channel_name">PeerTube</string>
    <string name="invalid_url">الرابط غير صالح.</string>
    <string name="pref_title_dark_mode">الوضع الداكن</string>
    <string name="pref_description_dark_mode">أعد تشغيل التطبيق لتنشيط الوضع الداكن.</string>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Thorium</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="title_activity_settings">সেটিংস</string>
    <string name="title_activity_login">সাইন ইন</string>
    <!-- Strings related to login -->
@ -25,13 +23,9 @@
    <string name="bottom_nav_title_subscriptions">সাবস্ক্রিপশন</string>
    <string name="bottom_nav_title_account">অ্যাকাউন্ট</string>
    <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
-    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
    <string name="pref_title_peertube_server">পিয়ারটিউব সার্ভার</string>
    <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
    <string name="meta_data_views">" দৃষ্ট"</string>
-    <string name="meta_data_owner_seperator" translatable="false">\@</string>
    <string name="video_row_video_thumbnail">ভিডিও থাম্বনেইল</string>
    <string name="video_row_account_avatar">অ্যাকাউন্ট অবতার</string>
    <string name="pref_title_show_nsfw">নিষিদ্ধ কন্টেন্ট</string>
@ -52,7 +46,6 @@
    <string name="no_data_available">ফলাফল নেই</string>
    <string name="descr_overflow_button">আরও</string>
    <string name="menu_share">শেয়ার</string>
-    <string name="playback_channel_name" translatable="false">PeerTube</string>
    <string name="invalid_url">অবৈধ ইউআরএল।</string>
    <string name="pref_title_dark_mode">অন্ধকার মোড</string>
    <string name="pref_description_dark_mode">অন্ধকার মোড কার্যকর করার জন্য অ্যাপ্লিকেশন রিস্টার্ট করো।</string>
@ -272,15 +265,6 @@
    <string name="video_speed_10">Normal</string>
    <string name="video_speed_15">১.৫x</string>
    <string name="video_speed_20">2x</string>
-    <string name="video_speed_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_expand_icon" translatable="false">{faw-expand}</string>
-    <string name="video_compress_icon" translatable="false">{faw-compress}</string>
-    <string name="video_more_icon" translatable="false">{faw-ellipsis-v}</string>
-    <string name="video_thumbs_up_icon" translatable="false">{faw-thumbs-up}</string>
-    <string name="video_thumbs_down_icon" translatable="false">{faw-thumbs-down}</string>
-    <string name="video_share_icon" translatable="false">{faw-share}</string>
-    <string name="video_download_icon" translatable="false">{faw-download}</string>
-    <string name="video_save_icon" translatable="false">{faw-save}</string>
    <string name="pref_title_background_play">ব্যাকগ্রাউন্ড প্লেব্যাক</string>
    <string name="pref_description_background_play">সক্রিয় থাকলে ব্যাকগ্রাউন্ডে ভিডিও প্লে করতে থাকবে।</string>
    <string name="bottom_nav_title_local">স্থানীয়</string>
@ -298,15 +282,6 @@
    <string name="video_meta_button_language">ভাষা</string>
    <string name="video_meta_button_tags">Tags</string>
    <!-- Constants, Don't translate -->
-    <string name="pref_token_access" translatable="false">pref_token_access</string>
-    <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
-    <string name="pref_token_expiration" translatable="false">pref_token_expiration</string>
-    <string name="pref_token_type" translatable="false">pref_token_type</string>
-    <string name="pref_auth_username" translatable="false">pref_auth_username</string>
-    <string name="pref_auth_password" translatable="false">pref_auth_password</string>
-    <string name="video_rating_none" translatable="false">none</string>
-    <string name="video_rating_like" translatable="false">like</string>
-    <string name="video_rating_dislike" translatable="false">dislike</string>
    <string name="deeppurple">গাঢ় বেগুনি</string>
    <string name="action_bar_title_account">অ্যাকাউন্ট</string>
    <string name="bottom_nav_title_recent">সাম্প্রতিক</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -16,7 +16,6 @@
    <string name="bottom_nav_title_subscriptions">Abos</string>
    <string name="bottom_nav_title_account">Konto</string>
    <string name="pref_title_peertube_server">PeerTube-Server</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="error_invalid_password">Dieses Passwort ist zu kurz</string>
    <string name="error_incorrect_password">Dieses Passwort ist falsch</string>
    <string name="action_bar_title_settings">Einstellungen</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Thorium</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="title_activity_settings">Paramètres</string>
    <string name="title_activity_login">Se connecter</string>
    <!-- Strings related to login -->
@ -24,13 +22,9 @@
    <string name="bottom_nav_title_subscriptions">Abonnements</string>
    <string name="bottom_nav_title_account">Compte</string>
    <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
-    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
    <string name="pref_title_peertube_server">Serveur Peertube</string>
    <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator">\u0020-\u0020</string>
    <string name="meta_data_views">" vues"</string>
-    <string name="meta_data_owner_seperator">\@</string>
    <string name="video_row_video_thumbnail">Miniature vidéo</string>
    <string name="video_row_account_avatar">Avatar du compte</string>
    <string name="pref_title_show_nsfw">Contenu pour adultes</string>
@ -49,7 +43,6 @@
    <string name="no_data_available">Pas de résultat</string>
    <string name="descr_overflow_button">Plus</string>
    <string name="menu_share">Partager</string>
-    <string name="playback_channel_name">PeerTube</string>
    <string name="invalid_url">URL invalide.</string>
    <string name="pref_title_dark_mode">Mode sombre</string>
    <string name="pref_description_dark_mode">Redémarrez l’application pour que le mode sombre soit activé.</string>
@ -312,7 +305,7 @@
    <string name="login_current_server_hint">Serveur actuel</string>
    <string name="video_speed_075">0,75×</string>
    <string name="video_speed_125">1,25×</string>
-    <string name="title_activity_server_address_book">Livre d\'adresse</string>
+    <string name="title_activity_server_address_book">Carnet d\'adresses</string>
    <string name="authentication_login_success">Identification réussie</string>
    <string name="authentication_login_failed">Identification échouée !</string>
    <string name="server_book_list_has_login">a un identifiant</string>
@ -333,4 +326,19 @@
    <string name="pref_language_app">Langue de l\'application</string>
    <string name="pref_description_back_pause">Mettre la lecture d\'arrière-plan en pause en appuyant sur la touche de retour pendant la lecture de la vidéo.</string>
    <string name="pref_title_back_pause">Pause sur le bouton retour</string>
+    <string name="settings_activity_about_category_title">À propos</string>
+    <string name="settings_activity_look_and_feel_category_title">Apparence</string>
+    <string name="title_activity_me">Compte</string>
+    <string name="pref_background_behavior">Paramètres de lecture en fond</string>
+    <string name="settings_api_error_float">Votre version Android ne supporte pas la lecture de vidéos dans une fenêtre flottante</string>
+    <string name="settings_permissions_error_float">Le mode Picture-in-Picture est désactivé pour cette applications dans les paramètres Android</string>
+    <string name="settings_activity_video_playback_category_title">Lecture de vidéos</string>
+    <string name="pref_background_audio">Continuer en fond sonore</string>
+    <string name="pref_background_stop">Arrêter de lire la vidéo</string>
+    <string name="pref_background_float">Continuer dans une fenêtre flottante</string>
+    <string name="pref_background_behavior_summary">Sélectionner le mode de fonctionnement de la lecture de vidéo lorsque l\'application est mise en arrière-plan</string>
+    <string name="settings_activity_video_list_category_title">Liste de vidéos</string>
+    <string name="title_activity_select_server">Sélectionner un serveur</string>
+    <string name="server_book_del_alert_title">Retirer un serveur</string>
+    <string name="server_book_del_alert_msg">Voulez-vous vraiment retirer ce serveur de votre carnet d\'adresses ?</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -61,7 +61,6 @@
    <string name="account_about_description">Beskrivelse:</string>
    <string name="account_about_joined">Tok del:</string>
    <string name="api_error">Noe gikk galt, prøv igjen senere.</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="permission_rationale">Innvilg kontakttilgang for fullføring av e-postadresser.</string>
    <string name="bottom_nav_title_trending">Populært</string>
    <string name="meta_data_views">" visninger"</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="title_activity_settings">Instellingen</string>
    <string name="title_activity_login">Inloggen</string>
    <string name="prompt_server">Server</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -282,7 +282,6 @@
    <string name="account_about_description">Beskrivning:</string>
    <string name="account_about_joined">Gick med:</string>
    <string name="api_error">Någonting gick snett, försök gärna igen om en stund!</string>
-    <string name="title_activity_video_play">VideoPlayActivity</string>
    <string name="permission_rationale">Ge åtkomst till kontakter för komplettering av e-postadresser.</string>
    <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
    <string name="pref_description_license">
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="title_activity_video_play">İzleti Oynatma Etkinliği</string>
    <string name="title_activity_settings">Ayarlar</string>
    <string name="title_activity_login">Oturum aç</string>
    <!-- Strings related to login -->
@ -24,13 +23,9 @@
    <string name="bottom_nav_title_subscriptions">Abonelikler</string>
    <string name="bottom_nav_title_account">Hesap</string>
    <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
-    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
    <string name="pref_title_peertube_server">PeerTube Sunucusu</string>
    <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
    <string name="meta_data_views">" Görüntüleme"</string>
-    <string name="meta_data_owner_seperator" translatable="false">\@</string>
    <string name="video_row_video_thumbnail">İzleti Küçük Resmi</string>
    <string name="video_row_account_avatar">Hesap Resmi</string>
    <string name="pref_title_show_nsfw">Ahlaksız İçerik</string>
@ -48,7 +43,6 @@
    <string name="no_data_available">Sonuç yok</string>
    <string name="descr_overflow_button">Daha</string>
    <string name="menu_share">Paylaş</string>
-    <string name="playback_channel_name" translatable="false">PeerTube</string>
    <string name="invalid_url">Geçersiz bağlantı.</string>
    <string name="pref_title_dark_mode">Karanlık Kipi</string>
    <string name="pref_description_dark_mode">Karanlık kipin etkinleşmesi için uygulamayı yeniden başlatın.</string>
@ -269,18 +263,6 @@
    <string name="video_speed_10">Normal</string>
    <string name="video_speed_15">1,5×</string>
    <string name="video_speed_20">2×</string>
-    <string name="video_option_speed_icon" translatable="false">{faw-play-circle}</string>
-    <string name="video_option_quality_icon" translatable="false">{faw-cog}</string>
-    <string name="video_speed_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_quality_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_expand_icon" translatable="false">{faw-expand}</string>
-    <string name="video_compress_icon" translatable="false">{faw-compress}</string>
-    <string name="video_more_icon" translatable="false">{faw-ellipsis-v}</string>
-    <string name="video_thumbs_up_icon" translatable="false">{faw-thumbs-up}</string>
-    <string name="video_thumbs_down_icon" translatable="false">{faw-thumbs-down}</string>
-    <string name="video_share_icon" translatable="false">{faw-share}</string>
-    <string name="video_download_icon" translatable="false">{faw-download}</string>
-    <string name="video_save_icon" translatable="false">{faw-save}</string>
    <string name="pref_title_background_play">Arkaplanda Oynatma</string>
    <string name="pref_description_background_play">Etkinleştirilirse, arka planda izleti oynatmaya devam eder.</string>
    <string name="bottom_nav_title_local">Yerel</string>
@ -300,15 +282,6 @@
    <string name="menu_video_options_playback_speed">Oynatma hızı</string>
    <string name="menu_video_options_quality">Kalite</string>
    <!-- Constants, Don't translate -->
-    <string name="pref_token_access" translatable="false">pref_token_access</string>
-    <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
-    <string name="pref_token_expiration" translatable="false">pref_token_expiration</string>
-    <string name="pref_token_type" translatable="false">pref_token_type</string>
-    <string name="pref_auth_username" translatable="false">pref_auth_username</string>
-    <string name="pref_auth_password" translatable="false">pref_auth_password</string>
-    <string name="video_rating_none" translatable="false">none</string>
-    <string name="video_rating_like" translatable="false">like</string>
-    <string name="video_rating_dislike" translatable="false">dislike</string>
    <string name="action_bar_title_account">Hesap</string>
    <string name="bottom_nav_title_recent">Yeniler</string>
    <string name="account_bottom_menu_videos">İzletiler</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -63,7 +63,6 @@
    <string name="pref_description_torrent_player">视频通过一个种子下载，此选项需要存储权限（实验阶段，不稳定！）</string>
    <string name="action_bar_title_logout">退出</string>
    <string name="zh">中文</string>
-    <string name="title_activity_video_play">视频播放Activity</string>
    <string name="error_field_required">本字段必填</string>
    <string name="action_bar_title_account">账户</string>
    <string name="bottom_nav_title_recent">最近</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="title_activity_video_play">影片播放活動</string>
    <string name="title_activity_settings">設定</string>
    <string name="title_activity_login">登入</string>
    <string name="prompt_server">伺服器</string>