conflict + fix news ui

app/src/main/AndroidManifest.xml

@@ -10,32 +10,41 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:screenOrientation="portrait"
             android:name=".Controller.MainController.MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:screenOrientation="portrait"
             android:name=".Controller.DetailsController.DetailsActivity"
-            android:label="@string/title_activity_details" >
+            android:label="@string/title_activity_details"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
-            android:screenOrientation="portrait"
             android:name=".Controller.FavoriteController.FavoriteActivity"
             android:label="@string/title_activity_favorite"
-            android:parentActivityName=".Controller.MainController.MainActivity">
+            android:parentActivityName=".Controller.MainController.MainActivity"
+            android:screenOrientation="portrait" >
         </activity>
-        <activity android:name=".Controller.Notification.NotificationAlert"
+        <activity
+            android:name=".Controller.Notification.NotificationAlert"
             android:label="Details of notification"
-            android:parentActivityName=".Controller.MainController.MainActivity">
+            android:parentActivityName=".Controller.MainController.MainActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".Controller.MainController.MainActivity" />
+        </activity>
+        <activity
+            android:name=".HelpActivity"
+            android:label="@string/title_activity_help"
+            android:parentActivityName=".Controller.MainController.MainActivity" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value=".Controller.MainController.MainActivity"/>
+                android:value="transientwatch.com.transientwatch.Controller.MainController.MainActivity" />
         </activity>
     </application>
 

app/src/main/java/transientwatch/com/transientwatch/Controller/MainController/MainActivity.java

@@ -2,6 +2,7 @@
 
 import android.app.SearchManager;
 import android.content.Context;
+import android.content.Intent;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBar;
@@ -18,6 +19,7 @@
 import java.util.List;
 
 import transientwatch.com.transientwatch.Controller.NavigationController.NavigationDrawerFragment;
+import transientwatch.com.transientwatch.HelpActivity;
 import transientwatch.com.transientwatch.Model.Transient;
 import transientwatch.com.transientwatch.R;
 
@@ -129,8 +131,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
             return true;
-        }else {
-
+        }else if(id == R.id.help){
+            Intent intent = new Intent(this , HelpActivity.class);
+            startActivity(intent);
         }
 
         return super.onOptionsItemSelected(item);

app/src/main/java/transientwatch/com/transientwatch/Controller/NavigationController/NavigationDrawerFragment.java

@@ -24,6 +24,7 @@
 
 import transientwatch.com.transientwatch.Controller.FavoriteController.FavoriteActivity;
 import transientwatch.com.transientwatch.Controller.MainController.MainActivity;
+import transientwatch.com.transientwatch.HelpActivity;
 import transientwatch.com.transientwatch.R;
 
 public class NavigationDrawerFragment extends Fragment {
@@ -86,6 +87,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
                 new String[]{
                         getString(R.string.Nav_Home),
                         "Favorite",
+                        "Help"
                 }));
         mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
         return mDrawerListView;
@@ -181,6 +183,9 @@ private void selectItem(int position) {
             {
                 Intent intent = new Intent(getActivity() , FavoriteActivity.class);
                 getActivity().startActivity(intent);
+            }else {
+                Intent intent = new Intent(getActivity() , HelpActivity.class);
+                getActivity().startActivity(intent);
             }
         }
         if (mDrawerLayout != null) {

app/src/main/java/transientwatch/com/transientwatch/HelpActivity.java

@@ -0,0 +1,39 @@
+package transientwatch.com.transientwatch;
+
+import android.support.v7.app.ActionBarActivity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+
+public class HelpActivity extends ActionBarActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_help);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_help, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_settings) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+}

app/src/main/java/transientwatch/com/transientwatch/Service/NewsAdapter.java

@@ -41,13 +41,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
             convertView = inflater.inflate(R.layout.news_item, null);
 
         TextView name = (TextView) convertView.findViewById(R.id.news_item_name);
-        TextView attributeName = (TextView) convertView.findViewById(R.id.news_item_attribute_name);
-        TextView attributeValue = (TextView) convertView.findViewById(R.id.news_item_attribute_value);
+        TextView attributeName = (TextView) convertView.findViewById(R.id.news_item_attribute_msg);
 
         NewsItem newsItem = newsItems.get(position);
-        name.setText(newsItem.getName());
-        attributeName.setText(newsItem.getChangedAttributeName());
-        attributeValue.setText(newsItem.getNewValue());
+        name.setText(newsItem.getName() + ": ");
+        attributeName.setText("My " + newsItem.getChangedAttributeName() + " is now " + newsItem.getNewValue());
 
         return convertView;
     }

app/src/main/java/transientwatch/com/transientwatch/Service/TransientAdapter.java

@@ -89,9 +89,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             public void onClick(View v) {
 
                 final Transient selectedItem = TransientDataFetcher.getData().get(myPosition);
-
                 System.out.println("Item Clicked");
-
                 if (selectedItem.isFollowed()) {
                     selectedItem.setFollowed(false);
                     ((Button) v).setText("Follow");
@@ -130,17 +128,15 @@ public void onClick(View v) {
                                     method.setAccessible(true);
                                     NewsItem newsItem = new NewsItem();
                                     newsItem.setName(newDataItem.getName().replace("get", ""));
-                                    newsItem.setChangedAttributeName(method.getName().toUpperCase());
+                                    newsItem.setChangedAttributeName(method.getName().replace("get", "").replace("_", " ").toLowerCase());
                                     newsItem.setNewValue(value != null ? value.toString() : "");
                                     TransientDataFetcher.getNews().add(newsItem);
                                     // This pending intent will open after notification click
                                     PendingIntent i=PendingIntent.getActivity(v.getContext(), 0,
                                             new Intent(v.getContext(), DetailsActivity.class).putExtra("TransientItem" , newDataItem),
                                             0);
-
                                     note.setLatestEventInfo(v.getContext(), selectedItem.getName() + "told you :D ",
                                             newsItem.getChangedAttributeName() + "change by " + newsItem.getNewValue(), i);
-
                                     mgr.notify(NOTIFY_ME_ID, note);
 
                                 }