update categories, cleanup code

Signed-off-by: Arnav Gupta <[email protected]>

Author: sauravtom

App/src/main/java/in/ac/dtu/subtlenews/MainActivity.java

@@ -49,24 +49,27 @@ public void onNavigationDrawerItemSelected(int position) {
     public void onSectionAttached(int number) {
         switch (number) {
             case 1:
-                mTitle = "Sports";
+                mTitle = "India";
                 break;
             case 2:
-                mTitle = "Entertainment";
+                mTitle = "World";
                 break;
             case 3:
-                mTitle = "Business";
+                mTitle = "Entertainment";
                 break;
             case 4:
                 mTitle = "Technology";
                 break;
             case 5:
-                mTitle = "World";
+                mTitle = "Business";
                 break;
             case 6:
                 mTitle = "Science";
                 break;
             case 7:
+                mTitle = "Sports";
+                break;
+            case 8:
                 mTitle = "Health";
                 break;
         }
@@ -102,18 +105,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
         switch (id){
             case R.id.action_refresh:
                 new UpdateNews(MainActivity.this).execute();
+                MainFragment mainFragment = (MainFragment) getSupportFragmentManager().findFragmentById(R.id.container);
+                mainFragment.updateView();
                 return true;
             case R.id.action_settings:
                 return true;
         }
         return super.onOptionsItemSelected(item);
     }
 
-    /**
-     * A placeholder fragment containing a simple view.
-     */
-    public static class PlaceholderFragment extends Fragment {
-
-    }
-
 }

App/src/main/java/in/ac/dtu/subtlenews/MainFragment.java

@@ -68,7 +68,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 //        TextView textView = (TextView) rootView.findViewById(R.id.section_label);
 //        textView.setText(Integer.toString(getArguments().getInt(ARG_SECTION_NUMBER)));
 
-        new ReadFromJSON().execute();
+        updateView();
 
         sNumber = getArguments().getInt(ARG_SECTION_NUMBER);
 
@@ -89,6 +89,10 @@ public void onAttach(Activity activity) {
     private static final String TAG_LINK = "link";
     private static final String TAG_DATE = "date";
 
+    public  void updateView(){
+        new ReadFromJSON().execute();
+    }
+
 
 
     private class ReadFromJSON extends AsyncTask<Void, Void, ArrayList<JSONObject>> {

App/src/main/java/in/ac/dtu/subtlenews/NavigationDrawerFragment.java

@@ -101,15 +101,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 getActionBar().getThemedContext(),
                 android.R.layout.simple_list_item_1,
                 android.R.id.text1,
-                new String[]{
-                        "Sports",
-                        "Entertainment",
-                        "Business",
-                        "Technology",
-                        "World",
-                        "Science",
-                        "Health"
-                }));
+                Utils.categoryMap));
         mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
         return mDrawerListView;
     }

App/src/main/java/in/ac/dtu/subtlenews/Utils.java

@@ -6,6 +6,6 @@
 
 public class Utils {
 
-    public static String[] categoryMap = {"Sports", "Entertainment", "Business", "Technology" , "World" , "Science" , "Health"};
+    public static String[] categoryMap = {"India", "World", "Entertainment" , "Technology", "Business","Science" , "Sports", "Health"};
 
 }