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..5404832 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 ("Jonathan", R.drawable.profilepicture) ); @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..335a922 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.JonColon; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -28,4 +29,11 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + + private void showJonColon(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile,new JonColon()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java new file mode 100644 index 0000000..31725ba --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/JonColon.java @@ -0,0 +1,22 @@ +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 jonathancolon on 10/19/16. + */ + +public class JonColon extends Fragment { + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.jonathan_colon, container, false); + } +} diff --git a/build.gradle b/build.gradle index 53f4fad..c20bca1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files