Merge pull request #411 from HimanshuS01/SettingButtonInSafetyPlan

Fixes #392:Settings button is missing in Trustees and SafetyPlanActivity Class

Author: sandarumk

app/src/main/java/com/peacecorps/pcsa/circle_of_trust/Trustees.java

@@ -15,6 +15,8 @@
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
@@ -26,6 +28,7 @@
 import com.peacecorps.pcsa.MainActivity;
 import com.peacecorps.pcsa.R;
 import com.peacecorps.pcsa.StatusBarColorUtil;
+import com.peacecorps.pcsa.UserSettingsActivity;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -161,6 +164,12 @@ public void onClick(View view) {
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.settings,menu);
+        return true;
+    }
     /**
      * Start for selecting contacts from standard contract picker
      * @param v
@@ -370,10 +379,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 finish();
-                return true;
+            case R.id.menu_settings:
+                Intent intent=new Intent(this, UserSettingsActivity.class);
+                startActivity(intent);
         }
-
-        return super.onOptionsItemSelected(item);
+        return true;
     }
 }
 

app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyPlanActivity.java

@@ -1,5 +1,6 @@
 package com.peacecorps.pcsa.safety_tools;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -8,9 +9,12 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 
 import com.peacecorps.pcsa.R;
+import com.peacecorps.pcsa.UserSettingsActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,12 +47,22 @@ protected void onCreate(Bundle savedInstanceState) {
         tabLayout.setupWithViewPager(viewPager);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.settings,menu);
+        return true;
+    }
+
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId())
         {
             case android.R.id.home:
                 this.finish();
                 break;
+            case R.id.menu_settings:
+                Intent intent=new Intent(this, UserSettingsActivity.class);
+                startActivity(intent);
         }
         return true;
     }