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..d0fa8c4 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,9 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( - new EmployeeDescription("Ashique", R.drawable.ashique) + new EmployeeDescription("Ashique", R.drawable.ashique), + new EmployeeDescription("Cat", R.drawable.catwong2) + ); @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..3b4961f 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.Cat; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -17,8 +18,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.employee_view); String employee = getIntent().getStringExtra(EMPLOYEE_NAME); - if(employee != null){ - // call a function + if (employee != null) { + switch (employee) { + case "Ashique": + showAshique(); + break; + case "Cat": + showCat(); + break; + default: + break; + } } } @@ -28,4 +38,11 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + + private void showCat(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile,new Cat()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Cat.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Cat.java new file mode 100644 index 0000000..6928c65 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Cat.java @@ -0,0 +1,24 @@ +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 catwong on 10/24/16. + */ + +public class Cat extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.cat_wong,container,false); + } + +} diff --git a/app/src/main/res/drawable/background.jpg b/app/src/main/res/drawable/cat_background.jpg similarity index 100% rename from app/src/main/res/drawable/background.jpg rename to app/src/main/res/drawable/cat_background.jpg diff --git a/app/src/main/res/layout/cat_wong.xml b/app/src/main/res/layout/cat_wong.xml index 2f81621..a4da1de 100644 --- a/app/src/main/res/layout/cat_wong.xml +++ b/app/src/main/res/layout/cat_wong.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/background" + android:background="@drawable/cat_background" android:orientation="vertical" android:baselineAligned="false"> @@ -69,7 +69,6 @@