diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java index e92e6f7..4d613bc 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -11,26 +11,27 @@ import nyc.c4q.grocerystore.R; -class EmployeeListAdapter extends RecyclerView.Adapter{ +class EmployeeListAdapter extends RecyclerView.Adapter { private List mData = Arrays.asList( - new EmployeeDescription("Ashique", R.drawable.ashique), - new EmployeeDescription("Nesada", R.drawable.nk), - new EmployeeDescription("Lily", R.drawable.hui), - new EmployeeDescription("Hyunjoo", R.drawable.hyunjoo), - new EmployeeDescription("Helen", R.drawable.helen), - new EmployeeDescription("Derek", R.drawable.derek), - new EmployeeDescription("Andres",R.drawable.andreas), - new EmployeeDescription("Danny", R.drawable.danny), - new EmployeeDescription("Rook", R.drawable.rooks), - new EmployeeDescription("Wesnie", R.drawable.wesnie), - new EmployeeDescription("Jordan", R.drawable.jordan), - new EmployeeDescription("JoseV", R.drawable.josev), - new EmployeeDescription("Mila", R.drawable.mila), - new EmployeeDescription("Jose G.", R.drawable.joseg), - new EmployeeDescription("Akasha", R.drawable.aa_profile_pic), -new EmployeeDescription("Yojana", R.drawable.yojana1), -new EmployeeDescription("Taryn", R.drawable.taryn_selfie) + new EmployeeDescription("Shannon", R.drawable.shannon) +// new EmployeeDescription("Ashique", R.drawable.ashique), +// new EmployeeDescription("Nesada", R.drawable.nk), +// new EmployeeDescription("Lily", R.drawable.hui), +// new EmployeeDescription("Hyunjoo", R.drawable.hyunjoo), +// new EmployeeDescription("Helen", R.drawable.helen), +// new EmployeeDescription("Derek", R.drawable.derek), +// new EmployeeDescription("Andres", R.drawable.andreas), +// new EmployeeDescription("Danny", R.drawable.danny), +// new EmployeeDescription("Rook", R.drawable.rooks), +// new EmployeeDescription("Wesnie", R.drawable.wesnie), +// new EmployeeDescription("Jordan", R.drawable.jordan), +// new EmployeeDescription("JoseV", R.drawable.josev), +// new EmployeeDescription("Mila", R.drawable.mila), +// new EmployeeDescription("Jose G.", R.drawable.joseg), +// new EmployeeDescription("Akasha", R.drawable.aa_profile_pic), +// new EmployeeDescription("Yojana", R.drawable.yojana1), +// new EmployeeDescription("Taryn", R.drawable.taryn_selfie) ); @@ -49,7 +50,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { } private View.OnClickListener buildEmployeeClickListener(EmployeeDescription employee) { - if (employee != null){ + if (employee != null) { return navigateToEmployeeViewListener(employee.getName()); } return defaultClickListener(); @@ -57,6 +58,7 @@ private View.OnClickListener buildEmployeeClickListener(EmployeeDescription empl /** * This click listener launches an intent with the employee name as an extra + * * @param name * @return */ diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java index 0e309ea..4ace845 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -15,6 +15,7 @@ import nyc.c4q.grocerystore.employeeHandbook.employees.Derek; import nyc.c4q.grocerystore.employeeHandbook.employees.Nesada; import nyc.c4q.grocerystore.employeeHandbook.employees.Rafael; +import nyc.c4q.grocerystore.employeeHandbook.employees.Shannon; import nyc.c4q.grocerystore.employeeHandbook.employees.Wesnie; import nyc.c4q.grocerystore.employeeHandbook.employees.Jordan; import nyc.c4q.grocerystore.employeeHandbook.employees.JoseV; @@ -45,6 +46,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } switch (employee) { + case "Shannon": + showShannon(); + break; case "Lily": showHuiLily(); break; @@ -94,6 +98,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { } } + + private void showShannon(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile,new Shannon()); + fragmentTransaction.commit(); + } private void showNesada(){ FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Shannon.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Shannon.java new file mode 100644 index 0000000..cf9f705 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Shannon.java @@ -0,0 +1,22 @@ +package nyc.c4q.grocerystore.employeeHandbook.employees; + +import android.app.Fragment; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import nyc.c4q.grocerystore.R; + +/** + * Created by shannonalexander-navarro on 10/24/16. + */ + +public class Shannon extends Fragment { + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.shannon_alexander, container, false); + } +} diff --git a/app/src/main/res/drawable/profile1.jpg b/app/src/main/res/drawable/profile1.jpg deleted file mode 100644 index 75f43d7..0000000 Binary files a/app/src/main/res/drawable/profile1.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/shannon.jpg b/app/src/main/res/drawable/shannon.jpg new file mode 100644 index 0000000..c681786 Binary files /dev/null and b/app/src/main/res/drawable/shannon.jpg differ diff --git a/app/src/main/res/layout/shannon_alexander.xml b/app/src/main/res/layout/shannon_alexander.xml index 2a59435..d5a83e6 100644 --- a/app/src/main/res/layout/shannon_alexander.xml +++ b/app/src/main/res/layout/shannon_alexander.xml @@ -13,21 +13,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="centerCrop" - android:src="@drawable/ramen1" /> + android:src="@drawable/ramen1" + android:layout_below="@+id/photo_image_view2" /> - - + android:layout_below="@+id/photo_image_view2" /> + + +