Merge branch 'develop' into runtimepermissions

abs51295 · web-flow · commit 3eb0b129b9f6 · 2017-03-13T01:13:31.000+05:30
diff --git a/app/src/main/java/com/peacecorps/pcsa/MainActivity.java b/app/src/main/java/com/peacecorps/pcsa/MainActivity.java
@@ -74,40 +74,7 @@ public class MainActivity extends AppCompatActivity {
     private int lastExpandedGroup = -1;
     private int lastChildExpandedGroup = -1;
     private String[] runTimePermissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.SEND_SMS, Manifest.permission.CALL_PHONE, Manifest.permission.READ_CONTACTS};
-
-    public static void swapFragmentIn(FragmentActivity activity, Fragment fragment, String TAG, boolean addToBackStack) {
-        FragmentManager fragmentManager = activity.getSupportFragmentManager();
-        // Insert the fragment by replacing any existing fragment
-        FRAGMENT_TAG = TAG;
-        int animEnter = R.anim.push_down_in;
-        int animExit = R.anim.push_down_out;
-        int animPopEnter = R.anim.fade_in;
-        int animPopExit = R.anim.fade_out;
-
-        if (addToBackStack) {
-            if (TAG.equals(ContactOtherStaff.TAG)) {
-                animEnter = R.anim.fade_in;
-                animExit = R.anim.fade_out;
-                animPopEnter = R.anim.fade_in_back;
-                animPopExit = R.anim.fade_out_back;
-            }
-            fragmentManager.beginTransaction()
-                    .setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
-                    .replace(R.id.fragment_container
-                            , fragment, TAG)
-                    .addToBackStack(TAG)
-                    .commit();
-        } else {
-            animEnter = R.anim.fade_in;
-            animExit = R.anim.fade_out;
-            fragmentManager.beginTransaction()
-                    .setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
-                    .replace(R.id.fragment_container
-                            , fragment, TAG)
-                    .commit();
-        }
-    }
-
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -302,6 +269,41 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
         });
     }
 
+
+    public static void swapFragmentIn(FragmentActivity activity, Fragment fragment, String TAG, boolean addToBackStack)
+    {
+        FragmentManager fragmentManager = activity.getSupportFragmentManager();
+        // Insert the fragment by replacing any existing fragment
+        FRAGMENT_TAG = TAG;
+        int animEnter = R.anim.fade_in;
+        int animExit = R.anim.fade_out;
+        int animPopEnter = R.anim.fade_in_back;
+        int animPopExit = R.anim.fade_out_back;
+
+        if(addToBackStack){
+            if (TAG.equals(ContactOtherStaff.TAG)) {
+                animEnter = R.anim.fade_in;
+                animExit = R.anim.fade_out;
+                animPopEnter = R.anim.fade_in_back;
+                animPopExit = R.anim.fade_out_back;
+            }
+            fragmentManager.beginTransaction()
+                    .setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
+                    .replace(R.id.fragment_container
+                            , fragment,TAG)
+                    .addToBackStack(TAG)
+                    .commit();
+        } else {
+            animEnter = R.anim.fade_in;
+            animExit = R.anim.fade_out;
+            fragmentManager.beginTransaction()
+                    .setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
+                    .replace(R.id.fragment_container
+                            , fragment,TAG)
+                    .commit();
+        }
+    }
+  
     /**
      * Populating the expandable list of the Navigation Drawer
      */
diff --git a/app/src/main/java/com/peacecorps/pcsa/SignupActivity.java b/app/src/main/java/com/peacecorps/pcsa/SignupActivity.java
@@ -2,11 +2,14 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -34,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_login);
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        //This method will change the status bar color by checking the android version
+        StatusBarColorUtil.changeStatusBarColor(this,getWindow());
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(SignupActivity.this);
diff --git a/app/src/main/java/com/peacecorps/pcsa/SplashScreenActivity.java b/app/src/main/java/com/peacecorps/pcsa/SplashScreenActivity.java
@@ -28,6 +28,7 @@ public class SplashScreenActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splashscreen);
+        getWindow().setBackgroundDrawable(null);
         progressBar = (ProgressBar)findViewById(R.id.splash_screen_progress);
         progressBar.getIndeterminateDrawable().setColorFilter(getResources().getColor(R.color.background_textview),android.graphics.PorterDuff.Mode.MULTIPLY);
         progressBar.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/peacecorps/pcsa/StatusBarColorUtil.java b/app/src/main/java/com/peacecorps/pcsa/StatusBarColorUtil.java
