merge pagecurl to master

AndroidManifest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.quran.labs.androidquran" android:versionName="1.3.1"
-	android:versionCode="5">
+	package="com.quran.labs.androidquran" android:versionName="1.4.0"
+	android:versionCode="6">
 	<application android:icon="@drawable/icon" android:label="@string/app_name"
-		android:debuggable="true">
+		android:debuggable="false">
 		<activity android:name=".QuranActivity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -14,8 +14,7 @@
 		<activity android:name=".QuranDataActivity" android:screenOrientation="portrait" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name=".AboutUsActivity" android:screenOrientation="portrait"/>
 		<activity android:name=".HelpActivity" android:screenOrientation="portrait"/>
-		<activity android:name=".QuranViewActivity"/>
-		<activity android:name=".ExpViewActivity"/>
+		<activity android:name=".QuranViewActivity" />
 		<service android:enabled="true" android:name=".service.QuranDataService" />
 		<activity android:name=".BookmarksActivity"/>
 		<activity android:name=".TranslationActivity"/>

res/layout-land/quran_page_layout.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width = "fill_parent"
+	android:layout_height = "fill_parent"
+	android:orientation = "vertical"
+	android:layout_gravity = "center">
+	<TextView 
+		android:id="@+id/txtPageNotFound" 
+		android:text="@string/pageLoading"
+		android:visibility="gone" 
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:gravity = "center"
+		android:textSize="16sp" 
+		android:textColor="@android:color/black"
+		android:background="#FFF4CB" />	
+ 	<ScrollView 
+ 		android:id = "@+id/page_scroller"
+ 		android:layout_width = "wrap_content"
+ 		android:layout_height = "wrap_content"
+ 		android:background = "@android:color/black"
+ 		android:fillViewport="true">
+	<ImageView
+		android:id = "@+id/page_image"
+		android:background="#FFF4CB"
+  		android:layout_width = "wrap_content"
+  		android:layout_height =  "wrap_content"/>
+  	</ScrollView>
+</LinearLayout>

res/layout/quran_exp.xml

@@ -1,15 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/expLayout"
 	android:layout_width="fill_parent" android:layout_height="fill_parent">
+
+<!-- 
 	<com.quran.labs.androidquran.widgets.QuranGallery
 		android:id="@+id/gallery" android:background="#FFF4CB"
 		android:spacing="10px" android:layout_width="fill_parent"
 		android:layout_height="fill_parent" />
+		
+-->
+
+	<com.quran.labs.androidquran.widgets.QuranPageCurlView
+		xmlns:quran="http://schemas.android.com/apk/res/com.quran.labs.androidquran"
+		android:id="@+id/gallery"
+		android:layout_width = "fill_parent"
+		android:layout_height = "fill_parent"
+		android:orientation = "vertical"
+  		quran:enableDebugMode="false"
+  		quran:curlSpeed = "80"
+  		quran:curlMode = "1" />
+
 	<TextView android:id="@+id/pagetitle" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:background="#90000000"
 		android:textColor="#ffffff" android:layout_gravity="top"
 		android:paddingTop="10dip" android:paddingBottom="10dip"
 		android:gravity="center" />
+
 	<LinearLayout android:id="@+id/toolbar" android:layout_width="fill_parent" 
 		android:layout_height="wrap_content" android:orientation="horizontal" >
 		<ImageView android:id="@+id/btnBookmark" android:src="@drawable/bookmarks"

res/layout/quran_page_layout.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width = "fill_parent"
+	android:layout_height = "fill_parent"
+	android:orientation = "vertical"
+	android:layout_gravity = "center">
+	<TextView 
+		android:id="@+id/txtPageNotFound" 
+		android:text="@string/pageLoading"
+		android:visibility="gone" 
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:gravity = "center" 
+		android:textSize="16sp" 
+		android:textColor="@android:color/black"
+		android:background="#FFF4CB" />
+	<ImageView
+		android:id = "@+id/page_image"
+		android:background="#FFF4CB"
+  		android:layout_width = "wrap_content"
+  		android:layout_height =  "wrap_content" />
+</LinearLayout>

res/layout/quran_translation.xml

