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..0614eb8 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("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("Jonathan", R.drawable.profilepicture) ); @@ -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..89f81af 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -13,6 +13,7 @@ import nyc.c4q.grocerystore.employeeHandbook.employees.HuiLily; import nyc.c4q.grocerystore.employeeHandbook.employees.Hyunjoo; import nyc.c4q.grocerystore.employeeHandbook.employees.Derek; +import nyc.c4q.grocerystore.employeeHandbook.employees.JonColon; import nyc.c4q.grocerystore.employeeHandbook.employees.Nesada; import nyc.c4q.grocerystore.employeeHandbook.employees.Rafael; import nyc.c4q.grocerystore.employeeHandbook.employees.Wesnie; @@ -87,6 +88,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { case "Taryn": showTaryn(); break; + case "Jonathan": + showJonathan(); default: break; @@ -207,4 +210,11 @@ private void showTaryn(){ fragmentTransaction.add(R.id.employee_profile,new Taryn()); fragmentTransaction.commit(); } + + private void showJonathan(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile, new JonColon()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java new file mode 100644 index 0000000..d2cf4b2 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java @@ -0,0 +1,23 @@ +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 jonathancolon on 10/24/16. + */ + +public class JonColon extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.jonathan_colon,container,false); + } +} diff --git a/app/src/main/res/drawable/profilepicture.jpg b/app/src/main/res/drawable/profilepicture.jpg new file mode 100644 index 0000000..43e5b12 Binary files /dev/null and b/app/src/main/res/drawable/profilepicture.jpg differ diff --git a/app/src/main/res/drawable/profilepicture.png b/app/src/main/res/drawable/profilepicture.png deleted file mode 100644 index 7e59ff5..0000000 Binary files a/app/src/main/res/drawable/profilepicture.png and /dev/null differ