From c5c91fb2b604559f73ded5979f1fab37ec0d730c Mon Sep 17 00:00:00 2001
From: Khalid Hussain <mohammad.khalid.hussain@gmail.com>
Date: Sun, 11 Jan 2015 02:13:19 +0800
Subject: [PATCH] Fix Dua Group ListView problem

Fixes issue #5.
---
 app/src/main/AndroidManifest.xml                 | 16 ++++++++--------
 ...uaListActivity.java => DuaGroupActivity.java} | 10 ++++------
 app/src/main/res/menu/dua_list.xml               |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)
 rename app/src/main/java/com/example/khalid/hisnulmuslim/{DuaListActivity.java => DuaGroupActivity.java} (93%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a9957dd..86bc624 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".DuaListActivity"
+            android:name=".DuaGroupActivity"
             android:label="@string/title_activity_dua_list"
             android:launchMode="singleTop" >
             <intent-filter>
@@ -26,31 +26,31 @@
         <activity
             android:name=".DuaDetailActivity"
             android:label="@string/title_activity_dua_detail"
-            android:parentActivityName=".DuaListActivity" >
+            android:parentActivityName=".DuaGroupActivity" >
         </activity>
         <activity
             android:name=".AboutActivity"
             android:label="@string/title_activity_about"
-            android:parentActivityName=".DuaListActivity" >
+            android:parentActivityName=".DuaGroupActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.khalid.hisnulmuslim.DuaListActivity" />
+                android:value=".DuaGroupActivity" />
         </activity>
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName=".DuaListActivity" >
+            android:parentActivityName=".DuaGroupActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.khalid.hisnulmuslim.DuaListActivity" />
+                android:value=".DuaGroupActivity" />
         </activity>
         <activity
             android:name=".BookmarksActivity"
             android:label="@string/title_activity_bookmarks"
-            android:parentActivityName=".DuaListActivity" >
+            android:parentActivityName=".DuaGroupActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.example.khalid.hisnulmuslim.DuaListActivity" />
+                android:value=".DuaGroupActivity" />
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/example/khalid/hisnulmuslim/DuaListActivity.java b/app/src/main/java/com/example/khalid/hisnulmuslim/DuaGroupActivity.java
similarity index 93%
rename from app/src/main/java/com/example/khalid/hisnulmuslim/DuaListActivity.java
rename to app/src/main/java/com/example/khalid/hisnulmuslim/DuaGroupActivity.java
index ef2e3c6..d3820f6 100644
--- a/app/src/main/java/com/example/khalid/hisnulmuslim/DuaListActivity.java
+++ b/app/src/main/java/com/example/khalid/hisnulmuslim/DuaGroupActivity.java
@@ -21,7 +21,7 @@
 import database.ExternalDbOpenHelper;
 import database.HisnDatabaseInfo;
 
-public class DuaListActivity extends ActionBarActivity {
+public class DuaGroupActivity extends ActionBarActivity {
     private SQLiteDatabase database;
     public ArrayList ArrayListDuas = new ArrayList<Dua>();
     private DuaGroupAdapter mAdapter;
@@ -34,8 +34,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_dua_list);
 
-        // TextView txtQuery = (TextView) findViewById(R.id.txtQuery);
-
         ExternalDbOpenHelper dbOpenHelper =
                 ExternalDbOpenHelper.getInstance(this);
         database = dbOpenHelper.openDataBase();
@@ -71,7 +69,6 @@ public void fromArrayListToListView() {
         final ListView listView;
         listView = (ListView) findViewById(R.id.duaListView);
 
-        // Search Related (Filter)
         listView.setTextFilterEnabled(true);
 
         this.mAdapter = new DuaGroupAdapter(this,
@@ -87,8 +84,9 @@ public void onItemClick(AdapterView<?> parent, View view,
                 intent = new Intent(getBaseContext(),
                         DuaDetailActivity.class);
 
-                String dua_id = String.valueOf(position + 1);
-                String dua_title = ((Dua) ArrayListDuas.get(position)).getTitle();
+                Dua SelectedDua = (Dua) parent.getAdapter().getItem(position);
+                String dua_id = SelectedDua.getReference() + "";
+                String dua_title = SelectedDua.getTitle();
 
                 intent.putExtra("dua_id", dua_id);
                 intent.putExtra("dua_title", dua_title);
diff --git a/app/src/main/res/menu/dua_list.xml b/app/src/main/res/menu/dua_list.xml
index ea2eb44..cb899bd 100644
--- a/app/src/main/res/menu/dua_list.xml
+++ b/app/src/main/res/menu/dua_list.xml
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.example.khalid.hisnulmuslim.DuaListActivity" >
+    tools:context="com.example.khalid.hisnulmuslim.DuaGroupActivity" >
     <item android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:orderInCategory="100"