Merge pull request #63 from mahmoudhossam/master

app2sd enabled. jazakAllah khair @mahmoudhossam.
quran · Aug 13, 2011 · e68e3b4 · e68e3b4
2 parents fe7913d + fc8ab20
commit e68e3b4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 20 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,38 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.quran.labs.androidquran" android:versionCode="8" android:versionName="1.5.1">
-	<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
-		<activity android:name=".QuranActivity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation">
+	package="com.quran.labs.androidquran" android:versionCode="8"
+	android:versionName="1.5.1" android:installLocation="preferExternal">
+	<application android:icon="@drawable/icon" android:label="@string/app_name"
+		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" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
 
-		<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=".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=".BookmarksActivity"/>
-		<activity android:name=".TranslationActivity"/>
-		<activity android:name=".DownloadActivity" android:screenOrientation="portrait"/>
-		<activity android:name=".QuranPreferenceActivity" android:screenOrientation="portrait"/>
+		<activity android:name=".BookmarksActivity" />
+		<activity android:name=".TranslationActivity" />
+		<activity android:name=".DownloadActivity"
+			android:screenOrientation="portrait" />
+		<activity android:name=".QuranPreferenceActivity"
+			android:screenOrientation="portrait" />
 		<activity android:name=".SearchActivity" android:launchMode="singleTop">
 			<intent-filter>
 				<action android:name="android.intent.action.SEARCH" />
 			</intent-filter>
 			<meta-data android:name="android.app.searchable"
 				android:resource="@xml/searchable" />
 		</activity>
-			
+
 		<!-- declare the default searchable Activity for the whole app -->
-		<meta-data android:name="android.app.default_searchable" android:value=".SearchActivity" />
+		<meta-data android:name="android.app.default_searchable"
+			android:value=".SearchActivity" />
 		<!-- provides search suggestions for verses. -->
-		<provider android:name=".data.QuranDataProvider" android:authorities="com.quran.labs.androidquran.data.QuranDataProvider" />
-
+		<provider android:name=".data.QuranDataProvider"
+			android:authorities="com.quran.labs.androidquran.data.QuranDataProvider" />
+
 		<service android:enabled="true" android:name=".service.QuranDataService" />
 		<service android:name=".service.QuranAudioService" />
-		
+
 	</application>
 	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="7" />
 

diff --git a/default.properties b/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-7
-android.library.reference.1=../johannilsson-android-actionbar-1a98f28/actionbar
+target=android-8
+android.library.reference.1=../android-actionbar/actionbar
diff --git a/src/com/quran/labs/androidquran/QuranActivity.java b/src/com/quran/labs/androidquran/QuranActivity.java
@@ -51,6 +51,10 @@ public void onCreate(Bundle savedInstanceState) {
 		addActions();
     }
 
+    /**
+     * Sets up the action bar.
+     */
+
 	protected void addActions() {
 		actionBar.setTitle("Quran");
 		actionBar.addAction(getIntentAction(ACTION_RESUME, R.drawable.translation));
@@ -157,7 +161,7 @@ public QuranElement(String text, boolean isJuz, int number, int page){
 		}
 	}
 
-	// http://www.androidpeople.com/android-custom-listview-tutorial-example/
+
 	private class EfficientAdapter extends BaseAdapter {
 		private LayoutInflater mInflater;
 		private QuranElement[] elements;
@@ -226,6 +230,7 @@ public void onClick(View v) {
 			return convertView;
 		}
 
+
 		private void downloadSuraAudio(int suraId) {
 			Intent intent = new Intent(QuranActivity.this, QuranDataService.class);
 			intent.putExtra(QuranDataService.DWONLOAD_TYPE_KEY, QuranDataService.DOWNLOAD_SURA_AUDIO);

diff --git a/src/com/quran/labs/androidquran/QuranJumpDialog.java b/src/com/quran/labs/androidquran/QuranJumpDialog.java
@@ -63,8 +63,8 @@ public void jump(){
 		leave();
 	}
 
-	// http://groups.google.com/group/android-developers/browse_frm/
-	//    thread/17210d784766602d/d430c900a9c4019c?
+	//hides the soft keyboard
+
 	public void leave(){
 		EditText pageField = (EditText)this.findViewById(R.id.page_field);
 		InputMethodManager imm =