From 4fde092791234177cf0ebdb893eef0932a6b6be9 Mon Sep 17 00:00:00 2001 From: Josiel Date: Mon, 24 Oct 2016 18:16:12 -0400 Subject: [PATCH 1/4] josiel changes --- .../employeeHandbook/EmployeeListAdapter.java | 3 ++- .../employeeHandbook/EmployeeView.java | 19 +++++++++++++++++ .../employeeHandbook/employees/Josiel.java | 21 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Josiel.java 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 b012723..71276fe 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -14,7 +14,8 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( - new EmployeeDescription("Ashique", R.drawable.ashique) + new EmployeeDescription("Ashique", R.drawable.ashique), + new EmployeeDescription("Josiel", R.drawable.cropped) ); @Override 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 c719a33..f2cc826 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -8,6 +8,7 @@ import nyc.c4q.grocerystore.R; import nyc.c4q.grocerystore.employeeHandbook.employees.Ashique; +import nyc.c4q.grocerystore.employeeHandbook.employees.Josiel; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -19,6 +20,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { String employee = getIntent().getStringExtra(EMPLOYEE_NAME); if(employee != null){ // call a function + switch(employee){ + case "Ashique": + showAshique(); + break; + case "Josiel": + showJosiel(); + break; + } } } @@ -27,5 +36,15 @@ private void showAshique(){ FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); + + } + +// R.id.employee_profile, new Josiel() + + private void showJosiel(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile, new Josiel()); + fragmentTransaction.commit(); } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Josiel.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Josiel.java new file mode 100644 index 0000000..8c76342 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Josiel.java @@ -0,0 +1,21 @@ +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; + + + +public class Josiel extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.josiel_lopez,container,false); + } +} From 970ded1f76a1470b77ceab668f7361e6098cff08 Mon Sep 17 00:00:00 2001 From: jdlopez114 Date: Mon, 24 Oct 2016 19:21:11 -0400 Subject: [PATCH 2/4] Update EmployeeListAdapter.java --- .../c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 71276fe..6c772fa 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -15,7 +15,7 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( new EmployeeDescription("Ashique", R.drawable.ashique), - new EmployeeDescription("Josiel", R.drawable.cropped) + new EmployeeDescription("Josiel", R.drawable.cropped) ); @Override From 4fc2810fec3ba225b947b6d0f9bceeeefd2b2410 Mon Sep 17 00:00:00 2001 From: jdlopez114 Date: Mon, 24 Oct 2016 19:21:41 -0400 Subject: [PATCH 3/4] Update EmployeeListAdapter.java --- .../c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java | 1 - 1 file changed, 1 deletion(-) 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 6c772fa..62c92da 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -14,7 +14,6 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( - new EmployeeDescription("Ashique", R.drawable.ashique), new EmployeeDescription("Josiel", R.drawable.cropped) ); From 2674f4ec927b77e033f320f2e5e11a15da84e5eb Mon Sep 17 00:00:00 2001 From: jdlopez114 Date: Mon, 24 Oct 2016 19:21:57 -0400 Subject: [PATCH 4/4] Update EmployeeListAdapter.java --- .../c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java | 1 + 1 file changed, 1 insertion(+) 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 62c92da..002edc8 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -14,6 +14,7 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( + new EmployeeDescription("Ashique", R.drawable.ashique) new EmployeeDescription("Josiel", R.drawable.cropped) );