@@ -0,0 +1,25 @@
+package com.peacecorps.pcsa;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+import android.view.Window;
+import android.view.WindowManager;
+
+/**
+ * Created by HIman$hu on 3/7/2017.
+ */
+
+public class StatusBarColorUtil {
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static void changeStatusBarColor(Context context, Window window) {
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_color));
+        }
+    }
+}
diff --git a/app/src/main/java/com/peacecorps/pcsa/UserSettingsActivity.java b/app/src/main/java/com/peacecorps/pcsa/UserSettingsActivity.java
@@ -26,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_preferences);
+        getWindow().setBackgroundDrawable(null);
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleIntroActivity.java b/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleIntroActivity.java
@@ -50,6 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_circle_intro);
+        getWindow().setBackgroundDrawable(null);
         slideViewPager = (ViewPager) findViewById(R.id.view_pager);
         indicatingDotsContainer = (LinearLayout) findViewById(R.id.layoutDots);
         btnSkip = (Button) findViewById(R.id.btn_skip);
diff --git a/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleOfTrustFragment.java b/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleOfTrustFragment.java
@@ -89,6 +89,7 @@ public CircleOfTrustFragment() {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_circle_of_trust, container, false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         ((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.circle_title);
 
         sharedPreferences = getActivity().getSharedPreferences(MY_PREFERENCES, Context.MODE_PRIVATE);
diff --git a/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/Trustees.java b/app/src/main/java/com/peacecorps/pcsa/circle_of_trust/Trustees.java
@@ -5,23 +5,27 @@
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.ContactsContract;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.Html;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import com.peacecorps.pcsa.MainActivity;
 import com.peacecorps.pcsa.R;
+import com.peacecorps.pcsa.StatusBarColorUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,9 +60,12 @@ public class Trustees extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_trustees);
+        getWindow().setBackgroundDrawable(null);
 
         toolbar = (Toolbar)findViewById(R.id.toolbar_trustees);
         setSupportActionBar(toolbar);
+        //This method will change the status bar color by checking the android version
+        StatusBarColorUtil.changeStatusBarColor(this,getWindow());
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
         getSupportActionBar().setTitle(R.string.title_activity_trustees);
diff --git a/app/src/main/java/com/peacecorps/pcsa/get_help_now/ContactPostStaff.java b/app/src/main/java/com/peacecorps/pcsa/get_help_now/ContactPostStaff.java
@@ -49,7 +49,7 @@ public class ContactPostStaff extends Fragment implements AdapterView.OnItemClic
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView = inflater.inflate(R.layout.fragment_reporting_contact_post_staff,container,false);
-
+        getActivity().getWindow().setBackgroundDrawable(null);
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
 
         locationDetails.put(getResources().getString(R.string.loc1_name), new LocationDetails(getResources().getString(R.string.loc1_name), getResources().getString(R.string.loc1_pcmo), getResources().getString(R.string.loc1_ssm), getResources().getString(R.string.loc1_sarl)));
diff --git a/app/src/main/java/com/peacecorps/pcsa/policies_glossary/GlossaryFragment.java b/app/src/main/java/com/peacecorps/pcsa/policies_glossary/GlossaryFragment.java
@@ -46,6 +46,7 @@ public class GlossaryFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_glossary,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         ((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.policies_glossary);
         //Get the listview
         final ExpandableListView expListView = (ExpandableListView) rootView.findViewById(R.id.list_words);
diff --git a/app/src/main/java/com/peacecorps/pcsa/policies_glossary/PoliciesFragment.java b/app/src/main/java/com/peacecorps/pcsa/policies_glossary/PoliciesFragment.java
@@ -36,6 +36,7 @@ public class PoliciesFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_policies,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         ((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.policies_glossary);
         policyButton = (Button)rootView.findViewById(R.id.policiesButton);
         glossaryButton = (Button)rootView.findViewById(R.id.glossaryButton);
diff --git a/app/src/main/java/com/peacecorps/pcsa/safety_tools/RadarFragment.java b/app/src/main/java/com/peacecorps/pcsa/safety_tools/RadarFragment.java
@@ -42,6 +42,7 @@ public class RadarFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_radar,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         mPager = (ViewPager) rootView.findViewById(R.id.pager);
         mPagerAdapter = new ScreenSlideCustomPagerAdapter(getActivity(),steps_content,NUM_PAGES);
         mPager.setAdapter(mPagerAdapter);
diff --git a/app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyPlanActivity.java b/app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyPlanActivity.java
@@ -31,6 +31,7 @@ public class SafetyPlanActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_safety_plan);
+        getWindow().setBackgroundDrawable(null);
 
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyToolsFragment.java b/app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyToolsFragment.java
@@ -34,6 +34,7 @@ public class SafetyToolsFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_safety_tools,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         radarButton = (Button)rootView.findViewById(R.id.radarButton);
         unwantedAttentionButton = (Button)rootView.findViewById(R.id.unwantedAttentionButton);
         tacticsButton = (Button)rootView.findViewById(R.id.tacticsButton);
diff --git a/app/src/main/java/com/peacecorps/pcsa/sexual_assault_awareness/MainFragment.java b/app/src/main/java/com/peacecorps/pcsa/sexual_assault_awareness/MainFragment.java
@@ -27,6 +27,7 @@ public class MainFragment extends Fragment{
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_assault_awareness,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         ((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.sexual_assault_awareness);
 
         Button wasButton = (Button) rootView.findViewById(R.id.wasButton);
diff --git a/app/src/main/java/com/peacecorps/pcsa/support_services/MythbustersFragment.java b/app/src/main/java/com/peacecorps/pcsa/support_services/MythbustersFragment.java
@@ -23,6 +23,7 @@ public class MythbustersFragment extends ListFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_coping,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
 
         String[] values = new String[] {
                 getResources().getString(R.string.mythbusters_subtitle1),getResources().getString(R.string.mythbusters_subtitle2),
diff --git a/app/src/main/java/com/peacecorps/pcsa/support_services/SupportServicesFragment.java b/app/src/main/java/com/peacecorps/pcsa/support_services/SupportServicesFragment.java
@@ -34,6 +34,7 @@ public class SupportServicesFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
         View rootView =  inflater.inflate(R.layout.fragment_support_services,container,false);
+        getActivity().getWindow().setBackgroundDrawable(null);
         ((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.support_services);
 
         benefitsButton = (Button) rootView.findViewById(R.id.benefitsButton);
diff --git a/app/src/main/res/anim/push_down_in.xml b/app/src/main/res/anim/push_down_in.xml
diff --git a/app/src/main/res/anim/push_down_out.xml b/app/src/main/res/anim/push_down_out.xml
diff --git a/app/src/main/res/layout/faq_layout.xml b/app/src/main/res/layout/faq_layout.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_app"
     android:padding="@dimen/activity_vertical_margin"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/fragment_glossary_item.xml b/app/src/main/res/layout/fragment_glossary_item.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@color/background_app"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:orientation="vertical" >
diff --git a/app/src/main/res/layout/navbar_list_header.xml b/app/src/main/res/layout/navbar_list_header.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal" android:layout_width="match_parent"
-    android:background="@color/main_yellow"
     android:layout_height="match_parent"
     android:paddingTop="@dimen/navbar_listitem_padding"
     android:paddingBottom="@dimen/navbar_listitem_padding">
diff --git a/app/src/main/res/layout/navbar_listview_header.xml b/app/src/main/res/layout/navbar_listview_header.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/main_yellow"
     android:padding="5dp"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <!-- Background colors-->
     <color name="background_app">#05D197</color>
     <color name="background_textview">#02845F</color>
+    <color name="status_bar_color">#02845F</color>
     <color name="background_clicked">#FFC25C</color>
     <color name="background_fragment_circle_of_trust">#05D197</color>
     <color name="intro_background">#ffdfb68a</color>
