Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.

Commit 3eb0b12

Browse files
abs51295abs51295
authored
Merge branch 'develop' into runtimepermissions
2 parents a48533f + 5673e4b commit 3eb0b12

24 files changed

+87
-49
lines changed

‎app/src/main/java/com/peacecorps/pcsa/MainActivity.java

+36-34
Original file line numberDiff line numberDiff line change
@@ -74,40 +74,7 @@ public class MainActivity extends AppCompatActivity {
7474
private int lastExpandedGroup = -1;
7575
private int lastChildExpandedGroup = -1;
7676
private String[] runTimePermissions = new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.SEND_SMS, Manifest.permission.CALL_PHONE, Manifest.permission.READ_CONTACTS};
77-
78-
public static void swapFragmentIn(FragmentActivity activity, Fragment fragment, String TAG, boolean addToBackStack) {
79-
FragmentManager fragmentManager = activity.getSupportFragmentManager();
80-
// Insert the fragment by replacing any existing fragment
81-
FRAGMENT_TAG = TAG;
82-
int animEnter = R.anim.push_down_in;
83-
int animExit = R.anim.push_down_out;
84-
int animPopEnter = R.anim.fade_in;
85-
int animPopExit = R.anim.fade_out;
86-
87-
if (addToBackStack) {
88-
if (TAG.equals(ContactOtherStaff.TAG)) {
89-
animEnter = R.anim.fade_in;
90-
animExit = R.anim.fade_out;
91-
animPopEnter = R.anim.fade_in_back;
92-
animPopExit = R.anim.fade_out_back;
93-
}
94-
fragmentManager.beginTransaction()
95-
.setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
96-
.replace(R.id.fragment_container
97-
, fragment, TAG)
98-
.addToBackStack(TAG)
99-
.commit();
100-
} else {
101-
animEnter = R.anim.fade_in;
102-
animExit = R.anim.fade_out;
103-
fragmentManager.beginTransaction()
104-
.setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
105-
.replace(R.id.fragment_container
106-
, fragment, TAG)
107-
.commit();
108-
}
109-
}
110-
77+
11178
@Override
11279
protected void onCreate(Bundle savedInstanceState) {
11380
super.onCreate(savedInstanceState);
@@ -302,6 +269,41 @@ public boolean onChildClick(ExpandableListView parent, View v, int groupPosition
302269
});
303270
}
304271

272+
273+
public static void swapFragmentIn(FragmentActivity activity, Fragment fragment, String TAG, boolean addToBackStack)
274+
{
275+
FragmentManager fragmentManager = activity.getSupportFragmentManager();
276+
// Insert the fragment by replacing any existing fragment
277+
FRAGMENT_TAG = TAG;
278+
int animEnter = R.anim.fade_in;
279+
int animExit = R.anim.fade_out;
280+
int animPopEnter = R.anim.fade_in_back;
281+
int animPopExit = R.anim.fade_out_back;
282+
283+
if(addToBackStack){
284+
if (TAG.equals(ContactOtherStaff.TAG)) {
285+
animEnter = R.anim.fade_in;
286+
animExit = R.anim.fade_out;
287+
animPopEnter = R.anim.fade_in_back;
288+
animPopExit = R.anim.fade_out_back;
289+
}
290+
fragmentManager.beginTransaction()
291+
.setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
292+
.replace(R.id.fragment_container
293+
, fragment,TAG)
294+
.addToBackStack(TAG)
295+
.commit();
296+
} else {
297+
animEnter = R.anim.fade_in;
298+
animExit = R.anim.fade_out;
299+
fragmentManager.beginTransaction()
300+
.setCustomAnimations(animEnter, animExit, animPopEnter, animPopExit)
301+
.replace(R.id.fragment_container
302+
, fragment,TAG)
303+
.commit();
304+
}
305+
}
306+
305307
/**
306308
* Populating the expandable list of the Navigation Drawer
307309
*/

