diff --git a/SHAPEUP2022/.idea/misc.xml b/SHAPEUP2022/.idea/misc.xml index 255f759..c3f3bf8 100644 --- a/SHAPEUP2022/.idea/misc.xml +++ b/SHAPEUP2022/.idea/misc.xml @@ -158,6 +158,13 @@ + + + + + + + diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/BreedFragment1.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/BreedFragment1.kt index 3bfd0d1..8bb5d4c 100644 --- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/BreedFragment1.kt +++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/BreedFragment1.kt @@ -1,6 +1,7 @@ package com.example.shape_up_2022 import android.content.Context +import android.content.Intent import android.os.Bundle import android.util.Log import androidx.fragment.app.Fragment @@ -11,6 +12,8 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.example.shape_up_2022.databinding.FragmentBreed1Binding import com.example.shape_up_2022.databinding.ItemBreedBinding +import com.example.shape_up_2022.simulation.SimStartNamingActivity +import com.example.shape_up_2022.simulation.SimWalkSearchAdapter // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -42,8 +45,24 @@ class MyBreedAdapter(val datas: MutableList) : RecyclerView.Adapter + if(isChecked){ // checked event가 발생했을 때 + // 4개의 체크박스가 모두 checked == true + if(check1.isChecked && check2.isChecked && check3.isChecked && check4.isChecked){ + binding.btnSimulationStartStart.isEnabled = true + binding.btnSimulationStartStart.setBackgroundColor(Color.parseColor("#FFE4A07F")); + } + } + + } + // CheckBox에 event 달기 + check1.setOnCheckedChangeListener(checkListener) + check2.setOnCheckedChangeListener(checkListener) + check3.setOnCheckedChangeListener(checkListener) + check4.setOnCheckedChangeListener(checkListener) // 입양하기 버튼 -> 화면 이동 diff --git a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimStartBreedActivity.kt b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimStartBreedActivity.kt index 6afe2ed..7ccf882 100644 --- a/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimStartBreedActivity.kt +++ b/SHAPEUP2022/app/src/main/java/com/example/shape_up_2022/simulation/SimStartBreedActivity.kt @@ -16,12 +16,6 @@ class SimStartBreedActivity : AppCompatActivity() { super.onCreate(savedInstanceState) binding = ActivitySimStartBreedBinding.inflate(layoutInflater) setContentView(binding.root) - binding.breedSkip.setOnClickListener { - val intent = Intent(this, SimStartNamingActivity::class.java) - startActivity(intent) - finish() - } - fragment1 = BreedFragment1() fragment2 = BreedFragment2() diff --git a/SHAPEUP2022/app/src/main/res/layout/activity_sim_start.xml b/SHAPEUP2022/app/src/main/res/layout/activity_sim_start.xml index 3be5dc9..08f4ee6 100644 --- a/SHAPEUP2022/app/src/main/res/layout/activity_sim_start.xml +++ b/SHAPEUP2022/app/src/main/res/layout/activity_sim_start.xml @@ -42,6 +42,7 @@ android:orientation="vertical"> @@ -53,6 +54,7 @@ android:text=" 반려견의 잠자리, 배변패드 또는 배변 판, 치약, 빗, 발톱깎기를 포함한 생필품을 준비해두어야 합니다. 어린 강아지의 경우 ..... 등이 추가로 필요합니다." /> @@ -64,6 +66,7 @@ android:text=" 1. 상담 \n 2. 보호소 등에서 강아지 데려오기\n 3. (입양 후 30일 이내에) 반려동물 등록\n 4. 입양 첫날 집중해서 보살펴야 하는 부분 숙지" /> @@ -75,6 +78,7 @@ android:text=" 반려견을 함께 돌볼 가족들과 충분한 상의를 거친 후 결정합시다." /> diff --git a/SHAPEUP2022/app/src/main/res/layout/activity_sim_start_breed.xml b/SHAPEUP2022/app/src/main/res/layout/activity_sim_start_breed.xml index 7dd96c8..cb55e63 100644 --- a/SHAPEUP2022/app/src/main/res/layout/activity_sim_start_breed.xml +++ b/SHAPEUP2022/app/src/main/res/layout/activity_sim_start_breed.xml @@ -42,9 +42,4 @@ android:layout_height="0dp" android:layout_weight="1" android:id="@+id/breed_tabContent" /> -