From 387b2c8834db4d648cc7ea77729a4f8735f2b07b Mon Sep 17 00:00:00 2001
From: Hussein Maher <hussein.maher@dynamix-systems.com>
Date: Wed, 22 Dec 2010 01:34:23 +0200
Subject: [PATCH] 1.2 Version update

---
 AndroidManifest.xml                           |  3 +-
 README                                        | 14 ++++-
 gen/com/quran/labs/androidquran/R.java        | 58 +++++++++----------
 res/layout/about_us.xml                       | 23 +++-----
 res/values/strings.xml                        | 24 +++++---
 .../labs/androidquran/AboutUsActivity.java    | 15 +----
 6 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 139bcc460e..98526c905e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.quran.labs.androidquran" android:versionCode="2"
-	android:versionName="1.1">
+	package="com.quran.labs.androidquran" android:versionName="1.2" android:versionCode="3">
 	<application android:icon="@drawable/icon" android:label="@string/app_name"
 		android:debuggable="true">
 		<activity android:name=".QuranActivity" android:label="@string/app_name"
diff --git a/README b/README
index f6bbf3c445..f5ee706147 100644
--- a/README
+++ b/README
@@ -11,8 +11,16 @@ patches, comments, etc are welcome.
 
 changelog
 ---------
+version 1.2
+- Sahih Internation Translation introduced
+- Fix orientation in either landscape or portrait modes
+- Adjust translation text size
+- Centralized menu for app
+- Bookmarks are added via menu
+- Fixed bookmarks bug
+
 version 1.1
-- added bookmarks (thanks Hussein)
+- added bookmarks
 - updated browse to allow browsing by juz'
 - remember the last place you left off
 - added help dialog
@@ -24,6 +32,8 @@ version 1.0
 
 todo
 ----
-- add translation for verses
+- add multiple translations
 - add transliteration search
+- add audio
+- add tafsir
 - code cleanup [strings localization, comments, etc]
