Converted four main activities to tab Fragments.

goodgec · May 30, 2014 · 0f3fdda · 0f3fdda
1 parent f2f01e3
commit 0f3fdda
Show file tree

Hide file tree

Showing 10 changed files with 289 additions and 193 deletions.
diff --git a/DotDash/DotDash/src/main/AndroidManifest.xml b/DotDash/DotDash/src/main/AndroidManifest.xml
@@ -13,33 +13,40 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:uiOptions="splitActionBarWhenNarrow" >
+
         <activity
-            android:name="com.groupa.dotdash.dotdash.ConversationsActivity"
-            android:label="@string/title_activity_conversations" >
-        </activity>
-        <activity
-            android:name="com.groupa.dotdash.dotdash.NewMessageActivity"
-            android:label="@string/title_activity_new_message" >
-        </activity>
-        <activity
-            android:name="com.groupa.dotdash.dotdash.ContactsActivity"
-            android:label="@string/title_activity_contacts" >
+            android:name=".DotDash"
+            android:label="DotDash" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
+        <!--<activity-->
+            <!--android:name="com.groupa.dotdash.dotdash.ConversationsActivity"-->
+            <!--android:label="@string/title_activity_conversations" >-->
+        <!--</activity>-->
+        <!--<activity-->
+            <!--android:name="com.groupa.dotdash.dotdash.NewMessageActivity"-->
+            <!--android:label="@string/title_activity_new_message" >-->
+        <!--</activity>-->
+        <!--<activity-->
+            <!--android:name="com.groupa.dotdash.dotdash.ContactsActivity"-->
+            <!--android:label="@string/title_activity_contacts" >-->
+        <!--</activity>-->
         <activity
             android:name="com.groupa.dotdash.dotdash.SingleContactActivity"
-            android:label="@string/title_activity_single_contact"
-            android:parentActivityName="com.groupa.dotdash.dotdash.ContactsActivity" >
-            >
-        </activity>
-        <activity
-            android:name="com.groupa.dotdash.dotdash.SettingsActivity"
-            android:label="@string/title_activity_settings" >
-        </activity>
+            android:label="@string/title_activity_single_contact" ></activity>
+            <!--android:parentActivityName="com.groupa.dotdash.dotdash.ContactsActivity" >-->
+        <!--<activity-->
+            <!--android:name="com.groupa.dotdash.dotdash.SettingsActivity"-->
+            <!--android:label="@string/title_activity_settings" >-->
+        <!--</activity>-->
         <activity
             android:name="com.groupa.dotdash.dotdash.CreateContactActivity"
-            android:label="@string/title_activity_create_contact"
-            android:parentActivityName="com.groupa.dotdash.dotdash.ContactsActivity" >
-        </activity>
+            android:label="@string/title_activity_create_contact" ></activity>
+            <!--android:parentActivityName="com.groupa.dotdash.dotdash.ContactsActivity" >-->
 
         <receiver android:name="com.groupa.dotdash.dotdash.LockScreenWidget" >
             <intent-filter>
@@ -54,11 +61,7 @@
         <activity
             android:name="com.groupa.dotdash.dotdash.SplashScreenActivity"
             android:label="@string/title_activity_splash_sceen" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
 
         <receiver android:name="com.groupa.dotdash.dotdash.Receiver" >
@@ -69,9 +72,9 @@
 
         <activity
             android:name="com.groupa.dotdash.dotdash.SingleConversationActivity"
-            android:label="@string/title_activity_single_conversation"
-            android:parentActivityName=".ConversationsActivity" >
-        </activity>
+            android:label="@string/title_activity_single_conversation" ></activity>
+            <!--android:parentActivityName=".ConversationsActivity" >-->
+        <!--</activity>-->
     </application>
 
 </manifest>
diff --git a/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/ContactsActivity.java b/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/ContactsActivity.java
@@ -1,8 +1,11 @@
 package com.groupa.dotdash.dotdash;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -12,49 +15,38 @@
 import java.util.ArrayList;
 
 
