장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
de0b955b 1 parent 37531795

1121 merging

Inline Side-by-side
Showing 17 changed files with 122 additions and 87 deletions
...@@ -41,6 +41,6 @@ def policy_hash_reader(): ...@@ -41,6 +41,6 @@ def policy_hash_reader():
41 for r in rdr: 41 for r in rdr:
42 policy_dict[r[0]] = r[1] 42 policy_dict[r[0]] = r[1]
43 43
44 -#policy_hash_writer(policies) 44 +policy_hash_writer(policies)
45 -policy_hash_reader() 45 +#policy_hash_reader()
46 -policy_db_reader() 46 +#policy_db_reader()
......
...@@ -82,7 +82,7 @@ class DetailActivity : AppCompatActivity() { ...@@ -82,7 +82,7 @@ class DetailActivity : AppCompatActivity() {
82 detailDday.text=memo!!.D_day 82 detailDday.text=memo!!.D_day
83 detailTitle.text=memo!!.Policy 83 detailTitle.text=memo!!.Policy
84 detailScore.rating=4.toFloat() 84 detailScore.rating=4.toFloat()
85 - detailFavor.text= " " + memo!!.Keyword 85 + detailFavor.text= memo!!.Keyword
86 86
87 val web : WebView = findViewById(R.id.policy_context) 87 val web : WebView = findViewById(R.id.policy_context)
88 val summary : String = memo!!.Content 88 val summary : String = memo!!.Content
......
...@@ -133,7 +133,7 @@ class InputProfilFirstFourActivity : AppCompatActivity() { ...@@ -133,7 +133,7 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
133 startActivity(intent) 133 startActivity(intent)
134 } 134 }
135 135
136 - val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도")) 136 + val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도"))
137 doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 137 doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
138 doSpinner.adapter = doadapter 138 doSpinner.adapter = doadapter
139 139
...@@ -145,31 +145,31 @@ class InputProfilFirstFourActivity : AppCompatActivity() { ...@@ -145,31 +145,31 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
145 // val item = parent.getItemAtPosition(position) as String 145 // val item = parent.getItemAtPosition(position) as String
146 //val item = adapter.getItem(position) 146 //val item = adapter.getItem(position)
147 if(doSpinner.selectedItem.toString()=="서울특별시"){ 147 if(doSpinner.selectedItem.toString()=="서울특별시"){
148 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("종로구","중구","용산구","성동구","광진구","동대문구","중랑구","성북구","강북구","도봉구","노원구","은평구","서대문구","마포구","양천구","강서구","구로구","금천구","영등포구","동작구","관악구","서초구","강남구","송파구","강동구")) 148 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","종로구","중구","용산구","성동구","광진구","동대문구","중랑구","성북구","강북구","도봉구","노원구","은평구","서대문구","마포구","양천구","강서구","구로구","금천구","영등포구","동작구","관악구","서초구","강남구","송파구","강동구"))
149 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 149 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
150 gooSpinner.adapter = gooadapter 150 gooSpinner.adapter = gooadapter
151 }else if(doSpinner.selectedItem.toString()=="부산광역시"){ 151 }else if(doSpinner.selectedItem.toString()=="부산광역시"){
152 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강서구","금정구","기장군","남구","동구","동래구","부산진구","북구","사상구","사하구","서구","수영구","연제구","영도구","중구","해운대구")) 152 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강서구","금정구","기장군","남구","동구","동래구","부산진구","북구","사상구","사하구","서구","수영구","연제구","영도구","중구","해운대구"))
153 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 153 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
154 gooSpinner.adapter = gooadapter 154 gooSpinner.adapter = gooadapter
155 }else if(doSpinner.selectedItem.toString()=="대구광역시"){ 155 }else if(doSpinner.selectedItem.toString()=="대구광역시"){
156 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","달서구","달성군","동구","북구","서구","수성구","중구")) 156 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","남구","달서구","달성군","동구","북구","서구","수성구","중구"))
157 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 157 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
158 gooSpinner.adapter = gooadapter 158 gooSpinner.adapter = gooadapter
159 }else if(doSpinner.selectedItem.toString()=="인천광역시"){ 159 }else if(doSpinner.selectedItem.toString()=="인천광역시"){
160 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강화군","계양구","남구","남동구","동구","부평구","서구","연수구","옹진군","중구","미추홀구")) 160 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강화군","계양구","남구","남동구","동구","부평구","서구","연수구","옹진군","중구","미추홀구"))
161 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 161 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
162 gooSpinner.adapter = gooadapter 162 gooSpinner.adapter = gooadapter
163 }else if(doSpinner.selectedItem.toString()=="광주광역시"){ 163 }else if(doSpinner.selectedItem.toString()=="광주광역시"){
164 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("광산구","남구","동구","북구","서구")) 164 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","광산구","남구","동구","북구","서구"))
165 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 165 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
166 gooSpinner.adapter = gooadapter 166 gooSpinner.adapter = gooadapter
167 }else if(doSpinner.selectedItem.toString()=="대전광역시"){ 167 }else if(doSpinner.selectedItem.toString()=="대전광역시"){
168 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("대덕구","동구","서구","유성구","중구")) 168 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","대덕구","동구","서구","유성구","중구"))
169 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 169 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
170 gooSpinner.adapter = gooadapter 170 gooSpinner.adapter = gooadapter
171 }else if(doSpinner.selectedItem.toString()=="울산광역시"){ 171 }else if(doSpinner.selectedItem.toString()=="울산광역시"){
172 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","동구","북구","울주군","중구")) 172 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","남구","동구","북구","울주군","중구"))
173 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 173 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
174 gooSpinner.adapter = gooadapter 174 gooSpinner.adapter = gooadapter
175 }else if(doSpinner.selectedItem.toString()=="세종특별자치시"){ 175 }else if(doSpinner.selectedItem.toString()=="세종특별자치시"){
...@@ -177,39 +177,39 @@ class InputProfilFirstFourActivity : AppCompatActivity() { ...@@ -177,39 +177,39 @@ class InputProfilFirstFourActivity : AppCompatActivity() {
177 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 177 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
178 gooSpinner.adapter = gooadapter 178 gooSpinner.adapter = gooadapter
179 }else if(doSpinner.selectedItem.toString()=="경기도"){ 179 }else if(doSpinner.selectedItem.toString()=="경기도"){
180 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("가평군","고양시","과천시","광명시","광주시","구리시","군포시","김포시","남양주시","동두천시","부천시","성남시","수원시","시흥시","안산시","안성시","안양시","양주시","양평군","여주시","연천군","오산시","용인시","의왕시","의정부시","이천시","파주시","평택시","포천시","하남시","화성시")) 180 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","가평군","고양시","과천시","광명시","광주시","구리시","군포시","김포시","남양주시","동두천시","부천시","성남시","수원시","시흥시","안산시","안성시","안양시","양주시","양평군","여주시","연천군","오산시","용인시","의왕시","의정부시","이천시","파주시","평택시","포천시","하남시","화성시"))
181 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 181 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
182 gooSpinner.adapter = gooadapter 182 gooSpinner.adapter = gooadapter
183 }else if(doSpinner.selectedItem.toString()=="강원도"){ 183 }else if(doSpinner.selectedItem.toString()=="강원도"){
184 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강릉시","고성군","동해시","삼척시","속초시","양구군","양양군","영월군","원주시","인제군","정선군","철원군","춘천시","태백시","평창군","홍천군","화천군","횡성군")) 184 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강릉시","고성군","동해시","삼척시","속초시","양구군","양양군","영월군","원주시","인제군","정선군","철원군","춘천시","태백시","평창군","홍천군","화천군","횡성군"))
185 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 185 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
186 gooSpinner.adapter = gooadapter 186 gooSpinner.adapter = gooadapter
187 }else if(doSpinner.selectedItem.toString()=="충청북도"){ 187 }else if(doSpinner.selectedItem.toString()=="충청북도"){
188 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("괴산군","단양군","보은군","영동군","옥천군","음성군","제천시","증평군","진천군","청주시","충주시")) 188 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","괴산군","단양군","보은군","영동군","옥천군","음성군","제천시","증평군","진천군","청주시","충주시"))
189 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 189 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
190 gooSpinner.adapter = gooadapter 190 gooSpinner.adapter = gooadapter
191 }else if(doSpinner.selectedItem.toString()=="충청남도"){ 191 }else if(doSpinner.selectedItem.toString()=="충청남도"){
192 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("계룡시","공주시","금산군","논산시","당진시","보령시","부여군","서산시","서천군","아산시","예산군","천안시","청양군","태안군","홍성군")) 192 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","계룡시","공주시","금산군","논산시","당진시","보령시","부여군","서산시","서천군","아산시","예산군","천안시","청양군","태안군","홍성군"))
193 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 193 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
194 gooSpinner.adapter = gooadapter 194 gooSpinner.adapter = gooadapter
195 }else if(doSpinner.selectedItem.toString()=="전라북도"){ 195 }else if(doSpinner.selectedItem.toString()=="전라북도"){
196 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("고창군","군산시","김제시","남원시","무주군","부안군","순창군","완주군","익산시","임실군","장수군","전주시","정읍시","진안군")) 196 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","고창군","군산시","김제시","남원시","무주군","부안군","순창군","완주군","익산시","임실군","장수군","전주시","정읍시","진안군"))
197 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 197 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
198 gooSpinner.adapter = gooadapter 198 gooSpinner.adapter = gooadapter
199 }else if(doSpinner.selectedItem.toString()=="전라남도"){ 199 }else if(doSpinner.selectedItem.toString()=="전라남도"){
200 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강진군","고흥군","곡성군","광양시","구례군","나주시","담양군","목포시","무안군","보성군","순천시","신안군","여수시","영광군","영암군","완도군","장성군","장흥군","진도군","함평군","해남군","화순군")) 200 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","강진군","고흥군","곡성군","광양시","구례군","나주시","담양군","목포시","무안군","보성군","순천시","신안군","여수시","영광군","영암군","완도군","장성군","장흥군","진도군","함평군","해남군","화순군"))
201 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 201 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
202 gooSpinner.adapter = gooadapter 202 gooSpinner.adapter = gooadapter
203 }else if(doSpinner.selectedItem.toString()=="경상북도"){ 203 }else if(doSpinner.selectedItem.toString()=="경상북도"){
204 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("경산시","경주시","고령군","구미시","군위군","김천시","문경시","봉화군","상주시","성주군","안동시","영덕군","영양군","영주시","영천시","예천군","울릉군","울진군","의성군","청도군","청송군","칠곡군","포항시")) 204 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","경산시","경주시","고령군","구미시","군위군","김천시","문경시","봉화군","상주시","성주군","안동시","영덕군","영양군","영주시","영천시","예천군","울릉군","울진군","의성군","청도군","청송군","칠곡군","포항시"))
205 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 205 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
206 gooSpinner.adapter = gooadapter 206 gooSpinner.adapter = gooadapter
207 }else if(doSpinner.selectedItem.toString()=="경상남도"){ 207 }else if(doSpinner.selectedItem.toString()=="경상남도"){
208 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("거제시","거창군","고성군","김해시","남해군","밀양시","사천시","산청군","양산시","의령군","진주시","창년군","창원시","통영시","하동군","함안군","함양군","합천군")) 208 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","거제시","거창군","고성군","김해시","남해군","밀양시","사천시","산청군","양산시","의령군","진주시","창년군","창원시","통영시","하동군","함안군","함양군","합천군"))
209 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 209 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
210 gooSpinner.adapter = gooadapter 210 gooSpinner.adapter = gooadapter
211 }else { 211 }else {
212 - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("서귀포시","제주시")) 212 + var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("선택해주세요.","서귀포시","제주시"))
213 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) 213 gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
214 gooSpinner.adapter = gooadapter 214 gooSpinner.adapter = gooadapter
215 } 215 }
......
...@@ -18,11 +18,18 @@ import androidx.core.content.ContextCompat.startActivity ...@@ -18,11 +18,18 @@ import androidx.core.content.ContextCompat.startActivity
18 import androidx.viewpager.widget.ViewPager 18 import androidx.viewpager.widget.ViewPager
19 import com.google.android.material.bottomnavigation.BottomNavigationView 19 import com.google.android.material.bottomnavigation.BottomNavigationView
20 import com.google.android.material.snackbar.Snackbar 20 import com.google.android.material.snackbar.Snackbar
21 +import com.google.firebase.database.FirebaseDatabase
22 +import com.google.firebase.messaging.FirebaseMessaging
21 import kotlinx.android.synthetic.main.activity_signin.* 23 import kotlinx.android.synthetic.main.activity_signin.*
22 import kotlinx.android.synthetic.main.dialog_example.* 24 import kotlinx.android.synthetic.main.dialog_example.*
23 25
24 class SignInActivity : AppCompatActivity() { 26 class SignInActivity : AppCompatActivity() {
25 27
28 + val user_db = FirebaseDatabase.getInstance("https://wello-topic.firebaseio.com/").reference
29 + private fun writeNewUser(Topic : String) {
30 + user_db.child(Topic).setValue(1)/// .setValue(user)
31 + }
32 +
26 internal lateinit var viewpager : ViewPager 33 internal lateinit var viewpager : ViewPager
27 ////bottom navigation view operation start 1 34 ////bottom navigation view operation start 1
28 lateinit var bottomBar: ActionBar 35 lateinit var bottomBar: ActionBar
...@@ -88,7 +95,26 @@ class SignInActivity : AppCompatActivity() { ...@@ -88,7 +95,26 @@ class SignInActivity : AppCompatActivity() {
88 startActivity(intent) 95 startActivity(intent)
89 } 96 }
90 .setNegativeButton("다음에 하기") { dialogInterface, i -> 97 .setNegativeButton("다음에 하기") { dialogInterface, i ->
91 - editor.clear() 98 + //editor.clear()
99 + 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"){
100 + /*
101 + FirebaseMessaging.getInstance().unsubscribeFromTopic(prof.getString("existing_topic","none").toString())
102 + FirebaseMessaging.getInstance().subscribeToTopic(user_topic).addOnCompleteListener { task ->
103 + if (!task.isSuccessful) { } // 성공
104 + }
105 + writeNewUser(user_topic) // db에 쓰기
106 + editor.putString("existing_topic",user_topic)
107 + editor.commit()
108 + */
109 + }else{
110 + FirebaseMessaging.getInstance().subscribeToTopic("c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1").addOnCompleteListener { task ->
111 + if (!task.isSuccessful) { } // 성공
112 + }
113 + writeNewUser("c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1") // db에 쓰기
114 + editor.putString("existing_topic","c1_1c2_1c3_1c4_1c5_1c6_1c7_1c8_1c9_1c10_1c11_1c12_1c13_1c14_1c15_1c16_1")
115 + editor.commit()
116 +
117 + }
92 118
93 } 119 }
94 .show() 120 .show()
......
...@@ -12,8 +12,8 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() { ...@@ -12,8 +12,8 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() {
12 12
13 private var layoutInflater : LayoutInflater? = null 13 private var layoutInflater : LayoutInflater? = null
14 val Image = arrayOf( 14 val Image = arrayOf(
15 - R.drawable.event1, 15 + R.drawable.event_1,
16 - R.drawable.event2, 16 + R.drawable.event_2,
17 R.drawable.image01 17 R.drawable.image01
18 ) 18 )
19 19
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
39 android:layout_height="match_parent" 39 android:layout_height="match_parent"
40 android:layout_marginLeft="8dp" 40 android:layout_marginLeft="8dp"
41 android:layout_marginRight="8dp" 41 android:layout_marginRight="8dp"
42 + android:layout_marginBottom="8dp"
42 android:layout_weight="1" 43 android:layout_weight="1"
43 android:background="@drawable/round_ratangle" 44 android:background="@drawable/round_ratangle"
44 android:elevation="3dp" 45 android:elevation="3dp"
...@@ -71,22 +72,42 @@ ...@@ -71,22 +72,42 @@
71 android:background="@drawable/broken_rectangle" 72 android:background="@drawable/broken_rectangle"
72 android:gravity="center" 73 android:gravity="center"
73 android:textColor="#FFF" 74 android:textColor="#FFF"
74 - android:textSize="18sp" /> 75 + android:textSize="18dp" />
75 76
76 <TextView 77 <TextView
77 android:id="@+id/policyFavorDetail" 78 android:id="@+id/policyFavorDetail"
78 android:layout_width="wrap_content" 79 android:layout_width="wrap_content"
79 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
81 + android:layout_marginLeft="16dp"
80 android:layout_marginTop="5dp" 82 android:layout_marginTop="5dp"
81 - android:ellipsize="end" /> 83 + android:layout_marginRight="5dp"
84 + android:ellipsize="end"
85 + android:textSize="14dp" />
82 86
83 <TextView 87 <TextView
84 android:id="@+id/policyTitleDetail" 88 android:id="@+id/policyTitleDetail"
85 android:layout_width="match_parent" 89 android:layout_width="match_parent"
86 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
87 android:layout_marginLeft="11dp" 91 android:layout_marginLeft="11dp"
88 - android:layout_marginBottom="4dp" 92 + android:layout_marginTop="10dp"
89 - android:textSize="30sp" /> 93 + android:layout_marginBottom="10dp"
94 + android:textSize="24dp" />
95 +
96 + <LinearLayout
97 + android:layout_width="wrap_content"
98 + android:layout_height="wrap_content"
99 + android:orientation="horizontal">
100 +
101 + <TextView
102 + android:id="@+id/textView12"
103 + android:layout_width="match_parent"
104 + android:layout_height="wrap_content"
105 + android:layout_gravity="center_horizontal"
106 + android:layout_marginLeft="5dp"
107 + android:gravity="center"
108 + android:text=" (Beta)"
109 + android:textColor="#29ABE2"
110 + android:textSize="14dp" />
90 111
91 <RatingBar 112 <RatingBar
92 android:id="@+id/policyScoreDetail" 113 android:id="@+id/policyScoreDetail"
...@@ -101,6 +122,8 @@ ...@@ -101,6 +122,8 @@
101 android:transformPivotX="0dp" 122 android:transformPivotX="0dp"
102 android:transformPivotY="0dp" /> 123 android:transformPivotY="0dp" />
103 124
125 + </LinearLayout>
126 +
104 <WebView 127 <WebView
105 android:id="@+id/policy_context" 128 android:id="@+id/policy_context"
106 android:layout_width="match_parent" 129 android:layout_width="match_parent"
...@@ -109,23 +132,28 @@ ...@@ -109,23 +132,28 @@
109 </LinearLayout> 132 </LinearLayout>
110 </ScrollView> 133 </ScrollView>
111 134
135 + <LinearLayout
136 + android:layout_width="match_parent"
137 + android:layout_height="5dp"
138 + android:background="@drawable/gradation"
139 + android:orientation="horizontal"></LinearLayout>
140 +
112 <FrameLayout 141 <FrameLayout
113 android:id="@+id/fragmentContainer" 142 android:id="@+id/fragmentContainer"
114 android:layout_width="match_parent" 143 android:layout_width="match_parent"
115 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
116 - android:elevation="4dp"
117 app:layout_constraintBottom_toBottomOf="parent"> 145 app:layout_constraintBottom_toBottomOf="parent">
118 146
119 <LinearLayout 147 <LinearLayout
120 android:layout_width="match_parent" 148 android:layout_width="match_parent"
121 android:layout_height="match_parent" 149 android:layout_height="match_parent"
122 - android:elevation="5dp"
123 android:orientation="horizontal"> 150 android:orientation="horizontal">
124 151
125 <LinearLayout 152 <LinearLayout
126 android:layout_width="match_parent" 153 android:layout_width="match_parent"
127 android:layout_height="match_parent" 154 android:layout_height="match_parent"
128 android:layout_weight="1.2" 155 android:layout_weight="1.2"
156 + android:background="#FFFFFF"
129 android:gravity="center" 157 android:gravity="center"
130 android:orientation="horizontal"> 158 android:orientation="horizontal">
131 159
......
...@@ -161,36 +161,36 @@ ...@@ -161,36 +161,36 @@
161 android:gravity="left|center_vertical" 161 android:gravity="left|center_vertical"
162 android:paddingLeft="33dp" 162 android:paddingLeft="33dp"
163 android:text="설정" 163 android:text="설정"
164 - android:textSize="20dp" /> 164 + android:textSize="18dp" />
165 165
166 <Button 166 <Button
167 android:id="@+id/InfoButtonNotice" 167 android:id="@+id/InfoButtonNotice"
168 + style="?android:attr/borderlessButtonStyle"
168 android:layout_width="match_parent" 169 android:layout_width="match_parent"
169 android:layout_height="wrap_content" 170 android:layout_height="wrap_content"
170 android:layout_marginTop="22dp" 171 android:layout_marginTop="22dp"
171 android:background="#FFF" 172 android:background="#FFF"
172 - style="?android:attr/borderlessButtonStyle"
173 android:drawableLeft="@drawable/_alert" 173 android:drawableLeft="@drawable/_alert"
174 android:drawablePadding="22dp" 174 android:drawablePadding="22dp"
175 android:gravity="left|center_vertical" 175 android:gravity="left|center_vertical"
176 android:paddingLeft="33dp" 176 android:paddingLeft="33dp"
177 android:text="공지사항" 177 android:text="공지사항"
178 - android:textSize="20dp" /> 178 + android:textSize="18dp" />
179 179
180 <Button 180 <Button
181 android:id="@+id/InfoButtonFAQ" 181 android:id="@+id/InfoButtonFAQ"
182 + style="?android:attr/borderlessButtonStyle"
182 android:layout_width="match_parent" 183 android:layout_width="match_parent"
183 android:layout_height="wrap_content" 184 android:layout_height="wrap_content"
184 android:layout_marginTop="22dp" 185 android:layout_marginTop="22dp"
185 android:background="#FFF" 186 android:background="#FFF"
186 - android:elevation="0dp"
187 - style="?android:attr/borderlessButtonStyle"
188 android:drawableLeft="@drawable/help" 187 android:drawableLeft="@drawable/help"
189 android:drawablePadding="22dp" 188 android:drawablePadding="22dp"
189 + android:elevation="0dp"
190 android:gravity="left|center_vertical" 190 android:gravity="left|center_vertical"
191 android:paddingLeft="33dp" 191 android:paddingLeft="33dp"
192 android:text="자주 묻는 질문" 192 android:text="자주 묻는 질문"
193 - android:textSize="20dp" /> 193 + android:textSize="18dp" />
194 194
195 </LinearLayout> 195 </LinearLayout>
196 196
......
...@@ -148,14 +148,6 @@ ...@@ -148,14 +148,6 @@
148 android:orientation="vertical"> 148 android:orientation="vertical">
149 149
150 <TextView 150 <TextView
151 - android:id="@+id/textView10"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"
154 - android:text="(*필수항목)"
155 - android:textColor="#29ABE2"
156 - android:textSize="13dp" />
157 -
158 - <TextView
159 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
160 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
......
...@@ -148,14 +148,6 @@ ...@@ -148,14 +148,6 @@
148 android:orientation="vertical"> 148 android:orientation="vertical">
149 149
150 <TextView 150 <TextView
151 - android:id="@+id/textView10"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"
154 - android:text="(*필수항목)"
155 - android:textColor="#29ABE2"
156 - android:textSize="13dp" />
157 -
158 - <TextView
159 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
160 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
......
...@@ -148,14 +148,6 @@ ...@@ -148,14 +148,6 @@
148 android:orientation="vertical"> 148 android:orientation="vertical">
149 149
150 <TextView 150 <TextView
151 - android:id="@+id/textView10"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"
154 - android:text="(*필수항목)"
155 - android:textColor="#29ABE2"
156 - android:textSize="13dp" />
157 -
158 - <TextView
159 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
160 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
......
...@@ -148,14 +148,6 @@ ...@@ -148,14 +148,6 @@
148 android:orientation="vertical"> 148 android:orientation="vertical">
149 149
150 <TextView 150 <TextView
151 - android:id="@+id/textView10"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"
154 - android:text="(*필수항목)"
155 - android:textColor="#29ABE2"
156 - android:textSize="13dp" />
157 -
158 - <TextView
159 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
160 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
......
...@@ -148,14 +148,6 @@ ...@@ -148,14 +148,6 @@
148 android:orientation="vertical"> 148 android:orientation="vertical">
149 149
150 <TextView 150 <TextView
151 - android:id="@+id/textView10"
152 - android:layout_width="wrap_content"
153 - android:layout_height="wrap_content"
154 - android:text="(*필수항목)"
155 - android:textColor="#29ABE2"
156 - android:textSize="13dp" />
157 -
158 - <TextView
159 android:id="@+id/explainTextView" 151 android:id="@+id/explainTextView"
160 android:layout_width="wrap_content" 152 android:layout_width="wrap_content"
161 android:layout_height="wrap_content" 153 android:layout_height="wrap_content"
......
...@@ -71,8 +71,29 @@ ...@@ -71,8 +71,29 @@
71 <LinearLayout 71 <LinearLayout
72 android:layout_width="match_parent" 72 android:layout_width="match_parent"
73 android:layout_height="wrap_content" 73 android:layout_height="wrap_content"
74 + android:layout_marginLeft="15dp"
75 + android:layout_marginTop="15dp"
76 + android:layout_marginRight="15dp"
77 + android:layout_marginBottom="2dp"
78 + android:orientation="vertical">
79 +
80 + <TextView
81 + android:id="@+id/textView10"
82 + android:layout_width="match_parent"
83 + android:layout_height="wrap_content"
84 + android:text="분야별 복지정책"
85 + android:textSize="18dp"
86 + android:textStyle="bold" />
87 + </LinearLayout>
88 +
89 + <LinearLayout
90 + android:layout_width="match_parent"
91 + android:layout_height="wrap_content"
74 android:layout_gravity="center" 92 android:layout_gravity="center"
75 - android:layout_margin="15dp" 93 + android:layout_marginLeft="15dp"
94 + android:layout_marginTop="5dp"
95 + android:layout_marginRight="15dp"
96 + android:layout_marginBottom="15dp"
76 android:layout_weight="1" 97 android:layout_weight="1"
77 android:background="@drawable/edgemaking" 98 android:background="@drawable/edgemaking"
78 android:gravity="center" 99 android:gravity="center"
......
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
141 android:text="# 장애인" 141 android:text="# 장애인"
142 android:textAppearance="@style/TextAppearance.AppCompat" 142 android:textAppearance="@style/TextAppearance.AppCompat"
143 android:textSize="16dp" 143 android:textSize="16dp"
144 - app:chipBackgroundColor="#C6FFFFFF" /> 144 + app:chipBackgroundColor="#FFFFFF" />
145 145
146 <com.google.android.material.chip.Chip 146 <com.google.android.material.chip.Chip
147 style="@style/Widget.MaterialComponents.Chip.Choice" 147 style="@style/Widget.MaterialComponents.Chip.Choice"
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
153 android:text="# 한부모" 153 android:text="# 한부모"
154 android:textAppearance="@style/TextAppearance.AppCompat" 154 android:textAppearance="@style/TextAppearance.AppCompat"
155 android:textSize="16dp" 155 android:textSize="16dp"
156 - app:chipBackgroundColor="#C6FFFFFF" /> 156 + app:chipBackgroundColor="#FFFFFF" />
157 157
158 158
159 <com.google.android.material.chip.Chip 159 <com.google.android.material.chip.Chip
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 android:text="# 다문화" 165 android:text="# 다문화"
166 android:textAppearance="@style/TextAppearance.AppCompat" 166 android:textAppearance="@style/TextAppearance.AppCompat"
167 android:textSize="16dp" 167 android:textSize="16dp"
168 - app:chipBackgroundColor="#C6FFFFFF" /> 168 + app:chipBackgroundColor="#FFFFFF" />
169 </com.google.android.material.chip.ChipGroup> 169 </com.google.android.material.chip.ChipGroup>
170 170
171 <com.google.android.material.chip.ChipGroup 171 <com.google.android.material.chip.ChipGroup
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
181 android:text="# 저소득층" 181 android:text="# 저소득층"
182 android:textAppearance="@style/TextAppearance.AppCompat" 182 android:textAppearance="@style/TextAppearance.AppCompat"
183 android:textSize="16dp" 183 android:textSize="16dp"
184 - app:chipBackgroundColor="#C6FFFFFF" 184 + app:chipBackgroundColor="#FFFFFF"
185 app:chipIcon="@drawable/image01" /> 185 app:chipIcon="@drawable/image01" />
186 186
187 <com.google.android.material.chip.Chip 187 <com.google.android.material.chip.Chip
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
192 android:text="# 임신/출산" 192 android:text="# 임신/출산"
193 android:textAppearance="@style/TextAppearance.AppCompat" 193 android:textAppearance="@style/TextAppearance.AppCompat"
194 android:textSize="16dp" 194 android:textSize="16dp"
195 - app:chipBackgroundColor="#C6FFFFFF" /> 195 + app:chipBackgroundColor="#FFFFFF" />
196 196
197 </com.google.android.material.chip.ChipGroup> 197 </com.google.android.material.chip.ChipGroup>
198 </com.google.android.material.chip.ChipGroup> 198 </com.google.android.material.chip.ChipGroup>
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
226 android:text="# 아동" 226 android:text="# 아동"
227 android:textAppearance="@style/TextAppearance.AppCompat" 227 android:textAppearance="@style/TextAppearance.AppCompat"
228 android:textSize="16dp" 228 android:textSize="16dp"
229 - app:chipBackgroundColor="#C6FFFFFF" /> 229 + app:chipBackgroundColor="#FFFFFF" />
230 230
231 <com.google.android.material.chip.Chip 231 <com.google.android.material.chip.Chip
232 style="@style/Widget.MaterialComponents.Chip.Choice" 232 style="@style/Widget.MaterialComponents.Chip.Choice"
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
238 android:text="# 청소년" 238 android:text="# 청소년"
239 android:textAppearance="@style/TextAppearance.AppCompat" 239 android:textAppearance="@style/TextAppearance.AppCompat"
240 android:textSize="16dp" 240 android:textSize="16dp"
241 - app:chipBackgroundColor="#C6FFFFFF" /> 241 + app:chipBackgroundColor="#FFFFFF" />
242 242
243 243
244 <com.google.android.material.chip.Chip 244 <com.google.android.material.chip.Chip
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
250 android:text="# 청년" 250 android:text="# 청년"
251 android:textAppearance="@style/TextAppearance.AppCompat" 251 android:textAppearance="@style/TextAppearance.AppCompat"
252 android:textSize="16dp" 252 android:textSize="16dp"
253 - app:chipBackgroundColor="#C6FFFFFF" /> 253 + app:chipBackgroundColor="#FFFFFF" />
254 </com.google.android.material.chip.ChipGroup> 254 </com.google.android.material.chip.ChipGroup>
255 255
256 <com.google.android.material.chip.ChipGroup 256 <com.google.android.material.chip.ChipGroup
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
266 android:text="# 중장년" 266 android:text="# 중장년"
267 android:textAppearance="@style/TextAppearance.AppCompat" 267 android:textAppearance="@style/TextAppearance.AppCompat"
268 android:textSize="16dp" 268 android:textSize="16dp"
269 - app:chipBackgroundColor="#C6FFFFFF" 269 + app:chipBackgroundColor="#FFFFFF"
270 app:chipIcon="@drawable/image01" /> 270 app:chipIcon="@drawable/image01" />
271 271
272 <com.google.android.material.chip.Chip 272 <com.google.android.material.chip.Chip
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
277 android:text="# 노년" 277 android:text="# 노년"
278 android:textAppearance="@style/TextAppearance.AppCompat" 278 android:textAppearance="@style/TextAppearance.AppCompat"
279 android:textSize="16dp" 279 android:textSize="16dp"
280 - app:chipBackgroundColor="#C6FFFFFF" /> 280 + app:chipBackgroundColor="#FFFFFF" />
281 281
282 </com.google.android.material.chip.ChipGroup> 282 </com.google.android.material.chip.ChipGroup>
283 </com.google.android.material.chip.ChipGroup> 283 </com.google.android.material.chip.ChipGroup>
......