@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.quran.labs.androidquran.widgets.GalleryFriendlyScrollView
-	xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/pageScrollView"
-	android:layout_width="fill_parent" android:layout_height="wrap_content">
-	<TextView android:background="#FFF4CB" android:textColor="#000000"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:textAppearance="?android:attr/textAppearanceSmall" android:id="@+id/translationText"
-		android:padding="5dip" />
-</com.quran.labs.androidquran.widgets.GalleryFriendlyScrollView>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width = "fill_parent"
+    android:layout_height = "fill_parent"
+    android:orientation = "vertical"
+    android:layout_gravity = "center">
+    <ScrollView 
+        android:id = "@+id/page_scroller"
+        android:layout_width = "wrap_content"
+        android:layout_height = "wrap_content"
+        android:background = "@android:color/black"
+        android:fillViewport="true">
+        <TextView android:background="#FFF4CB" android:textColor="#000000"
+            android:layout_width="fill_parent" android:layout_height="fill_parent"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:id="@+id/translationText"
+            android:padding="5dip" />
+    </ScrollView>
+</LinearLayout>

res/values/attr.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?> 
+<resources> 
+	<declare-styleable name="QuranPageCurlView"> 
+		<attr name="enableDebugMode" format="boolean" /> 
+		<attr name="curlSpeed" format="integer" /> 
+		<attr name="updateRate" format="integer" /> 
+		<attr name="initialEdgeOffset" format="integer" /> 
+		<attr name="backgroundColor" format="color" />
+		<attr name="curlMode" format="integer"/> 
+	</declare-styleable>
+
+	<declare-styleable name="SlidingPanel">
+		<attr name="speed" format="integer" />
+		<attr name="targetHeight" format="dimension" />
+		<attr name="isRTL" format="boolean" />
+	</declare-styleable>
+
+</resources>

res/values/strings.xml

@@ -4,6 +4,7 @@
 	<string name="translationsNeeded">Need to download translation!</string>
 	<string name="app_name">Quran Android</string>
 	<string name="pageNotFound">Page not found.</string>
+	<string name="pageLoading">Page Loading...</string>
 	<string name="downloadPrompt_title">Download Required Files?</string>
 	<string name="downloadPrompt">For optimal performance, some files must be
 		downloaded to the sd card.
@@ -41,16 +42,17 @@
 	<string name="email_subject">Feedback</string>
 	<string name="email_to">[email protected]</string>
 	<string name="aboutUs">Quran Android is a free, open source Quran
-      application for Android. The images used are from the quran.com
-      project, and the data used in the translations and Arabic comes from
-      tanzil.net.  graphics by @somaiagabr.
+		application for Android.  The images used are from the quran.com
+		project, and the data used in the translations and Arabic comes from
+		tanzil.net.
+		\n\nCredits:
+		\n @wnafee - page flip animation (based on android-page-curl project)
+		\n @hams_rrr - arabic support for non-arabic phones
+		\n @neo_4583 - arabic reshaper project
+		\n @somaiagabr - graphics
 		\n\nNew features in this release:
-		\n- Enhanced Navigation.
-		\n- Arabic support (if your device does not support Arabic).
-		\n- New translations added: French, German, Urdu, Spanish, Indonesian, 
-		Turkish and Malay Translations.
-		\n- Al Tafsir Al Mouyassar. (Added with translations)
-		\n- Search translations. (Soon we will introduce Arabic search)
+		\n- Awesome page flip animation (thanks @wnafee).
+		\n- Minor bugfixes.
 		\n\nUpcoming features include:
 		\n- Recitation.
 		\nAnd more..
@@ -68,9 +70,9 @@
 	    \n- Adjust translation text size to your preference via Settings.
 	    \n- Initial search implementation allows you to search the active translation 
 	    via the search button.
- 	    \n- On tapping the center of the screen and you will find the page bookmarker 
- 	    on the top left corner. 
- 	    tap on the bookmarker to toggle the page bookmark state.
+ 	    \n- On tapping the center of the screen and you will find the page bookmark 
+ 	    option in the top left corner. 
+ 	    tap on the bookmark button to toggle the page bookmark state.
 	    \n- You can add as many bookmarks as you\'d like.
 	    \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>