‎app/src/main/java/com/peacecorps/pcsa/SignupActivity.java

+5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
import android.content.Intent;
44
import android.content.SharedPreferences;
5+
import android.os.Build;
56
import android.os.Bundle;
67
import android.preference.PreferenceManager;
8+
import android.support.v4.content.ContextCompat;
79
import android.support.v7.app.AppCompatActivity;
810
import android.support.v7.widget.Toolbar;
911
import android.view.View;
12+
import android.view.WindowManager;
1013
import android.widget.AdapterView;
1114
import android.widget.ArrayAdapter;
1215
import android.widget.Button;
@@ -34,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
3437
setContentView(R.layout.activity_login);
3538
toolbar = (Toolbar) findViewById(R.id.toolbar);
3639
setSupportActionBar(toolbar);
40+
//This method will change the status bar color by checking the android version
41+
StatusBarColorUtil.changeStatusBarColor(this,getWindow());
3742
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
3843

3944
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(SignupActivity.this);

‎app/src/main/java/com/peacecorps/pcsa/SplashScreenActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public class SplashScreenActivity extends Activity {
2828
protected void onCreate(Bundle savedInstanceState) {
2929
super.onCreate(savedInstanceState);
3030
setContentView(R.layout.activity_splashscreen);
31+
getWindow().setBackgroundDrawable(null);
3132
progressBar = (ProgressBar)findViewById(R.id.splash_screen_progress);
3233
progressBar.getIndeterminateDrawable().setColorFilter(getResources().getColor(R.color.background_textview),android.graphics.PorterDuff.Mode.MULTIPLY);
3334
progressBar.setVisibility(View.VISIBLE);

‎app/src/main/java/com/peacecorps/pcsa/StatusBarColorUtil.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.peacecorps.pcsa;
2+
3+
import android.annotation.TargetApi;
4+
import android.content.Context;
5+
import android.os.Build;
6+
import android.support.v4.content.ContextCompat;
7+
import android.view.Window;
8+
import android.view.WindowManager;
9+
10+
/**
11+
* Created by HIman$hu on 3/7/2017.
12+
*/
13+
14+
public class StatusBarColorUtil {
15+
16+
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
17+
public static void changeStatusBarColor(Context context, Window window) {
18+
19+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
20+
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
21+
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
22+
window.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_color));
23+
}
24+
}
25+
}

‎app/src/main/java/com/peacecorps/pcsa/UserSettingsActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
2626
super.onCreate(savedInstanceState);
2727

2828
setContentView(R.layout.activity_preferences);
29+
getWindow().setBackgroundDrawable(null);
2930
toolbar = (Toolbar) findViewById(R.id.toolbar);
3031
setSupportActionBar(toolbar);
3132
getSupportActionBar().setDisplayHomeAsUpEnabled(true);

‎app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleIntroActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
5050
requestWindowFeature(Window.FEATURE_NO_TITLE);
5151
this.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
5252
setContentView(R.layout.activity_circle_intro);
53+
getWindow().setBackgroundDrawable(null);
5354
slideViewPager = (ViewPager) findViewById(R.id.view_pager);
5455
indicatingDotsContainer = (LinearLayout) findViewById(R.id.layoutDots);
5556
btnSkip = (Button) findViewById(R.id.btn_skip);

