From fb5a2101f5aebb70baf94fa5f24a8d919969b89a Mon Sep 17 00:00:00 2001 From: shawn-speaks Date: Mon, 24 Oct 2016 20:11:38 -0400 Subject: [PATCH] Shawn's employee photo + fragment --- .../employeeHandbook/EmployeeListAdapter.java | 36 +++++++++---------- .../employeeHandbook/EmployeeView.java | 7 ++++ .../grocerystore/employeeHandbook/Shawn.java | 21 +++++++++++ .../c4q/grocerystore/sushiShop/SushiYa.java | 4 --- .../main/res/layout/employee_view_holder.xml | 3 +- 5 files changed, 47 insertions(+), 24 deletions(-) create mode 100644 app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/Shawn.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 e92e6f7..0774112 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -14,24 +14,24 @@ 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("Speaks", R.drawable.rooftop_beer) ); 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..34605d3 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -43,6 +43,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { if(employee.equalsIgnoreCase("Mila")){ showMila(); } + if (employee.equalsIgnoreCase("Speaks")) { + showShawn(); + } switch (employee) { case "Lily": @@ -119,6 +122,10 @@ private void showAndres(){ private void showHelen(){ getFragmentManager().beginTransaction().add(R.id.employee_profile, new Helen()).commit(); } + + private void showShawn(){ + getFragmentManager().beginTransaction().add(R.id.employee_profile, new Shawn()).commit(); + } private void showAshique(){ FragmentManager fragmentManager = getFragmentManager(); FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/Shawn.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/Shawn.java new file mode 100644 index 0000000..1a51fe1 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/Shawn.java @@ -0,0 +1,21 @@ +package nyc.c4q.grocerystore.employeeHandbook; + +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 shawnspeaks on 10/24/16. + */ +public class Shawn extends Fragment { + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.shawn_speaks, container, false); + } +} diff --git a/app/src/main/java/nyc/c4q/grocerystore/sushiShop/SushiYa.java b/app/src/main/java/nyc/c4q/grocerystore/sushiShop/SushiYa.java index 53b442d..8e6ac51 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/sushiShop/SushiYa.java +++ b/app/src/main/java/nyc/c4q/grocerystore/sushiShop/SushiYa.java @@ -11,8 +11,4 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.sushi); } - - - - } diff --git a/app/src/main/res/layout/employee_view_holder.xml b/app/src/main/res/layout/employee_view_holder.xml index a2dbbac..0909e94 100644 --- a/app/src/main/res/layout/employee_view_holder.xml +++ b/app/src/main/res/layout/employee_view_holder.xml @@ -7,8 +7,7 @@ + android:layout_height="@dimen/small_image_size"/>