Skip to content

Commit 29182ed

Browse files
committed
Update toolbar elevation for detail page for larger toolbar look
1 parent d3de340 commit 29182ed

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

WordPress/src/main/java/org/wordpress/android/ui/people/PeopleManagementActivity.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ public void onPersonSelected(Person person) {
117117
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
118118
fragmentTransaction.add(R.id.fragment_container, personDetailFragment, KEY_PERSON_DETAIL_FRAGMENT);
119119
fragmentTransaction.addToBackStack(null);
120+
121+
// remove the toolbar elevation for larger toolbar look
122+
ActionBar actionBar = getSupportActionBar();
123+
if (actionBar != null) {
124+
actionBar.setElevation(0);
125+
}
120126
fragmentTransaction.commit();
121127
}
122128
}
@@ -224,6 +230,12 @@ private void refreshPeopleListFragment() {
224230
private boolean navigateBackToPeopleListFragment() {
225231
if (getFragmentManager().getBackStackEntryCount() > 0) {
226232
getFragmentManager().popBackStack();
233+
234+
// reset the toolbar elevation
235+
ActionBar actionBar = getSupportActionBar();
236+
if (actionBar != null) {
237+
actionBar.setElevation(getResources().getDimension(R.dimen.appbar_elevation));
238+
}
227239
return true;
228240
}
229241
return false;

WordPress/src/main/java/org/wordpress/android/ui/people/PersonDetailFragment.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22

33
import android.animation.Animator;
44
import android.animation.AnimatorInflater;
5-
import android.app.AlertDialog;
65
import android.app.Fragment;
7-
import android.content.Context;
8-
import android.content.DialogInterface;
96
import android.os.Bundle;
7+
import android.support.v4.content.ContextCompat;
108
import android.view.LayoutInflater;
119
import android.view.Menu;
1210
import android.view.MenuInflater;
1311
import android.view.View;
1412
import android.view.ViewGroup;
15-
import android.widget.ArrayAdapter;
1613
import android.widget.LinearLayout;
17-
import android.widget.RadioButton;
14+
import android.widget.RelativeLayout;
1815
import android.widget.TextView;
1916

2017
import org.wordpress.android.R;
@@ -84,6 +81,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
8481
mRoleContainer = (LinearLayout) rootView.findViewById(R.id.person_role_container);
8582
mRoleTextView = (TextView) rootView.findViewById(R.id.person_role);
8683

84+
// set the background color here since we are including a layout
85+
RelativeLayout detailsLayout = (RelativeLayout) rootView.findViewById(R.id.person_details);
86+
detailsLayout.setBackgroundColor(ContextCompat.getColor(getActivity(), R.color.color_primary));
87+
88+
mDisplayNameTextView.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
89+
mUsernameTextView.setTextColor(ContextCompat.getColor(getActivity(), R.color.white));
90+
8791
Account account = AccountHelper.getDefaultAccount();
8892
boolean isCurrentUser = account.getUserId() == mPersonID;
8993
Blog blog = WordPress.getBlog(mLocalTableBlogID);

0 commit comments

Comments
 (0)