Release 2.0

* Added ETA in torrent list * Added .torrent file recognition (send torrent file) * Added Spanish translation Merge branch 'testing'
lgallard · Sep 18, 2014 · dbcb9d2 · dbcb9d2
2 parents 1662601 + a579fb7
commit dbcb9d2
Show file tree

Hide file tree

Showing 24 changed files with 1,154 additions and 379 deletions.
diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml
@@ -11,8 +11,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.lgallardo.qbittorrentclient"
-    android:versionCode="192"
-    android:versionName="1.9.2" >
+    android:versionCode="200"
+    android:versionName="2.0" >
 
     <uses-sdk
         android:minSdkVersion="14"
@@ -41,8 +41,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:mimeType="application/x-bittorrent" />
                 <data
+                    android:host="*"
                     android:mimeType="application/x-bittorrent"
                     android:scheme="http" />
             </intent-filter>
@@ -61,9 +61,33 @@
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
+                    android:host="*"
                     android:pathPattern=".*\\.torrent"
+                    android:scheme="https" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
                     android:scheme="file" />
             </intent-filter>
             <intent-filter>
@@ -72,6 +96,39 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="file" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:mimeType="application/x-bittorrent"
+                    android:scheme="content" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*\\.torrent"
+                    android:scheme="content" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
                 <data android:scheme="magnet" />
             </intent-filter>
         </activity>
@@ -93,6 +150,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
             android:theme="@android:style/Theme.Translucent" >
         </activity>
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />

diff --git a/qBittorrentClient/libs/httpcore-4.3.2.jar b/qBittorrentClient/libs/httpcore-4.3.2.jar
diff --git a/qBittorrentClient/libs/httpmime-4.3.5.jar b/qBittorrentClient/libs/httpmime-4.3.5.jar
diff --git a/qBittorrentClient/res/layout-large/activity_main.xml b/qBittorrentClient/res/layout-large/activity_main.xml
@@ -35,7 +35,8 @@
             android:layout_width="fill_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/adView"
-            android:orientation="horizontal" >
+            android:orientation="horizontal"
+            android:baselineAligned="false" >
 
             <FrameLayout
                 android:id="@+id/list_frame"

diff --git a/qBittorrentClient/res/layout/about.xml b/qBittorrentClient/res/layout/about.xml
@@ -29,6 +29,7 @@
                 android:layout_below="@+id/qBittorrent_logo"
                 android:layout_centerHorizontal="true"
                 android:background="@android:color/white"
+                android:contentDescription="@string/app_name"
                 android:text="@string/app_name"
                 android:textAppearance="?android:attr/textAppearanceLarge" />
 
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/textView2"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:text="To start using the client, set your qBittorrent server&apos;s settings and account by selecting &apos;Settings&apos; from the drawer menu" />
+                android:text="@string/about_help1" />
 
             <TextView
                 android:id="@+id/textView4"
@@ -60,7 +61,7 @@
                 android:layout_below="@+id/textView3"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:text="Press the refresh button on the menu to refresh the results, or choose an option from the drawer menu to get the torrent list from the server." />
+                android:text="@string/about_help2" />
 
             <TextView
                 android:id="@+id/textView2"
@@ -69,7 +70,7 @@
                 android:layout_below="@+id/textView1"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:text="Manage all your torrent from your Android using qBittorent Client" />
+                android:text="@string/about_motto" />
         </RelativeLayout>
     </ScrollView>
 

diff --git a/qBittorrentClient/res/layout/activity_main_original.xml b/qBittorrentClient/res/layout/activity_main_original.xml
@@ -14,16 +14,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity" >
+    android:paddingBottom="5dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:paddingTop="10dp"
+    tools:context=".MainActivity"
+    android:baselineAligned="false" >
 
     <ListView
         android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"  >
     </ListView>
 
 </LinearLayout>
diff --git a/qBittorrentClient/res/layout/listview_item_row.xml b/qBittorrentClient/res/layout/listview_item_row.xml
@@ -17,6 +17,7 @@
 
     <ImageView
         android:id="@+id/imageViewIcon"
+        android:contentDescription="@string/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
@@ -30,7 +31,6 @@
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/imageViewIcon"
         android:paddingRight="10dp"
-        android:text="Folder name here."
         android:textAppearance="?android:attr/textAppearanceListItemSmall"
         android:textColor="#ffffff" />
 

diff --git a/qBittorrentClient/res/layout/listview_main.xml b/qBittorrentClient/res/layout/listview_main.xml
@@ -8,6 +8,8 @@
   
   Contributors:
       Luis M. Gallardo D. - initial implementation
+      
+      CHECK IF IT USED!
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -17,7 +19,8 @@
     <ListView
         android:id="@android:id/list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content" 
+        >
     </ListView>
 
 </LinearLayout>
diff --git a/qBittorrentClient/res/layout/no_items_found.xml b/qBittorrentClient/res/layout/no_items_found.xml
@@ -21,6 +21,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingRight="10dp"
-        android:text="No results" />
+        android:text="@string/no_results" />
 
 </LinearLayout>
diff --git a/qBittorrentClient/res/layout/row.xml b/qBittorrentClient/res/layout/row.xml
@@ -15,20 +15,21 @@
     android:orientation="horizontal" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
         <ImageView
             android:id="@+id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/downloading"
-            android:layout_marginRight="5dp" />
+            android:layout_marginRight="5dp"
+            android:src="@drawable/downloading" />
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:orientation="vertical" >
 
             <TextView
@@ -48,4 +49,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
diff --git a/qBittorrentClient/res/layout/tablet_help.xml b/qBittorrentClient/res/layout/tablet_help.xml
@@ -21,7 +21,7 @@
         android:layout_toRightOf="@+id/arrow"
         android:background="@android:color/white"
         android:padding="10dp"
-        android:text="Use the drawer menu to choose an option" />
+        android:text="@string/tablet_help" />
 
     <ImageView
         android:id="@+id/arrow"
@@ -31,6 +31,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginLeft="15dp"
         android:layout_marginTop="20dp"
+        android:contentDescription="@string/icon"
         android:src="@drawable/ic_arrow" />
 
-</RelativeLayout>
+</RelativeLayout>