diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8f77eb95..1e68070e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -64,9 +64,13 @@ + - + + diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/adapter/JobGroupAdapter.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/adapter/JobGroupAdapter.kt index 835d30ae..c34f81fc 100644 --- a/app/src/main/java/com/example/cherry_pick_android/presentation/adapter/JobGroupAdapter.kt +++ b/app/src/main/java/com/example/cherry_pick_android/presentation/adapter/JobGroupAdapter.kt @@ -7,6 +7,8 @@ import android.view.View import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.Button +import android.widget.ImageView +import android.widget.TextView import androidx.core.content.ContextCompat import com.example.cherry_pick_android.R import com.example.cherry_pick_android.domain.model.JobGroup @@ -27,49 +29,41 @@ class JobGroupAdapter(var context: Context, private val jobgroups: List 0) { - completeBtn.setBackgroundColor(ContextCompat.getColor(context, R.color.main_pink)) - completeBtn.setBackgroundResource(R.drawable.ic_job_complete_clicked) - completeBtn.isEnabled = true - Log.d("JobGroupActivity", "selectedData크기 : ${selectedjobList.size}이므로 버튼 활성화 ") - } else { - completeBtn.setBackgroundResource(R.drawable.ic_job_complete) - completeBtn.isEnabled = false - } - }*/ - - btn.setOnClickListener{ -// 이미 선택했던 직군 선택시 버튼 변경 - if (selectedjobList.contains(btn.text)) { - btn.setBackgroundResource(R.drawable.ic_job_button) - btn.setTextColor(ContextCompat.getColor(context, R.color.black)) - selectedjobList.remove(btn.text) - Log.d("JobGroupAdapter", "removed ${btn.text} from selectedjobList") + fun resetItem(){ + // 이미 선택했던 직군 선택시 버튼 변경 + if (selectedjobList.contains(tvBtn.text)) { + ivBtn.setBackgroundResource(R.drawable.ic_job_button) + tvBtn.setTextColor(ContextCompat.getColor(context, R.color.black)) + selectedjobList.remove(tvBtn.text) + Log.d("JobGroupAdapter", "removed ${tvBtn.text} from selectedjobList") } // 최대 선택 가능한 직군 개수(=3) 제한 else if(selectedjobList.size==3) { - // 아무일도 일어나지 않음^___^ + } // 새롭게 직군 선택시 버튼 변경 else { - btn.setBackgroundResource(R.drawable.ic_job_button_clicked) - btn.setTextColor(ContextCompat.getColor(context, R.color.sub_bage)) - selectedjobList.add(btn.text.toString()) - Log.d("JobGroupAdapter", "added ${btn.text} from selectedjobList") + ivBtn.setBackgroundResource(R.drawable.ic_job_button_clicked) + tvBtn.setTextColor(ContextCompat.getColor(context, R.color.sub_bage)) + selectedjobList.add(tvBtn.text.toString()) + Log.d("JobGroupAdapter", "added ${tvBtn.text} from selectedjobList") Log.d("JobGroupAdapter", "selectedjobList크기 : ${selectedjobList.size} ") } + } + tvBtn.setOnClickListener{ + resetItem() + } + ivBtn.setOnClickListener{ + resetItem() } return view diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/jobGroup/JobGroupActivity.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/jobGroup/JobGroupActivity.kt index b022f909..5537049b 100644 --- a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/jobGroup/JobGroupActivity.kt +++ b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/jobGroup/JobGroupActivity.kt @@ -26,27 +26,47 @@ class JobGroupActivity : AppCompatActivity() { gridView = findViewById(R.id.gv_job_group) arrayList = ArrayList() + var selectedData: ArrayList + adapter = JobGroupAdapter(applicationContext, jobgroups!!) + //adapter = JobGroupAdapter(this, jobgroups) gridView?.adapter = adapter - var selectedData = adapter.getSelectedList() + selectedData = adapter.getSelectedList() Log.d("JobGroupActivity", "$selectedData") + //gridview의 item click 감지 gridView.onItemClickListener = AdapterView.OnItemClickListener { parent, view, position, id -> - Log.e("JobGroupActivity", "onItemCli ckListener is working") - var jobgroupItem: JobGroup = jobgroups.get(position) + val completeBtn : Button = findViewById(R.id.btn_complete) + selectedData = adapter.getSelectedList() + + // 직군 1개이상 선택시 완료 버튼 활성화 + if (selectedData.size > 0) { + completeBtn.setBackgroundResource(R.drawable.ic_job_complete_clicked) + completeBtn.isEnabled= true + Log.d("JobGroupActivity", "arrayList크기 : ${arrayList.size}이므로 버튼 활성화 ") + Log.d("JobGroupActivity", "arrayList크기 : ${selectedData.size}이므로 버튼 활성화 ") + } + else{ + completeBtn.setBackgroundResource(R.drawable.ic_job_complete) + completeBtn.isEnabled= false + } + + //activateCompleteBtn() + Log.d("JobGroupActivity", "onItemClickListener is working") + /*var jobgroupItem: JobGroup = jobgroups[position] arrayList.add(jobgroupItem.toString()) Log.d("JobGroupActivity", "arrayList : $arrayList ") var selectedData = adapter.getSelectedList() - Log.d("JobGroupActivity", "$selectedData") + Log.d("JobGroupActivity", "$selectedData")*/ } GoToProfile() clickcompletebutton() - //activateCompleteBtn() + } private fun GoToProfile() { @@ -76,19 +96,17 @@ class JobGroupActivity : AppCompatActivity() { private fun activateCompleteBtn() { val completeBtn : Button = findViewById(R.id.btn_complete) + // 직군 1개이상 선택시 완료 버튼 활성화 + if (arrayList.size > 0) { + completeBtn.setBackgroundResource(R.drawable.ic_job_complete_clicked) + completeBtn.isEnabled= true + Log.d("JobGroupActivity", "arrayList크기 : ${arrayList.size}이므로 버튼 활성화 ") -// 직군 1개이상 선택시 완료 버튼 활성화 - if (arrayList.size > 0) { - completeBtn.setBackgroundResource(R.drawable.ic_job_complete_clicked) - completeBtn.isEnabled= true - Log.d("JobGroupActivity", "arrayList크기 : ${arrayList.size}이므로 버튼 활성화 ") - - } - else{ - completeBtn.setBackgroundResource(R.drawable.ic_job_complete) - completeBtn.isEnabled= false - } - + } + else{ + completeBtn.setBackgroundResource(R.drawable.ic_job_complete) + completeBtn.isEnabled= false + } } diff --git a/app/src/main/res/drawable/ic_job_button.xml b/app/src/main/res/drawable/ic_job_button.xml index 11f3f7b3..8948e9b2 100644 --- a/app/src/main/res/drawable/ic_job_button.xml +++ b/app/src/main/res/drawable/ic_job_button.xml @@ -1,8 +1,7 @@ + android:color="@color/gray_1" /> + android:color="@color/main_pink"/> + tools:context=".presentation.ui.jobGroup.JobGroupActivity" + android:descendantFocusability="blocksDescendants" > + xmlns:app="http://schemas.android.com/apk/res-auto" + android:focusable="false" + android:focusableInTouchMode="false" > - + + + + + + + + + + \ No newline at end of file