Skip to content

Shawn's employee photo + fragment #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shawn-Speaks wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Shawn's employee photo + fragment #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
class EmployeeListAdapter extends RecyclerView.Adapter{

private List<EmployeeDescription> mData = Arrays.asList(
new EmployeeDescription("Ashique", R.drawable.ashique),
new EmployeeDescription("Nesada", R.drawable.nk),
new EmployeeDescription("Lily", R.drawable.hui),
new EmployeeDescription("Hyunjoo", R.drawable.hyunjoo),
new EmployeeDescription("Helen", R.drawable.helen),
new EmployeeDescription("Derek", R.drawable.derek),
new EmployeeDescription("Andres",R.drawable.andreas),
new EmployeeDescription("Danny", R.drawable.danny),
new EmployeeDescription("Rook", R.drawable.rooks),
new EmployeeDescription("Wesnie", R.drawable.wesnie),
new EmployeeDescription("Jordan", R.drawable.jordan),
new EmployeeDescription("JoseV", R.drawable.josev),
new EmployeeDescription("Mila", R.drawable.mila),
new EmployeeDescription("Jose G.", R.drawable.joseg),
new EmployeeDescription("Akasha", R.drawable.aa_profile_pic),
new EmployeeDescription("Yojana", R.drawable.yojana1),
new EmployeeDescription("Taryn", R.drawable.taryn_selfie)

// new EmployeeDescription("Ashique", R.drawable.ashique),
// new EmployeeDescription("Nesada", R.drawable.nk),
// new EmployeeDescription("Lily", R.drawable.hui),
// new EmployeeDescription("Hyunjoo", R.drawable.hyunjoo),
// new EmployeeDescription("Helen", R.drawable.helen),
// new EmployeeDescription("Derek", R.drawable.derek),
// new EmployeeDescription("Andres",R.drawable.andreas),
// new EmployeeDescription("Danny", R.drawable.danny),
// new EmployeeDescription("Rook", R.drawable.rooks),
// new EmployeeDescription("Wesnie", R.drawable.wesnie),
// new EmployeeDescription("Jordan", R.drawable.jordan),
// new EmployeeDescription("JoseV", R.drawable.josev),
// new EmployeeDescription("Mila", R.drawable.mila),
// new EmployeeDescription("Jose G.", R.drawable.joseg),
// new EmployeeDescription("Akasha", R.drawable.aa_profile_pic),
// new EmployeeDescription("Yojana", R.drawable.yojana1),
// new EmployeeDescription("Taryn", R.drawable.taryn_selfie)
new EmployeeDescription("Speaks", R.drawable.rooftop_beer)

);

Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/EmployeeView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
if(employee.equalsIgnoreCase("Mila")){
showMila();
}
if (employee.equalsIgnoreCase("Speaks")) {
showShawn();
}

switch (employee) {
case "Lily":
Expand Down Expand Up @@ -119,6 +122,10 @@ private void showAndres(){
private void showHelen(){
getFragmentManager().beginTransaction().add(R.id.employee_profile, new Helen()).commit();
}

private void showShawn(){
getFragmentManager().beginTransaction().add(R.id.employee_profile, new Shawn()).commit();
}
private void showAshique(){
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/java/nyc/c4q/grocerystore/employeeHandbook/Shawn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package nyc.c4q.grocerystore.employeeHandbook;

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 shawnspeaks on 10/24/16.
*/
public class Shawn extends Fragment {
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
return inflater.inflate(R.layout.shawn_speaks, container, false);
}
}
4 changes: 0 additions & 4 deletions app/src/main/java/nyc/c4q/grocerystore/sushiShop/SushiYa.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@ public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.sushi);
}




}
3 changes: 1 addition & 2 deletions app/src/main/res/layout/employee_view_holder.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<ImageView
android:id="@+id/employee_image"
android:layout_width="@dimen/small_image_size"
android:layout_height="@dimen/small_image_size"
android:background="@drawable/blank_pic"/>
android:layout_height="@dimen/small_image_size"/>

<TextView
android:id="@+id/employee_name"
Expand Down