From 6c50e353291093116dd5b77b4aa7ef3044fedb09 Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Mon, 26 Aug 2013 17:54:02 +0200
Subject: [PATCH] Preparing for beta 1 release with proper list of used
 libraries and their licenses.

---
 core/AndroidManifest.xml         |   4 +-
 core/res/layout/dialog_about.xml | 101 +++++++++++++++++++------------
 core/res/values/strings.xml      |   2 +
 full/AndroidManifest.xml         |   4 +-
 lite/AndroidManifest.xml         |   4 +-
 5 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/core/AndroidManifest.xml b/core/AndroidManifest.xml
index a6e16137..1bb75454 100644
--- a/core/AndroidManifest.xml
+++ b/core/AndroidManifest.xml
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.core"
-	android:versionCode="4"
-	android:versionName="2.0-alpha4" >
+	android:versionCode="5"
+	android:versionName="2.0-beta1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
diff --git a/core/res/layout/dialog_about.xml b/core/res/layout/dialog_about.xml
index 9f7f61a9..2e01e4ee 100644
--- a/core/res/layout/dialog_about.xml
+++ b/core/res/layout/dialog_about.xml
@@ -15,50 +15,73 @@
   You should have received a copy of the GNU General Public License
   along with Transdroid.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:orientation="vertical"
-	android:padding="@dimen/margin_default" >
+	android:fillViewport="true" >
 
-	<TextView
-		android:layout_width="wrap_content"
+	<LinearLayout
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:layout_marginBottom="@dimen/margin_half"
-		android:layout_marginTop="@dimen/margin_half"
-		android:drawableLeft="@drawable/ic_launcher"
-		android:drawablePadding="@dimen/margin_half"
-		android:fontFamily="sans-serif-condensed"
-		android:text="@string/app_name"
-		android:textColor="@android:color/white"
-		android:textSize="36sp" />
+		android:orientation="vertical"
+		android:padding="@dimen/margin_default" >
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:gravity="center"
-		android:text="@string/system_description" />
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/margin_half"
+			android:layout_marginTop="@dimen/margin_half"
+			android:drawableLeft="@drawable/ic_launcher"
+			android:drawablePadding="@dimen/margin_half"
+			android:fontFamily="sans-serif-condensed"
+			android:text="@string/app_name"
+			android:textColor="@android:color/white"
+			android:textSize="36sp" />
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:layout_marginTop="@dimen/margin_default"
-		android:fontFamily="sans-serif-condensed"
-		android:gravity="center"
-		android:text="@string/system_developer"
-		android:textColor="@android:color/white"
-		android:textSize="18sp" />
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:gravity="center"
+			android:text="@string/system_description" />
 
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="center_horizontal"
-		android:layout_marginBottom="@dimen/margin_default"
-		android:layout_marginTop="4dip"
-		android:gravity="center"
-		android:text="@string/system_license" />
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginTop="@dimen/margin_default"
+			android:fontFamily="sans-serif-condensed"
+			android:gravity="center"
+			android:text="@string/system_developer"
+			android:textColor="@android:color/white"
+			android:textSize="18sp" />
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/margin_default"
+			android:layout_marginTop="4dip"
+			android:gravity="center"
+			android:text="@string/system_license" />
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/margin_half"
+			android:gravity="center"
+			android:text="@string/system_librarieslabel" />
+		
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
+			android:layout_marginBottom="@dimen/margin_default"
+			android:fontFamily="monospace"
+			android:textSize="12sp"
+			android:text="@string/system_libraries" />
+	</LinearLayout>
 
-</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index 22c2a5cb..b37aedad 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -362,6 +362,8 @@
 	<string name="system_name" translatable="false">Transdroid</string>
 	<string name="system_developer" translatable="false">\u00A9 Eric Kok, 2312 development</string>
 	<string name="system_license" translatable="false">Published under GNU General Public License v3</string>
+	<string name="system_librarieslabel">Some code/libraries are used in the project:</string>
+	<string name="system_libraries" translatable="false">ActionBarSherlock\n \u00A0 http://actionbarsherlock.com/\n \u00A0 Jake Wharton  \n \u00A0 Apache License, Version 2.0\nAndroidAnnotations\n \u00A0 http://androidannotations.org/\n \u00A0 Pierre-Yves Ricau (eBusinessInformations) et al.  \n \u00A0 Apache License, Version 2.0\nCrouton\n \u00A0 https://github.com/keyboardsurfer/Crouton\n \u00A0 Code: Benjamin Weiss (Neofonie Mobile Gmbh) et al.  \n \u00A0 Idea: Cyril Mottier  \n \u00A0 Apache License, Version 2.0\nBase16Encoder\n \u00A0 http://openjpa.apache.org/\n \u00A0 Marc Prud\'hommeaux  \n \u00A0 Apache OpenJPA\n MultipartEntity  \n \u00A0 Apache Software Foundation  \n \u00A0 Apache License, Version 2.0\nRssParser (learning-android)\n \u00A0 http://github.com/digitalspaghetti/learning-android\n \u00A0 Tane Piper  \n \u00A0 Public Domain\nBase64\n \u00A0 http://iharder.net/base64\n \u00A0 Robert Harder  \n \u00A0 Public Domain\nandroid-xmlrpc\n \u00A0 http://code.google.com/p/android-xmlrpc/\n \u00A0 pskink et al.  \n \u00A0 Apache License, Version 2.0\nandroid-ColorPickerPreference\n \u00A0 https://github.com/attenzione/android-ColorPickerPreference\n \u00A0 Daniel Nilsson and Sergey Margaritov  \n \u00A0 Apache License, Version 2.0\nCheckableRelativeLayout\n \u00A0 http://www.marvinlabs.com/2010/10/custom-listview-ability-check-items/\n \u00A0 Cédric Caron (MarvinLabs)\n \u00A0 Public Domain</string>
 	<string name="system_description">Manage your torrents from your Android device</string>
 
 </resources>
diff --git a/full/AndroidManifest.xml b/full/AndroidManifest.xml
index b1eb62ee..2508b9e9 100644
--- a/full/AndroidManifest.xml
+++ b/full/AndroidManifest.xml
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.full"
-	android:versionCode="4"
-	android:versionName="2.0-alpha4" >
+	android:versionCode="5"
+	android:versionName="2.0-beta1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"
diff --git a/lite/AndroidManifest.xml b/lite/AndroidManifest.xml
index baba7250..be11360b 100644
--- a/lite/AndroidManifest.xml
+++ b/lite/AndroidManifest.xml
@@ -17,8 +17,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.transdroid.lite"
-	android:versionCode="4"
-	android:versionName="2.0-alpha4" >
+	android:versionCode="5"
+	android:versionName="2.0-beta1" >
 
 	<uses-sdk
 		android:minSdkVersion="7"