Merge branch 'develop' of https://github.com/systers/FirstAide-Android into runtimepermissions

Author: abs51295

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;
     }

app/src/main/res/layout/activity_circle_intro.xml

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
 
     <android.support.v4.view.ViewPager
@@ -25,8 +22,8 @@
         android:id="@+id/horizontal_line"
         android:layout_width="match_parent"
         android:layout_height="0.75dp"
-        android:alpha=".5"
         android:layout_above="@id/layoutDots"
+        android:alpha=".5"
         android:background="@android:color/white"
         />
 
@@ -36,33 +33,33 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@null"
-        android:src="@drawable/ic_navigate_next_white_24dp"
         android:layout_marginBottom="18dp"
-        android:layout_marginRight="28dp"/>
+        android:layout_marginRight="28dp"
+        android:background="@null"
+        android:src="@drawable/ic_navigate_next_white_24dp" />
 
     <Button
         android:id="@+id/btn_skip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@null"
-        android:text="Skip"
-        android:textColor="@android:color/white"
         android:layout_marginBottom="7.5dp"
-        android:layout_marginLeft="20dp"/>
+        android:layout_marginLeft="20dp"
+        android:background="@null"
+        android:text="@string/circle_intro_skip"
+        android:textColor="@android:color/white" />
     <Button
         android:id="@+id/btn_done"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
-        android:background="@null"
-        android:text="Done"
-        android:textColor="@android:color/white"
         android:layout_marginBottom="7.5dp"
         android:layout_marginRight="20dp"
+        android:background="@null"
+        android:text="@string/circle_intro_done"
+        android:textColor="@android:color/white"
         android:visibility="gone"/>
 
 

app/src/main/res/values/strings.xml

@@ -55,6 +55,8 @@
     <!-- Locations that are available on dropdown of Contact Staff-->
 
     <!--String related to Circle of Trust-->
+    <string name="circle_intro_skip">Skip</string>
+    <string name="circle_intro_done">Done</string>
     <string name="circle_title">Circle of Trust</string>
     <string name="home_title">A Safety Resource for Peace Corps Volunteers</string>
     <string name="helping">Helping</string>