-public class ContactsActivity extends DotDash {
+public class ContactsActivity extends Fragment {
     private ArrayList<Contact> contactsList;
-    private DataManager dm;
-
     private ListView contactsListView;
     private Button newContactButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_contacts);
-        currentScreen = R.id.action_contacts;
-
-        dm = DataManager.getInstance();
-        contactsList = dm.getAddressBookList();
-        contactsListView = (ListView)findViewById(R.id.contactsListView);
-        ArrayAdapter<Contact> arrayAdapter = new ArrayAdapter<Contact>(this, android.R.layout.simple_list_item_1, contactsList);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.activity_contacts, container, false);
+
+        contactsList = DataManager.getInstance().getAddressBookList();
+        contactsListView = (ListView)fragmentView.findViewById(R.id.contactsListView);
+        ArrayAdapter<Contact> arrayAdapter = new ArrayAdapter<Contact>(getActivity(), android.R.layout.simple_list_item_1, contactsList);
         contactsListView.setAdapter(arrayAdapter);
 
         contactsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int pos, long id) {
-                Intent nameIntent = new Intent(getApplicationContext(), SingleContactActivity.class);
-                nameIntent.putExtra(CONTACT_NAME, ((Contact)adapterView.getItemAtPosition(pos)).getName());
+                Intent nameIntent = new Intent(view.getContext(), SingleContactActivity.class);
+                nameIntent.putExtra(DotDash.CONTACT_NAME, ((Contact)adapterView.getItemAtPosition(pos)).getName());
                 startActivity(nameIntent);
-                overridePendingTransition(0, 0);
             }
         });
 
-        newContactButton = (Button)findViewById(R.id.newContactButton);
+        newContactButton = (Button)fragmentView.findViewById(R.id.newContactButton);
         newContactButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 startActivity(new Intent(view.getContext(), CreateContactActivity.class));
-                overridePendingTransition(0, 0);
             }
         });
-    }
-
-//    @Override
-//    protected void onActivityResult(int requested, int result, Intent intent) {
-//        Toast.makeText(this, String.valueOf(result), Toast.LENGTH_LONG).show();
-//        finish();
-//    }
 
+        return fragmentView;
+    }
 }
diff --git a/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/ConversationsActivity.java b/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/ConversationsActivity.java
@@ -1,8 +1,12 @@
 package com.groupa.dotdash.dotdash;
 
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -11,17 +15,17 @@
 import java.util.ArrayList;
 
 
-public class ConversationsActivity extends DotDash {
+public class ConversationsActivity extends Fragment {
 
     private ArrayList<Contact> allContactsList;
     private ArrayList<Contact> contactsList;
     private ListView conversationsListView;
+    private ArrayAdapter<Contact> conversationsActivityArrayAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_conversations);
-        currentScreen = R.id.action_conversations;
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View fragmentView = inflater.inflate(R.layout.activity_conversations, container, false);
 
         allContactsList = DataManager.getInstance().getAddressBookList();
         contactsList = new ArrayList<Contact>();
@@ -32,20 +36,19 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         //TODO sort by most recent talking.
 
-        conversationsListView = (ListView)findViewById(R.id.conversationsListView);
-        conversationsActivityArrayAdapter = new ArrayAdapter<Contact>(this, android.R.layout.simple_list_item_1, contactsList);
+        conversationsListView = (ListView)fragmentView.findViewById(R.id.conversationsListView);
+        conversationsActivityArrayAdapter = new ArrayAdapter<Contact>(getActivity(), android.R.layout.simple_list_item_1, contactsList);
         conversationsListView.setAdapter(conversationsActivityArrayAdapter);
 
         conversationsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int pos, long id) {
-                Intent nameIntent = new Intent(getApplicationContext(), SingleConversationActivity.class);
+                Intent nameIntent = new Intent(view.getContext(), SingleConversationActivity.class);
                 nameIntent.putExtra("contactName", ((Contact)adapterView.getItemAtPosition(pos)).getName());
                 startActivity(nameIntent);
-                overridePendingTransition(0, 0);
             }
         });
-    }
-
 
+        return fragmentView;
+    }
 }
diff --git a/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/DataManager.java b/DotDash/DotDash/src/main/java/com/groupa/dotdash/dotdash/DataManager.java
@@ -50,6 +50,7 @@ private Contact createContactFromDb(Cursor c) {
 
     private void populateAddressBooks() {
         // load things from file.
+        Log.e("alby", String.valueOf(dbHelper == null));
         SQLiteDatabase db = dbHelper.getReadableDatabase();
 
         Cursor c = db.query(DotDashContract.ContactsTable.TABLE_NAME, null, null, null, null, null, null);