Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".presentation.util.ApplicationClass"
Expand All @@ -22,13 +22,6 @@
<activity
android:name=".presentation.ui.home.HomeActivity"
android:exported="true">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

</activity>

<activity android:name=".presentation.ui.infrom.InformSettingActivity">
Expand All @@ -45,6 +38,13 @@
android:name=".presentation.ui.login.LoginActivity"
android:exported="true">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>


</activity>
<activity
android:name=".presentation.ui.searchList.SearchListActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.example.cherry_pick_android.domain.model

data class JobGroup(
var jobgroup: String
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package com.example.cherry_pick_android.presentation.adapter

import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.BaseAdapter
import android.widget.Button
import androidx.core.content.ContextCompat
import com.example.cherry_pick_android.R
import com.example.cherry_pick_android.domain.model.JobGroup


class JobGroupAdapter(var context: Context, private val jobgroups: List<JobGroup>) : BaseAdapter() {
private var selectedjobList =arrayListOf<String>()

override fun getCount(): Int = jobgroups.size

override fun getItem(position: Int): Any {
return jobgroups[position].jobgroup
}

override fun getItemId(position: Int): Long {
return position.toLong()
}

override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
var view: View = LayoutInflater.from(context).inflate(R.layout.item_job_group, null)
var btn: Button = view.findViewById(R.id.btn_job_group)
//var surroundView: View = LayoutInflater.from(context).inflate(R.layout.activity_job_group, null)
//var completeBtn: Button = surroundView.findViewById(R.id.btn_complete)

fun setItem(jobgroup: String) {
btn.text= jobgroup
}
setItem(jobgroups[position].jobgroup)

// 1๊ฐœ ์ด์ƒ ์ง๊ตฐ ์„ ํƒ์‹œ ์™„๋ฃŒ ๋ฒ„ํŠผ ํ™œ์„ฑํ™”
/*fun activateCompleteBtn() {
if (selectedjobList.size > 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")
}
// ์ตœ๋Œ€ ์„ ํƒ ๊ฐ€๋Šฅํ•œ ์ง๊ตฐ ๊ฐœ์ˆ˜(=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")
Log.d("JobGroupAdapter", "selectedjobListํฌ๊ธฐ : ${selectedjobList.size} ")
}

}

return view
}

fun getSelectedList(): ArrayList<String>{

return selectedjobList

}


}



Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package com.example.cherry_pick_android.presentation.ui.jobGroup

import android.app.Activity
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.widget.AdapterView
import android.widget.Button
import android.widget.GridView
import android.widget.ImageButton
import com.example.cherry_pick_android.R
import com.example.cherry_pick_android.domain.model.JobGroup
import com.example.cherry_pick_android.presentation.adapter.JobGroupAdapter
import com.example.cherry_pick_android.presentation.ui.jobGroup.JobGroups.jobgroups
import com.example.cherry_pick_android.presentation.ui.mypage.ProfileActivity

class JobGroupActivity : AppCompatActivity() {
private lateinit var adapter: JobGroupAdapter
private lateinit var gridView: GridView
private lateinit var arrayList: ArrayList<String>

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_job_group)

gridView = findViewById(R.id.gv_job_group)
arrayList = ArrayList()
adapter = JobGroupAdapter(applicationContext, jobgroups!!)
gridView?.adapter = adapter

var selectedData = adapter.getSelectedList()
Log.d("JobGroupActivity", "$selectedData")

gridView.onItemClickListener =
AdapterView.OnItemClickListener { parent, view, position, id ->
Log.e("JobGroupActivity", "onItemCli ckListener is working")
var jobgroupItem: JobGroup = jobgroups.get(position)
arrayList.add(jobgroupItem.toString())
Log.d("JobGroupActivity", "arrayList : $arrayList ")

var selectedData = adapter.getSelectedList()
Log.d("JobGroupActivity", "$selectedData")

}

GoToProfile()
clickcompletebutton()
//activateCompleteBtn()
}

private fun GoToProfile() {
val backbtn : ImageButton = findViewById(R.id.ibtn_job_change_back)
backbtn.setOnClickListener{
var selectedData = adapter.getSelectedList()
Log.d("JobGroupActivity","$selectedData")

finish()
}
}

// ํ”„๋กœํ•„ํŽ˜์ด์ง€๋กœ ์ด๋™ = ์™„๋ฃŒ๋ฒ„ํŠผ ํด๋ฆญ
private fun clickcompletebutton() {
val completeBtn : Button = findViewById(R.id.btn_complete)
completeBtn.setOnClickListener{
var selectedData = adapter.getSelectedList()
Log.d("JobGroupActivity","$selectedData")

val intent = Intent(this, ProfileActivity::class.java).apply{
putStringArrayListExtra("selectedJobList",selectedData)
}
setResult(Activity.RESULT_OK,intent)
if(!isFinishing) finish()
}
}

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}์ด๋ฏ€๋กœ ๋ฒ„ํŠผ ํ™œ์„ฑํ™” ")

}
else{
completeBtn.setBackgroundResource(R.drawable.ic_job_complete)
completeBtn.isEnabled= false
}

}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.example.cherry_pick_android.presentation.ui.jobGroup

import com.example.cherry_pick_android.domain.model.JobGroup

object JobGroups {
val jobgroups = listOf(
JobGroup("์ฒ ๊ฐ•"), JobGroup("์„์œ ยทํ™”ํ•™"), JobGroup("์ •์œ "),
JobGroup("2์ฐจ ์ „์ง€"), JobGroup("๋ฐ˜๋„์ฒด"), JobGroup("๋””์Šคํ”Œ๋ ˆ์ด"),
JobGroup("ํœด๋Œ€ํฐ"), JobGroup("IT"), JobGroup("์ž๋™์ฐจ"),
JobGroup("์กฐ์„ "), JobGroup("ํ•ด์šด"), JobGroup("F&B"),
JobGroup("์†Œ๋งค์œ ํ†ต"), JobGroup("๊ฑด์„ค"), JobGroup("ํ˜ธํ…”ยท์—ฌํ–‰ยทํ•ญ๊ณต"),
JobGroup("์„ฌ์œ ยท์˜๋ฅ˜"),
)
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,55 @@
package com.example.cherry_pick_android.presentation.ui.mypage

import android.content.Intent
import androidx.fragment.app.Fragment
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.example.cherry_pick_android.R
import com.example.cherry_pick_android.databinding.FragmentMypageBinding

class MyPageFragment : Fragment() {

private var _binding: FragmentMypageBinding? = null
private val binding get() = _binding!!
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_mypage, container, false)
_binding = FragmentMypageBinding.inflate(inflater, container, false)
val view = binding.root

setButton()

return view
}

override fun onDestroyView() {
super.onDestroyView()
}

private fun setButton() {
binding.apply {
// ๊ณ„์ •์„ค์ • (ํ”„๋กœํ•„) ํŽ˜์ด์ง€๋กœ ์ด๋™
ibtnMypageToProfile.setOnClickListener{
val intent = Intent(it.context,ProfileActivity::class.java)
it.context.startActivity(intent)
}
// ์Šคํ† ์–ด ๋ณ„์  ๋‚จ๊ธฐ๊ธฐ ์ด๋™
ibtnMoveToScore.setOnClickListener {
// val intent = Intent(Intent.ACTION_VIEW)
// intent.data = Uri.parse("market://details?id=$packageName")
// requireContext().startActivity(intent)
}
// ์ด์šฉ์•ฝ๊ด€ ๋ฐ ์‚ฌ์šฉ์ž ์ •์ฑ… ํŽ˜์ด์ง€ ์ด๋™
ibtnMoveToPolicy.setOnClickListener {

}
// ์–ธ๋ก ์‚ฌ ์—ฐ๋ฝ์ฒ˜

// ๊ฐœ์ธ์ •๋ณด์ฒ˜๋ฆฌ๋ฐฉ์นจ
}
}

}
Loading