Merge pull request #96 from sschueller/develop

Release v1.0.21

CHANGELOG.md

@@ -1,3 +1,13 @@
+### Version 1.0.21 Tag: v1.0.21 (2019-01-05)
+ * Added more video meta data
+ * Very basic like and dislike functionality
+ * UI changes to video detail page
+ * Torrent stream fatal fix (@lishoujun)
+ * AR Strings update (@rex07)
+ * ZH Strings update (@lishoujun)
+ * RU Strings update (@ferhadnecef)
+ * Refacturing (@lishoujun)
+
 ### Version 1.0.20 Tag: v1.0.20 (2019-01-02)
  * Added basic login framework
  * AR Strings update (@rex07)

app/build.gradle

@@ -6,9 +6,14 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1020
+        versionCode 1021
-        versionName "1.0.20"
+        versionName "1.0.21"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        ext {
+            libVersions = [
+                    exoplayer: '2.9.3'
+            ]
+        }
         dependencies {
             implementation fileTree(dir: 'libs', include: ['*.jar'])
 
@@ -41,13 +46,13 @@ android {
 //            implementation "com.github.TorrentStream:TorrentStreamServer-Android:1.0.1"
 //            implementation 'org.webrtc:google-webrtc:1.0.+'
 
-            // video player
+            // video player  repo:jcenter()
-            implementation 'com.google.android.exoplayer:exoplayer-core:2.9.2'
+            implementation "com.google.android.exoplayer:exoplayer-core:$libVersions.exoplayer"
-            implementation 'com.google.android.exoplayer:exoplayer-dash:2.9.2'
+            implementation "com.google.android.exoplayer:exoplayer-dash:$libVersions.exoplayer"
-            implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.2'
+            implementation "com.google.android.exoplayer:exoplayer-ui:$libVersions.exoplayer"
-            implementation 'com.google.android.exoplayer:exoplayer-hls:2.9.2'
+            implementation "com.google.android.exoplayer:exoplayer-hls:$libVersions.exoplayer"
-            implementation 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.2'
+            implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$libVersions.exoplayer"
-            implementation 'com.google.android.exoplayer:extension-mediasession:2.9.2'
+            implementation "com.google.android.exoplayer:extension-mediasession:$libVersions.exoplayer"
 
             // testing
             testImplementation 'junit:junit:4.12'

app/src/main/java/net/schueller/peertube/activity/CommonActivity.java

@@ -0,0 +1,32 @@
+package net.schueller.peertube.activity;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+
+import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
+import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
+
+public class CommonActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Set Night Mode
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
+        AppCompatDelegate.setDefaultNightMode(sharedPref.getBoolean("pref_dark_mode", false) ?
+                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
+
+        // Set theme
+        setTheme(getResources().getIdentifier(
+                sharedPref.getString(THEME_PREF_KEY, DEFAULT_THEME),
+                "style",
+                getPackageName())
+        );
+    }
+
+}

app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java

@@ -71,7 +71,7 @@ import retrofit2.Response;
 import static net.schueller.peertube.helper.Constants.DEFAULT_THEME;
 import static net.schueller.peertube.helper.Constants.THEME_PREF_KEY;
 
-public class VideoListActivity extends AppCompatActivity {
+public class VideoListActivity extends CommonActivity {
 
     private String TAG = "VideoListActivity";
 
@@ -98,18 +98,6 @@ public class VideoListActivity extends AppCompatActivity {
 
         super.onCreate(savedInstanceState);
 
-        // Set Night Mode
-        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-        AppCompatDelegate.setDefaultNightMode(sharedPref.getBoolean("pref_dark_mode", false) ?
-                AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-
-        // Set theme
-        setTheme(getResources().getIdentifier(
-                sharedPref.getString(THEME_PREF_KEY, DEFAULT_THEME),
-                "style",
-                getPackageName())
-        );
-
         setContentView(R.layout.activity_video_list);
 
         filter = null;

app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java

@@ -62,10 +62,12 @@ import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import com.mikepenz.iconics.Iconics;
 import com.squareup.picasso.Picasso;
 import net.schueller.peertube.R;
+import net.schueller.peertube.fragment.VideoMetaDataFragment;
 import net.schueller.peertube.fragment.VideoOptionsFragment;
 import net.schueller.peertube.helper.APIUrlHelper;
 import net.schueller.peertube.helper.MetaDataHelper;
 import net.schueller.peertube.intents.Intents;
+import net.schueller.peertube.model.Account;
 import net.schueller.peertube.model.Avatar;
 import net.schueller.peertube.model.Video;
 import net.schueller.peertube.network.GetVideoDataService;
@@ -89,7 +91,7 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     private Context context = this;
     private TextView fullscreenButton;
     private Boolean isFullscreen = false;
-
+    private TorrentStream torrentStream;
     boolean mBound = false;
     VideoPlayerService mService;
 
@@ -182,8 +184,9 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
         torrentStream.addListener(new TorrentListener() {
             @Override
             public void onStreamReady(Torrent torrent) {
-                Log.d(TAG, "Ready");
+                String videopath = Uri.fromFile(torrent.getVideoFile()).toString();
-                mService.setCurrentStreamUrl(Uri.fromFile(torrent.getVideoFile()).toString());
+                Log.d(TAG, "Ready! torrentStream videopath:" + videopath);
+                mService.setCurrentStreamUrl(videopath);
                 startPlayer();
             }
 
@@ -281,74 +284,23 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
 
                 // TODO: remove this code duplication, similar code as in video list rows
 
-                TextView videoName = findViewById(R.id.name);
-                TextView videoDescription = findViewById(R.id.description);
-                TextView videoOwner = findViewById(R.id.videoOwner);
-                TextView videoMeta = findViewById(R.id.videoMeta);
-                ImageView avatarView = findViewById(R.id.avatar);
-                TextView moreButton = findViewById(R.id.moreButton);
-                TextView videoOptions = findViewById(R.id.exo_more);
-
 
                 Video video = response.body();
 
                 mService.setCurrentVideo(video);
 
-                String baseUrl = APIUrlHelper.getUrl(context);
+                if (video == null){
-
+                    Toast.makeText(VideoPlayActivity.this, "Something went wrong...Please try later!", Toast.LENGTH_SHORT).show();
-                Avatar avatar = video.getAccount().getAvatar();
+                    return;
-                if (avatar != null) {
-                    String avatarPath = avatar.getPath();
-                    Picasso.with(context)
-                            .load(baseUrl + avatarPath)
-                            .into(avatarView);
                 }
 
-                videoName.setText(video.getName());
+                VideoMetaDataFragment videoMetaDataFragment = (VideoMetaDataFragment)
-                videoMeta.setText(
+                        getSupportFragmentManager().findFragmentById(R.id.video_meta_data_fragment);
-                        MetaDataHelper.getMetaString(
-                                video.getCreatedAt(),
-                                video.getViews(),
-                                getBaseContext()
-                        )
-                );
-                videoOwner.setText(
-                        MetaDataHelper.getOwnerString(video.getAccount().getName(),
-                                video.getAccount().getHost(),
-                                context
-                        )
-                );
-                videoDescription.setText(video.getDescription());
 
-                moreButton.setText(R.string.video_more_icon);
+                assert videoMetaDataFragment != null;
-                new Iconics.IconicsBuilder().ctx(context).on(moreButton).build();
+                videoMetaDataFragment.updateVideoMeta(video, mService);
 
-                moreButton.setOnClickListener(v -> {
+                Log.v(TAG, "url : " + video.getFiles().get(0).getFileUrl());
-                    PopupMenu popup = new PopupMenu(context, v);
-                    popup.setOnMenuItemClickListener(menuItem -> {
-                        switch (menuItem.getItemId()) {
-                            case R.id.menu_share:
-                                Intents.Share(context, video);
-                                return true;
-                            default:
-                                return false;
-                        }
-                    });
-                    popup.inflate(R.menu.menu_video_row_mode);
-                    popup.show();
-                });
-
-                // video player options
-                videoOptions.setText(R.string.video_more_icon);
-                new Iconics.IconicsBuilder().ctx(context).on(videoOptions).build();
-
-                videoOptions.setOnClickListener(v -> {
-
-                    VideoOptionsFragment videoOptionsFragment =
-                            VideoOptionsFragment.newInstance(mService);
-                    videoOptionsFragment.show(getSupportFragmentManager(),
-                            "video_options_fragment");
-                });
 
                 mService.setCurrentStreamUrl(video.getFiles().get(0).getFileUrl());
 
@@ -357,11 +309,13 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
                 if (sharedPref.getBoolean("pref_torrent_player", false)) {
 
                     String stream = video.getFiles().get(0).getTorrentUrl();
-                    TorrentStream torrentStream = setupTorrentStream();
+                    Log.v(TAG, "getTorrentUrl : " + video.getFiles().get(0).getTorrentUrl());
+                    torrentStream = setupTorrentStream();
                     torrentStream.startStream(stream);
                 } else {
                     startPlayer();
                 }
+                Log.v(TAG,"end of load Video");
 
             }
 
@@ -412,8 +366,12 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
         simpleExoPlayerView.setPlayer(null);
+        if (torrentStream != null){
+            torrentStream.stopStream();
+        }
+        super.onDestroy();
+        Log.v(TAG, "onDestroy...");
     }
 
     @Override

app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java

@@ -0,0 +1,278 @@
+package net.schueller.peertube.fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.mikepenz.fontawesome_typeface_library.FontAwesome;
+import com.mikepenz.iconics.Iconics;
+import com.mikepenz.iconics.IconicsDrawable;
+import com.squareup.picasso.Picasso;
+
+import net.schueller.peertube.R;
+import net.schueller.peertube.activity.VideoPlayActivity;
+import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.MetaDataHelper;
+import net.schueller.peertube.intents.Intents;
+import net.schueller.peertube.model.Account;
+import net.schueller.peertube.model.Avatar;
+import net.schueller.peertube.model.Video;
+import net.schueller.peertube.network.GetVideoDataService;
+import net.schueller.peertube.network.RetrofitInstance;
+import net.schueller.peertube.network.Session;
+import net.schueller.peertube.service.VideoPlayerService;
+
+import org.json.JSONObject;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+
+public class VideoMetaDataFragment extends Fragment {
+
+    private static final String TAG = "VideoMetaDataFragment";
+
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_video_meta, container, false);
+    }
+
+    public void updateVideoMeta(Video video, VideoPlayerService mService) {
+
+        Context context = getContext();
+        Activity activity = getActivity();
+
+
+        // Thumbs up
+        Button thumbsUpButton = activity.findViewById(R.id.video_thumbs_up);
+        thumbsUpButton.setText(R.string.video_thumbs_up_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(thumbsUpButton).build();
+        thumbsUpButton.setOnClickListener(v -> {
+
+            if (Session.getInstance().isLoggedIn()) {
+
+                // TODO: move this out helper/service
+                RequestBody body = RequestBody.create(
+                        okhttp3.MediaType.parse("application/json"),
+                        "{\"rating\":\"like\"}"
+                );
+
+                String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
+                GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+
+                Call<ResponseBody> call = service.rateVideo(video.getId(), body);
+
+                call.enqueue(new Callback<ResponseBody>() {
+
+                    @Override
+                    public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+
+                        Log.v(TAG, response.toString() );
+
+                        // if 20x update likes
+                    }
+
+                    @Override
+                    public void onFailure(Call<ResponseBody> call, Throwable t) {
+                        Toast.makeText(context, "Rating Failed", Toast.LENGTH_SHORT).show();
+                    }
+                });
+            } else {
+                Toast.makeText(context, "You must login to use this service", Toast.LENGTH_SHORT).show();
+
+            }
+
+        });
+
+        TextView thumbsUpButtonTotal = activity.findViewById(R.id.video_thumbs_up_total);
+        thumbsUpButtonTotal.setText(video.getLikes().toString());
+
+        // Thumbs Down
+        TextView thumbsDownButton = activity.findViewById(R.id.video_thumbs_down);
+        thumbsDownButton.setText(R.string.video_thumbs_down_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(thumbsDownButton).build();
+        thumbsDownButton.setOnClickListener(v -> {
+
+            if (Session.getInstance().isLoggedIn()) {
+
+                // TODO: move this out helper/service
+                RequestBody body = RequestBody.create(
+                        okhttp3.MediaType.parse("application/json"),
+                        "{\"rating\":\"dislike\"}"
+                );
+
+                String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
+                GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+
+                Call<ResponseBody> call = service.rateVideo(video.getId(), body);
+
+                call.enqueue(new Callback<ResponseBody>() {
+
+                    @Override
+                    public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
+
+                        // if 20x update likes
+
+                        Log.v(TAG, response.toString() );
+
+                    }
+
+                    @Override
+                    public void onFailure(Call<ResponseBody> call, Throwable t) {
+                        Toast.makeText(context, "Rating Failed", Toast.LENGTH_SHORT).show();
+                    }
+                });
+            } else {
+                Toast.makeText(context, "You must login to use this service", Toast.LENGTH_SHORT).show();
+
+            }
+
+        });
+
+        TextView thumbsDownButtonTotal = activity.findViewById(R.id.video_thumbs_down_total);
+        thumbsDownButtonTotal.setText(video.getDislikes().toString());
+
+        // Share
+        TextView videoShareButton = activity.findViewById(R.id.video_share);
+        videoShareButton.setText(R.string.video_share_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(videoShareButton).build();
+        videoShareButton.setOnClickListener(v -> Intents.Share(context, video));
+
+        // Download
+        TextView videoDownloadButton = activity.findViewById(R.id.video_download);
+        videoDownloadButton.setText(R.string.video_download_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(videoDownloadButton).build();
+        videoDownloadButton.setOnClickListener(v -> Toast.makeText(context, "Not Implemented", Toast.LENGTH_SHORT).show());
+
+        // add to playlist
+        TextView videoSaveButton = activity.findViewById(R.id.video_save);
+        videoSaveButton.setText(R.string.video_save_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(videoSaveButton).build();
+        videoSaveButton.setOnClickListener(v -> Toast.makeText(context, "Not Implemented", Toast.LENGTH_SHORT).show());
+
+
+        Account account = video.getAccount();
+
+        // owner / creator Avatar
+        Avatar avatar = account.getAvatar();
+        if (avatar != null) {
+            ImageView avatarView = activity.findViewById(R.id.avatar);
+            String baseUrl = APIUrlHelper.getUrl(context);
+            String avatarPath = avatar.getPath();
+            Picasso.with(context)
+                    .load(baseUrl + avatarPath)
+                    .into(avatarView);
+        }
+
+
+        // title / name
+        TextView videoName = activity.findViewById(R.id.name);
+        videoName.setText(video.getName());
+
+        // created at / views
+        TextView videoMeta = activity.findViewById(R.id.videoMeta);
+        videoMeta.setText(
+                MetaDataHelper.getMetaString(
+                        video.getCreatedAt(),
+                        video.getViews(),
+                        context
+                )
+        );
+
+        // owner / creator
+        TextView videoOwner = activity.findViewById(R.id.videoOwner);
+        videoOwner.setText(
+                MetaDataHelper.getOwnerString(video.getAccount().getName(),
+                        video.getAccount().getHost(),
+                        context
+                )
+        );
+
+        // description
+        TextView videoDescription = activity.findViewById(R.id.description);
+        videoDescription.setText(video.getDescription());
+
+
+        // video privacy
+        TextView videoPrivacy = activity.findViewById(R.id.video_privacy);
+        videoPrivacy.setText(video.getPrivacy().getLabel());
+
+        // video category
+        TextView videoCategory = activity.findViewById(R.id.video_category);
+        videoCategory.setText(video.getCategory().getLabel());
+
+        // video privacy
+        TextView videoLicense = activity.findViewById(R.id.video_license);
+        videoLicense.setText(video.getLicence().getLabel());
+
+        // video langauge
+        TextView videoLanguage = activity.findViewById(R.id.video_language);
+        videoLanguage.setText(video.getLanguage().getLabel());
+
+        // video privacy
+        TextView videoTags = activity.findViewById(R.id.video_tags);
+        videoTags.setText(android.text.TextUtils.join(", ", video.getTags()));
+
+
+        // more button
+        TextView moreButton = activity.findViewById(R.id.moreButton);
+        moreButton.setText(R.string.video_more_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(moreButton).build();
+
+        moreButton.setOnClickListener(v -> {
+            PopupMenu popup = new PopupMenu(context, v);
+            popup.setOnMenuItemClickListener(menuItem -> {
+                switch (menuItem.getItemId()) {
+                    case R.id.video_more_report:
+                        Log.v(TAG, "Report" );
+                        Toast.makeText(context, "Not Implemented", Toast.LENGTH_SHORT).show();
+                        return true;
+                    case R.id.video_more_blacklist:
+                        Log.v(TAG, "Blacklist" );
+                        Toast.makeText(context, "Not Implemented", Toast.LENGTH_SHORT).show();
+                        return true;
+                    default:
+                        return false;
+                }
+            });
+            popup.inflate(R.menu.menu_video_more);
+            popup.show();
+        });
+
+        // video player options
+        TextView videoOptions = activity.findViewById(R.id.exo_more);
+        videoOptions.setText(R.string.video_more_icon);
+        new Iconics.IconicsBuilder().ctx(context).on(videoOptions).build();
+
+        videoOptions.setOnClickListener(v -> {
+
+            VideoOptionsFragment videoOptionsFragment =
+                    VideoOptionsFragment.newInstance(mService);
+            videoOptionsFragment.show(getActivity().getSupportFragmentManager(),
+                    "video_options_fragment");
+        });
+
+    }
+
+}

app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java

@@ -22,8 +22,13 @@ import net.schueller.peertube.model.VideoList;
 
 import java.util.Set;
 
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
 import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.Field;
 import retrofit2.http.GET;
+import retrofit2.http.PUT;
 import retrofit2.http.Path;
 import retrofit2.http.Query;
 
@@ -53,4 +58,11 @@ public interface GetVideoDataService {
             @Query("filter") String filter,
             @Query("languageOneOf") Set<String> languages
     );
+
+    @PUT("videos/{id}/rate")
+    Call<ResponseBody> rateVideo(
+            @Path(value = "id", encoded = true) Integer id,
+            @Body RequestBody params
+    );
+
 }

app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java

@@ -35,6 +35,7 @@ import androidx.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -82,6 +83,8 @@ public class VideoPlayerService extends Service {
 
     @Override
     public void onCreate() {
+        Log.v(TAG, "onCreate...");
+
         super.onCreate();
 
         player = ExoPlayerFactory.newSimpleInstance(getApplicationContext(), new DefaultTrackSelector());
@@ -136,7 +139,11 @@ public class VideoPlayerService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        Context context = this;
         Log.v(TAG, "onStartCommand...");
+        if(currentStreamUrl == null){
+            Toast.makeText(context, "currentStreamUrl must not null", Toast.LENGTH_SHORT).show();
+        }
         playVideo();
         return START_STICKY;
     }
@@ -150,7 +157,7 @@ public class VideoPlayerService extends Service {
 
     public void setCurrentStreamUrl(String streamUrl)
     {
-        Log.v(TAG, "setCurrentStreamUrl...");
+        Log.v(TAG, "setCurrentStreamUrl..." + streamUrl);
         currentStreamUrl = streamUrl;
     }
 

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

@@ -18,8 +18,8 @@
             android:layout_width="match_parent"
             android:layout_height="250dp"
             android:background="@color/videoBackgroundColor"
-            app:resize_mode="fixed_width"
             app:controller_layout_id="@layout/video_playback_controls"
+            app:resize_mode="fixed_width"
 
             />
 
@@ -32,89 +32,26 @@
             android:indeterminate="false"
             android:max="100" />
 
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/progress"
-            android:padding="6dp"
             android:orientation="vertical">
 
-            <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+            <ScrollView
-                android:id="@+id/avatar"
+                android:id="@+id/login_form"
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="0dp"
-                android:contentDescription="@string/video_row_account_avatar"
-                android:paddingStart="12dp"
-                android:paddingTop="12dp"
-                android:paddingEnd="12dp" />
-
-            <TextView
-                android:id="@+id/name"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent">
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="24dp"
-                android:layout_toEndOf="@+id/avatar"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Title" />
-
-            <TextView
-                android:id="@+id/videoMeta"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/name"
-                android:layout_alignParentEnd="true"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="12dp"
-                android:layout_toEndOf="@+id/avatar"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
-
-            <TextView
-                android:id="@+id/videoOwner"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/videoMeta"
-                android:layout_marginStart="6dp"
-                android:layout_marginTop="0dp"
-                android:layout_marginEnd="0dp"
-                android:layout_toEndOf="@id/avatar"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                />
-
-            <TextView
-                android:id="@+id/moreButton"
-                android:layout_width="45dp"
-                android:layout_height="45dp"
-                android:layout_below="@+id/thumb"
-                android:layout_marginTop="16dp"
-                android:layout_marginStart="-16dp"
-                android:layout_marginEnd="0dp"
-                android:layout_toEndOf="@+id/name"
-                android:background="@null"
-                android:contentDescription="@string/descr_overflow_button"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption"
-                />
-
-            <TextView
-                android:id="@+id/description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/videoMeta"
-                android:layout_alignParentStart="true"
-                android:layout_marginStart="18dp"
-                android:layout_marginTop="35dp"
-                android:layout_marginEnd="12dp"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
 
+                <fragment android:name="net.schueller.peertube.fragment.VideoMetaDataFragment"
+                    android:id="@+id/video_meta_data_fragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
+            </ScrollView>
         </RelativeLayout>
 
 
-
     </RelativeLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="6dp">
+
+    <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/avatar"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_alignParentStart="true"
+        android:layout_marginTop="0dp"
+        android:contentDescription="@string/video_row_account_avatar"
+        android:paddingStart="12dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="12dp" />
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="24dp"
+        android:layout_toEndOf="@+id/avatar"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Title" />
+
+    <TextView
+        android:id="@+id/videoMeta"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/name"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="12dp"
+        android:layout_toEndOf="@+id/avatar"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+    <TextView
+        android:id="@+id/videoOwner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/videoMeta"
+        android:layout_marginStart="6dp"
+        android:layout_marginTop="0dp"
+        android:layout_marginEnd="0dp"
+        android:layout_toEndOf="@id/avatar"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+
+    <TextView
+        android:id="@+id/moreButton"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_marginStart="-16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="0dp"
+        android:layout_toEndOf="@+id/name"
+        android:background="@null"
+        android:contentDescription="@string/descr_overflow_button"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+
+    <LinearLayout
+        android:id="@+id/video_actions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/videoOwner"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="54dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/video_thumbs_up"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?android:selectableItemBackground"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/video_thumbs_up_total"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="54dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/video_thumbs_down"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?android:selectableItemBackground"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/video_thumbs_down_total"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="54dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/video_share"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?android:selectableItemBackground"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/video_share_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Share"
+
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="54dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/video_download"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?android:selectableItemBackground"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/video_download_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Download"
+                android:textSize="12sp" />
+
+        </LinearLayout>
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <LinearLayout
+            android:layout_width="54dp"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/video_save"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:background="?android:selectableItemBackground"
+                android:gravity="center" />
+
+            <TextView
+                android:id="@+id/video_save_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Save"
+
+                android:textSize="12sp" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/video_actions"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/description"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Privacy"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+            <Space
+                android:layout_width="12dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/video_privacy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text=""
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Category"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+            <Space
+                android:layout_width="12dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/video_category"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text=""
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="License"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+            <Space
+                android:layout_width="12dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/video_license"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text=""
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Language"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+            <Space
+                android:layout_width="12dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/video_language"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text=""
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="Tags"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" />
+
+            <Space
+                android:layout_width="12dp"
+                android:layout_height="1dp" />
+
+            <TextView
+                android:id="@+id/video_tags"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text=""
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</RelativeLayout>

app/src/main/res/menu/menu_video_more.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/video_more_report"
+        android:title="@string/menu_video_more_report" />
+    <item
+        android:id="@+id/video_more_blacklist"
+        android:title="@string/menu_video_more_blacklist" />
+</menu>

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

@@ -45,6 +45,8 @@
 
     <string name="pref_title_show_nsfw">عرض NSFW</string>
     <string name="pref_description_show_nsfw">عند التنشيط سيتم عرض محتويات NSFW</string>
+    <string name="pref_language">عرض اللغات</string>
+    <string name="pref_description_language">أختيار لغة ليتم عرضها.</string>    
     <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
     <string name="pref_title_torrent_player">مشغل فيديو التورنت</string>
     <string name="pref_description_torrent_player">تشغيل الفيديو عبر بث التورنت . يتطلب هذا أذونات التخزين. (ألفا ، غير مستقر!)</string>
@@ -64,7 +66,10 @@
     <string name="pref_description_dark_mode">أعد تشغيل التطبيق لتنشيط الوضع الداكن.</string>
     <string name="pref_title_app_theme">مظهر التطبيق</string>
     <string name="pref_description_app_theme">أعد تشغيل التطبيق لتفعيل التعديلات التي طرأت على المظهر.</string>
-
+    
+    <string name="en">الإنجليزية</string>
+    <string name="fr">الفرنسية</string>
+    
     <string name="red">أحمر</string>
     <string name="pink">وردي</string>
     <string name="purple">بنفسجي</string>

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

@@ -0,0 +1,268 @@
+<resources>
+
+    <string name="title_activity_settings">Настройки</string>
+    <string name="title_activity_login">Вход</string>
+
+    <!-- Strings related to login -->
+    <string name="prompt_server">Сервер</string>
+    <string name="prompt_email">Почта</string>
+    <string name="prompt_password">Пароль</string>
+    <string name="action_sign_in">Войти</string>
+    <string name="action_sign_in_short">Войти</string>
+    <string name="error_invalid_email">Этот адрес электронной почты недействителен</string>
+    <string name="error_invalid_password">Этот пароль слишком короткий</string>
+    <string name="error_incorrect_password">Неверный пароль</string>
+    <string name="error_field_required">Это поле обязательно к заполнению</string>
+    <string name="permission_rationale">«Разрешения на контакты необходимы для предоставления электронных писем».</string>
+
+    <!-- Action bar -->
+    <string name="action_bar_title_search">Поиск</string>
+    <string name="action_bar_title_settings">Настройки</string>
+    <string name="action_bar_title_logout">Выйти</string>
+
+    <!-- Bottom navigation bar -->
+    <string name="bottom_nav_title_home">Домашняя</string>
+    <string name="bottom_nav_title_trending">Популярные</string>
+    <string name="bottom_nav_title_subscriptions">Подписки</string>
+    <string name="bottom_nav_title_account">Аккаунт</string>
+
+    <!-- Strings related to Settings -->
+
+    <string name="pref_title_peertube_server">Сервер PeerTube</string>
+
+
+    <!-- Strings related to Video meta data -->
+
+
+    <string name="video_row_video_thumbnail">Миниатюра видео</string>
+    <string name="video_row_account_avatar">Аватар</string>
+
+    <string name="pref_title_show_nsfw">Показ NSFW ( контекст сексуального характера)</string>
+    <string name="pref_description_show_nsfw">Содержание NSFW ( контекст сексульного характера)  будет показано, если включено.</string>
+    <string name="pref_language">Фильтр языков</string>
+    <string name="pref_description_language">Выберите языки видео, которые вы хотите видеть. Ни один из выбранных покажет все видео на всех языках.</string>
+    <string name="pref_title_torrent_player">Торрент видео плеер</string>
+    <string name="pref_description_torrent_player">Воспроизведение видео через торрент поток. Это требует разрешения на хранение. (Альфа, не стабильный!)</string>
+    <string name="pref_title_license">Лицензия</string>
+    <string name="pref_description_license"><b >Универсальная общественная лицензия GNU Affero v3.0.</b> Разрешения этой самой мощной лицензии с авторским левом обусловлены предоставлением полного исходного кода лицензированных произведений и модификаций, которые включают в себя более крупные произведения с использованием лицензированных произведений, по той же лицензии. Уведомления об авторских правах и лицензии должны быть сохранены. Авторы предоставляют явное предоставление патентных прав. Когда измененная версия используется для предоставления услуги по сети, должен быть доступен полный исходный код модифицированной версии.</string>
+    <string name="pref_title_version">Версия</string>
+    <string name="search_hint">Поиск PeerTube</string>
+    <string name="title_activity_search">Поиск</string>
+    <string name="no_data_available">Нет результатов</string>
+    <string name="descr_overflow_button">Другое</string>
+    <string name="menu_share">Поделиться</string>
+    <string name="invalid_url">Неверная ссылка!</string>
+    <string name="pref_title_dark_mode">Темный режим</string>
+    <string name="pref_description_dark_mode">Перезапустите приложение для того чтобы изменение вступило в силу.</string>
+    <string name="pref_title_app_theme">Тема приложения</string>
+    <string name="pref_description_app_theme">Перезапустите приложение, чтобы тема вступила в силу.</string>
+
+    <string name="ab">Абхазия</string>
+    <string name="aa">Афар</string>
+    <string name="af">Африканский</string>
+    <string name="ak">Акан</string>
+    <string name="sq">Албанский</string>
+    <string name="ase">Английский США</string>
+    <string name="am">Амхарик</string>
+    <string name="ar">Арабский</string>
+    <string name="an">Арагонский</string>
+    <string name="hy">Америкаский</string>
+    <string name="as">Ассамский</string>
+    <string name="av">Аварский</string>
+    <string name="ay">Аймара</string>
+    <string name="az">Азербайджанский</string>
+    <string name="bm">Бамбара</string>
+    <string name="ba">Башкирский</string>
+    <string name="eu">Баскский</string>
+    <string name="be">Беларусский</string>
+    <string name="bn">Бенгальский</string>
+    <string name="bi">Бислама</string>
+    <string name="bs">Боснийский</string>
+    <string name="bzs">Бразильский язык ввода</string>
+    <string name="br">Бретонский</string>
+    <string name="bfi">Английский ВБ</string>
+    <string name="bg">Болгарский</string>
+    <string name="my">Бирманский</string>
+    <string name="ca">Каталонский</string>
+    <string name="ch">Чаморро</string>
+    <string name="ce">Чешский</string>
+    <string name="zh">Китайский</string>
+    <string name="csl">Китайский язык ввода</string>
+    <string name="cv">Чувашский</string>
+    <string name="kw">Корнуоллский</string>
+    <string name="co">Корсиканский</string>
+    <string name="cr">Cree</string>
+    <string name="hr">Хорватский</string>
+    <string name="cs">Чешия</string>
+    <string name="cse">Чешский язык ввода</string>
+    <string name="da">Дания</string>
+    <string name="dsl">Датский язык ввода</string>
+    <string name="dv">Мальдивский</string>
+    <string name="nl">Голландский</string>
+    <string name="dz">Dzongkha</string>
+    <string name="en">Английский</string>
+    <string name="eo">Esperanto</string>
+    <string name="et">Эстонский</string>
+    <string name="ee">Ewe</string>
+    <string name="fo">Фарерская</string>
+    <string name="fj">Fijian</string>
+    <string name="fi">Финский</string>
+    <string name="fr">Французский</string>
+    <string name="fsl">Французский язык ввода</string>
+    <string name="ff">Fulah</string>
+    <string name="gl">Галицкая</string>
+    <string name="lg">Ганда</string>
+    <string name="ka">Грузинский</string>
+    <string name="de">Германия</string>
+    <string name="gsg">Немецкий язык ввода</string>
+    <string name="gn">Гуарани</string>
+    <string name="gu">Гуджарати</string>
+    <string name="ht">Гаитянский</string>
+    <string name="ha">Хауса</string>
+    <string name="he">Иврит</string>
+    <string name="hz">Гереро</string>
+    <string name="hi">Хинди</string>
+    <string name="ho">Хири Моту</string>
+    <string name="hu">Венгерский</string>
+    <string name="is">Исландский</string>
+    <string name="ig">Игбо</string>
+    <string name="id">Индонезийский</string>
+    <string name="iu">Инуктитут</string>
+    <string name="ik">Инупиак</string>
+    <string name="ga">Ирландский</string>
+    <string name="it">Итальянский</string>
+    <string name="ja">Японский</string>
+    <string name="jsl">Японский язык знаков</string>
+    <string name="jv">Яванский</string>
+    <string name="kl">Гренландский</string>
+    <string name="kn">Каннада</string>
+    <string name="kr">Канури</string>
+    <string name="ks">Кашмирский</string>
+    <string name="kk">Казахский</string>
+    <string name="km">Кхмерский</string>
+    <string name="ki">Кикуйю</string>
+    <string name="rw">Киньяруанда</string>
+    <string name="ky">Киргизский</string>
+    <string name="tlh">Клингон</string>
+    <string name="kv">Коми</string>
+    <string name="kg">Конго</string>
+    <string name="ko">Корейский</string>
+    <string name="avk">Котава</string>
+    <string name="kj">Kuanyama</string>
+    <string name="ku">Курдский</string>
+    <string name="lo">Лао</string>
+    <string name="lv">Латышский</string>
+    <string name="li">Лимбурган</string>
+    <string name="ln">Лингала</string>
+    <string name="lt">Литовский</string>
+    <string name="jbo">Ложбан</string>
+    <string name="lu">Луба-Катанга</string>
+    <string name="lb">Люксембургский</string>
+    <string name="mk">Македонский</string>
+    <string name="mg">Малагасийский</string>
+    <string name="ms">Малайский (макроязык)</string>
+    <string name="mt">Мальтийский</string>
+    <string name="gv">Острова Мэн</string>
+    <string name="mi">Маори</string>
+    <string name="mr">Маратхи</string>
+    <string name="el">Грецкий</string>
+    <string name="mn">Монгольский</string>
+    <string name="na">Науру</string>
+    <string name="nv">Навахо</string>
+    <string name="ne">Непальский (макроязык)</string>
+    <string name="nd">Северный ндебеле</string>
+    <string name="se">Северный саам</string>
+    <string name="no">Норвежский</string>
+    <string name="nb">Норвежский букмол</string>
+    <string name="nn">Норвежский Нюнорск</string>
+    <string name="oj">Оджибва</string>
+    <string name="or">Ория (макроязык)</string>
+    <string name="os">Осетинский</string>
+    <string name="pks">Пакистанский язык знаков</string>
+    <string name="fa">Персидский</string>
+    <string name="pl">Польский</string>
+    <string name="pt">Португальский</string>
+    <string name="ps">Нажмите, чтобы</string>
+    <string name="qu">Кечуа</string>
+    <string name="ro">Румынский</string>
+    <string name="rm">Ретороманский диалект</string>
+    <string name="rn">Рунди</string>
+    <string name="ru">Русский</string>
+    <string name="rsl">Русский язык знаков</string>
+    <string name="sg">Санго</string>
+    <string name="sc">Сардинский</string>
+    <string name="sdl">Саудовская Аравия Арабский Язык знаков</string>
+    <string name="gd">Шотландский гэльский</string>
+    <string name="sr">Сербский</string>
+    <string name="sh">Сербско-хорватский</string>
+    <string name="ii">Сычуань Йи</string>
+    <string name="sk">Словацкий</string>
+    <string name="sl">Словенский</string>
+    <string name="so">Сомалийский</string>
+    <string name="sfs">Южноафриканский язык жестов</string>
+    <string name="nr">Южный Ндебеле</string>
+    <string name="st">Южный Сото</string>
+    <string name="es">Испанский</string>
+    <string name="su">Суданский</string>
+    <string name="sw">Суахили (макроязык)</string>
+    <string name="ss">Свати</string>
+    <string name="sv">Шведский</string>
+    <string name="swl">Шведский язык жестов</string>
+    <string name="tl">Тагальский</string>
+    <string name="ty">Таитянский</string>
+    <string name="tg">Таджикский</string>
+    <string name="ta">Тамильский</string>
+    <string name="tt">Татарский</string>
+    <string name="te">Телугу</string>
+    <string name="th">Тайски</string>
+    <string name="bo">Тибетский</string>
+    <string name="ti">Тигринья</string>
+    <string name="to">Тонга (Острова Тонга)</string>
+    <string name="ts">Тсонга</string>
+    <string name="tr">Турецкий</string>
+    <string name="tk">Туркменский</string>
+    <string name="ug">Уйгурский</string>
+    <string name="uk">Украинский</string>
+    <string name="ur">Урду</string>
+    <string name="uz">Узбекский</string>
+    <string name="vi">Вьетнамский</string>
+    <string name="wa">Валлонский</string>
+    <string name="cy">Валлийский</string>
+    <string name="fy">Западно-фризский</string>
+    <string name="yi">Идиш</string>
+    <string name="yo">Йоруба</string>
+    <string name="za">Чжуан</string>
+
+    <string name="red">Красный</string>
+    <string name="pink">Розовый</string>
+    <string name="purple">Пурпурный</string>
+    <string name="deeppurple">Темно-фиолетовый</string>
+    <string name="indigo">Индиго</string>
+    <string name="blue">Синий</string>
+    <string name="lightblue">Светло-синий</string>
+    <string name="cyan">Сиан</string>
+    <string name="green">Зелёный</string>
+    <string name="lightgreen">Светло-зеленый</string>
+    <string name="lime">Лайм</string>
+    <string name="yellow">Желтый</string>
+    <string name="amber">Янтарный</string>
+    <string name="orange">Оранжевый</string>
+    <string name="deeporange">Темно-оранжевый</string>
+    <string name="brown">Коричневый</string>
+    <string name="gray">Серый</string>
+    <string name="bluegray">Серо-голубой</string>
+    <string name="video_speed_05">0.5x</string>
+    <string name="video_speed_10">Нормальный</string>
+    <string name="video_speed_15">1.5x</string>
+    <string name="video_speed_20">2x</string>
+
+
+    <string name="pref_title_background_play">Фоновое воспроизведение</string>
+    <string name="pref_description_background_play">Если включено, продолжает воспроизводить видео в фоновом режиме.</string>
+    <string name="bottom_nav_title_local">Локаль</string>
+
+    <string name="title_activity_account">Аккаунт</string>
+
+    <!-- Constants, Don't translate -->
+
+</resources>

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

@@ -56,4 +56,12 @@
     <string name="gray">灰色</string>
     <string name="bluegray">蓝灰色</string>
     <string name="meta_data_views">次观看</string>
+    <string name="bottom_nav_title_local">本地</string>
+    <string name="title_activity_account">帐号</string>
+    <string name="pref_language">按语言过滤</string>
+    <string name="pref_description_language">选择你使用的语言，不勾选时所有语言的视频都会显示</string>
+    <string name="pref_title_torrent_player">使用种子播放</string>
+    <string name="pref_description_torrent_player">视频通过一个种子下载，此选项需要存储权限（实验阶段，不稳定！）</string>
+    <string name="action_bar_title_logout">退出</string>
+    <string name="zh">中文</string>
 </resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">PeerTube</string>
+    <string name="app_name" translatable="false">PeerTube</string>
 
     <string name="title_activity_video_play">VideoPlayActivity</string>
     <string name="title_activity_settings">Settings</string>
@@ -31,16 +31,16 @@
     <string name="bottom_nav_title_account">Account</string>
 
     <!-- Strings related to Settings -->
-    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
+    <string name="peertube_required_server_version" translatable="false">1.0.0-alpha.7</string>
 
-    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
+    <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
     <string name="pref_title_peertube_server">PeerTube Server</string>
 
 
     <!-- Strings related to Video meta data -->
-    <string name="meta_data_seperator">\u0020-\u0020</string>
+    <string name="meta_data_seperator" translatable="false">\u0020-\u0020</string>
     <string name="meta_data_views">\u0020Views</string>
-    <string name="meta_data_owner_seperator">\@</string>
+    <string name="meta_data_owner_seperator" translatable="false">\@</string>
 
 
     <string name="video_row_video_thumbnail">Video Thumbnail</string>
@@ -61,7 +61,7 @@
     <string name="no_data_available">No Results</string>
     <string name="descr_overflow_button">More</string>
     <string name="menu_share">Share</string>
-    <string name="playback_channel_name">PeerTube</string>
+    <string name="playback_channel_name" translatable="false">PeerTube</string>
     <string name="invalid_url">Invalid Url!</string>
     <string name="pref_title_dark_mode">Dark Mode</string>
     <string name="pref_description_dark_mode">Restart App for Dark Mode to take effect.</string>
@@ -286,10 +286,16 @@
     <string name="video_speed_20">2x</string>
 
 
-    <string name="video_speed_active_icon">{faw-check}</string>
+    <string name="video_speed_active_icon" translatable="false">{faw-check}</string>
-    <string name="video_expand_icon">{faw-expand}</string>
+    <string name="video_expand_icon" translatable="false">{faw-expand}</string>
-    <string name="video_compress_icon">{faw-compress}</string>
+    <string name="video_compress_icon" translatable="false">{faw-compress}</string>
-    <string name="video_more_icon">{faw-ellipsis-v}</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">Background Playback</string>
     <string name="pref_description_background_play">If enabled, continues to play video in background.</string>
     <string name="bottom_nav_title_local">Local</string>
@@ -297,11 +303,13 @@
     <string name="title_activity_account">Account</string>
 
     <!-- Constants, Don't translate -->
-    <string name="pref_token_access">pref_token_access</string>
+    <string name="pref_token_access" translatable="false">pref_token_access</string>
-    <string name="pref_token_refresh">pref_token_refresh</string>
+    <string name="pref_token_refresh" translatable="false">pref_token_refresh</string>
-    <string name="pref_token_expiration">pref_token_expiration</string>
+    <string name="pref_token_expiration" translatable="false">pref_token_expiration</string>
-    <string name="pref_token_type">pref_token_type</string>
+    <string name="pref_token_type" translatable="false">pref_token_type</string>
-    <string name="pref_auth_username">pref_auth_username</string>
+    <string name="pref_auth_username" translatable="false">pref_auth_username</string>
-    <string name="pref_auth_password">pref_auth_password</string>
+    <string name="pref_auth_password" translatable="false">pref_auth_password</string>
+    <string name="menu_video_more_report">Report</string>
+    <string name="menu_video_more_blacklist">Blacklist</string>
 
 </resources>