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..bf4afc8 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("Max", R.drawable.maxrosadoprofilepic) ); @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..fe01f94 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.Max; 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 "Max": + showMax(); + break; + default: + break; + } } } @@ -28,4 +38,11 @@ private void showAshique(){ fragmentTransaction.add(R.id.employee_profile,new Ashique()); fragmentTransaction.commit(); } + + private void showMax(){ + FragmentManager fragmentManager = getFragmentManager(); + FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.add(R.id.employee_profile, new Max()); + fragmentTransaction.commit(); + } } diff --git a/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Max.java b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Max.java new file mode 100644 index 0000000..b7d8609 --- /dev/null +++ b/app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/employees/Max.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 ashiquechowdhury on 10/11/16. + */ +public class Max extends Fragment { + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.maxrosado,container,false); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/duesexbackground.jpg b/app/src/main/res/drawable/deusexbackground.jpg similarity index 100% rename from app/src/main/res/drawable/duesexbackground.jpg rename to app/src/main/res/drawable/deusexbackground.jpg diff --git a/app/src/main/res/layout/maxrosado.xml b/app/src/main/res/layout/maxrosado.xml index 158e374..549bf00 100644 --- a/app/src/main/res/layout/maxrosado.xml +++ b/app/src/main/res/layout/maxrosado.xml @@ -6,7 +6,7 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - android:background="@drawable/duesexbackground"> + android:background="@drawable/deusexbackground"> + android:layout_marginLeft="60dp" + android:layout_above="@+id/textView2" /> + android:layout_marginLeft="168dp" + android:layout_above="@+id/textView2" /> 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