diff --git a/gen/com/quran/labs/androidquran/R.java b/gen/com/quran/labs/androidquran/R.java
index 25959ae693..8dd8204d2e 100644
--- a/gen/com/quran/labs/androidquran/R.java
+++ b/gen/com/quran/labs/androidquran/R.java
@@ -22,38 +22,36 @@ public static final class drawable {
         public static final int translation=0x7f020008;
     }
     public static final class id {
-        public static final int bgPageview=0x7f070013;
-        public static final int btnAboutBack=0x7f070005;
-        public static final int btnEmailUs=0x7f070006;
-        public static final int btnHelpBack=0x7f07000a;
-        public static final int cancelButton=0x7f07000c;
-        public static final int jumpButton=0x7f07000d;
+        public static final int bgPageview=0x7f070011;
+        public static final int btnEmailUs=0x7f070004;
+        public static final int btnHelpBack=0x7f070008;
+        public static final int cancelButton=0x7f07000a;
+        public static final int jumpButton=0x7f07000b;
         public static final int linear=0x7f070000;
-        public static final int lstBookmarks=0x7f070007;
-        public static final int menu_item_about_us=0x7f070018;
-        public static final int menu_item_bookmarks=0x7f07001a;
-        public static final int menu_item_bookmarks_add=0x7f07001c;
-        public static final int menu_item_bookmarks_remove=0x7f07001d;
-        public static final int menu_item_bookmarks_view=0x7f07001b;
-        public static final int menu_item_help=0x7f07001f;
-        public static final int menu_item_jump=0x7f070017;
-        public static final int menu_item_settings=0x7f070019;
-        public static final int menu_item_translations=0x7f07001e;
-        public static final int pageScrollView=0x7f070015;
-        public static final int page_field=0x7f07000b;
-        public static final int page_info=0x7f070011;
-        public static final int pageview=0x7f070014;
-        public static final int splashview=0x7f070016;
-        public static final int sura_info=0x7f070010;
-        public static final int sura_title=0x7f07000f;
-        public static final int suralist=0x7f07000e;
-        public static final int translationText=0x7f070012;
+        public static final int lstBookmarks=0x7f070005;
+        public static final int menu_item_about_us=0x7f070016;
+        public static final int menu_item_bookmarks=0x7f070018;
+        public static final int menu_item_bookmarks_add=0x7f07001a;
+        public static final int menu_item_bookmarks_remove=0x7f07001b;
+        public static final int menu_item_bookmarks_view=0x7f070019;
+        public static final int menu_item_help=0x7f07001d;
+        public static final int menu_item_jump=0x7f070015;
+        public static final int menu_item_settings=0x7f070017;
+        public static final int menu_item_translations=0x7f07001c;
+        public static final int pageScrollView=0x7f070013;
+        public static final int page_field=0x7f070009;
+        public static final int page_info=0x7f07000f;
+        public static final int pageview=0x7f070012;
+        public static final int splashview=0x7f070014;
+        public static final int sura_info=0x7f07000e;
+        public static final int sura_title=0x7f07000d;
+        public static final int suralist=0x7f07000c;
+        public static final int translationText=0x7f070010;
         public static final int txtAbout=0x7f070001;
-        public static final int txtCopyRights=0x7f070004;
-        public static final int txtDevelopedBy=0x7f070003;
-        public static final int txtHelp=0x7f070009;
-        public static final int txtHelpTitle=0x7f070008;
-        public static final int txtSupport=0x7f070002;
+        public static final int txtCopyRights=0x7f070003;
+        public static final int txtDevelopedBy=0x7f070002;
+        public static final int txtHelp=0x7f070007;
+        public static final int txtHelpTitle=0x7f070006;
     }
     public static final class layout {
         public static final int about_us=0x7f030000;
diff --git a/res/layout/about_us.xml b/res/layout/about_us.xml
index dd06c7d878..a9e7f0e409 100644
--- a/res/layout/about_us.xml
+++ b/res/layout/about_us.xml
@@ -5,21 +5,17 @@
 
 	<LinearLayout android:id="@+id/linear"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:orientation="vertical">
+		android:scrollbarAlwaysDrawVerticalTrack="true"
+		android:orientation="vertical" android:paddingBottom="5dip">
 		<TextView android:layout_width="fill_parent"
 			android:layout_height="fill_parent" android:visibility="visible"
 			android:textAppearance="?android:attr/textAppearanceSmall"
 			android:textColor="#FFFFFF" android:textStyle="bold" android:id="@+id/txtAbout"
 			android:singleLine="false" android:scrollbarAlwaysDrawVerticalTrack="true"
-			android:scrollbars="vertical" android:maxLines="16" android:text="@string/aboutUs"
+			android:scrollbars="vertical" android:text="@string/aboutUs"
 			android:padding="10dip" android:lineSpacingExtra="4dip" />
-		<TextView android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:visibility="visible"
-			android:textAppearance="?android:attr/textAppearanceSmall"
-			android:textStyle="bold" android:id="@+id/txtSupport"
-			android:singleLine="false" android:textColor="#CCCCCC" android:text="" />
-
 	</LinearLayout>
+	
 	<TextView android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:linksClickable="true"
 		android:id="@+id/txtDevelopedBy" android:text="@string/developedBy"
@@ -31,13 +27,12 @@
 		android:id="@+id/txtCopyRights" android:text="@string/copyRights"
 		android:textSize="12dip" android:layout_above="@id/txtDevelopedBy"
 		android:textColor="#FFFFFF" android:paddingLeft="10dip" />
-	<Button android:layout_width="300dip" android:layout_height="wrap_content"
-		android:id="@+id/btnAboutBack" android:text="Back"
-		android:layout_centerHorizontal="true" android:layout_above="@id/txtCopyRights"
-		android:visibility="visible" />
-	<Button android:layout_width="300dip" android:layout_height="wrap_content"
+		
+	<Button android:layout_width="300dip" android:layout_height="20px"
 		android:id="@+id/btnEmailUs" android:text="Email Quran Android"
-		android:layout_centerHorizontal="true" android:layout_above="@id/btnAboutBack"
+		android:layout_centerHorizontal="true"
+		android:layout_below="@id/linear" 
+		android:layout_above="@id/txtCopyRights"
 		android:visibility="visible" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7a6898a4db..838996a22a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,19 +34,29 @@
 	<string name="page_hint">Page Number</string>
 	<string name="go">Go</string>
 	<string name="cancel">Cancel</string>
-	<string name="developedBy">Quran Android - Muslim Developers</string>
+	<string name="developedBy">Developed by: Ahmed El-Helw - Hussein Maher</string>
 	<string name="copyRights">Copy Rights - All Muslims</string>
 	<string name="email_subject">Feedback</string>
 	<string name="email_to">quran.android@gmail.com</string>
 	<string name="aboutUs">Quran Android is a free, open source Quran
-		application for Android.\nUpcoming features include:
-		\n- Translations.\n- Search.\n- And more..\n\nLa tansawna men saleh el
-		doaa.</string>
+		application for Android.
+		\n\nNew features in this release:
+		\n- English translation (Sahih International)
+		\n- Ability to fix orientation to either landscape or portrait modes.
+		\n\nUpcoming features include:
+		\n- More translations.
+		\n- Tafsir.
+		\n- Recitation.
+		\n- Search.
+		\n- And more..
+		\n\nLa tansawna men saleh el doaa.
+	</string>
 	<string name="help_title">Quran Android Help</string>
-	<string name="help">- Font size too small?  Try
-	    flipping your screen to landscape mode for a zoomed in version.
+	<string name="help">- Flip your screen to landscape mode for a zoomed in version.
 	    \n- Change pages by swiping your finger across the screen or by using the arrow keys or trackball.
-	    \n- Long press on any page to bring up the option to bookmark a page.
+	    \n- You can fix the orientation in either landscape or portrait modes.
+	    \n- Adjust translation text size to your preference via Settings.
+	    \n- Bookmark a page via Menu > Bookmarks > View.
 	    \n- You can add as many bookmarks as you\'d like.  Long press on a bookmark to remove it.
 	    \n- The application remembers the last page you were reading and displays it when you restart the app.
 	    \n- Don\'t forget to check out the settings.</string>
diff --git a/src/com/quran/labs/androidquran/AboutUsActivity.java b/src/com/quran/labs/androidquran/AboutUsActivity.java
index da2abd5430..d6158eb709 100644
--- a/src/com/quran/labs/androidquran/AboutUsActivity.java
+++ b/src/com/quran/labs/androidquran/AboutUsActivity.java
@@ -10,28 +10,18 @@
 import android.widget.TextView;
 
 public class AboutUsActivity extends Activity implements OnClickListener {
-	protected Button btnBack;
 	protected Button btnEmailUs;
-	protected TextView txtDevelopedBy;
-	protected TextView txtCopyRights;
 	protected TextView txtAbout;
 
 	public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.about_us);
-        btnBack = (Button)findViewById(R.id.btnAboutBack);        
-        btnBack.setOnClickListener(this);
         
         btnEmailUs = (Button)findViewById(R.id.btnEmailUs);
         btnEmailUs.setOnClickListener(this);
         
-        txtDevelopedBy = (TextView)findViewById(R.id.txtDevelopedBy);
-        txtDevelopedBy.setOnClickListener(this);
-        
-        txtCopyRights = (TextView)findViewById(R.id.txtCopyRights);
-        txtCopyRights.setOnClickListener(this);
-        
         txtAbout = (TextView)findViewById(R.id.txtAbout);
+        txtAbout.setVerticalScrollBarEnabled(true);
         txtAbout.setMovementMethod(new ScrollingMovementMethod());
         
         if (getWindowManager().getDefaultDisplay().getHeight() < 
@@ -44,9 +34,6 @@ public void onCreate(Bundle savedInstanceState) {
 	@Override
 	public void onClick(View v) {
 		switch (v.getId()) {
-		case R.id.btnAboutBack:
-			finish();
-			break;
 		case R.id.btnEmailUs:
 			final Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND);			 
 			emailIntent.setType("plain/text");