Merge branch 'testing'

Conflicts: app/app.iml
lgallard · Nov 1, 2015 · 525c7a8 · 525c7a8
2 parents cb0a193 + cfbbcdd
commit 525c7a8
Show file tree

Hide file tree

Showing 52 changed files with 651 additions and 355 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/app/app.iml
 # Built application files
 *.apk
 *.ap_
@@ -8,7 +9,7 @@
 # Java class files
 *.class
 
-/app/app.iml
+        
 # Gradle files
 .gradle/
 /.idea/libraries

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
 
     buildToolsVersion "22.0.0"
-    compileSdkVersion 21
+    compileSdkVersion 22
 
     defaultConfig {
         applicationId 'com.lgallardo.qbittorrentclient'
@@ -30,18 +30,18 @@ android {
     productFlavors {
         pro {
             applicationId 'com.lgallardo.qbittorrentclientpro'
-            versionName '4.2.1'
+            versionName '4.2.2'
             minSdkVersion 14
-            targetSdkVersion 21
-            versionCode 421
+            targetSdkVersion 22
+            versionCode 422
             archivesBaseName = "qBittorrentController_v" + versionName
         }
         free {
             applicationId "com.lgallardo.qbittorrentclient"
-            versionName '4.2.1'
+            versionName '4.2.2'
             minSdkVersion 14
-            targetSdkVersion 21
-            versionCode 421
+            targetSdkVersion 22
+            versionCode 422
         }
     }
 

diff --git a/app/src/free/res/layout-large-port/torrent_details.xml b/app/src/free/res/layout-large-port/torrent_details.xml
@@ -366,15 +366,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/layout-large-port/torrent_details_old.xml b/app/src/free/res/layout-large-port/torrent_details_old.xml
@@ -319,15 +319,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/layout-large/torrent_details.xml b/app/src/free/res/layout-large/torrent_details.xml
@@ -361,15 +361,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/layout-large/torrent_details_old.xml b/app/src/free/res/layout-large/torrent_details_old.xml
@@ -318,15 +318,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/layout-sw600dp/torrent_details.xml b/app/src/free/res/layout-sw600dp/torrent_details.xml
@@ -364,12 +364,12 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
-                        <ListView
+                        <android.support.v7.widget.RecyclerView
                             android:id="@+id/theList"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
+                            android:layout_marginRight="5dp"></android.support.v7.widget.RecyclerView> a a
                     </LinearLayout>
                 </LinearLayout>
             </LinearLayout>

diff --git a/app/src/free/res/layout/torrent_details.xml b/app/src/free/res/layout/torrent_details.xml
@@ -366,15 +366,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/layout/torrent_details_old.xml b/app/src/free/res/layout/torrent_details_old.xml
@@ -319,15 +319,9 @@
                         android:id="@+id/files"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
-                        <ListView
-                            android:id="@+id/theList"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="5dp"
-                            android:layout_marginRight="5dp"></ListView>
-                    </LinearLayout>
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:orientation="vertical"></LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 

diff --git a/app/src/free/res/values-es/strings.xml b/app/src/free/res/values-es/strings.xml
@@ -213,6 +213,7 @@
     <string name="checkbox_autodownload_rss">Descargar nuevos torrents automáticamente?</string>
     <string name="checkbox_notifynew_rss">Notificar nuevos torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtro</string>
     <string name="dialog_label_rss">Nombre </string>
     <string name="error_rss">No se pudo obtener RSS</string>
     <string name="settings_qbittorrent_advanced">Opciones avanzadas...</string>
@@ -221,4 +222,8 @@
     <string name="options_qbittorrent_schedule_alt_from">De</string>
     <string name="options_qbittorrent_schedule_alt_to">A</string>
     <string name="options_qbittorrent_scheduler_days_title">Cuándo:</string>
+    <string name="action_file_dont_download">No descargar</string>
+    <string name="action_file_high_priority">Alta</string>
+    <string name="action_file_maximum_priority">Máxima</string>
+    <string name="action_file_normal_priority">Normal</string>
 </resources>
diff --git a/app/src/free/res/values-eu/strings.xml b/app/src/free/res/values-eu/strings.xml
@@ -210,6 +210,7 @@
   <string name="action_addRss">Gehitu RSS-a</string>
   <string name="action_rss">RSS</string>
   <string name="dialog_add_rss">RSS url-a</string>
+  <string name="dialog_add_rss_filter">Iragazkia</string>
   <string name="dialog_label_rss">Izena</string>
   <string name="checkbox_autodownload_rss">Jeitsi torrent berriak berezgaitasunez?</string>
   <string name="checkbox_notifynew_rss">Jakinarazi torrent berriak?</string>
@@ -220,4 +221,8 @@
   <string name="options_qbittorrent_scheduler_days_title">Noiz:</string>
   <string name="options_qbittorrent_schedule_alt_from">Hemendik</string>
   <string name="options_qbittorrent_schedule_alt_to">Hona</string>
+  <string name="action_file_dont_download">Ez deskargatu</string>
+  <string name="action_file_maximum_priority">Gehienezko</string>
+  <string name="action_file_high_priority">Handia</string>
+  <string name="action_file_normal_priority">Normala</string>
 </resources>
diff --git a/app/src/free/res/values-fr/strings.xml b/app/src/free/res/values-fr/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Téléchargez de nouveaux torrents automatiquement?</string>
     <string name="checkbox_notifynew_rss">Notifier nouvelles torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtre</string>
     <string name="dialog_label_rss">Nom</string>
     <string name="error_rss">Impossible d\'obtenir RSS</string>
     <string name="settings_qbittorrent_advanced">Options avancées...</string>
@@ -220,4 +221,8 @@
     <string name="options_qbittorrent_schedule_alt_from">De</string>
     <string name="options_qbittorrent_schedule_alt_to">À</string>
     <string name="options_qbittorrent_scheduler_days_title">Quand:</string>
+    <string name="action_file_dont_download">Ne téléchargez pas</string>
+    <string name="action_file_maximum_priority">Maximale</string>
+    <string name="action_file_high_priority">Haute</string>
+    <string name="action_file_normal_priority">Normale</string>
 </resources>
diff --git a/app/src/free/res/values-it-rIT/strings.xml b/app/src/free/res/values-it-rIT/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Scarica nuovi torrents automaticamente?</string>
     <string name="checkbox_notifynew_rss">Notifica nuove torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtro</string>
     <string name="dialog_label_rss">Nome</string>
     <string name="error_rss">Impossibile ottenere RSS</string>
     <string name="settings_qbittorrent_advanced">Opzioni avanzate...</string>
@@ -220,4 +221,8 @@
     <string name="options_qbittorrent_scheduler_days_title">Quando:</string>
     <string name="options_qbittorrent_schedule_alt_from">Da</string>
     <string name="options_qbittorrent_schedule_alt_to">A</string>
+    <string name="action_file_dont_download">Non scaricare</string>
+    <string name="action_file_high_priority">Elevata</string>
+    <string name="action_file_normal_priority">Normale</string>
+    <string name="action_file_maximum_priority">Massima</string>
 </resources>
diff --git a/app/src/free/res/values-pl/strings.xml b/app/src/free/res/values-pl/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Automatyczne pobieranie nowych torrents?</string>
     <string name="checkbox_notifynew_rss">Informuj nowych torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtr</string>
     <string name="dialog_label_rss">Nazwa</string>
     <string name="error_rss">Nie udało się uzyskać RSS</string>
     <string name="settings_qbittorrent_advanced">Opcje zaawansowane...</string>
@@ -220,4 +221,9 @@
     <string name="options_qbittorrent_schedule_alt_from">Od</string>
     <string name="options_qbittorrent_schedule_alt_to">Do</string>
     <string name="options_qbittorrent_scheduler_days_title">Kiedy:</string>
+    <string name="action_file_dont_download">Nie pobieraj</string>
+    <string name="action_file_high_priority">Wysoki</string>
+    <string name="action_file_maximum_priority">Maksymalna</string>
+    <string name="action_file_normal_priority">Normalny</string>
+
 </resources>
diff --git a/app/src/free/res/values-pt-rBR/strings.xml b/app/src/free/res/values-pt-rBR/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Baixar automaticamente novos torrents?</string>
     <string name="checkbox_notifynew_rss">Notificar novos torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtro</string>
     <string name="dialog_label_rss">Nome</string>
     <string name="error_rss">Não foi possível obter RSS</string>
     <string name="settings_qbittorrent_advanced">Opções avançadas...</string>
@@ -220,4 +221,8 @@
     <string name="options_qbittorrent_schedule_alt_to">A</string>
     <string name="options_qbittorrent_schedule_alternative_rate_limits">Agendar utilização das taxas limite alternativas</string>
     <string name="options_qbittorrent_scheduler_days_title">Quando:</string>
+    <string name="action_file_dont_download">Não faça download</string>
+    <string name="action_file_high_priority">Alta</string>
+    <string name="action_file_normal_priority">Normal</string>
+    <string name="action_file_maximum_priority">Máxima</string>
 </resources>
diff --git a/app/src/free/res/values-pt-rPT/strings.xml b/app/src/free/res/values-pt-rPT/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Baixar automaticamente novos torrents?</string>
     <string name="checkbox_notifynew_rss">Notificar novos torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtro</string>
     <string name="dialog_label_rss">Nome</string>
     <string name="error_rss">Não foi possível obter RSS</string>
     <string name="settings_qbittorrent_advanced">Opções avançadas...</string>
@@ -220,4 +221,8 @@
     <string name="options_qbittorrent_schedule_alt_to">A</string>
     <string name="options_qbittorrent_schedule_alternative_rate_limits">Agendar utilização das taxas limite alternativas</string>
     <string name="options_qbittorrent_scheduler_days_title">Quando:</string>
+    <string name="action_file_dont_download">Não faça download</string>
+    <string name="action_file_high_priority">Alta</string>
+    <string name="action_file_normal_priority">Normal</string>
+    <string name="action_file_maximum_priority">Máxima</string>
 </resources>
diff --git a/app/src/free/res/values-ru/strings.xml b/app/src/free/res/values-ru/strings.xml
@@ -210,6 +210,7 @@
   <string name="action_addRss">Добавить RSS</string>
   <string name="action_rss">RSS</string>
   <string name="dialog_add_rss">Ссылка на RSS</string>
+  <string name="dialog_add_rss_filter">Фильтр</string>
   <string name="dialog_label_rss">Название</string>
   <string name="checkbox_autodownload_rss">Загружать новые торренты автоматически?</string>
   <string name="checkbox_notifynew_rss">Уведомлять о новых торрентах?</string>
@@ -220,4 +221,8 @@
   <string name="options_qbittorrent_schedule_alt_from">С</string>
   <string name="options_qbittorrent_schedule_alt_to">до</string>
   <string name="options_qbittorrent_scheduler_days_title">Когда:</string>
+  <string name="action_file_dont_download">Не загружать</string>
+  <string name="action_file_high_priority">Высокий</string>
+  <string name="action_file_maximum_priority">Максимальный </string>
+  <string name="action_file_normal_priority">Обычный</string>
 </resources>
diff --git a/app/src/free/res/values-sv/strings.xml b/app/src/free/res/values-sv/strings.xml
@@ -212,6 +212,7 @@
     <string name="checkbox_autodownload_rss">Ladda ner nya torrents automatiskt?</string>
     <string name="checkbox_notifynew_rss">Meddela nya torrents?</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filtrera</string>
     <string name="dialog_label_rss">Namn</string>
     <string name="error_rss">Det gick inte att få RSS</string>
     <string name="settings_qbittorrent_advanced">Alternativ avancerat...</string>
@@ -220,4 +221,8 @@
     <string name="options_qbittorrent_schedule_alt_from">Från</string>
     <string name="options_qbittorrent_schedule_alt_to">Till</string>
     <string name="options_qbittorrent_scheduler_days_title">När:</string>
+    <string name="action_file_dont_download">Ladda inte ner</string>
+    <string name="action_file_high_priority">Hög</string>
+    <string name="action_file_normal_priority">Normal</string>
+    <string name="action_file_maximum_priority">Högsta</string>
 </resources>
diff --git a/app/src/free/res/values/strings.xml b/app/src/free/res/values/strings.xml
@@ -29,6 +29,10 @@
     <string name="action_download_rate_limit">Download rate limit</string>
     <string name="action_upload_rate_limit">Upload rate limit</string>
     <string name="action_force_recheck">Force recheck</string>
+    <string name="action_file_dont_download">Do not download</string>
+    <string name="action_file_normal_priority">Normal</string>
+    <string name="action_file_high_priority">High</string>
+    <string name="action_file_maximum_priority">Maximum</string>
     <string name="connection_error">Network connection failed</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
@@ -47,7 +51,7 @@
     <string name="torrentDeleted">Torrent deleted!</string>
     <string name="torrentDeletedDrive">Torrent and data deleted!</string>
     <string name="increasePrioTorrent">Priority increased!</string>
-    <string name="decreasePrioTorrent">Priority decreased!</string>
+    <string name="decreasePrioTorrent" translatable="false">Priority decreased!</string>
     <string name="priorityUpdated">Priority updated!</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
@@ -220,6 +224,7 @@
     <string name="action_addRss" >Add RSS</string>
     <string name="action_rss">RSS</string>
     <string name="dialog_add_rss">RSS url</string>
+    <string name="dialog_add_rss_filter">Filter</string>
     <string name="dialog_label_rss">Name</string>
     <string name="checkbox_autodownload_rss">Download new torrents automatically?</string>
     <string name="checkbox_notifynew_rss">Notify new torrents?</string>

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,7 @@
     <!-- Permission needed to open downloaded .torrent files -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <android:uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/com/lgallardo/qbittorrentclient/ContentFile.java b/app/src/main/java/com/lgallardo/qbittorrentclient/ContentFile.java
@@ -6,6 +6,7 @@ public class ContentFile {
 	private String size;
 	private Double progress;
 	private int priority;
+	private int recyclerViewItemHeight;
 
 	public ContentFile(String name, String size, Double progress, int priority) {
 
@@ -52,4 +53,11 @@ public String getProgressAsString(){
 		return String.format("%.2f", this.progress * 100) + "%";
 	}
 
+	public int getRecyclerViewItemHeight() {
+		return recyclerViewItemHeight;
+	}
+
+	public void setRecyclerViewItemHeight(int recyclerViewItemHeight) {
+		this.recyclerViewItemHeight = recyclerViewItemHeight;
+	}
 }