‎app/src/main/java/com/peacecorps/pcsa/circle_of_trust/CircleOfTrustFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public CircleOfTrustFragment() {
8989
public View onCreateView(LayoutInflater inflater, ViewGroup container,
9090
Bundle savedInstanceState) {
9191
View rootView = inflater.inflate(R.layout.fragment_circle_of_trust, container, false);
92+
getActivity().getWindow().setBackgroundDrawable(null);
9293
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.circle_title);
9394

9495
sharedPreferences = getActivity().getSharedPreferences(MY_PREFERENCES, Context.MODE_PRIVATE);

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

+7
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,27 @@
55
import android.content.SharedPreferences;
66
import android.database.Cursor;
77
import android.net.Uri;
8+
import android.os.Build;
89
import android.os.Bundle;
910
import android.os.Handler;
1011
import android.provider.ContactsContract;
1112
import android.support.v4.app.Fragment;
13+
import android.support.v4.content.ContextCompat;
1214
import android.support.v7.app.AppCompatActivity;
1315
import android.support.v7.widget.Toolbar;
1416
import android.text.Html;
1517
import android.util.Log;
1618
import android.view.MenuItem;
1719
import android.view.View;
20+
import android.view.WindowManager;
1821
import android.widget.AdapterView;
1922
import android.widget.Button;
2023
import android.widget.EditText;
2124
import android.widget.Toast;
2225

2326
import com.peacecorps.pcsa.MainActivity;
2427
import com.peacecorps.pcsa.R;
28+
import com.peacecorps.pcsa.StatusBarColorUtil;
2529

2630
import java.util.ArrayList;
2731
import java.util.Arrays;
@@ -56,9 +60,12 @@ public class Trustees extends AppCompatActivity {
5660
protected void onCreate(Bundle savedInstanceState) {
5761
super.onCreate(savedInstanceState);
5862
setContentView(R.layout.activity_trustees);
63+
getWindow().setBackgroundDrawable(null);
5964

6065
toolbar = (Toolbar)findViewById(R.id.toolbar_trustees);
6166
setSupportActionBar(toolbar);
67+
//This method will change the status bar color by checking the android version
68+
StatusBarColorUtil.changeStatusBarColor(this,getWindow());
6269
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
6370
getSupportActionBar().setDisplayShowHomeEnabled(true);
6471
getSupportActionBar().setTitle(R.string.title_activity_trustees);

‎app/src/main/java/com/peacecorps/pcsa/get_help_now/ContactPostStaff.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class ContactPostStaff extends Fragment implements AdapterView.OnItemClic
4949
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
5050

5151
View rootView = inflater.inflate(R.layout.fragment_reporting_contact_post_staff,container,false);
52-
52+
getActivity().getWindow().setBackgroundDrawable(null);
5353
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
5454

5555
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)));

‎app/src/main/java/com/peacecorps/pcsa/policies_glossary/GlossaryFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class GlossaryFragment extends Fragment {
4646
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
4747

4848
View rootView = inflater.inflate(R.layout.fragment_glossary,container,false);
49+
getActivity().getWindow().setBackgroundDrawable(null);
4950
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.policies_glossary);
5051
//Get the listview
5152
final ExpandableListView expListView = (ExpandableListView) rootView.findViewById(R.id.list_words);

‎app/src/main/java/com/peacecorps/pcsa/policies_glossary/PoliciesFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class PoliciesFragment extends Fragment {
3636
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
3737

3838
View rootView = inflater.inflate(R.layout.fragment_policies,container,false);
39+
getActivity().getWindow().setBackgroundDrawable(null);
3940
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.policies_glossary);
4041
policyButton = (Button)rootView.findViewById(R.id.policiesButton);
4142
glossaryButton = (Button)rootView.findViewById(R.id.glossaryButton);

