신기성

1121 merging

......@@ -41,6 +41,6 @@ def policy_hash_reader():
for r in rdr:
policy_dict[r[0]] = r[1]
#policy_hash_writer(policies)
policy_hash_reader()
policy_db_reader()
policy_hash_writer(policies)
#policy_hash_reader()
#policy_db_reader()
......
......@@ -82,7 +82,7 @@ class DetailActivity : AppCompatActivity() {
detailDday.text=memo!!.D_day
detailTitle.text=memo!!.Policy
detailScore.rating=4.toFloat()
detailFavor.text= " " + memo!!.Keyword
detailFavor.text= memo!!.Keyword
val web : WebView = findViewById(R.id.policy_context)
val summary : String = memo!!.Content
......
......@@ -133,7 +133,7 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
startActivity(intent)
}
val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도"))
val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도"))
doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
doSpinner.adapter = doadapter
......@@ -145,31 +145,31 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
// val item = parent.getItemAtPosition(position) as String
//val item = adapter.getItem(position)
if(doSpinner.selectedItem.toString()=="서울특별시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("종로구","중구","용산구","성동구","광진구","동대문구","중랑구","성북구","강북구","도봉구","노원구","은평구","서대문구","마포구","양천구","강서구","구로구","금천구","영등포구","동작구","관악구","서초구","강남구","송파구","강동구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","종로구","중구","용산구","성동구","광진구","동대문구","중랑구","성북구","강북구","도봉구","노원구","은평구","서대문구","마포구","양천구","강서구","구로구","금천구","영등포구","동작구","관악구","서초구","강남구","송파구","강동구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="부산광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강서구","금정구","기장군","남구","동구","동래구","부산진구","북구","사상구","사하구","서구","수영구","연제구","영도구","중구","해운대구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강서구","금정구","기장군","남구","동구","동래구","부산진구","북구","사상구","사하구","서구","수영구","연제구","영도구","중구","해운대구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="대구광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","달서구","달성군","동구","북구","서구","수성구","중구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","남구","달서구","달성군","동구","북구","서구","수성구","중구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="인천광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강화군","계양구","남구","남동구","동구","부평구","서구","연수구","옹진군","중구","미추홀구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강화군","계양구","남구","남동구","동구","부평구","서구","연수구","옹진군","중구","미추홀구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="광주광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("광산구","남구","동구","북구","서구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","광산구","남구","동구","북구","서구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="대전광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("대덕구","동구","서구","유성구","중구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","대덕구","동구","서구","유성구","중구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="울산광역시"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","동구","북구","울주군","중구"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","남구","동구","북구","울주군","중구"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="세종특별자치시"){
......@@ -177,39 +177,39 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="경기도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("가평군","고양시","과천시","광명시","광주시","구리시","군포시","김포시","남양주시","동두천시","부천시","성남시","수원시","시흥시","안산시","안성시","안양시","양주시","양평군","여주시","연천군","오산시","용인시","의왕시","의정부시","이천시","파주시","평택시","포천시","하남시","화성시"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","가평군","고양시","과천시","광명시","광주시","구리시","군포시","김포시","남양주시","동두천시","부천시","성남시","수원시","시흥시","안산시","안성시","안양시","양주시","양평군","여주시","연천군","오산시","용인시","의왕시","의정부시","이천시","파주시","평택시","포천시","하남시","화성시"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="강원도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강릉시","고성군","동해시","삼척시","속초시","양구군","양양군","영월군","원주시","인제군","정선군","철원군","춘천시","태백시","평창군","홍천군","화천군","횡성군"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강릉시","고성군","동해시","삼척시","속초시","양구군","양양군","영월군","원주시","인제군","정선군","철원군","춘천시","태백시","평창군","홍천군","화천군","횡성군"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="충청북도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("괴산군","단양군","보은군","영동군","옥천군","음성군","제천시","증평군","진천군","청주시","충주시"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","괴산군","단양군","보은군","영동군","옥천군","음성군","제천시","증평군","진천군","청주시","충주시"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="충청남도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("계룡시","공주시","금산군","논산시","당진시","보령시","부여군","서산시","서천군","아산시","예산군","천안시","청양군","태안군","홍성군"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","계룡시","공주시","금산군","논산시","당진시","보령시","부여군","서산시","서천군","아산시","예산군","천안시","청양군","태안군","홍성군"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="전라북도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("고창군","군산시","김제시","남원시","무주군","부안군","순창군","완주군","익산시","임실군","장수군","전주시","정읍시","진안군"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","고창군","군산시","김제시","남원시","무주군","부안군","순창군","완주군","익산시","임실군","장수군","전주시","정읍시","진안군"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="전라남도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강진군","고흥군","곡성군","광양시","구례군","나주시","담양군","목포시","무안군","보성군","순천시","신안군","여수시","영광군","영암군","완도군","장성군","장흥군","진도군","함평군","해남군","화순군"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강진군","고흥군","곡성군","광양시","구례군","나주시","담양군","목포시","무안군","보성군","순천시","신안군","여수시","영광군","영암군","완도군","장성군","장흥군","진도군","함평군","해남군","화순군"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="경상북도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("경산시","경주시","고령군","구미시","군위군","김천시","문경시","봉화군","상주시","성주군","안동시","영덕군","영양군","영주시","영천시","예천군","울릉군","울진군","의성군","청도군","청송군","칠곡군","포항시"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","경산시","경주시","고령군","구미시","군위군","김천시","문경시","봉화군","상주시","성주군","안동시","영덕군","영양군","영주시","영천시","예천군","울릉군","울진군","의성군","청도군","청송군","칠곡군","포항시"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else if(doSpinner.selectedItem.toString()=="경상남도"){
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("거제시","거창군","고성군","김해시","남해군","밀양시","사천시","산청군","양산시","의령군","진주시","창년군","창원시","통영시","하동군","함안군","함양군","합천군"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","거제시","거창군","고성군","김해시","남해군","밀양시","사천시","산청군","양산시","의령군","진주시","창년군","창원시","통영시","하동군","함안군","함양군","합천군"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}else {
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("서귀포시","제주시"))
var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서귀포시","제주시"))
gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
gooSpinner.adapter = gooadapter
}
......
......@@ -18,11 +18,18 @@ import androidx.core.content.ContextCompat.startActivity
import androidx.viewpager.widget.ViewPager
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.snackbar.Snackbar
import com.google.firebase.database.FirebaseDatabase
import com.google.firebase.messaging.FirebaseMessaging
import kotlinx.android.synthetic.main.activity_signin.*
import kotlinx.android.synthetic.main.dialog_example.*
class SignInActivity : AppCompatActivity() {
val user_db = FirebaseDatabase.getInstance("https://wello-topic.firebaseio.com/").reference
private fun writeNewUser(Topic : String) {
user_db.child(Topic).setValue(1)/// .setValue(user)
}
internal lateinit var viewpager : ViewPager
////bottom navigation view operation start 1
lateinit var bottomBar: ActionBar
......@@ -88,7 +95,26 @@ class SignInActivity : AppCompatActivity() {
startActivity(intent)
}
.setNegativeButton("다음에 하기") { dialogInterface, i ->
editor.clear()
//editor.clear()
if(prof.getString("existing_topic","c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1")!="c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1"){
/*
FirebaseMessaging.getInstance().unsubscribeFromTopic(prof.getString("existing_topic","none").toString())
FirebaseMessaging.getInstance().subscribeToTopic(user_topic).addOnCompleteListener { task ->
if (!task.isSuccessful) { } // 성공
}
writeNewUser(user_topic) // db에 쓰기
editor.putString("existing_topic",user_topic)
editor.commit()
*/
}else{
FirebaseMessaging.getInstance().subscribeToTopic("c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1").addOnCompleteListener { task ->
if (!task.isSuccessful) { } // 성공
}
writeNewUser("c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1") // db에 쓰기
editor.putString("existing_topic","c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1")
editor.commit()
}
}
.show()
......
......@@ -12,8 +12,8 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() {
private var layoutInflater : LayoutInflater? = null
val Image = arrayOf(
R.drawable.event1,
R.drawable.event2,
R.drawable.event_1,
R.drawable.event_2,
R.drawable.image01
)
......
......@@ -39,6 +39,7 @@
android:layout_height="match_parent"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:background="@drawable/round_ratangle"
android:elevation="3dp"
......@@ -71,35 +72,57 @@
android:background="@drawable/broken_rectangle"
android:gravity="center"
android:textColor="#FFF"
android:textSize="18sp" />
android:textSize="18dp" />
<TextView
android:id="@+id/policyFavorDetail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="5dp"
android:ellipsize="end" />
android:layout_marginRight="5dp"
android:ellipsize="end"
android:textSize="14dp" />
<TextView
android:id="@+id/policyTitleDetail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:layout_marginBottom="4dp"
android:textSize="30sp" />
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:textSize="24dp" />
<RatingBar
android:id="@+id/policyScoreDetail"
style="?android:attr/ratingBarStyleIndicator"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:max="5"
android:rating="3.5"
android:scaleX=".5"
android:scaleY="0.5"
android:transformPivotX="0dp"
android:transformPivotY="0dp" />
android:orientation="horizontal">
<TextView
android:id="@+id/textView12"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="5dp"
android:gravity="center"
android:text=" (Beta)"
android:textColor="#29ABE2"
android:textSize="14dp" />
<RatingBar
android:id="@+id/policyScoreDetail"
style="?android:attr/ratingBarStyleIndicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="11dp"
android:max="5"
android:rating="3.5"
android:scaleX=".5"
android:scaleY="0.5"
android:transformPivotX="0dp"
android:transformPivotY="0dp" />
</LinearLayout>
<WebView
android:id="@+id/policy_context"
......@@ -109,23 +132,28 @@
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@drawable/gradation"
android:orientation="horizontal"></LinearLayout>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="5dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.2"
android:background="#FFFFFF"
android:gravity="center"
android:orientation="horizontal">
......
......@@ -161,36 +161,36 @@
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="설정"
android:textSize="20dp" />
android:textSize="18dp" />
<Button
android:id="@+id/InfoButtonNotice"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
android:background="#FFF"
style="?android:attr/borderlessButtonStyle"
android:drawableLeft="@drawable/_alert"
android:drawablePadding="22dp"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="공지사항"
android:textSize="20dp" />
android:textSize="18dp" />
<Button
android:id="@+id/InfoButtonFAQ"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
android:background="#FFF"
android:elevation="0dp"
style="?android:attr/borderlessButtonStyle"
android:drawableLeft="@drawable/help"
android:drawablePadding="22dp"
android:elevation="0dp"
android:gravity="left|center_vertical"
android:paddingLeft="33dp"
android:text="자주 묻는 질문"
android:textSize="20dp" />
android:textSize="18dp" />
</LinearLayout>
......
......@@ -148,14 +148,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -148,14 +148,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -148,14 +148,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -148,14 +148,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -148,14 +148,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
......@@ -71,8 +71,29 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="2dp"
android:orientation="vertical">
<TextView
android:id="@+id/textView10"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="분야별 복지정책"
android:textSize="18dp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="15dp"
android:layout_marginLeft="15dp"
android:layout_marginTop="5dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="15dp"
android:layout_weight="1"
android:background="@drawable/edgemaking"
android:gravity="center"
......
......@@ -141,7 +141,7 @@
android:text="# 장애인"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
<com.google.android.material.chip.Chip
style="@style/Widget.MaterialComponents.Chip.Choice"
......@@ -153,7 +153,7 @@
android:text="# 한부모"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
<com.google.android.material.chip.Chip
......@@ -165,7 +165,7 @@
android:text="# 다문화"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
</com.google.android.material.chip.ChipGroup>
<com.google.android.material.chip.ChipGroup
......@@ -181,7 +181,7 @@
android:text="# 저소득층"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF"
app:chipBackgroundColor="#FFFFFF"
app:chipIcon="@drawable/image01" />
<com.google.android.material.chip.Chip
......@@ -192,7 +192,7 @@
android:text="# 임신/출산"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
</com.google.android.material.chip.ChipGroup>
</com.google.android.material.chip.ChipGroup>
......@@ -226,7 +226,7 @@
android:text="# 아동"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
<com.google.android.material.chip.Chip
style="@style/Widget.MaterialComponents.Chip.Choice"
......@@ -238,7 +238,7 @@
android:text="# 청소년"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
<com.google.android.material.chip.Chip
......@@ -250,7 +250,7 @@
android:text="# 청년"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
</com.google.android.material.chip.ChipGroup>
<com.google.android.material.chip.ChipGroup
......@@ -266,7 +266,7 @@
android:text="# 중장년"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF"
app:chipBackgroundColor="#FFFFFF"
app:chipIcon="@drawable/image01" />
<com.google.android.material.chip.Chip
......@@ -277,7 +277,7 @@
android:text="# 노년"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textSize="16dp"
app:chipBackgroundColor="#C6FFFFFF" />
app:chipBackgroundColor="#FFFFFF" />
</com.google.android.material.chip.ChipGroup>
</com.google.android.material.chip.ChipGroup>
......