diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fa4de42..c104fc7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,7 +46,8 @@ android:enabled="true" android:exported="true" /> - + + \ No newline at end of file diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java index 43d40d0..e8ee7d0 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/adapter/CardHolder.java @@ -1,6 +1,7 @@ package com.example.ninefourone.nutritionmaster.adapter; import android.content.Context; +import android.content.Intent; import android.os.Build; import android.support.annotation.RequiresApi; import android.support.v7.widget.RecyclerView; @@ -9,6 +10,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.example.ninefourone.nutritionmaster.R; +import com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization.CustomizationActivity; import java.util.ArrayList; @@ -27,16 +29,27 @@ public class CardHolder extends RecyclerView.ViewHolder { @BindView(R.id.tv_sign) TextView tvSign; + private View itemView; + public CardHolder(View itemView) { super(itemView); ButterKnife.bind(this, itemView); + this.itemView = itemView; } @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public void bindView(int picId, String text, Context context) { + public void bindView(int picId, String text, final Context context) { tvName.setText(text); ivPhoto.setImageDrawable(context.getDrawable(picId)); + itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent i = new Intent(context, CustomizationActivity.class); + i.putExtra("SEND_CODE", getAdapterPosition()); + context.startActivity(i); + } + }); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java index 7dbae5c..970588d 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/addinformation/AddActivity.java @@ -117,6 +117,7 @@ public class AddActivity extends AppCompatActivity { @Override public void onClick(View v) { resultLayout.setVisibility(View.VISIBLE); + cardList.setVisibility(View.INVISIBLE); } }); } diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java new file mode 100644 index 0000000..c79e3ee --- /dev/null +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationActivity.java @@ -0,0 +1,25 @@ +package com.example.ninefourone.nutritionmaster.modules.viewpagerfragments.customization; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.widget.TextView; + +import com.example.ninefourone.nutritionmaster.R; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class CustomizationActivity extends AppCompatActivity { + + @BindView(R.id.index_text) + TextView indexText; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_customization); + ButterKnife.bind(this); + String text = getIntent().getStringExtra("SEND_CODE"); + indexText.setText(text); + } +} diff --git a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java index 7844d9a..daebe4e 100644 --- a/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java +++ b/app/src/main/java/com/example/ninefourone/nutritionmaster/modules/viewpagerfragments/customization/CustomizationFragment.java @@ -34,7 +34,6 @@ public class CustomizationFragment extends BaseFragment { Unbinder unbinder; private CardAdapter cardAdapter; - private CardHolder cardHolder; private ArrayList mDataList = new ArrayList<>(); private int[] picList = new int[]{ diff --git a/app/src/main/res/layout/activity_customization.xml b/app/src/main/res/layout/activity_customization.xml new file mode 100644 index 0000000..038bb90 --- /dev/null +++ b/app/src/main/res/layout/activity_customization.xml @@ -0,0 +1,15 @@ + + + + +