Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Release 1.9.2
Browse files Browse the repository at this point in the history 
* Fixed ads overlapping

Merge branch 'testing'
  • Loading branch information
@lgallard
lgallard committed Sep 9, 2014
2 parents a9df982 + 9080370 commit 1662601
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 121 deletions.
7 changes: 4 additions & 3 deletions qBittorrentClient/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lgallardo.qbittorrentclient"
android:versionCode="191"
android:versionName="1.9.1" >
android:versionCode="192"
android:versionName="1.9.2" >

<uses-sdk
android:minSdkVersion="14"
Expand Down Expand Up @@ -90,7 +90,8 @@
</activity>
<activity
android:name="com.google.android.gms.ads.AdActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" >
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"
Expand Down
45 changes: 31 additions & 14 deletions qBittorrentClient/res/layout-large/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,47 @@
Luis M. Gallardo D. - initial implementation
-->
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:ads="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" >

<LinearLayout
<RelativeLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal" >
android:layout_height="wrap_content"
android:orientation="vertical" >

<FrameLayout
android:id="@+id/list_frame"
android:layout_width="75px"
android:layout_height="match_parent"
android:layout_weight="1" />
<com.google.android.gms.ads.AdView
android:id="@+id/adView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
ads:adSize="SMART_BANNER"
ads:adUnitId="ca-app-pub-1035265933040074/6449288097"
android:gravity="bottom" />

<FrameLayout
android:id="@+id/content_frame"
android:layout_width="0px"
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="2" />
</LinearLayout>
android:layout_above="@+id/adView"
android:orientation="horizontal" >

<FrameLayout
android:id="@+id/list_frame"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />

<FrameLayout
android:id="@+id/content_frame"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2" />
</LinearLayout>
</RelativeLayout>

<ListView
android:id="@+id/left_drawer"
Expand Down
101 changes: 56 additions & 45 deletions qBittorrentClient/res/layout/about.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,53 +13,64 @@
android:layout_height="fill_parent"
android:orientation="vertical" >

<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/qBittorrent_logo"
android:layout_centerHorizontal="true"
android:background="@android:color/white"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content" >

<ImageView
android:id="@+id/qBittorrent_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="41dp"
android:paddingRight="10dp"
android:src="@drawable/ic_launcher" />
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" >

<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
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" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/qBittorrent_logo"
android:layout_centerHorizontal="true"
android:background="@android:color/white"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge" />

<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
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." />
<ImageView
android:id="@+id/qBittorrent_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="41dp"
android:paddingRight="10dp"
android:src="@drawable/ic_launcher" />

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView1"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="Manage all your torrent from your Android using qBittorent Client" />
<TextView
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
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" />

</RelativeLayout>
<TextView
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
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." />

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView1"
android:layout_marginTop="10dp"
android:padding="10dp"
android:text="Manage all your torrent from your Android using qBittorent Client" />
</RelativeLayout>
</ScrollView>

</RelativeLayout>
36 changes: 30 additions & 6 deletions qBittorrentClient/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,41 @@
Luis M. Gallardo D.
-->
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:ads="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" >

<FrameLayout
android:id="@+id/one_frame"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@android:color/white"
android:layout_weight="2" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<com.google.android.gms.ads.AdView
android:id="@+id/adView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
ads:adSize="SMART_BANNER"
ads:adUnitId="ca-app-pub-1035265933040074/6449288097"
android:gravity="bottom" />

<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/adView"
android:orientation="horizontal" >

<FrameLayout
android:id="@+id/one_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white" />
</LinearLayout>
</RelativeLayout>

<ListView
android:id="@+id/left_drawer"
Expand Down
Loading

0 comments on commit 1662601

Please sign in to comment.