‎app/src/main/java/com/peacecorps/pcsa/safety_tools/RadarFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public class RadarFragment extends Fragment {
4242
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
4343

4444
View rootView = inflater.inflate(R.layout.fragment_radar,container,false);
45+
getActivity().getWindow().setBackgroundDrawable(null);
4546
mPager = (ViewPager) rootView.findViewById(R.id.pager);
4647
mPagerAdapter = new ScreenSlideCustomPagerAdapter(getActivity(),steps_content,NUM_PAGES);
4748
mPager.setAdapter(mPagerAdapter);

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

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class SafetyPlanActivity extends AppCompatActivity {
3131
protected void onCreate(Bundle savedInstanceState) {
3232
super.onCreate(savedInstanceState);
3333
setContentView(R.layout.activity_safety_plan);
34+
getWindow().setBackgroundDrawable(null);
3435

3536
toolbar = (Toolbar) findViewById(R.id.toolbar);
3637
setSupportActionBar(toolbar);

‎app/src/main/java/com/peacecorps/pcsa/safety_tools/SafetyToolsFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class SafetyToolsFragment extends Fragment {
3434
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
3535

3636
View rootView = inflater.inflate(R.layout.fragment_safety_tools,container,false);
37+
getActivity().getWindow().setBackgroundDrawable(null);
3738
radarButton = (Button)rootView.findViewById(R.id.radarButton);
3839
unwantedAttentionButton = (Button)rootView.findViewById(R.id.unwantedAttentionButton);
3940
tacticsButton = (Button)rootView.findViewById(R.id.tacticsButton);

‎app/src/main/java/com/peacecorps/pcsa/sexual_assault_awareness/MainFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public class MainFragment extends Fragment{
2727
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
2828

2929
View rootView = inflater.inflate(R.layout.fragment_assault_awareness,container,false);
30+
getActivity().getWindow().setBackgroundDrawable(null);
3031
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.sexual_assault_awareness);
3132

3233
Button wasButton = (Button) rootView.findViewById(R.id.wasButton);

‎app/src/main/java/com/peacecorps/pcsa/support_services/MythbustersFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class MythbustersFragment extends ListFragment {
2323
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
2424

2525
View rootView = inflater.inflate(R.layout.fragment_coping,container,false);
26+
getActivity().getWindow().setBackgroundDrawable(null);
2627

2728
String[] values = new String[] {
2829
getResources().getString(R.string.mythbusters_subtitle1),getResources().getString(R.string.mythbusters_subtitle2),

‎app/src/main/java/com/peacecorps/pcsa/support_services/SupportServicesFragment.java

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class SupportServicesFragment extends Fragment {
3434
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
3535

3636
View rootView = inflater.inflate(R.layout.fragment_support_services,container,false);
37+
getActivity().getWindow().setBackgroundDrawable(null);
3738
((AppCompatActivity)getActivity()).getSupportActionBar().setTitle(R.string.support_services);
3839

3940
benefitsButton = (Button) rootView.findViewById(R.id.benefitsButton);

‎app/src/main/res/anim/push_down_in.xml

-5
This file was deleted.

‎app/src/main/res/anim/push_down_out.xml

-5
This file was deleted.

‎app/src/main/res/layout/faq_layout.xml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
5-
android:background="@color/background_app"
65
android:padding="@dimen/activity_vertical_margin"
76
android:orientation="vertical">
87

‎app/src/main/res/layout/fragment_glossary_item.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
4-
android:background="@color/background_app"
54
android:layout_height="match_parent"
65
android:paddingBottom="@dimen/activity_vertical_margin"
76
android:orientation="vertical" >

‎app/src/main/res/layout/navbar_list_header.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:orientation="horizontal" android:layout_width="match_parent"
4-
android:background="@color/main_yellow"
54
android:layout_height="match_parent"
65
android:paddingTop="@dimen/navbar_listitem_padding"
76
android:paddingBottom="@dimen/navbar_listitem_padding">

‎app/src/main/res/layout/navbar_listview_header.xml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="wrap_content"
5-
android:background="@color/main_yellow"
65
android:padding="5dp"
76
android:orientation="vertical">
87

‎app/src/main/res/values/colors.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<!-- Background colors-->
44
<color name="background_app">#05D197</color>
55
<color name="background_textview">#02845F</color>
6+
<color name="status_bar_color">#02845F</color>
67
<color name="background_clicked">#FFC25C</color>
78
<color name="background_fragment_circle_of_trust">#05D197</color>
89
<color name="intro_background">#ffdfb68a</color>

0 commit comments

Comments
 (0)