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..cd734d4 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("Mel", R.drawable.mel) ); @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..ec01425 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.Mel; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -18,7 +19,16 @@ 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 "Ashique": + showAshique(); + break; + case "Mel": + showMel(); + break; + default: + break; + } } } @@ -28,4 +38,13 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + + + + private void showMel(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile,new Mel()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Mel.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Mel.java new file mode 100644 index 0000000..e1d612c --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Mel.java @@ -0,0 +1,26 @@ +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 meltemyildirim on 10/23/16. + */ + +public class Mel extends Fragment { + + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.meltem_yildirim,container,false); + } + + +} diff --git a/app/src/main/res/drawable/mel.jpg b/app/src/main/res/drawable/mel.jpg new file mode 100644 index 0000000..9b78f44 Binary files /dev/null and b/app/src/main/res/drawable/mel.jpg differ diff --git a/app/src/main/res/layout/meltem_yildirim.xml b/app/src/main/res/layout/meltem_yildirim.xml index 0b023bf..0026fc1 100644 --- a/app/src/main/res/layout/meltem_yildirim.xml +++ b/app/src/main/res/layout/meltem_yildirim.xml @@ -1,44 +1,33 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + android:src="@drawable/mel" + android:background="#000" /> - + android:layout_weight="50" + android:layout_height="0dp" /> - - - - + - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0d4ff93..ca761fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,4 +25,11 @@ 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 + " The angels, not half so happy in Heaven, + Went envying her and me— + Yes!—that was the reason (as all men know, + In this kingdom by the sea) + That the wind came out of the cloud by night, + Chilling and killing my Annabel Lee. + - Edgar A. POE - "