diff --git a/application/.idea/misc.xml b/application/.idea/misc.xml index 03ccd08..b667fc3 100644 --- a/application/.idea/misc.xml +++ b/application/.idea/misc.xml @@ -3,6 +3,11 @@ diff --git a/application/app/src/main/java/com/example/myapplication/ui/petSelect/AddPetActivity.java b/application/app/src/main/java/com/example/myapplication/ui/petSelect/AddPetActivity.java index c7d162a..a8089d8 100644 --- a/application/app/src/main/java/com/example/myapplication/ui/petSelect/AddPetActivity.java +++ b/application/app/src/main/java/com/example/myapplication/ui/petSelect/AddPetActivity.java @@ -21,11 +21,14 @@ import com.example.myapplication.ui.setting.PetinfoData; import com.example.myapplication.ui.setting.ProfileResponse; +import java.util.ArrayList; + import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; public class AddPetActivity extends AppCompatActivity { + private String CATDOG; private ImageView petprofile; private TextView petAge; private EditText petBreed,petNickName; @@ -105,19 +108,22 @@ public void onClick(DialogInterface dialog, int i) { AgePicker.show(); } }); - // 개/고양이 버튼 클릭 시에 해당 사진으로 이미지뷰 변경 - selectCatButton.setOnClickListener(new View.OnClickListener() { + //개/고양이 버튼 클릭 시에 해당 사진으로 이미지뷰 변경 + selectDogButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - petprofile.setImageResource(R.drawable.catface); + petprofile.setImageResource(R.drawable.dog2); + CATDOG = "dog"; } }); - selectDogButton.setOnClickListener(new View.OnClickListener() { + selectCatButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - petprofile.setImageResource(R.drawable.dogface); + petprofile.setImageResource(R.drawable.cat2); + CATDOG = "cat"; } }); + } //반려동물 정보 설정 public void getPetinfo(){ @@ -126,20 +132,13 @@ public void getPetinfo(){ //String Breed = petBreed.getText().toString().trim(); String Gender = null; String Neutering = null; - if (man.isEnabled()) { - Gender = man.getText().toString(); - } else if (woman.isEnabled()) { - Gender = woman.getText().toString(); - } - - if (NeuteringYes.isEnabled()) { - Neutering = NeuteringYes.getText().toString(); - } else if (NeuteringNo.isEnabled()) { - Neutering = NeuteringNo.getText().toString(); - } + if (man.isEnabled()) { Gender = man.getText().toString(); + } else if (woman.isEnabled()) { Gender = woman.getText().toString();} - PetinfoData petinfoData = new PetinfoData(Name, Age, null, Gender, Neutering); + if (NeuteringYes.isEnabled()) { Neutering = NeuteringYes.getText().toString(); + } else if (NeuteringNo.isEnabled()) { Neutering = NeuteringNo.getText().toString(); } + PetinfoData petinfoData = new PetinfoData(Name, Age, null, Gender, Neutering); Call call = profileAPI.getPetinfo(petinfoData); call.enqueue(new Callback() { @@ -149,6 +148,7 @@ public void onResponse(Call call, Response res Toast.makeText(getApplicationContext(),"등록되었습니다.", Toast.LENGTH_SHORT).show(); Intent intent = new Intent(AddPetActivity.this, PetSelectActivity.class); intent.putExtra("petName", Name); + intent.putExtra("CATDOG", CATDOG); setResult(Activity.RESULT_OK, intent); finish(); } diff --git a/application/app/src/main/java/com/example/myapplication/ui/petSelect/PetSelectActivity.java b/application/app/src/main/java/com/example/myapplication/ui/petSelect/PetSelectActivity.java index a4f8441..7726ca4 100644 --- a/application/app/src/main/java/com/example/myapplication/ui/petSelect/PetSelectActivity.java +++ b/application/app/src/main/java/com/example/myapplication/ui/petSelect/PetSelectActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.widget.Adapter; import android.widget.Button; import android.widget.Toast; @@ -16,6 +17,7 @@ import com.example.myapplication.ui.mainPage.MainActivity; import java.util.ArrayList; +import java.util.Locale; public class PetSelectActivity extends AppCompatActivity { @@ -33,11 +35,9 @@ protected void onCreate(Bundle savedInstanceState) { // 리사이클러뷰에 데이터추가 (함수가 밑에 구현되어있음) addItem("cat", "밤이"); - addItem("dog", "보리"); mRecyclerViewAdapter = new RecyclerViewAdapter(mList); mRecyclerView.setAdapter(mRecyclerViewAdapter); - mRecyclerView.setLayoutManager(new LinearLayoutManager(this)); mRecyclerView.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false)); // 리사이클러뷰 안의 아이템(반려동물 아이콘) 클릭시 메인화면으로 이동 @@ -62,14 +62,17 @@ public void onClick(View view){ }); } + //사용자가 작성한 반려동물 정보 불러오기 @Override protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent intent) { super.onActivityResult(requestCode, resultCode, intent); - if (requestCode == 101) { - if (resultCode == Activity.RESULT_OK) { - String petName = intent.getExtras().getString("petName"); - //리사이클러뷰 새로 생성 + if (resultCode == Activity.RESULT_OK) { + if (intent !=null) { + String petName = intent.getStringExtra("petName"); + String CATDOG = intent.getStringExtra("CATDOG"); + addItem(CATDOG, petName); + mRecyclerViewAdapter.notifyDataSetChanged(); } } } diff --git a/application/app/src/main/java/com/example/myapplication/ui/petSelect/RecyclerViewAdapter.java b/application/app/src/main/java/com/example/myapplication/ui/petSelect/RecyclerViewAdapter.java index e7d72ff..2cc1cb0 100644 --- a/application/app/src/main/java/com/example/myapplication/ui/petSelect/RecyclerViewAdapter.java +++ b/application/app/src/main/java/com/example/myapplication/ui/petSelect/RecyclerViewAdapter.java @@ -76,10 +76,10 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public void onBindViewHolder(@NonNull RecyclerViewAdapter.ViewHolder holder, int position) { RecyclerViewItem item = mList.get(position); - if(item.getImgName()=="cat") // 아이템의 이미지 이름이 cat이면 고양이 사진으로 설정 - holder.imgView_item.setImageResource(R.drawable.catface); + if(item.getImgName().equals("cat")) // 아이템의 이미지 이름이 cat이면 고양이 사진으로 설정 + holder.imgView_item.setImageResource(R.drawable.cat); else - holder.imgView_item.setImageResource(R.drawable.dogface); + holder.imgView_item.setImageResource(R.drawable.dog); holder.petNickName.setText(item.getMainText()); } diff --git a/application/app/src/main/res/drawable-xxhdpi/cat.png b/application/app/src/main/res/drawable-xxhdpi/cat.png new file mode 100644 index 0000000..47878bb Binary files /dev/null and b/application/app/src/main/res/drawable-xxhdpi/cat.png differ diff --git a/application/app/src/main/res/drawable-xxhdpi/cat2.png b/application/app/src/main/res/drawable-xxhdpi/cat2.png new file mode 100644 index 0000000..1148d2d Binary files /dev/null and b/application/app/src/main/res/drawable-xxhdpi/cat2.png differ diff --git a/application/app/src/main/res/drawable-xxhdpi/dog.png b/application/app/src/main/res/drawable-xxhdpi/dog.png new file mode 100644 index 0000000..f9d7f68 Binary files /dev/null and b/application/app/src/main/res/drawable-xxhdpi/dog.png differ diff --git a/application/app/src/main/res/drawable-xxhdpi/dog2.png b/application/app/src/main/res/drawable-xxhdpi/dog2.png new file mode 100644 index 0000000..9a5cc4c Binary files /dev/null and b/application/app/src/main/res/drawable-xxhdpi/dog2.png differ diff --git a/application/app/src/main/res/layout/newpetprofile.xml b/application/app/src/main/res/layout/newpetprofile.xml index da31a87..8a1f2eb 100644 --- a/application/app/src/main/res/layout/newpetprofile.xml +++ b/application/app/src/main/res/layout/newpetprofile.xml @@ -8,16 +8,16 @@ + android:src="@drawable/dog2" /> + android:src="@drawable/dog2" />