From d91525cc783eb15c52e9e5d17153fc6b2e7f059b Mon Sep 17 00:00:00 2001 From: Rusi Li Date: Wed, 19 Oct 2016 20:49:49 -0400 Subject: [PATCH 1/6] classwork --- .../employeeHandbook/EmployeeListAdapter.java | 3 ++- .../employeeHandbook/EmployeeView.java | 9 ++++++++ .../employeeHandbook/employees/Rusi.java | 23 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Rusi.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 b012723..8949a79 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("Rusi's Awesome", R.drawable.rli_image_self1) ); @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..d8d9a23 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.Rusi; public class EmployeeView extends AppCompatActivity { public static final String EMPLOYEE_NAME = "extra.employee.name"; @@ -28,4 +29,12 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + + private void showRusi(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile,new Rusi()); + fragmentTransaction.commit(); + } + } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Rusi.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Rusi.java new file mode 100644 index 0000000..f734a81 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Rusi.java @@ -0,0 +1,23 @@ +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 rusili on 10/19/16. + */ + +public class Rusi extends Fragment{ + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.rusi_li,container,false); + } +} From 06d560e3a9c51e5d2e5b0b9ac370d55f6d040587 Mon Sep 17 00:00:00 2001 From: rusili56 Date: Fri, 21 Oct 2016 16:14:00 -0400 Subject: [PATCH 2/6] Update EmployeeListAdapter.java --- .../c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8949a79..d79e005 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -15,7 +15,7 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( new EmployeeDescription("Ashique", R.drawable.ashique), - new EmployeeDescription("Rusi's Awesome", R.drawable.rli_image_self1) + new EmployeeDescription("Rusi", R.drawable.rli_image_self1) ); @Override From 66af5e7805eb8eda00728b6df4ed052281e099a1 Mon Sep 17 00:00:00 2001 From: rusili56 Date: Fri, 21 Oct 2016 16:35:33 -0400 Subject: [PATCH 3/6] Update EmployeeView.java --- .../nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d8d9a23..7eaea33 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -19,7 +19,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.employee_view); String employee = getIntent().getStringExtra(EMPLOYEE_NAME); if(employee != null){ - // call a function + if (employee.equals("Rusi is awesome") showRusi(); } } From 4447a0d198c73003cadff412c4db0b0bc468956e Mon Sep 17 00:00:00 2001 From: rusili56 Date: Fri, 21 Oct 2016 16:36:35 -0400 Subject: [PATCH 4/6] Update EmployeeListAdapter.java --- .../c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d79e005..b62d325 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -15,7 +15,7 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( new EmployeeDescription("Ashique", R.drawable.ashique), - new EmployeeDescription("Rusi", R.drawable.rli_image_self1) + new EmployeeDescription("Rusi is amazing", R.drawable.rli_image_self1) ); @Override From 3d4fb7a4fb75161ff67c658a75aa6e9162566362 Mon Sep 17 00:00:00 2001 From: rusili56 Date: Fri, 21 Oct 2016 16:37:23 -0400 Subject: [PATCH 5/6] Update EmployeeView.java --- .../nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7eaea33..f90e9b8 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -19,7 +19,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.employee_view); String employee = getIntent().getStringExtra(EMPLOYEE_NAME); if(employee != null){ - if (employee.equals("Rusi is awesome") showRusi(); + if (employee.equals("Rusi is amazing") showRusi(); } } From 767cc2f6e355dc5ca0e2bb2ffd7f16d80333e056 Mon Sep 17 00:00:00 2001 From: Rusi Li Date: Tue, 25 Oct 2016 13:41:26 -0400 Subject: [PATCH 6/6] my memory sucks --- .../grocerystore/employeeHandbook/EmployeeListAdapter.java | 2 +- .../nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 8949a79..d79e005 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java @@ -15,7 +15,7 @@ class EmployeeListAdapter extends RecyclerView.Adapter{ private List mData = Arrays.asList( new EmployeeDescription("Ashique", R.drawable.ashique), - new EmployeeDescription("Rusi's Awesome", R.drawable.rli_image_self1) + new EmployeeDescription("Rusi", R.drawable.rli_image_self1) ); @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 d8d9a23..7f9ae13 100644 --- a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java @@ -19,7 +19,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.employee_view); String employee = getIntent().getStringExtra(EMPLOYEE_NAME); if(employee != null){ - // call a function + if (employee.equals("Rusi")){ + this.showRusi(); + } } }