Merge branch 'testing' for releases 1.9.1

* Added Upload and download rate limit for tablets … * Fixed issue related to empty port number field * Fixed About text * Added the refresh option when launching the app * Trapped odd condition when changing account's server and setting upload and download limit rates * Added "(KiB/s)" units in upload and download dialogs * Changed typo "qBitttorrent" application name * Added the retrieval of qBittorrent's options after changing the account's settings * Added Ads
lgallard · Sep 1, 2014 · a9df982 · a9df982
2 parents 135d690 + d6d8f54
commit a9df982
Show file tree

Hide file tree

Showing 12 changed files with 225 additions and 96 deletions.
diff --git a/qBittorrentClient/AndroidManifest.xml b/qBittorrentClient/AndroidManifest.xml
@@ -11,13 +11,11 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.lgallardo.qbittorrentclient"
-
-    android:versionCode="18"
-    android:versionName="1.8" >
+    android:versionCode="191"
+    android:versionName="1.9.1" >
 
     <uses-sdk
         android:minSdkVersion="14"
-
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -50,8 +48,10 @@
             </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"
@@ -83,12 +83,19 @@
         <activity
             android:name="com.lgallardo.qbittorrentclient.SettingsActivity"
             android:label="@string/title_activity_settings" >
-        </activity> 
-
-                <activity
+        </activity>
+        <activity
             android:name="com.lgallardo.qbittorrentclient.OptionsActivity"
             android:label="Options" >
-        </activity>     
+        </activity>
+        <activity
+            android:name="com.google.android.gms.ads.AdActivity"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" >
+        </activity>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+             />
     </application>
 
-</manifest>
+</manifest>
diff --git a/qBittorrentClient/project.properties b/qBittorrentClient/project.properties
@@ -22,3 +22,4 @@
 
 # Project target.
 target=android-19
+android.library.reference.1=../../../Projects/Android/extras/google/google_play_services/libproject/google-play-services_lib
diff --git a/qBittorrentClient/res/drawable-mdpi/qbittorrent32.png b/qBittorrentClient/res/drawable-mdpi/qbittorrent32.png
diff --git a/qBittorrentClient/res/layout/about.xml b/qBittorrentClient/res/layout/about.xml
@@ -20,7 +20,7 @@
         android:layout_below="@+id/qBittorrent_logo"
         android:layout_centerHorizontal="true"
         android:background="@android:color/white"
-        android:text="qBitttorrent Client"
+        android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
     <ImageView
@@ -37,7 +37,7 @@
         android:id="@+id/textView3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView2"
         android:layout_marginTop="10dp"
         android:padding="10dp"

diff --git a/qBittorrentClient/res/layout/activity_main.xml b/qBittorrentClient/res/layout/activity_main.xml
@@ -16,8 +16,8 @@
 
     <FrameLayout
         android:id="@+id/one_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:background="@android:color/white" 
         android:layout_weight="2" />
 

diff --git a/qBittorrentClient/res/layout/download_rate_limit.xml b/qBittorrentClient/res/layout/download_rate_limit.xml
@@ -19,7 +19,7 @@ Luis M. Gallardo D.
         android:id="@+id/textView1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Download rate limit" />
+        android:text="Download rate limit (KiB/s)" />
 
     <EditText
         android:id="@+id/download_rate_limit"

diff --git a/qBittorrentClient/res/layout/limit_updown_limit.xml b/qBittorrentClient/res/layout/limit_updown_limit.xml
diff --git a/qBittorrentClient/res/layout/torrent_details.xml b/qBittorrentClient/res/layout/torrent_details.xml
@@ -9,10 +9,10 @@
   Contributors:
       Luis M. Gallardo D. - initial implementation
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@android:color/white"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -26,6 +26,7 @@
         android:layout_height="match_parent" >
 
         <LinearLayout
+            android:id="@+id/linearLayout3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
@@ -175,4 +176,4 @@
         </LinearLayout>
     </ScrollView>
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/qBittorrentClient/res/layout/upload_rate_limit.xml b/qBittorrentClient/res/layout/upload_rate_limit.xml
@@ -19,7 +19,7 @@ Luis M. Gallardo D.
         android:id="@+id/textView1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Upload rate limit" />
+        android:text="Upload rate limit (KiB/s)" />
 
     <EditText
         android:id="@+id/upload_rate_limit"

diff --git a/qBittorrentClient/res/values/strings.xml b/qBittorrentClient/res/values/strings.xml
@@ -11,7 +11,7 @@
 -->
 <resources>
 
-    <string name="app_name">qBitttorrent Client</string>
+    <string name="app_name">qBittorrent Client</string>
     <string name="action_settings">Settings</string>
     <string name="action_refresh">Refresh</string>
     <string name="action_add">Add</string>
@@ -45,7 +45,9 @@
     <string name="setQBittorrentPrefefrences">Options saved</string>
     <string name="setUploadRateLimit">Upload rate limit set</string>
     <string name="setDownloadRateLimit">Download rate limit set</string>
-
+    <string name="error">Error</string>
+    <string name="global_value_error">Global value cannot be retrieved. Please check your connection settings!</string>
+
     <string-array name="navigation_drawer_items_array">
         <item>All</item>
         <item>Downloading</item>
@@ -57,4 +59,4 @@
         <item>Settings</item>
     </string-array>
 
-</resources>
+</resources>