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..317151c 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("Eddie", R.drawable.e_melendez) ); @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..0ece573 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.Eddie; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -18,7 +19,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.employee_view); String employee = getIntent().getStringExtra(EMPLOYEE_NAME); if(employee != null){ - // call a function + switch (employee) { + case "Eddie": + showEddie(); + break; + default: + break; + } } } @@ -28,4 +35,7 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + private void showEddie() { + getFragmentManager().beginTransaction().add(R.id.employee_profile, new Eddie()).commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Eddie.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Eddie.java new file mode 100644 index 0000000..ef2639a --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Eddie.java @@ -0,0 +1,16 @@ +package nyc.c4q.grocerystore.employeeHandbook.employees; + +import android.app.Fragment; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import nyc.c4q.grocerystore.R; + +public class Eddie extends Fragment { + + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.eddie_melendez,container,false); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/e_melendez.png b/app/src/main/res/drawable/e_melendez.png new file mode 100644 index 0000000..2196ab9 Binary files /dev/null and b/app/src/main/res/drawable/e_melendez.png differ diff --git a/app/src/main/res/drawable/e_melendez_bg.png b/app/src/main/res/drawable/e_melendez_bg.png new file mode 100644 index 0000000..3e38049 Binary files /dev/null and b/app/src/main/res/drawable/e_melendez_bg.png differ diff --git a/app/src/main/res/layout/eddie_melendez.xml b/app/src/main/res/layout/eddie_melendez.xml new file mode 100644 index 0000000..da4e924 --- /dev/null +++ b/app/src/main/res/layout/eddie_melendez.xml @@ -0,0 +1,50 @@ + + + + + + + /> + + + /> + + + /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0d4ff93..f21e898 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,4 +25,5 @@ Nickname: The World\'s Greatest My name is Jordan Smith. I\'m the manager of the freezer section of JJ\'s Grocery Store. Here\'s a picture of a waffle. I like waffles. Name:Jordan Smith + Bio:\n\nIn a far away place called Puerto Rico, a weird little boy was born. He found passion in the arts, writing, acting and now progamming. This is his story, as it begins....