Merge pull request #15 from sschueller/develop

Updates

app/build.gradle

@@ -24,12 +24,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-    implementation 'com.android.support:cardview-v7:27.1.0'
-    implementation 'com.android.support:recyclerview-v7:27.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
 
-    implementation 'com.google.android.gms:play-services-auth:11.8.0'
+    implementation 'com.google.android.gms:play-services-auth:15.0.1'
 
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
@@ -39,19 +39,19 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.2'
 
 //    implementation 'org.webrtc:google-webrtc:1.0.+'
-    implementation 'com.android.support:design:27.1.0'
+    implementation 'com.android.support:design:27.1.1'
 
     implementation 'com.blackboardtheory:android-iconify-fontawesome:3.0.1-SNAPSHOT'
 
     implementation 'com.github.TorrentStream:TorrentStream-Android:2.5.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.7.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.8.1'
 //    implementation "com.github.TorrentStream:TorrentStreamServer-Android:1.0.1"
 //    implementation 'com.devbrackets.android:exomedia:4.1.0'
 
     implementation 'de.hdodenhof:circleimageview:2.2.0'
 
-    implementation 'com.android.support:support-v4:27.1.0'
+    implementation 'com.android.support:support-v4:27.1.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }

app/src/main/AndroidManifest.xml

@@ -14,7 +14,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".activity.VideoListActivity">

app/src/main/java/net/schueller/peertube/model/Language.java

@@ -2,14 +2,14 @@ package net.schueller.peertube.model;
 
 public class Language {
 
-    private Integer id;
+    private String id;
     private String label;
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

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

@@ -0,0 +1,47 @@
+<resources>
+    <string name="app_name">PeerTube</string>
+
+    <string name="title_activity_torrent_video_play">TorrentVideoPlayActivity</string>
+    <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>
+
+    <!-- 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="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>
+
+</resources>