... | @@ -9,8 +9,7 @@ | ... | @@ -9,8 +9,7 @@ |
9 | android:roundIcon="@mipmap/ic_launcher_round" | 9 | android:roundIcon="@mipmap/ic_launcher_round" |
10 | android:supportsRtl="true" | 10 | android:supportsRtl="true" |
11 | android:theme="@style/NoActionBar"> | 11 | android:theme="@style/NoActionBar"> |
12 | - <activity android:name=".ChildAdapter"></activity> | 12 | + <activity android:name=".InputProfilFifthFourActivity"></activity> |
13 | - <activity android:name=".InputProfilFifthFourActivity" /> | ||
14 | <activity android:name=".InputProfilFifthThreeActivity" /> | 13 | <activity android:name=".InputProfilFifthThreeActivity" /> |
15 | <activity android:name=".InputProfilFifthTwoActivity" /> | 14 | <activity android:name=".InputProfilFifthTwoActivity" /> |
16 | <activity android:name=".InputProfilFifthOneActivity" /> | 15 | <activity android:name=".InputProfilFifthOneActivity" /> |
... | @@ -31,21 +30,25 @@ | ... | @@ -31,21 +30,25 @@ |
31 | <activity android:name=".InputProfilFirstFourActivity" /> | 30 | <activity android:name=".InputProfilFirstFourActivity" /> |
32 | <activity android:name=".InputProfilFirstThreeActivity" /> | 31 | <activity android:name=".InputProfilFirstThreeActivity" /> |
33 | <activity android:name=".InputProfilFirstTwoActivity" /> | 32 | <activity android:name=".InputProfilFirstTwoActivity" /> |
34 | - <activity android:name=".FragmentActivity" /> | ||
35 | - <activity android:name=".FragmentLayout" /> | ||
36 | <activity android:name=".InputProfilFirstOneActivity" /> | 33 | <activity android:name=".InputProfilFirstOneActivity" /> |
34 | + <activity android:name=".AccountSettingActivity"/> | ||
35 | + <activity android:name=".PrivacyPolicyActivity"/> | ||
36 | + <activity android:name=".TermsOfUserActivity"/> | ||
37 | + <activity android:name=".NoticeActivity"/> | ||
38 | + <activity android:name=".QuestionsActivity"/> | ||
37 | <activity android:name=".WelcomeActivity" /> | 39 | <activity android:name=".WelcomeActivity" /> |
40 | + <activity android:name=".PushInfoActivity"/> | ||
38 | <activity android:name=".SettingActivity" /> | 41 | <activity android:name=".SettingActivity" /> |
42 | + <activity android:name=".TermsDetailActivity"/> | ||
39 | <activity android:name=".DetailActivity" /> | 43 | <activity android:name=".DetailActivity" /> |
40 | <activity android:name=".InfoActivity" /> | 44 | <activity android:name=".InfoActivity" /> |
41 | <activity android:name=".FavoritesActivity" /> | 45 | <activity android:name=".FavoritesActivity" /> |
46 | + <activity android:name=".SettingsInForm"/> | ||
42 | <activity android:name=".RecommendActivity" /> | 47 | <activity android:name=".RecommendActivity" /> |
43 | <activity android:name=".SignInActivity" /> | 48 | <activity android:name=".SignInActivity" /> |
44 | <activity android:name=".SignUpActivity" /> | 49 | <activity android:name=".SignUpActivity" /> |
45 | <activity android:name=".MainActivity" /> | 50 | <activity android:name=".MainActivity" /> |
46 | - <activity | 51 | + <activity android:name=".SearchActivity" android:windowSoftInputMode="adjustNothing"/> |
47 | - android:name=".SearchActivity" | ||
48 | - android:windowSoftInputMode="adjustNothing" /> | ||
49 | <activity | 52 | <activity |
50 | android:name=".SplashActivity" | 53 | android:name=".SplashActivity" |
51 | android:theme="@style/SplashTheme"> | 54 | android:theme="@style/SplashTheme"> | ... | ... |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.os.Bundle | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | + | ||
6 | +class AccountSettingActivity : AppCompatActivity() { | ||
7 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
8 | + super.onCreate(savedInstanceState) | ||
9 | + setContentView(R.layout.activity_account_settings) | ||
10 | + } | ||
11 | +} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -package com.example.vip | ||
2 | - | ||
3 | -import android.content.Context | ||
4 | -import android.content.Intent | ||
5 | -import android.content.SharedPreferences | ||
6 | -import androidx.appcompat.app.AppCompatActivity | ||
7 | -import android.os.Bundle | ||
8 | -import android.view.LayoutInflater | ||
9 | -import android.view.View | ||
10 | -import android.view.ViewGroup | ||
11 | -import androidx.recyclerview.widget.RecyclerView | ||
12 | -import kotlinx.android.synthetic.main.item_bs.view.* | ||
13 | - | ||
14 | -class BSAdapter(private val items: ArrayList<BSItem>) : | ||
15 | - RecyclerView.Adapter<BSAdapter.ViewHolder>() { | ||
16 | - | ||
17 | - override fun getItemCount() = items.size | ||
18 | - | ||
19 | - override fun onBindViewHolder(holder: BSAdapter.ViewHolder, position: Int) { | ||
20 | - val item = items[position] | ||
21 | - | ||
22 | - holder.apply { | ||
23 | - bind(item) | ||
24 | - itemView.tag = item | ||
25 | - } | ||
26 | - } | ||
27 | - | ||
28 | - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): | ||
29 | - BSAdapter.ViewHolder { | ||
30 | - val inflatedView = LayoutInflater.from(parent.context) | ||
31 | - .inflate(R.layout.item_bs, parent, false) | ||
32 | - return BSAdapter.ViewHolder(inflatedView) | ||
33 | - } | ||
34 | - | ||
35 | - class ViewHolder(v: View) : RecyclerView.ViewHolder(v) { | ||
36 | - | ||
37 | - private var view: View = v | ||
38 | - | ||
39 | - fun bind(item: BSItem) { | ||
40 | - view.circleformButton.text=item.numOfBS.toString() | ||
41 | - view.bsTextView.text=" 형제자매 "+item.numOfBS.toString() | ||
42 | - | ||
43 | - view.womanButton.setOnClickListener { | ||
44 | - if(view.manButton.isChecked){ | ||
45 | - view.manButton.isChecked=false | ||
46 | - }else{ | ||
47 | - } | ||
48 | - } | ||
49 | - view.manButton.setOnClickListener { | ||
50 | - if(view.womanButton.isChecked){ | ||
51 | - view.womanButton.isChecked=false | ||
52 | - }else{ | ||
53 | - } | ||
54 | - } | ||
55 | - | ||
56 | - } | ||
57 | - } | ||
58 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -package com.example.vip | ||
2 | - | ||
3 | -import android.content.Context | ||
4 | -import android.content.Intent | ||
5 | -import android.content.SharedPreferences | ||
6 | -import androidx.appcompat.app.AppCompatActivity | ||
7 | -import android.os.Bundle | ||
8 | -import android.view.LayoutInflater | ||
9 | -import android.view.View | ||
10 | -import android.view.ViewGroup | ||
11 | -import androidx.recyclerview.widget.RecyclerView | ||
12 | -import kotlinx.android.synthetic.main.item_child.view.* | ||
13 | -import kotlinx.android.synthetic.main.item_policyfield.view.* | ||
14 | - | ||
15 | -class ChildAdapter(private val items: ArrayList<ChildItem>) : | ||
16 | - RecyclerView.Adapter<ChildAdapter.ViewHolder>() { | ||
17 | - | ||
18 | - override fun getItemCount() = items.size | ||
19 | - | ||
20 | - override fun onBindViewHolder(holder: ChildAdapter.ViewHolder, position: Int) { | ||
21 | - val item = items[position] | ||
22 | - | ||
23 | - holder.apply { | ||
24 | - bind(item) | ||
25 | - itemView.tag = item | ||
26 | - } | ||
27 | - } | ||
28 | - | ||
29 | - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): | ||
30 | - ChildAdapter.ViewHolder { | ||
31 | - val inflatedView = LayoutInflater.from(parent.context) | ||
32 | - .inflate(R.layout.item_child, parent, false) | ||
33 | - return ChildAdapter.ViewHolder(inflatedView) | ||
34 | - } | ||
35 | - | ||
36 | - class ViewHolder(v: View) : RecyclerView.ViewHolder(v) { | ||
37 | - | ||
38 | - private var view: View = v | ||
39 | - | ||
40 | - fun bind(item: ChildItem) { | ||
41 | - view.circleformButton.text=item.numOfChild.toString() | ||
42 | - view.childTextView.text=" 자녀 "+item.numOfChild.toString() | ||
43 | - | ||
44 | - view.womanButton.setOnClickListener { | ||
45 | - if(view.manButton.isChecked){ | ||
46 | - view.manButton.isChecked=false | ||
47 | - }else{ | ||
48 | - } | ||
49 | - } | ||
50 | - view.manButton.setOnClickListener { | ||
51 | - if(view.womanButton.isChecked){ | ||
52 | - view.womanButton.isChecked=false | ||
53 | - }else{ | ||
54 | - } | ||
55 | - } | ||
56 | - | ||
57 | - } | ||
58 | - } | ||
59 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | import android.app.Activity | 3 | import android.app.Activity |
4 | +import android.content.Context | ||
4 | import android.content.Intent | 5 | import android.content.Intent |
6 | +import android.graphics.drawable.GradientDrawable | ||
5 | import android.os.Bundle | 7 | import android.os.Bundle |
6 | import android.util.Half.toFloat | 8 | import android.util.Half.toFloat |
7 | import android.view.Menu | 9 | import android.view.Menu |
... | @@ -75,7 +77,7 @@ class DetailActivity : AppCompatActivity() { | ... | @@ -75,7 +77,7 @@ class DetailActivity : AppCompatActivity() { |
75 | detailDday.text=memo!!.Date | 77 | detailDday.text=memo!!.Date |
76 | detailTitle.text=memo!!.Policy | 78 | detailTitle.text=memo!!.Policy |
77 | detailScore.rating=4.toFloat() | 79 | detailScore.rating=4.toFloat() |
78 | - detailFavor.text="0" | 80 | + detailFavor.text=" [실행 부처]" |
79 | 81 | ||
80 | val web : WebView = findViewById(R.id.policy_context) | 82 | val web : WebView = findViewById(R.id.policy_context) |
81 | val summary : String = memo!!.Content | 83 | val summary : String = memo!!.Content |
... | @@ -104,8 +106,11 @@ class DetailActivity : AppCompatActivity() { | ... | @@ -104,8 +106,11 @@ class DetailActivity : AppCompatActivity() { |
104 | } | 106 | } |
105 | ////bottom navigation view operation start 2 | 107 | ////bottom navigation view operation start 2 |
106 | bottomBar=supportActionBar!! | 108 | bottomBar=supportActionBar!! |
107 | - val bottomNavigation: BottomNavigationView =findViewById(R.id.bottomNavigation) | 109 | + val bottomNavigation: BottomNavigationView =findViewById(R.id.rightBottomBVW) |
108 | bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) | 110 | bottomNavigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) |
111 | + val bottomNavigation2: BottomNavigationView =findViewById(R.id.leftBottomBVW) | ||
112 | + bottomNavigation2.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) | ||
113 | + | ||
109 | ////bottom navigation view operation end 2 | 114 | ////bottom navigation view operation end 2 |
110 | 115 | ||
111 | 116 | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | +import android.app.Activity | ||
3 | import android.content.Context | 4 | import android.content.Context |
4 | import android.content.Intent | 5 | import android.content.Intent |
5 | import android.content.SharedPreferences | 6 | import android.content.SharedPreferences |
7 | +import android.os.Build | ||
6 | import androidx.appcompat.app.AppCompatActivity | 8 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 9 | import android.os.Bundle |
10 | +import android.view.Window | ||
11 | +import android.view.WindowManager | ||
8 | import android.widget.ImageView | 12 | import android.widget.ImageView |
9 | import android.widget.Toast | 13 | import android.widget.Toast |
10 | import kotlinx.android.synthetic.main.activity_info.* | 14 | import kotlinx.android.synthetic.main.activity_info.* |
15 | +import android.graphics.drawable.ColorDrawable | ||
16 | +import androidx.core.content.ContextCompat | ||
17 | +import kotlinx.android.synthetic.main.activity_settings_in_form.* | ||
11 | 18 | ||
12 | class InfoActivity : AppCompatActivity() { | 19 | class InfoActivity : AppCompatActivity() { |
13 | 20 | ||
... | @@ -15,34 +22,46 @@ class InfoActivity : AppCompatActivity() { | ... | @@ -15,34 +22,46 @@ class InfoActivity : AppCompatActivity() { |
15 | super.onCreate(savedInstanceState) | 22 | super.onCreate(savedInstanceState) |
16 | setContentView(R.layout.activity_info) | 23 | setContentView(R.layout.activity_info) |
17 | 24 | ||
25 | + // statusbar color chacnge | ||
26 | + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { | ||
27 | + getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); | ||
28 | + getWindow().setStatusBarColor(getResources().getColor(R.color.infomainColor)); | ||
29 | + } | ||
30 | + | ||
18 | val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | 31 | val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) |
19 | val editor: SharedPreferences.Editor=prof.edit() | 32 | val editor: SharedPreferences.Editor=prof.edit() |
20 | 33 | ||
21 | Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"), | 34 | Toast.makeText(applicationContext,prof.getString("manorwoman","nothing"), |
22 | Toast.LENGTH_SHORT).show() | 35 | Toast.LENGTH_SHORT).show() |
23 | 36 | ||
24 | - //temp | 37 | + InfoProfilModify.setOnClickListener { |
25 | - var accountImage: ImageView =findViewById(R.id.infoAccountImage) | 38 | + var intent = Intent(this, SettingActivity::class.java) |
26 | - var profilImage: ImageView =findViewById(R.id.InfoProfilImage) | 39 | + startActivity(intent) |
27 | - | 40 | + } |
28 | - accountImage.setImageResource(R.drawable.image01) | ||
29 | - profilImage.setImageResource(R.drawable.image01) | ||
30 | 41 | ||
31 | - //temp | 42 | + InfoButtonSettings.setOnClickListener { |
43 | + var intent = Intent(this, SettingsInForm::class.java) | ||
44 | + startActivity(intent) | ||
45 | + // 설정 눌렀을 때 | ||
46 | + } | ||
32 | 47 | ||
33 | - InfoButtonLaw.setOnClickListener { | 48 | + InfoButtonNotice.setOnClickListener { |
34 | - var intent = Intent(this, SettingActivity::class.java) | 49 | + var intent = Intent(this, NoticeActivity::class.java) |
50 | + startActivity(intent) | ||
51 | + } | ||
52 | + InfoButtonFAQ.setOnClickListener { | ||
53 | + var intent = Intent(this, QuestionsActivity::class.java) | ||
35 | startActivity(intent) | 54 | startActivity(intent) |
36 | } | 55 | } |
37 | 56 | ||
38 | //pushing test start | 57 | //pushing test start |
39 | - InfoButtonSettings.setOnClickListener { | 58 | + // InfoButtonSettings.setOnClickListener { |
40 | - //var intent = Intent(this, SettingActivity::class.java) | 59 | + // //var intent = Intent(this, SettingActivity::class.java) |
41 | //test start | 60 | //test start |
42 | - var intent = Intent(this, InputProfilFirstOneActivity::class.java) | 61 | + // var intent = Intent(this, InputProfilFirstOneActivity::class.java) |
43 | //test end | 62 | //test end |
44 | - startActivity(intent) | 63 | + // startActivity(intent) |
45 | - } | 64 | + // } |
46 | //pushing test end | 65 | //pushing test end |
47 | } | 66 | } |
48 | } | 67 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.* |
... | @@ -18,28 +16,7 @@ class InputProfilFifthFourActivity : AppCompatActivity() { | ... | @@ -18,28 +16,7 @@ class InputProfilFifthFourActivity : AppCompatActivity() { |
18 | startActivity(intent) | 16 | startActivity(intent) |
19 | } | 17 | } |
20 | 18 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
25 | - | ||
26 | - editor.putInt("c1_1",1); editor.commit() | ||
27 | - editor.putInt("c2_1",1); editor.commit() | ||
28 | - editor.putInt("c3_1",1); editor.commit() | ||
29 | - editor.putInt("c4_1",1); editor.commit() | ||
30 | - editor.putInt("c5_1",1); editor.commit() | ||
31 | - editor.putInt("c6_1",1); editor.commit() | ||
32 | - editor.putInt("c7_1",1); editor.commit() | ||
33 | - editor.putInt("c8_1",1); editor.commit() | ||
34 | - editor.putInt("c9_1",1); editor.commit() | ||
35 | - editor.putInt("c10_1",1); editor.commit() | ||
36 | - editor.putInt("c11_1",1); editor.commit() | ||
37 | - editor.putInt("c12_1",1); editor.commit() | ||
38 | - editor.putInt("c13_1",1); editor.commit() | ||
39 | - editor.putInt("c14_1",1); editor.commit() | ||
40 | - editor.putInt("c15_1",1); editor.commit() | ||
41 | - editor.putInt("c16_1",1); editor.commit() | ||
42 | - | ||
43 | var intent = Intent(this, SignInActivity::class.java) | 20 | var intent = Intent(this, SignInActivity::class.java) |
44 | startActivity(intent) | 21 | startActivity(intent) |
45 | } | 22 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import android.graphics.Color | 4 | import android.graphics.Color |
7 | import androidx.appcompat.app.AppCompatActivity | 5 | import androidx.appcompat.app.AppCompatActivity |
8 | import android.os.Bundle | 6 | import android.os.Bundle |
... | @@ -30,17 +28,7 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { | ... | @@ -30,17 +28,7 @@ class InputProfilFirstFiveActivity : AppCompatActivity() { |
30 | startActivity(intent) | 28 | startActivity(intent) |
31 | } | 29 | } |
32 | 30 | ||
33 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
34 | - val editor: SharedPreferences.Editor=prof.edit() | ||
35 | - | ||
36 | nextButton.setOnClickListener { | 31 | nextButton.setOnClickListener { |
37 | - if(inmanButton.isChecked){ | ||
38 | - editor.putInt("c1_2",1); editor.commit() | ||
39 | - }else if(outmanButton.isChecked){ | ||
40 | - editor.putInt("c1_3",1); editor.commit() | ||
41 | - }else{ | ||
42 | - | ||
43 | - } | ||
44 | var intent = Intent(this, InputProfilFirstSixActivity::class.java) | 32 | var intent = Intent(this, InputProfilFirstSixActivity::class.java) |
45 | startActivity(intent) | 33 | startActivity(intent) |
46 | } | 34 | } | ... | ... |
... | @@ -3,12 +3,8 @@ package com.example.vip | ... | @@ -3,12 +3,8 @@ package com.example.vip |
3 | import android.content.Intent | 3 | import android.content.Intent |
4 | import android.content.Context | 4 | import android.content.Context |
5 | import android.content.SharedPreferences | 5 | import android.content.SharedPreferences |
6 | -import android.icu.lang.UCharacter.GraphemeClusterBreak.T | ||
7 | import androidx.appcompat.app.AppCompatActivity | 6 | import androidx.appcompat.app.AppCompatActivity |
8 | import android.os.Bundle | 7 | import android.os.Bundle |
9 | -import android.view.View | ||
10 | -import android.widget.AdapterView | ||
11 | -import android.widget.ArrayAdapter | ||
12 | import android.widget.EditText | 8 | import android.widget.EditText |
13 | import kotlinx.android.synthetic.main.activity_input_profil_first_four.* | 9 | import kotlinx.android.synthetic.main.activity_input_profil_first_four.* |
14 | import kotlinx.android.synthetic.main.activity_input_profil_first_four.nextButton | 10 | import kotlinx.android.synthetic.main.activity_input_profil_first_four.nextButton |
... | @@ -26,364 +22,43 @@ class InputProfilFirstFourActivity : AppCompatActivity() { | ... | @@ -26,364 +22,43 @@ class InputProfilFirstFourActivity : AppCompatActivity() { |
26 | startActivity(intent) | 22 | startActivity(intent) |
27 | } | 23 | } |
28 | 24 | ||
29 | - val doadapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, listOf("서울특별시", "부산광역시", "대구광역시", "인천광역시","광주광역시","대전광역시","울산광역시","세종특별자치시","경기도","강원도","충청북도","충청남도","전라북도","전라남도","경상북도","경상남도","제주특별자치도")) | ||
30 | - doadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
31 | - doSpinner.adapter = doadapter | ||
32 | - | ||
33 | - doSpinner.onItemSelectedListener = object: AdapterView.OnItemSelectedListener { | ||
34 | - override fun onNothingSelected(parent: AdapterView<*>?) { | ||
35 | - } | ||
36 | - override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) { | ||
37 | - // either one will work as well | ||
38 | - // val item = parent.getItemAtPosition(position) as String | ||
39 | - //val item = adapter.getItem(position) | ||
40 | - if(doSpinner.selectedItem.toString()=="서울특별시"){ | ||
41 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("종로구","중구","용산구","성동구","광진구","동대문구","중랑구","성북구","강북구","도봉구","노원구","은평구","서대문구","마포구","양천구","강서구","구로구","금천구","영등포구","동작구","관악구","서초구","강남구","송파구","강동구")) | ||
42 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
43 | - gooSpinner.adapter = gooadapter | ||
44 | - }else if(doSpinner.selectedItem.toString()=="부산광역시"){ | ||
45 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강서구","금정구","기장군","남구","동구","동래구","부산진구","북구","사상구","사하구","서구","수영구","연제구","영도구","중구","해운대구")) | ||
46 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
47 | - gooSpinner.adapter = gooadapter | ||
48 | - }else if(doSpinner.selectedItem.toString()=="대구광역시"){ | ||
49 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","달서구","달성군","동구","북구","서구","수성구","중구")) | ||
50 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
51 | - gooSpinner.adapter = gooadapter | ||
52 | - }else if(doSpinner.selectedItem.toString()=="인천광역시"){ | ||
53 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강화군","계양구","남구","남동구","동구","부평구","서구","연수구","옹진군","중구","미추홀구")) | ||
54 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
55 | - gooSpinner.adapter = gooadapter | ||
56 | - }else if(doSpinner.selectedItem.toString()=="광주광역시"){ | ||
57 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("광산구","남구","동구","북구","서구")) | ||
58 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
59 | - gooSpinner.adapter = gooadapter | ||
60 | - }else if(doSpinner.selectedItem.toString()=="대전광역시"){ | ||
61 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("대덕구","동구","서구","유성구","중구")) | ||
62 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
63 | - gooSpinner.adapter = gooadapter | ||
64 | - }else if(doSpinner.selectedItem.toString()=="울산광역시"){ | ||
65 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("남구","동구","북구","울주군","중구")) | ||
66 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
67 | - gooSpinner.adapter = gooadapter | ||
68 | - }else if(doSpinner.selectedItem.toString()=="세종특별자치시"){ | ||
69 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("해당 없음")) | ||
70 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
71 | - gooSpinner.adapter = gooadapter | ||
72 | - }else if(doSpinner.selectedItem.toString()=="경기도"){ | ||
73 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("가평군","고양시","과천시","광명시","광주시","구리시","군포시","김포시","남양주시","동두천시","부천시","성남시","수원시","시흥시","안산시","안성시","안양시","양주시","양평군","여주시","연천군","오산시","용인시","의왕시","의정부시","이천시","파주시","평택시","포천시","하남시","화성시")) | ||
74 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
75 | - gooSpinner.adapter = gooadapter | ||
76 | - }else if(doSpinner.selectedItem.toString()=="강원도"){ | ||
77 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강릉시","고성군","동해시","삼척시","속초시","양구군","양양군","영월군","원주시","인제군","정선군","철원군","춘천시","태백시","평창군","홍천군","화천군","횡성군")) | ||
78 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
79 | - gooSpinner.adapter = gooadapter | ||
80 | - }else if(doSpinner.selectedItem.toString()=="충청북도"){ | ||
81 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("괴산군","단양군","보은군","영동군","옥천군","음성군","제천시","증평군","진천군","청주시","충주시")) | ||
82 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
83 | - gooSpinner.adapter = gooadapter | ||
84 | - }else if(doSpinner.selectedItem.toString()=="충청남도"){ | ||
85 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("계룡시","공주시","금산군","논산시","당진시","보령시","부여군","서산시","서천군","아산시","예산군","천안시","청양군","태안군","홍성군")) | ||
86 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
87 | - gooSpinner.adapter = gooadapter | ||
88 | - }else if(doSpinner.selectedItem.toString()=="전라북도"){ | ||
89 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("고창군","군산시","김제시","남원시","무주군","부안군","순창군","완주군","익산시","임실군","장수군","전주시","정읍시","진안군")) | ||
90 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
91 | - gooSpinner.adapter = gooadapter | ||
92 | - }else if(doSpinner.selectedItem.toString()=="전라남도"){ | ||
93 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("강진군","고흥군","곡성군","광양시","구례군","나주시","담양군","목포시","무안군","보성군","순천시","신안군","여수시","영광군","영암군","완도군","장성군","장흥군","진도군","함평군","해남군","화순군")) | ||
94 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
95 | - gooSpinner.adapter = gooadapter | ||
96 | - }else if(doSpinner.selectedItem.toString()=="경상북도"){ | ||
97 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("경산시","경주시","고령군","구미시","군위군","김천시","문경시","봉화군","상주시","성주군","안동시","영덕군","영양군","영주시","영천시","예천군","울릉군","울진군","의성군","청도군","청송군","칠곡군","포항시")) | ||
98 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
99 | - gooSpinner.adapter = gooadapter | ||
100 | - }else if(doSpinner.selectedItem.toString()=="경상남도"){ | ||
101 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("거제시","거창군","고성군","김해시","남해군","밀양시","사천시","산청군","양산시","의령군","진주시","창년군","창원시","통영시","하동군","함안군","함양군","합천군")) | ||
102 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
103 | - gooSpinner.adapter = gooadapter | ||
104 | - }else { | ||
105 | - var gooadapter = ArrayAdapter(this@InputProfilFirstFourActivity, android.R.layout.simple_spinner_item, listOf("서귀포시","제주시")) | ||
106 | - gooadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) | ||
107 | - gooSpinner.adapter = gooadapter | ||
108 | - } | ||
109 | - } | ||
110 | - } | ||
111 | - | ||
112 | val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) | 25 | val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) |
113 | val editor: SharedPreferences.Editor=prof.edit() | 26 | val editor: SharedPreferences.Editor=prof.edit() |
114 | - nextButton.setOnClickListener { | ||
115 | - if(doSpinner.selectedItem.toString()=="서울특별시"){ editor.putInt("c11_2",1); editor.commit()} | ||
116 | - if(doSpinner.selectedItem.toString()=="부산광역시"){ editor.putInt("c11_3",1); editor.commit()} | ||
117 | - if(doSpinner.selectedItem.toString()=="대구광역시"){ editor.putInt("c11_4",1); editor.commit()} | ||
118 | - if(doSpinner.selectedItem.toString()=="인천광역시"){ editor.putInt("c11_5",1); editor.commit()} | ||
119 | - if(doSpinner.selectedItem.toString()=="광주광역시"){ editor.putInt("c11_6",1); editor.commit()} | ||
120 | - if(doSpinner.selectedItem.toString()=="대전광역시"){ editor.putInt("c11_7",1); editor.commit()} | ||
121 | - if(doSpinner.selectedItem.toString()=="울산광역시"){ editor.putInt("c11_8",1); editor.commit()} | ||
122 | - if(doSpinner.selectedItem.toString()=="세종특별자치시"){ editor.putInt("c11_9",1); editor.commit()} | ||
123 | - if(doSpinner.selectedItem.toString()=="경기도"){ editor.putInt("c11_10",1); editor.commit()} | ||
124 | - if(doSpinner.selectedItem.toString()=="강원도"){ editor.putInt("c11_11",1); editor.commit()} | ||
125 | - if(doSpinner.selectedItem.toString()=="충청북도"){ editor.putInt("c11_12",1); editor.commit()} | ||
126 | - if(doSpinner.selectedItem.toString()=="충청남도"){ editor.putInt("c11_13",1); editor.commit()} | ||
127 | - if(doSpinner.selectedItem.toString()=="전라북도"){ editor.putInt("c11_14",1); editor.commit()} | ||
128 | - if(doSpinner.selectedItem.toString()=="전라남도"){ editor.putInt("c11_15",1); editor.commit()} | ||
129 | - if(doSpinner.selectedItem.toString()=="경상북도"){ editor.putInt("c11_16",1); editor.commit()} | ||
130 | - if(doSpinner.selectedItem.toString()=="경상남도"){ editor.putInt("c11_17",1); editor.commit()} | ||
131 | - if(doSpinner.selectedItem.toString()=="제주특별자치도"){ editor.putInt("c11_18",1); editor.commit()} | ||
132 | - | ||
133 | - if(gooSpinner.selectedItem=="종로구"){editor.putInt("c12_100",1); editor.commit()} | ||
134 | - if(gooSpinner.selectedItem=="중구"){editor.putInt("c12_101",1); editor.commit()} | ||
135 | - if(gooSpinner.selectedItem=="용산구"){editor.putInt("c12_102",1); editor.commit()} | ||
136 | - if(gooSpinner.selectedItem=="성동구"){editor.putInt("c12_103",1); editor.commit()} | ||
137 | - if(gooSpinner.selectedItem=="광진구"){editor.putInt("c12_104",1); editor.commit()} | ||
138 | - if(gooSpinner.selectedItem=="동대문구"){editor.putInt("c12_105",1); editor.commit()} | ||
139 | - if(gooSpinner.selectedItem=="중랑구"){editor.putInt("c12_106",1); editor.commit()} | ||
140 | - if(gooSpinner.selectedItem=="성북구"){editor.putInt("c12_107",1); editor.commit()} | ||
141 | - if(gooSpinner.selectedItem=="강북구"){editor.putInt("c12_108",1); editor.commit()} | ||
142 | - if(gooSpinner.selectedItem=="도봉구"){editor.putInt("c12_109",1); editor.commit()} | ||
143 | - if(gooSpinner.selectedItem=="노원구"){editor.putInt("c12_110",1); editor.commit()} | ||
144 | - if(gooSpinner.selectedItem=="은평구"){editor.putInt("c12_111",1); editor.commit()} | ||
145 | - if(gooSpinner.selectedItem=="서대문구"){editor.putInt("c12_112",1); editor.commit()} | ||
146 | - if(gooSpinner.selectedItem=="마포구"){editor.putInt("c12_113",1); editor.commit()} | ||
147 | - if(gooSpinner.selectedItem=="양천구"){editor.putInt("c12_114",1); editor.commit()} | ||
148 | - if(gooSpinner.selectedItem=="강서구"){editor.putInt("c12_115",1); editor.commit()} | ||
149 | - if(gooSpinner.selectedItem=="구로구"){editor.putInt("c12_116",1); editor.commit()} | ||
150 | - if(gooSpinner.selectedItem=="금천구"){editor.putInt("c12_117",1); editor.commit()} | ||
151 | - if(gooSpinner.selectedItem=="영등포구"){editor.putInt("c12_118",1); editor.commit()} | ||
152 | - if(gooSpinner.selectedItem=="동작구"){editor.putInt("c12_119",1); editor.commit()} | ||
153 | - if(gooSpinner.selectedItem=="관악구"){editor.putInt("c12_120",1); editor.commit()} | ||
154 | - if(gooSpinner.selectedItem=="서초구"){editor.putInt("c12_121",1); editor.commit()} | ||
155 | - if(gooSpinner.selectedItem=="강남구"){editor.putInt("c12_122",1); editor.commit()} | ||
156 | - if(gooSpinner.selectedItem=="송파구"){editor.putInt("c12_123",1); editor.commit()} | ||
157 | - if(gooSpinner.selectedItem=="강동구"){editor.putInt("c12_124",1); editor.commit()} | ||
158 | - if(gooSpinner.selectedItem=="서구"){editor.putInt("c12_125",1); editor.commit()} | ||
159 | - if(gooSpinner.selectedItem=="동구"){editor.putInt("c12_126",1); editor.commit()} | ||
160 | - if(gooSpinner.selectedItem=="영도구"){editor.putInt("c12_127",1); editor.commit()} | ||
161 | - if(gooSpinner.selectedItem=="부산진구"){editor.putInt("c12_128",1); editor.commit()} | ||
162 | - if(gooSpinner.selectedItem=="동래구"){editor.putInt("c12_129",1); editor.commit()} | ||
163 | - if(gooSpinner.selectedItem=="남구"){editor.putInt("c12_130",1); editor.commit()} | ||
164 | - if(gooSpinner.selectedItem=="북구"){editor.putInt("c12_131",1); editor.commit()} | ||
165 | - if(gooSpinner.selectedItem=="해운대구"){editor.putInt("c12_132",1); editor.commit()} | ||
166 | - if(gooSpinner.selectedItem=="사하구"){editor.putInt("c12_133",1); editor.commit()} | ||
167 | - if(gooSpinner.selectedItem=="금정구"){editor.putInt("c12_134",1); editor.commit()} | ||
168 | - if(gooSpinner.selectedItem=="연제구"){editor.putInt("c12_135",1); editor.commit()} | ||
169 | - if(gooSpinner.selectedItem=="수영구"){editor.putInt("c12_136",1); editor.commit()} | ||
170 | - if(gooSpinner.selectedItem=="사상구"){editor.putInt("c12_137",1); editor.commit()} | ||
171 | - if(gooSpinner.selectedItem=="기장군"){editor.putInt("c12_138",1); editor.commit()} | ||
172 | - if(gooSpinner.selectedItem=="수성구"){editor.putInt("c12_139",1); editor.commit()} | ||
173 | - if(gooSpinner.selectedItem=="달서구"){editor.putInt("c12_140",1); editor.commit()} | ||
174 | - if(gooSpinner.selectedItem=="달성군"){editor.putInt("c12_141",1); editor.commit()} | ||
175 | - if(gooSpinner.selectedItem=="중구영종출장소"){editor.putInt("c12_142",1); editor.commit()} | ||
176 | - if(gooSpinner.selectedItem=="중구용유출장소"){editor.putInt("c12_143",1); editor.commit()} | ||
177 | - if(gooSpinner.selectedItem=="미추홀구"){editor.putInt("c12_144",1); editor.commit()} | ||
178 | - if(gooSpinner.selectedItem=="연수구"){editor.putInt("c12_145",1); editor.commit()} | ||
179 | - if(gooSpinner.selectedItem=="남동구"){editor.putInt("c12_146",1); editor.commit()} | ||
180 | - if(gooSpinner.selectedItem=="부평구"){editor.putInt("c12_147",1); editor.commit()} | ||
181 | - if(gooSpinner.selectedItem=="계양구"){editor.putInt("c12_148",1); editor.commit()} | ||
182 | - if(gooSpinner.selectedItem=="서구검단출장"){editor.putInt("c12_149",1); editor.commit()} | ||
183 | - if(gooSpinner.selectedItem=="강화군"){editor.putInt("c12_150",1); editor.commit()} | ||
184 | - if(gooSpinner.selectedItem=="옹진군"){editor.putInt("c12_151",1); editor.commit()} | ||
185 | - if(gooSpinner.selectedItem=="광산구"){editor.putInt("c12_152",1); editor.commit()} | ||
186 | - if(gooSpinner.selectedItem=="유성구"){editor.putInt("c12_153",1); editor.commit()} | ||
187 | - if(gooSpinner.selectedItem=="대덕구"){editor.putInt("c12_154",1); editor.commit()} | ||
188 | - if(gooSpinner.selectedItem=="울주군"){editor.putInt("c12_155",1); editor.commit()} | ||
189 | - if(gooSpinner.selectedItem=="수원시"){editor.putInt("c12_156",1); editor.commit()} | ||
190 | - if(gooSpinner.selectedItem=="수원시 장안구"){editor.putInt("c12_157",1); editor.commit()} | ||
191 | - if(gooSpinner.selectedItem=="수원시 권선구"){editor.putInt("c12_158",1); editor.commit()} | ||
192 | - if(gooSpinner.selectedItem=="수원시 팔달구"){editor.putInt("c12_159",1); editor.commit()} | ||
193 | - if(gooSpinner.selectedItem=="수원시 영통구"){editor.putInt("c12_160",1); editor.commit()} | ||
194 | - if(gooSpinner.selectedItem=="성남시"){editor.putInt("c12_161",1); editor.commit()} | ||
195 | - if(gooSpinner.selectedItem=="성남시 수정구"){editor.putInt("c12_162",1); editor.commit()} | ||
196 | - if(gooSpinner.selectedItem=="성남시 중원구"){editor.putInt("c12_163",1); editor.commit()} | ||
197 | - if(gooSpinner.selectedItem=="성남시 분당구"){editor.putInt("c12_164",1); editor.commit()} | ||
198 | - if(gooSpinner.selectedItem=="의정부시"){editor.putInt("c12_165",1); editor.commit()} | ||
199 | - if(gooSpinner.selectedItem=="안양시"){editor.putInt("c12_166",1); editor.commit()} | ||
200 | - if(gooSpinner.selectedItem=="안양시 만안구"){editor.putInt("c12_167",1); editor.commit()} | ||
201 | - if(gooSpinner.selectedItem=="안양시 동안구"){editor.putInt("c12_168",1); editor.commit()} | ||
202 | - if(gooSpinner.selectedItem=="부천시"){editor.putInt("c12_169",1); editor.commit()} | ||
203 | - if(gooSpinner.selectedItem=="광명시"){editor.putInt("c12_170",1); editor.commit()} | ||
204 | - if(gooSpinner.selectedItem=="평택시"){editor.putInt("c12_171",1); editor.commit()} | ||
205 | - if(gooSpinner.selectedItem=="송탄출장소"){editor.putInt("c12_172",1); editor.commit()} | ||
206 | - if(gooSpinner.selectedItem=="안중출장소"){editor.putInt("c12_173",1); editor.commit()} | ||
207 | - if(gooSpinner.selectedItem=="동두천시"){editor.putInt("c12_174",1); editor.commit()} | ||
208 | - if(gooSpinner.selectedItem=="안산시"){editor.putInt("c12_175",1); editor.commit()} | ||
209 | - if(gooSpinner.selectedItem=="안산시 상록구"){editor.putInt("c12_176",1); editor.commit()} | ||
210 | - if(gooSpinner.selectedItem=="안산시 단원구"){editor.putInt("c12_177",1); editor.commit()} | ||
211 | - if(gooSpinner.selectedItem=="고양시"){editor.putInt("c12_178",1); editor.commit()} | ||
212 | - if(gooSpinner.selectedItem=="고양시 덕양구"){editor.putInt("c12_179",1); editor.commit()} | ||
213 | - if(gooSpinner.selectedItem=="고양시 일산동구"){editor.putInt("c12_180",1); editor.commit()} | ||
214 | - if(gooSpinner.selectedItem=="고양시 일산서구"){editor.putInt("c12_181",1); editor.commit()} | ||
215 | - if(gooSpinner.selectedItem=="과천시"){editor.putInt("c12_182",1); editor.commit()} | ||
216 | - if(gooSpinner.selectedItem=="구리시"){editor.putInt("c12_183",1); editor.commit()} | ||
217 | - if(gooSpinner.selectedItem=="남양주시"){editor.putInt("c12_184",1); editor.commit()} | ||
218 | - if(gooSpinner.selectedItem=="풍양출장소"){editor.putInt("c12_185",1); editor.commit()} | ||
219 | - if(gooSpinner.selectedItem=="오산시"){editor.putInt("c12_186",1); editor.commit()} | ||
220 | - if(gooSpinner.selectedItem=="시흥시"){editor.putInt("c12_187",1); editor.commit()} | ||
221 | - if(gooSpinner.selectedItem=="군포시"){editor.putInt("c12_188",1); editor.commit()} | ||
222 | - if(gooSpinner.selectedItem=="의왕시"){editor.putInt("c12_189",1); editor.commit()} | ||
223 | - if(gooSpinner.selectedItem=="하남시"){editor.putInt("c12_190",1); editor.commit()} | ||
224 | - if(gooSpinner.selectedItem=="용인시"){editor.putInt("c12_191",1); editor.commit()} | ||
225 | - if(gooSpinner.selectedItem=="용인시 처인구"){editor.putInt("c12_192",1); editor.commit()} | ||
226 | - if(gooSpinner.selectedItem=="용인시 기흥구"){editor.putInt("c12_193",1); editor.commit()} | ||
227 | - if(gooSpinner.selectedItem=="용인시 수지구"){editor.putInt("c12_194",1); editor.commit()} | ||
228 | - if(gooSpinner.selectedItem=="파주시"){editor.putInt("c12_195",1); editor.commit()} | ||
229 | - if(gooSpinner.selectedItem=="이천시"){editor.putInt("c12_196",1); editor.commit()} | ||
230 | - if(gooSpinner.selectedItem=="안성시"){editor.putInt("c12_197",1); editor.commit()} | ||
231 | - if(gooSpinner.selectedItem=="김포시"){editor.putInt("c12_198",1); editor.commit()} | ||
232 | - if(gooSpinner.selectedItem=="화성시"){editor.putInt("c12_199",1); editor.commit()} | ||
233 | - if(gooSpinner.selectedItem=="화성시동부출장소"){editor.putInt("c12_200",1); editor.commit()} | ||
234 | - if(gooSpinner.selectedItem=="화성시동탄출장소"){editor.putInt("c12_201",1); editor.commit()} | ||
235 | - if(gooSpinner.selectedItem=="광주시"){editor.putInt("c12_202",1); editor.commit()} | ||
236 | - if(gooSpinner.selectedItem=="양주시"){editor.putInt("c12_203",1); editor.commit()} | ||
237 | - if(gooSpinner.selectedItem=="포천시"){editor.putInt("c12_204",1); editor.commit()} | ||
238 | - if(gooSpinner.selectedItem=="여주시"){editor.putInt("c12_205",1); editor.commit()} | ||
239 | - if(gooSpinner.selectedItem=="연천군"){editor.putInt("c12_206",1); editor.commit()} | ||
240 | - if(gooSpinner.selectedItem=="가평군"){editor.putInt("c12_207",1); editor.commit()} | ||
241 | - if(gooSpinner.selectedItem=="양평군"){editor.putInt("c12_208",1); editor.commit()} | ||
242 | - if(gooSpinner.selectedItem=="춘천시"){editor.putInt("c12_209",1); editor.commit()} | ||
243 | - if(gooSpinner.selectedItem=="원주시"){editor.putInt("c12_210",1); editor.commit()} | ||
244 | - if(gooSpinner.selectedItem=="강릉시"){editor.putInt("c12_211",1); editor.commit()} | ||
245 | - if(gooSpinner.selectedItem=="동해시"){editor.putInt("c12_212",1); editor.commit()} | ||
246 | - if(gooSpinner.selectedItem=="태백시"){editor.putInt("c12_213",1); editor.commit()} | ||
247 | - if(gooSpinner.selectedItem=="속초시"){editor.putInt("c12_214",1); editor.commit()} | ||
248 | - if(gooSpinner.selectedItem=="삼척시"){editor.putInt("c12_215",1); editor.commit()} | ||
249 | - if(gooSpinner.selectedItem=="홍천군"){editor.putInt("c12_216",1); editor.commit()} | ||
250 | - if(gooSpinner.selectedItem=="횡성군"){editor.putInt("c12_217",1); editor.commit()} | ||
251 | - if(gooSpinner.selectedItem=="영월군"){editor.putInt("c12_218",1); editor.commit()} | ||
252 | - if(gooSpinner.selectedItem=="평창군"){editor.putInt("c12_219",1); editor.commit()} | ||
253 | - if(gooSpinner.selectedItem=="정선군"){editor.putInt("c12_220",1); editor.commit()} | ||
254 | - if(gooSpinner.selectedItem=="철원군"){editor.putInt("c12_221",1); editor.commit()} | ||
255 | - if(gooSpinner.selectedItem=="화천군"){editor.putInt("c12_222",1); editor.commit()} | ||
256 | - if(gooSpinner.selectedItem=="양구군"){editor.putInt("c12_223",1); editor.commit()} | ||
257 | - if(gooSpinner.selectedItem=="인제군"){editor.putInt("c12_224",1); editor.commit()} | ||
258 | - if(gooSpinner.selectedItem=="고성군"){editor.putInt("c12_225",1); editor.commit()} | ||
259 | - if(gooSpinner.selectedItem=="양양군"){editor.putInt("c12_226",1); editor.commit()} | ||
260 | - if(gooSpinner.selectedItem=="청주시"){editor.putInt("c12_227",1); editor.commit()} | ||
261 | - if(gooSpinner.selectedItem=="청주시 상당구"){editor.putInt("c12_228",1); editor.commit()} | ||
262 | - if(gooSpinner.selectedItem=="청주시 서원구"){editor.putInt("c12_229",1); editor.commit()} | ||
263 | - if(gooSpinner.selectedItem=="청주시 흥덕구"){editor.putInt("c12_230",1); editor.commit()} | ||
264 | - if(gooSpinner.selectedItem=="청주시 청원구"){editor.putInt("c12_231",1); editor.commit()} | ||
265 | - if(gooSpinner.selectedItem=="충주시"){editor.putInt("c12_232",1); editor.commit()} | ||
266 | - if(gooSpinner.selectedItem=="제천시"){editor.putInt("c12_233",1); editor.commit()} | ||
267 | - if(gooSpinner.selectedItem=="보은군"){editor.putInt("c12_234",1); editor.commit()} | ||
268 | - if(gooSpinner.selectedItem=="옥천군"){editor.putInt("c12_235",1); editor.commit()} | ||
269 | - if(gooSpinner.selectedItem=="영동군"){editor.putInt("c12_236",1); editor.commit()} | ||
270 | - if(gooSpinner.selectedItem=="증평군"){editor.putInt("c12_237",1); editor.commit()} | ||
271 | - if(gooSpinner.selectedItem=="진천군"){editor.putInt("c12_238",1); editor.commit()} | ||
272 | - if(gooSpinner.selectedItem=="괴산군"){editor.putInt("c12_239",1); editor.commit()} | ||
273 | - if(gooSpinner.selectedItem=="음성군"){editor.putInt("c12_240",1); editor.commit()} | ||
274 | - if(gooSpinner.selectedItem=="단양군"){editor.putInt("c12_241",1); editor.commit()} | ||
275 | - if(gooSpinner.selectedItem=="천안시"){editor.putInt("c12_242",1); editor.commit()} | ||
276 | - if(gooSpinner.selectedItem=="천안시 동남구"){editor.putInt("c12_243",1); editor.commit()} | ||
277 | - if(gooSpinner.selectedItem=="천안시 서북구"){editor.putInt("c12_244",1); editor.commit()} | ||
278 | - if(gooSpinner.selectedItem=="공주시"){editor.putInt("c12_245",1); editor.commit()} | ||
279 | - if(gooSpinner.selectedItem=="보령시"){editor.putInt("c12_246",1); editor.commit()} | ||
280 | - if(gooSpinner.selectedItem=="아산시"){editor.putInt("c12_247",1); editor.commit()} | ||
281 | - if(gooSpinner.selectedItem=="서산시"){editor.putInt("c12_248",1); editor.commit()} | ||
282 | - if(gooSpinner.selectedItem=="논산시"){editor.putInt("c12_249",1); editor.commit()} | ||
283 | - if(gooSpinner.selectedItem=="계룡시"){editor.putInt("c12_250",1); editor.commit()} | ||
284 | - if(gooSpinner.selectedItem=="당진시"){editor.putInt("c12_251",1); editor.commit()} | ||
285 | - if(gooSpinner.selectedItem=="금산군"){editor.putInt("c12_252",1); editor.commit()} | ||
286 | - if(gooSpinner.selectedItem=="부여군"){editor.putInt("c12_253",1); editor.commit()} | ||
287 | - if(gooSpinner.selectedItem=="서천군"){editor.putInt("c12_254",1); editor.commit()} | ||
288 | - if(gooSpinner.selectedItem=="청양군"){editor.putInt("c12_255",1); editor.commit()} | ||
289 | - if(gooSpinner.selectedItem=="홍성군"){editor.putInt("c12_256",1); editor.commit()} | ||
290 | - if(gooSpinner.selectedItem=="예산군"){editor.putInt("c12_257",1); editor.commit()} | ||
291 | - if(gooSpinner.selectedItem=="태안군"){editor.putInt("c12_258",1); editor.commit()} | ||
292 | - if(gooSpinner.selectedItem=="전주시"){editor.putInt("c12_259",1); editor.commit()} | ||
293 | - if(gooSpinner.selectedItem=="전주시 완산구"){editor.putInt("c12_260",1); editor.commit()} | ||
294 | - if(gooSpinner.selectedItem=="전주시 덕진구"){editor.putInt("c12_261",1); editor.commit()} | ||
295 | - if(gooSpinner.selectedItem=="전주시효자출"){editor.putInt("c12_262",1); editor.commit()} | ||
296 | - if(gooSpinner.selectedItem=="군산시"){editor.putInt("c12_263",1); editor.commit()} | ||
297 | - if(gooSpinner.selectedItem=="익산시"){editor.putInt("c12_264",1); editor.commit()} | ||
298 | - if(gooSpinner.selectedItem=="익산시함열출"){editor.putInt("c12_265",1); editor.commit()} | ||
299 | - if(gooSpinner.selectedItem=="정읍시"){editor.putInt("c12_266",1); editor.commit()} | ||
300 | - if(gooSpinner.selectedItem=="남원시"){editor.putInt("c12_267",1); editor.commit()} | ||
301 | - if(gooSpinner.selectedItem=="김제시"){editor.putInt("c12_268",1); editor.commit()} | ||
302 | - if(gooSpinner.selectedItem=="완주군"){editor.putInt("c12_269",1); editor.commit()} | ||
303 | - if(gooSpinner.selectedItem=="진안군"){editor.putInt("c12_270",1); editor.commit()} | ||
304 | - if(gooSpinner.selectedItem=="무주군"){editor.putInt("c12_271",1); editor.commit()} | ||
305 | - if(gooSpinner.selectedItem=="장수군"){editor.putInt("c12_272",1); editor.commit()} | ||
306 | - if(gooSpinner.selectedItem=="임실군"){editor.putInt("c12_273",1); editor.commit()} | ||
307 | - if(gooSpinner.selectedItem=="순창군"){editor.putInt("c12_274",1); editor.commit()} | ||
308 | - if(gooSpinner.selectedItem=="고창군"){editor.putInt("c12_275",1); editor.commit()} | ||
309 | - if(gooSpinner.selectedItem=="부안군"){editor.putInt("c12_276",1); editor.commit()} | ||
310 | - if(gooSpinner.selectedItem=="목포시"){editor.putInt("c12_277",1); editor.commit()} | ||
311 | - if(gooSpinner.selectedItem=="여수시"){editor.putInt("c12_278",1); editor.commit()} | ||
312 | - if(gooSpinner.selectedItem=="순천시"){editor.putInt("c12_279",1); editor.commit()} | ||
313 | - if(gooSpinner.selectedItem=="나주시"){editor.putInt("c12_280",1); editor.commit()} | ||
314 | - if(gooSpinner.selectedItem=="광양시"){editor.putInt("c12_281",1); editor.commit()} | ||
315 | - if(gooSpinner.selectedItem=="담양군"){editor.putInt("c12_282",1); editor.commit()} | ||
316 | - if(gooSpinner.selectedItem=="곡성군"){editor.putInt("c12_283",1); editor.commit()} | ||
317 | - if(gooSpinner.selectedItem=="구례군"){editor.putInt("c12_284",1); editor.commit()} | ||
318 | - if(gooSpinner.selectedItem=="고흥군"){editor.putInt("c12_285",1); editor.commit()} | ||
319 | - if(gooSpinner.selectedItem=="보성군"){editor.putInt("c12_286",1); editor.commit()} | ||
320 | - if(gooSpinner.selectedItem=="화순군"){editor.putInt("c12_287",1); editor.commit()} | ||
321 | - if(gooSpinner.selectedItem=="장흥군"){editor.putInt("c12_288",1); editor.commit()} | ||
322 | - if(gooSpinner.selectedItem=="강진군"){editor.putInt("c12_289",1); editor.commit()} | ||
323 | - if(gooSpinner.selectedItem=="해남군"){editor.putInt("c12_290",1); editor.commit()} | ||
324 | - if(gooSpinner.selectedItem=="영암군"){editor.putInt("c12_291",1); editor.commit()} | ||
325 | - if(gooSpinner.selectedItem=="무안군"){editor.putInt("c12_292",1); editor.commit()} | ||
326 | - if(gooSpinner.selectedItem=="함평군"){editor.putInt("c12_293",1); editor.commit()} | ||
327 | - if(gooSpinner.selectedItem=="영광군"){editor.putInt("c12_294",1); editor.commit()} | ||
328 | - if(gooSpinner.selectedItem=="장성군"){editor.putInt("c12_295",1); editor.commit()} | ||
329 | - if(gooSpinner.selectedItem=="완도군"){editor.putInt("c12_296",1); editor.commit()} | ||
330 | - if(gooSpinner.selectedItem=="진도군"){editor.putInt("c12_297",1); editor.commit()} | ||
331 | - if(gooSpinner.selectedItem=="신안군"){editor.putInt("c12_298",1); editor.commit()} | ||
332 | - if(gooSpinner.selectedItem=="포항시"){editor.putInt("c12_299",1); editor.commit()} | ||
333 | - if(gooSpinner.selectedItem=="포항시 남구"){editor.putInt("c12_300",1); editor.commit()} | ||
334 | - if(gooSpinner.selectedItem=="포항시 북구"){editor.putInt("c12_301",1); editor.commit()} | ||
335 | - if(gooSpinner.selectedItem=="경주시"){editor.putInt("c12_302",1); editor.commit()} | ||
336 | - if(gooSpinner.selectedItem=="김천시"){editor.putInt("c12_303",1); editor.commit()} | ||
337 | - if(gooSpinner.selectedItem=="안동시"){editor.putInt("c12_304",1); editor.commit()} | ||
338 | - if(gooSpinner.selectedItem=="구미시"){editor.putInt("c12_305",1); editor.commit()} | ||
339 | - if(gooSpinner.selectedItem=="영주시"){editor.putInt("c12_306",1); editor.commit()} | ||
340 | - if(gooSpinner.selectedItem=="영천시"){editor.putInt("c12_307",1); editor.commit()} | ||
341 | - if(gooSpinner.selectedItem=="상주시"){editor.putInt("c12_308",1); editor.commit()} | ||
342 | - if(gooSpinner.selectedItem=="문경시"){editor.putInt("c12_309",1); editor.commit()} | ||
343 | - if(gooSpinner.selectedItem=="경산시"){editor.putInt("c12_310",1); editor.commit()} | ||
344 | - if(gooSpinner.selectedItem=="군위군"){editor.putInt("c12_311",1); editor.commit()} | ||
345 | - if(gooSpinner.selectedItem=="의성군"){editor.putInt("c12_312",1); editor.commit()} | ||
346 | - if(gooSpinner.selectedItem=="청송군"){editor.putInt("c12_313",1); editor.commit()} | ||
347 | - if(gooSpinner.selectedItem=="영양군"){editor.putInt("c12_314",1); editor.commit()} | ||
348 | - if(gooSpinner.selectedItem=="영덕군"){editor.putInt("c12_315",1); editor.commit()} | ||
349 | - if(gooSpinner.selectedItem=="청도군"){editor.putInt("c12_316",1); editor.commit()} | ||
350 | - if(gooSpinner.selectedItem=="고령군"){editor.putInt("c12_317",1); editor.commit()} | ||
351 | - if(gooSpinner.selectedItem=="성주군"){editor.putInt("c12_318",1); editor.commit()} | ||
352 | - if(gooSpinner.selectedItem=="칠곡군"){editor.putInt("c12_319",1); editor.commit()} | ||
353 | - if(gooSpinner.selectedItem=="예천군"){editor.putInt("c12_320",1); editor.commit()} | ||
354 | - if(gooSpinner.selectedItem=="봉화군"){editor.putInt("c12_321",1); editor.commit()} | ||
355 | - if(gooSpinner.selectedItem=="울진군"){editor.putInt("c12_322",1); editor.commit()} | ||
356 | - if(gooSpinner.selectedItem=="울릉군"){editor.putInt("c12_323",1); editor.commit()} | ||
357 | - if(gooSpinner.selectedItem=="창원시"){editor.putInt("c12_324",1); editor.commit()} | ||
358 | - if(gooSpinner.selectedItem=="창원시 의창구"){editor.putInt("c12_325",1); editor.commit()} | ||
359 | - if(gooSpinner.selectedItem=="창원시 성산구"){editor.putInt("c12_326",1); editor.commit()} | ||
360 | - if(gooSpinner.selectedItem=="창원시 마산합포구"){editor.putInt("c12_327",1); editor.commit()} | ||
361 | - if(gooSpinner.selectedItem=="창원시 마산회원구"){editor.putInt("c12_328",1); editor.commit()} | ||
362 | - if(gooSpinner.selectedItem=="창원시 진해구"){editor.putInt("c12_329",1); editor.commit()} | ||
363 | - if(gooSpinner.selectedItem=="진주시"){editor.putInt("c12_330",1); editor.commit()} | ||
364 | - if(gooSpinner.selectedItem=="통영시"){editor.putInt("c12_331",1); editor.commit()} | ||
365 | - if(gooSpinner.selectedItem=="사천시"){editor.putInt("c12_332",1); editor.commit()} | ||
366 | - if(gooSpinner.selectedItem=="사천남양출장"){editor.putInt("c12_333",1); editor.commit()} | ||
367 | - if(gooSpinner.selectedItem=="김해시"){editor.putInt("c12_334",1); editor.commit()} | ||
368 | - if(gooSpinner.selectedItem=="장유출장소"){editor.putInt("c12_335",1); editor.commit()} | ||
369 | - if(gooSpinner.selectedItem=="밀양시"){editor.putInt("c12_336",1); editor.commit()} | ||
370 | - if(gooSpinner.selectedItem=="거제시"){editor.putInt("c12_337",1); editor.commit()} | ||
371 | - if(gooSpinner.selectedItem=="양산시"){editor.putInt("c12_338",1); editor.commit()} | ||
372 | - if(gooSpinner.selectedItem=="양산시웅상출장소"){editor.putInt("c12_339",1); editor.commit()} | ||
373 | - if(gooSpinner.selectedItem=="의령군"){editor.putInt("c12_340",1); editor.commit()} | ||
374 | - if(gooSpinner.selectedItem=="함안군"){editor.putInt("c12_341",1); editor.commit()} | ||
375 | - if(gooSpinner.selectedItem=="창녕군"){editor.putInt("c12_342",1); editor.commit()} | ||
376 | - if(gooSpinner.selectedItem=="남해군"){editor.putInt("c12_343",1); editor.commit()} | ||
377 | - if(gooSpinner.selectedItem=="하동군"){editor.putInt("c12_344",1); editor.commit()} | ||
378 | - if(gooSpinner.selectedItem=="산청군"){editor.putInt("c12_345",1); editor.commit()} | ||
379 | - if(gooSpinner.selectedItem=="함양군"){editor.putInt("c12_346",1); editor.commit()} | ||
380 | - if(gooSpinner.selectedItem=="거창군"){editor.putInt("c12_347",1); editor.commit()} | ||
381 | - if(gooSpinner.selectedItem=="합천군"){editor.putInt("c12_348",1); editor.commit()} | ||
382 | - if(gooSpinner.selectedItem=="제주시"){editor.putInt("c12_349",1); editor.commit()} | ||
383 | - if(gooSpinner.selectedItem=="서귀포시"){editor.putInt("c12_350",1); editor.commit()} | ||
384 | 27 | ||
28 | + nextButton.setOnClickListener { | ||
385 | var intent = Intent(this, InputProfilFirstFiveActivity::class.java) | 29 | var intent = Intent(this, InputProfilFirstFiveActivity::class.java) |
386 | startActivity(intent) | 30 | startActivity(intent) |
31 | + | ||
32 | + /* | ||
33 | + var birthdateinput=findViewById<EditText>(R.id.editText).text.toString().toInt() | ||
34 | + if ((2019-birthdateinput)<19){ | ||
35 | + editor.putInt("c1_2",1) | ||
36 | + editor.commit() | ||
37 | + //마지막장에 상관없음 추가 | ||
38 | + } | ||
39 | + else if((2019-birthdateinput)<34){ | ||
40 | + editor.putInt("c1_3",1) | ||
41 | + editor.commit() | ||
42 | + } | ||
43 | + else if((2019-birthdateinput)<40){ | ||
44 | + editor.putInt("c1_4",1) | ||
45 | + editor.commit() | ||
46 | + } | ||
47 | + else if((2019-birthdateinput)<49){ | ||
48 | + editor.putInt("c1_5",1) | ||
49 | + editor.commit() | ||
50 | + } | ||
51 | + else if((2019-birthdateinput)<59){ | ||
52 | + editor.putInt("c1_6",1) | ||
53 | + editor.commit() | ||
54 | + } | ||
55 | + else{ | ||
56 | + editor.putInt("c1_7",1) | ||
57 | + editor.commit() | ||
58 | + } | ||
59 | + | ||
60 | + */ | ||
387 | } | 61 | } |
62 | + | ||
388 | } | 63 | } |
389 | -} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
64 | +} | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_first_six.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_first_six.* |
... | @@ -18,18 +16,7 @@ class InputProfilFirstSixActivity : AppCompatActivity() { | ... | @@ -18,18 +16,7 @@ class InputProfilFirstSixActivity : AppCompatActivity() { |
18 | startActivity(intent) | 16 | startActivity(intent) |
19 | } | 17 | } |
20 | 18 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
25 | - if(gagoojooButton.isChecked){ | ||
26 | - editor.putInt("c13_2",1); editor.commit() | ||
27 | - }else if(gagoowonButton.isChecked){ | ||
28 | - editor.putInt("c13_3",1); editor.commit() | ||
29 | - }else{ | ||
30 | - | ||
31 | - } | ||
32 | - | ||
33 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) | 20 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) |
34 | startActivity(intent) | 21 | startActivity(intent) |
35 | } | 22 | } | ... | ... |
... | @@ -45,12 +45,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { | ... | @@ -45,12 +45,12 @@ class InputProfilFirstThreeActivity : AppCompatActivity() { |
45 | startActivity(intent) | 45 | startActivity(intent) |
46 | 46 | ||
47 | if (manButton.isChecked){ | 47 | if (manButton.isChecked){ |
48 | - editor.putInt("c3_2",1) | 48 | + editor.putInt("c2_1",1) |
49 | editor.commit() | 49 | editor.commit() |
50 | //마지막장에 상관없음 추가 | 50 | //마지막장에 상관없음 추가 |
51 | } | 51 | } |
52 | else{ | 52 | else{ |
53 | - editor.putInt("c3_3",1) | 53 | + editor.putInt("c2_2",1) |
54 | editor.commit() | 54 | editor.commit() |
55 | } | 55 | } |
56 | } | 56 | } | ... | ... |
... | @@ -5,10 +5,7 @@ import android.content.Intent | ... | @@ -5,10 +5,7 @@ import android.content.Intent |
5 | import android.content.SharedPreferences | 5 | import android.content.SharedPreferences |
6 | import androidx.appcompat.app.AppCompatActivity | 6 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 7 | import android.os.Bundle |
8 | -import android.util.Log | ||
9 | import android.widget.EditText | 8 | import android.widget.EditText |
10 | -import android.widget.Toast | ||
11 | -import com.google.firebase.messaging.FirebaseMessaging | ||
12 | import kotlinx.android.synthetic.main.activity_input_profil_first_two.* | 9 | import kotlinx.android.synthetic.main.activity_input_profil_first_two.* |
13 | import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton | 10 | import kotlinx.android.synthetic.main.activity_input_profil_first_two.nextButton |
14 | import kotlinx.android.synthetic.main.activity_input_profil_second_two.* | 11 | import kotlinx.android.synthetic.main.activity_input_profil_second_two.* |
... | @@ -40,15 +37,7 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { | ... | @@ -40,15 +37,7 @@ class InputProfilFirstTwoActivity : AppCompatActivity() { |
40 | if ((2019-birthdateint)<19){ | 37 | if ((2019-birthdateint)<19){ |
41 | editor.putInt("c1_2",1) | 38 | editor.putInt("c1_2",1) |
42 | editor.commit() | 39 | editor.commit() |
43 | - Toast.makeText(baseContext, prof.getInt("c1_2",0).toString(), Toast.LENGTH_SHORT).show() | ||
44 | //마지막장에 상관없음 추가 | 40 | //마지막장에 상관없음 추가 |
45 | - FirebaseMessaging.getInstance().subscribeToTopic("c1_2") | ||
46 | - .addOnCompleteListener { task -> | ||
47 | - var msg = getString(R.string.msg_subscribed) | ||
48 | - if (!task.isSuccessful) { | ||
49 | - msg = getString(R.string.msg_subscribe_failed) | ||
50 | - } | ||
51 | - } | ||
52 | } | 41 | } |
53 | else if((2019-birthdateint)<34){ | 42 | else if((2019-birthdateint)<34){ |
54 | editor.putInt("c1_3",1) | 43 | editor.putInt("c1_3",1) | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.* |
... | @@ -18,36 +16,7 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { | ... | @@ -18,36 +16,7 @@ class InputProfilFourthFiveActivity : AppCompatActivity() { |
18 | startActivity(intent) | 16 | startActivity(intent) |
19 | } | 17 | } |
20 | 18 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
25 | - if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()} | ||
26 | - if(iljaeButton.isChecked){editor.putInt("c8_12",1); editor.commit()} | ||
27 | - if(specialpihaeButton.isChecked){editor.putInt("c8_13",1); editor.commit()} | ||
28 | - if(sanuppihaeButton.isChecked){editor.putInt("c8_14",1); editor.commit()} | ||
29 | - if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()} | ||
30 | - //기타가 똑같은거 지정 | ||
31 | - | ||
32 | - editor.putInt("c1_1",1); editor.commit() | ||
33 | - editor.putInt("c2_1",1); editor.commit() | ||
34 | - editor.putInt("c3_1",1); editor.commit() | ||
35 | - editor.putInt("c4_1",1); editor.commit() | ||
36 | - editor.putInt("c5_1",1); editor.commit() | ||
37 | - editor.putInt("c6_1",1); editor.commit() | ||
38 | - editor.putInt("c7_1",1); editor.commit() | ||
39 | - editor.putInt("c8_1",1); editor.commit() | ||
40 | - editor.putInt("c9_1",1); editor.commit() | ||
41 | - editor.putInt("c10_1",1); editor.commit() | ||
42 | - editor.putInt("c11_1",1); editor.commit() | ||
43 | - editor.putInt("c12_1",1); editor.commit() | ||
44 | - editor.putInt("c13_1",1); editor.commit() | ||
45 | - editor.putInt("c14_1",1); editor.commit() | ||
46 | - editor.putInt("c15_1",1); editor.commit() | ||
47 | - editor.putInt("c16_1",1); editor.commit() | ||
48 | - | ||
49 | - | ||
50 | - | ||
51 | var intent = Intent(this, InputProfilFifthOneActivity::class.java) | 20 | var intent = Intent(this, InputProfilFifthOneActivity::class.java) |
52 | startActivity(intent) | 21 | startActivity(intent) |
53 | } | 22 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.* |
... | @@ -18,30 +16,11 @@ class InputProfilFourthFourActivity : AppCompatActivity() { | ... | @@ -18,30 +16,11 @@ class InputProfilFourthFourActivity : AppCompatActivity() { |
18 | startActivity(intent) | 16 | startActivity(intent) |
19 | } | 17 | } |
20 | 18 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
25 | - | ||
26 | - if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()} | ||
27 | - if(pokryukButton.isChecked){editor.putInt("c8_9",1); editor.commit()} | ||
28 | - if(pihaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()} | ||
29 | - if(kachoolButton.isChecked){editor.putInt("c8_9",1); editor.commit()} | ||
30 | - if(sagoButton.isChecked){editor.putInt("c8_9",1); editor.commit()} | ||
31 | - if(ihonButton.isChecked){editor.putInt("c8_15",1); editor.commit()} | ||
32 | - if(jaehaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()} | ||
33 | - if(hakkyobaakButton.isChecked){editor.putInt("c8_16",1); editor.commit()} | ||
34 | - if(siljikButton.isChecked){editor.putInt("c5_9",1); editor.commit()} | ||
35 | - if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()} | ||
36 | - | ||
37 | var intent = Intent(this, InputProfilFourthFiveActivity::class.java) | 20 | var intent = Intent(this, InputProfilFourthFiveActivity::class.java) |
38 | startActivity(intent) | 21 | startActivity(intent) |
39 | } | 22 | } |
40 | 23 | ||
41 | 24 | ||
42 | - | ||
43 | - | ||
44 | - | ||
45 | - | ||
46 | } | 25 | } |
47 | } | 26 | } | ... | ... |
... | @@ -5,7 +5,6 @@ import android.content.Intent | ... | @@ -5,7 +5,6 @@ import android.content.Intent |
5 | import android.content.SharedPreferences | 5 | import android.content.SharedPreferences |
6 | import androidx.appcompat.app.AppCompatActivity | 6 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 7 | import android.os.Bundle |
8 | -import android.view.View.GONE | ||
9 | import android.view.View.VISIBLE | 8 | import android.view.View.VISIBLE |
10 | import android.widget.TextView | 9 | import android.widget.TextView |
11 | import androidx.appcompat.app.AlertDialog | 10 | import androidx.appcompat.app.AlertDialog |
... | @@ -60,56 +59,48 @@ class InputProfilFourthOneActivity : AppCompatActivity() { | ... | @@ -60,56 +59,48 @@ class InputProfilFourthOneActivity : AppCompatActivity() { |
60 | val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) | 59 | val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE) |
61 | val editor: SharedPreferences.Editor=prof.edit() | 60 | val editor: SharedPreferences.Editor=prof.edit() |
62 | 61 | ||
63 | - previousButton.setOnClickListener { | 62 | + noButton.setOnClickListener{ |
64 | - var intent = Intent(this, InputProfilThirdFourActivity::class.java) | 63 | + subLinearLayout.visibility=VISIBLE |
65 | - startActivity(intent) | ||
66 | - } | ||
67 | 64 | ||
68 | - yesButton.setOnClickListener { | ||
69 | - subLinearLayout.visibility=GONE | ||
70 | - noButton.isChecked=false | ||
71 | } | 65 | } |
72 | 66 | ||
73 | - noButton.setOnClickListener { | 67 | + |
74 | - subLinearLayout.visibility=VISIBLE | 68 | + previousButton.setOnClickListener { |
75 | - yesButton.isChecked=false | 69 | + var intent = Intent(this, InputProfilThirdFourActivity::class.java) |
70 | + startActivity(intent) | ||
76 | } | 71 | } |
77 | 72 | ||
78 | nextButton.setOnClickListener { | 73 | nextButton.setOnClickListener { |
79 | 74 | ||
80 | if(yesButton.isChecked){ | 75 | if(yesButton.isChecked){ |
81 | - editor.putInt("c14_2",1) | 76 | + editor.putInt("c7_2",1) |
82 | - editor.commit() | ||
83 | - } | ||
84 | - if(noButton.isChecked){ | ||
85 | - editor.putInt("c14_3",1) | ||
86 | editor.commit() | 77 | editor.commit() |
87 | } | 78 | } |
79 | + | ||
88 | if(jeonsaeButton.isChecked){ | 80 | if(jeonsaeButton.isChecked){ |
89 | - editor.putInt("c16_2",1) | 81 | + editor.putInt("c7_31",1) |
90 | editor.commit() | 82 | editor.commit() |
91 | } | 83 | } |
92 | if(wolseButton.isChecked){ | 84 | if(wolseButton.isChecked){ |
93 | - editor.putInt("c16_3",1) | 85 | + editor.putInt("c7_31",1) |
94 | editor.commit() | 86 | editor.commit() |
95 | } | 87 | } |
96 | if(kongkongButton.isChecked){ | 88 | if(kongkongButton.isChecked){ |
97 | - editor.putInt("c16_4",1) | 89 | + editor.putInt("c7_31",1) |
98 | editor.commit() | 90 | editor.commit() |
99 | } | 91 | } |
100 | if(moosangButton.isChecked){ | 92 | if(moosangButton.isChecked){ |
101 | - editor.putInt("c16_5",1) | 93 | + editor.putInt("c7_31",1) |
102 | editor.commit() | 94 | editor.commit() |
103 | } | 95 | } |
104 | if(bojangButton.isChecked){ | 96 | if(bojangButton.isChecked){ |
105 | - editor.putInt("c16_6",1) | 97 | + editor.putInt("c7_31",1) |
106 | editor.commit() | 98 | editor.commit() |
107 | } | 99 | } |
108 | if(guitarButton.isChecked){ | 100 | if(guitarButton.isChecked){ |
109 | - editor.putInt("c16_7",1) | 101 | + editor.putInt("c7_31",1) |
110 | editor.commit() | 102 | editor.commit() |
111 | } | 103 | } |
112 | - | ||
113 | var intent = Intent(this, InputProfilFourthTwoActivity::class.java) | 104 | var intent = Intent(this, InputProfilFourthTwoActivity::class.java) |
114 | startActivity(intent) | 105 | startActivity(intent) |
115 | } | 106 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.* |
... | @@ -18,24 +16,7 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { | ... | @@ -18,24 +16,7 @@ class InputProfilFourthThreeActivity : AppCompatActivity() { |
18 | startActivity(intent) | 16 | startActivity(intent) |
19 | } | 17 | } |
20 | 18 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | - | ||
25 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
26 | - if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()} | ||
27 | - if(jeosodeukButton.isChecked){editor.putInt("c8_3",1); editor.commit()} | ||
28 | - if(hanboomoButton.isChecked){editor.putInt("c8_7",1); editor.commit()} | ||
29 | - if(oegookinButton.isChecked){editor.putInt("c8_5",1); editor.commit()} | ||
30 | - if(damoonhwaButton.isChecked){editor.putInt("c8_4",1); editor.commit()} | ||
31 | - if(jaangaeButton.isChecked){editor.putInt("c8_2",1); editor.commit()} | ||
32 | - if(imshinchoolsanButton.isChecked){editor.putInt("c7_1",1); editor.commit()} | ||
33 | - if(ipyaangButton.isChecked){editor.putInt("c8_10",1); editor.commit()} | ||
34 | - if(gaajungButton.isChecked){editor.putInt("c8_11",1); editor.commit()} | ||
35 | - if(bookhanButton.isChecked){editor.putInt("c8_6",1); editor.commit()} | ||
36 | - if(gookgayoogongButton.isChecked){editor.putInt("c8_8",1); editor.commit()} | ||
37 | - if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()} | ||
38 | - | ||
39 | var intent = Intent(this, InputProfilFourthFourActivity::class.java) | 20 | var intent = Intent(this, InputProfilFourthFourActivity::class.java) |
40 | startActivity(intent) | 21 | startActivity(intent) |
41 | } | 22 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.view.View.GONE | ||
9 | -import android.view.View.VISIBLE | ||
10 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.* |
11 | 7 | ||
12 | class InputProfilFourthTwoActivity : AppCompatActivity() { | 8 | class InputProfilFourthTwoActivity : AppCompatActivity() { |
... | @@ -20,31 +16,10 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { | ... | @@ -20,31 +16,10 @@ class InputProfilFourthTwoActivity : AppCompatActivity() { |
20 | startActivity(intent) | 16 | startActivity(intent) |
21 | } | 17 | } |
22 | 18 | ||
23 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
24 | - val editor: SharedPreferences.Editor=prof.edit() | ||
25 | - | ||
26 | nextButton.setOnClickListener { | 19 | nextButton.setOnClickListener { |
27 | - if(yesButton.isChecked){editor.putInt("c15_2",1); editor.commit()} | ||
28 | - if(noButton.isChecked){editor.putInt("c15_3",1); editor.commit()} | ||
29 | - if(jeonsaeButton.isChecked){editor.putInt("c16_2",1); editor.commit()} | ||
30 | - if(wolseButton.isChecked){editor.putInt("c16_3",1); editor.commit()} | ||
31 | - if(kongkongButton.isChecked){editor.putInt("c16_4",1); editor.commit()} | ||
32 | - if(moosangButton.isChecked){editor.putInt("c16_5",1); editor.commit()} | ||
33 | - if(bojangButton.isChecked){editor.putInt("c16_6",1); editor.commit()} | ||
34 | - if(guitarButton.isChecked){editor.putInt("c16_7",1); editor.commit()} | ||
35 | - | ||
36 | var intent = Intent(this, InputProfilFourthThreeActivity::class.java) | 20 | var intent = Intent(this, InputProfilFourthThreeActivity::class.java) |
37 | startActivity(intent) | 21 | startActivity(intent) |
38 | } | 22 | } |
39 | 23 | ||
40 | - yesButton.setOnClickListener { | ||
41 | - subLayout.visibility=GONE | ||
42 | - noButton.isChecked=false | ||
43 | - } | ||
44 | - noButton.setOnClickListener { | ||
45 | - subLayout.visibility=VISIBLE | ||
46 | - yesButton.isChecked=false | ||
47 | - } | ||
48 | - | ||
49 | } | 24 | } |
50 | } | 25 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.widget.Button | ||
9 | import android.widget.EditText | 6 | import android.widget.EditText |
10 | import android.widget.RatingBar | 7 | import android.widget.RatingBar |
11 | import android.widget.TextView | 8 | import android.widget.TextView |
... | @@ -58,39 +55,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() { | ... | @@ -58,39 +55,9 @@ class InputProfilSecondOneActivity : AppCompatActivity() { |
58 | startActivity(intent) | 55 | startActivity(intent) |
59 | } | 56 | } |
60 | 57 | ||
61 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
62 | - val editor: SharedPreferences.Editor=prof.edit() | ||
63 | - | ||
64 | - | ||
65 | nextButton.setOnClickListener { | 58 | nextButton.setOnClickListener { |
66 | - | 59 | + var intent = Intent(this, InputProfilSecondTwoActivity::class.java) |
67 | - if(baewoojaButton.isChecked){editor.putInt("c10_2",1); editor.commit()} | 60 | + startActivity(intent) |
68 | - if(baewoojaboomoButton.isChecked){editor.putInt("c10_3",1); editor.commit()} | ||
69 | - if(baewoojajoboomoButton.isChecked){editor.putInt("c10_4",1); editor.commit()} | ||
70 | - if(brotherButton.isChecked){editor.putInt("c10_5",1); editor.commit() | ||
71 | - editor.putString("with_brothersister","yes")} | ||
72 | - if(baewoojabrotherButton.isChecked){editor.putInt("c10_6",1); editor.commit()} | ||
73 | - if(donggeoButton.isChecked){editor.putInt("c10_7",1); editor.commit()} | ||
74 | - if(fatherButton.isChecked){editor.putInt("c10_8",1); editor.commit()} | ||
75 | - if(motherButton.isChecked){editor.putInt("c10_9",1); editor.commit()} | ||
76 | - if(grandsonbaewoojaButton.isChecked){editor.putInt("c10_10",1); editor.commit()} | ||
77 | - if(grandfatherButton.isChecked){editor.putInt("c10_11",1); editor.commit()} | ||
78 | - if(grandmotherButton.isChecked){editor.putInt("c10_12",1); editor.commit()} | ||
79 | - if(grandsonButton.isChecked){editor.putInt("c10_13",1); editor.commit()} | ||
80 | - if(janyeoButton.isChecked){editor.putInt("c10_14",1); editor.commit() | ||
81 | - editor.putString("with_child","yes")} | ||
82 | - if(janyeobaewoojaButton.isChecked){editor.putInt("c10_15",1); editor.commit()} | ||
83 | - if(nothingButton.isChecked){editor.putInt("c10_18",1); editor.commit()} | ||
84 | - | ||
85 | - if(janyeoButton.isChecked | ||
86 | - //prof.getString("with_child","none")=="yes" | ||
87 | - ){ | ||
88 | - var intent = Intent(this, InputProfilSecondTwoActivity::class.java) | ||
89 | - startActivity(intent) | ||
90 | - }else{ | ||
91 | - var intent = Intent(this, InputProfilThirdOneActivity::class.java) | ||
92 | - startActivity(intent) | ||
93 | - } | ||
94 | } | 61 | } |
95 | } | 62 | } |
96 | } | 63 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.widget.EditText | ||
9 | import kotlinx.android.synthetic.main.activity_input_profil_second_three.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_second_three.* |
10 | -import kotlinx.android.synthetic.main.activity_input_profil_second_three.nextButton | ||
11 | -import kotlinx.android.synthetic.main.activity_input_profil_second_three.previousButton | ||
12 | -import kotlinx.android.synthetic.main.activity_input_profil_second_three.skipButton | ||
13 | -import kotlinx.android.synthetic.main.activity_input_profil_second_three.toolbar | ||
14 | 7 | ||
15 | class InputProfilSecondThreeActivity : AppCompatActivity() { | 8 | class InputProfilSecondThreeActivity : AppCompatActivity() { |
16 | 9 | ||
... | @@ -18,10 +11,6 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { | ... | @@ -18,10 +11,6 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { |
18 | super.onCreate(savedInstanceState) | 11 | super.onCreate(savedInstanceState) |
19 | setContentView(R.layout.activity_input_profil_second_three) | 12 | setContentView(R.layout.activity_input_profil_second_three) |
20 | 13 | ||
21 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
22 | - val editor: SharedPreferences.Editor=prof.edit() | ||
23 | - | ||
24 | - | ||
25 | setSupportActionBar(toolbar) | 14 | setSupportActionBar(toolbar) |
26 | 15 | ||
27 | skipButton.setOnClickListener { | 16 | skipButton.setOnClickListener { |
... | @@ -35,40 +24,8 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { | ... | @@ -35,40 +24,8 @@ class InputProfilSecondThreeActivity : AppCompatActivity() { |
35 | } | 24 | } |
36 | 25 | ||
37 | nextButton.setOnClickListener { | 26 | nextButton.setOnClickListener { |
38 | - var numOfBS=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt() | ||
39 | - if(numOfBS>=2){ | ||
40 | - editor.putInt("c10_16",1); editor.commit() | ||
41 | - } | ||
42 | - if(numOfBS<2){ | ||
43 | - editor.putInt("c10_17",1); editor.commit() | ||
44 | - } | ||
45 | var intent = Intent(this, InputProfilThirdOneActivity::class.java) | 27 | var intent = Intent(this, InputProfilThirdOneActivity::class.java) |
46 | startActivity(intent) | 28 | startActivity(intent) |
47 | } | 29 | } |
48 | - | ||
49 | - val bsList = ArrayList<BSItem>() | ||
50 | - bsNumberInputButton.setOnClickListener { | ||
51 | - | ||
52 | - if(findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt()>0){ | ||
53 | - var bsNum=findViewById<EditText>(R.id.bsNumberEditText).text.toString().toInt() | ||
54 | - var cnt=1 | ||
55 | - while(bsNum>=cnt){ | ||
56 | - bsList.add( | ||
57 | - BSItem(cnt) | ||
58 | - ) | ||
59 | - cnt++ | ||
60 | - } | ||
61 | - //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show() | ||
62 | - } | ||
63 | - else{ | ||
64 | - var bsNum=0 | ||
65 | - } | ||
66 | - | ||
67 | - val adapter = BSAdapter(bsList) | ||
68 | - bsRecyclerView.adapter = adapter | ||
69 | - | ||
70 | - | ||
71 | - | ||
72 | - } | ||
73 | } | 30 | } |
74 | } | 31 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.view.View.GONE | ||
9 | import android.view.View.VISIBLE | 6 | import android.view.View.VISIBLE |
10 | import android.widget.EditText | 7 | import android.widget.EditText |
11 | -import android.widget.Toast | ||
12 | -import androidx.core.content.ContextCompat | ||
13 | import kotlinx.android.synthetic.main.activity_input_profil_second_two.* | 8 | import kotlinx.android.synthetic.main.activity_input_profil_second_two.* |
14 | -import kotlinx.android.synthetic.main.item_child.view.* | ||
15 | 9 | ||
16 | class InputProfilSecondTwoActivity : AppCompatActivity() { | 10 | class InputProfilSecondTwoActivity : AppCompatActivity() { |
17 | 11 | ||
... | @@ -19,73 +13,34 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { | ... | @@ -19,73 +13,34 @@ class InputProfilSecondTwoActivity : AppCompatActivity() { |
19 | super.onCreate(savedInstanceState) | 13 | super.onCreate(savedInstanceState) |
20 | setContentView(R.layout.activity_input_profil_second_two) | 14 | setContentView(R.layout.activity_input_profil_second_two) |
21 | 15 | ||
22 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
23 | - val editor: SharedPreferences.Editor=prof.edit() | ||
24 | 16 | ||
25 | setSupportActionBar(toolbar) | 17 | setSupportActionBar(toolbar) |
18 | + | ||
26 | skipButton.setOnClickListener { | 19 | skipButton.setOnClickListener { |
27 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) | 20 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) |
28 | startActivity(intent) | 21 | startActivity(intent) |
29 | } | 22 | } |
23 | + | ||
30 | previousButton.setOnClickListener { | 24 | previousButton.setOnClickListener { |
31 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) | 25 | var intent = Intent(this, InputProfilSecondOneActivity::class.java) |
32 | startActivity(intent) | 26 | startActivity(intent) |
33 | } | 27 | } |
34 | - nextButton.setOnClickListener { | ||
35 | - var numOfChild=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() | ||
36 | - if(numOfChild>=3){ | ||
37 | - editor.putInt("c10_16",1); editor.commit() | ||
38 | - } | ||
39 | - if(numOfChild<3){ | ||
40 | - editor.putInt("c10_17",1); editor.commit() | ||
41 | - } | ||
42 | 28 | ||
43 | - | 29 | + nextButton.setOnClickListener { |
44 | - | 30 | + var intent = Intent(this, InputProfilSecondThreeActivity::class.java) |
45 | - /* | 31 | + startActivity(intent) |
46 | - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo birth", childRecyclerView.childBirthEditText.text.toString()); editor.commit() | ||
47 | - if(childRecyclerView.womanButton.isChecked){ | ||
48 | - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","woman"); editor.commit() | ||
49 | - }else{ | ||
50 | - editor.putString(childRecyclerView.circleformButton.text.toString()+"st janyeo gender","man"); editor.commit() | ||
51 | - } | ||
52 | - */ | ||
53 | - | ||
54 | - if(prof.getString("with_brothersister","none")=="yes"){ | ||
55 | - var intent = Intent(this, InputProfilSecondThreeActivity::class.java) | ||
56 | - startActivity(intent) | ||
57 | - }else{ | ||
58 | - var intent = Intent(this, InputProfilThirdOneActivity::class.java) | ||
59 | - startActivity(intent) | ||
60 | - } | ||
61 | } | 32 | } |
33 | + | ||
62 | //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) | 34 | //val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt) |
63 | //mainTv.text = dialogText.text.toString() | 35 | //mainTv.text = dialogText.text.toString() |
64 | - val childList = ArrayList<ChildItem>() | ||
65 | childNumberInputButton.setOnClickListener { | 36 | childNumberInputButton.setOnClickListener { |
66 | - | 37 | + var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString() |
67 | - if(findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt()>0){ | 38 | + if(childNum=="3"){ |
68 | - var childNum=findViewById<EditText>(R.id.childNumberEditText).text.toString().toInt() | 39 | + child1LinearLayout.visibility=VISIBLE |
69 | - var cnt=1 | 40 | + child2LinearLayout.visibility=VISIBLE |
70 | - while(childNum>=cnt){ | 41 | + child3LinearLayout.visibility=VISIBLE |
71 | - childList.add( | ||
72 | - ChildItem(cnt) | ||
73 | - ) | ||
74 | - cnt++ | ||
75 | - } | ||
76 | - //Toast.makeText(this, cnt.toString(), Toast.LENGTH_SHORT).show() | ||
77 | - } | ||
78 | - else{ | ||
79 | - var childNum=0 | ||
80 | } | 42 | } |
81 | - | ||
82 | - val adapter = ChildAdapter(childList) | ||
83 | - childRecyclerView.adapter = adapter | ||
84 | - | ||
85 | - | ||
86 | - | ||
87 | } | 43 | } |
88 | 44 | ||
89 | - | ||
90 | } | 45 | } |
91 | } | 46 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.view.View.GONE | ||
9 | -import android.view.View.VISIBLE | ||
10 | import kotlinx.android.synthetic.main.activity_input_profil_third_four.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_third_four.* |
11 | 7 | ||
12 | class InputProfilThirdFourActivity : AppCompatActivity() { | 8 | class InputProfilThirdFourActivity : AppCompatActivity() { |
... | @@ -21,51 +17,9 @@ class InputProfilThirdFourActivity : AppCompatActivity() { | ... | @@ -21,51 +17,9 @@ class InputProfilThirdFourActivity : AppCompatActivity() { |
21 | startActivity(intent) | 17 | startActivity(intent) |
22 | } | 18 | } |
23 | 19 | ||
24 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
25 | - val editor: SharedPreferences.Editor=prof.edit() | ||
26 | - | ||
27 | nextButton.setOnClickListener { | 20 | nextButton.setOnClickListener { |
28 | - | ||
29 | - if(yesButton.isChecked){ | ||
30 | - editor.putInt("c8_2",1); editor.commit() | ||
31 | - } | ||
32 | - if(jichaeButton.isChecked){editor.putInt("c9_2",1); editor.commit()} | ||
33 | - if(noebyungbyunButton.isChecked){editor.putInt("c9_3",1); editor.commit()} | ||
34 | - if(sigaakButton.isChecked){editor.putInt("c9_4",1); editor.commit()} | ||
35 | - if(chungkaakButton.isChecked){editor.putInt("c9_5",1); editor.commit()} | ||
36 | - if(unuhButton.isChecked){editor.putInt("c9_6",1); editor.commit()} | ||
37 | - if(ahnmyunButton.isChecked){editor.putInt("c9_7",1); editor.commit()} | ||
38 | - if(sinjaangButton.isChecked){editor.putInt("c9_8",1); editor.commit()} | ||
39 | - if(simjaangButton.isChecked){editor.putInt("c9_9",1); editor.commit()} | ||
40 | - if(gaanjaangButton.isChecked){editor.putInt("c9_10",1); editor.commit()} | ||
41 | - if(jaangrooButton.isChecked){editor.putInt("c9_11",1); editor.commit()} | ||
42 | - if(noejungjeungButton.isChecked){editor.putInt("c9_12",1); editor.commit()} | ||
43 | - if(hoheupkiButton.isChecked){editor.putInt("c9_13",1); editor.commit()} | ||
44 | - if(jijukButton.isChecked){editor.putInt("c9_14",1); editor.commit()} | ||
45 | - if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit()} | ||
46 | - if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit()} | ||
47 | - | ||
48 | - if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}//DB,pref 뻑 주의 | ||
49 | - if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit()} | ||
50 | - if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit()} | ||
51 | - if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit()} | ||
52 | - if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit()} | ||
53 | - if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()} | ||
54 | - | ||
55 | var intent = Intent(this, InputProfilFourthOneActivity::class.java) | 21 | var intent = Intent(this, InputProfilFourthOneActivity::class.java) |
56 | startActivity(intent) | 22 | startActivity(intent) |
57 | } | 23 | } |
58 | - | ||
59 | - yesButton.setOnClickListener { | ||
60 | - eightoneLayout.visibility=VISIBLE | ||
61 | - eighttwoLayout.visibility= GONE | ||
62 | - | ||
63 | - } | ||
64 | - noButton.setOnClickListener { | ||
65 | - eightoneLayout.visibility= GONE | ||
66 | - eighttwoLayout.visibility= VISIBLE | ||
67 | - } | ||
68 | - | ||
69 | - | ||
70 | } | 24 | } |
71 | } | 25 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.widget.Button | ||
9 | import android.widget.TextView | 6 | import android.widget.TextView |
10 | import kotlinx.android.synthetic.main.activity_input_profil_third_one.* | 7 | import kotlinx.android.synthetic.main.activity_input_profil_third_one.* |
11 | 8 | ||
... | @@ -23,89 +20,12 @@ class InputProfilThirdOneActivity : AppCompatActivity() { | ... | @@ -23,89 +20,12 @@ class InputProfilThirdOneActivity : AppCompatActivity() { |
23 | startActivity(intent) | 20 | startActivity(intent) |
24 | } | 21 | } |
25 | 22 | ||
26 | - elementaryButton.setOnClickListener { | ||
27 | - middleButton.isChecked=false | ||
28 | - highButton.isChecked=false | ||
29 | - specialButton.isChecked=false | ||
30 | - universityButton.isChecked=false | ||
31 | - graduateButton.isChecked=false | ||
32 | - nothingButton.isChecked=false | ||
33 | - } | ||
34 | - middleButton.setOnClickListener { | ||
35 | - elementaryButton.isChecked=false | ||
36 | - highButton.isChecked=false | ||
37 | - specialButton.isChecked=false | ||
38 | - universityButton.isChecked=false | ||
39 | - graduateButton.isChecked=false | ||
40 | - nothingButton.isChecked=false | ||
41 | - } | ||
42 | - highButton.setOnClickListener { | ||
43 | - elementaryButton.isChecked=false | ||
44 | - middleButton.isChecked=false | ||
45 | - specialButton.isChecked=false | ||
46 | - universityButton.isChecked=false | ||
47 | - graduateButton.isChecked=false | ||
48 | - nothingButton.isChecked=false | ||
49 | - } | ||
50 | - specialButton.setOnClickListener { | ||
51 | - elementaryButton.isChecked=false | ||
52 | - middleButton.isChecked=false | ||
53 | - highButton.isChecked=false | ||
54 | - universityButton.isChecked=false | ||
55 | - graduateButton.isChecked=false | ||
56 | - nothingButton.isChecked=false | ||
57 | - } | ||
58 | - universityButton.setOnClickListener { | ||
59 | - elementaryButton.isChecked=false | ||
60 | - middleButton.isChecked=false | ||
61 | - highButton.isChecked=false | ||
62 | - specialButton.isChecked=false | ||
63 | - graduateButton.isChecked=false | ||
64 | - nothingButton.isChecked=false | ||
65 | - } | ||
66 | - graduateButton.setOnClickListener { | ||
67 | - elementaryButton.isChecked=false | ||
68 | - middleButton.isChecked=false | ||
69 | - highButton.isChecked=false | ||
70 | - specialButton.isChecked=false | ||
71 | - universityButton.isChecked=false | ||
72 | - nothingButton.isChecked=false | ||
73 | - } | ||
74 | - nothingButton.setOnClickListener { | ||
75 | - elementaryButton.isChecked=false | ||
76 | - middleButton.isChecked=false | ||
77 | - highButton.isChecked=false | ||
78 | - specialButton.isChecked=false | ||
79 | - universityButton.isChecked=false | ||
80 | - graduateButton.isChecked=false | ||
81 | - } | ||
82 | - | ||
83 | previousButton.setOnClickListener { | 23 | previousButton.setOnClickListener { |
84 | var intent = Intent(this, InputProfilSecondThreeActivity::class.java) | 24 | var intent = Intent(this, InputProfilSecondThreeActivity::class.java) |
85 | startActivity(intent) | 25 | startActivity(intent) |
86 | } | 26 | } |
87 | 27 | ||
88 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
89 | - val editor: SharedPreferences.Editor=prof.edit() | ||
90 | - | ||
91 | nextButton.setOnClickListener { | 28 | nextButton.setOnClickListener { |
92 | - if(elementaryButton.isChecked){ | ||
93 | - editor.putInt("c6_2",1); editor.commit() | ||
94 | - }else if(middleButton.isChecked){ | ||
95 | - editor.putInt("c6_3",1); editor.commit() | ||
96 | - }else if(highButton.isChecked){ | ||
97 | - editor.putInt("c6_4",1); editor.commit() | ||
98 | - }else if(universityButton.isChecked){ | ||
99 | - editor.putInt("c6_5",1); editor.commit() | ||
100 | - }else if(graduateButton.isChecked){ | ||
101 | - editor.putInt("c6_6",1); editor.commit() | ||
102 | - }else if(nothingButton.isChecked){ | ||
103 | - editor.putInt("c6_7",1); editor.commit() | ||
104 | - }else{ | ||
105 | - | ||
106 | - } | ||
107 | - | ||
108 | - | ||
109 | var intent = Intent(this, InputProfilThirdTwoActivity::class.java) | 29 | var intent = Intent(this, InputProfilThirdTwoActivity::class.java) |
110 | startActivity(intent) | 30 | startActivity(intent) |
111 | } | 31 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | import kotlinx.android.synthetic.main.activity_input_profil_third_three.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_third_three.* |
... | @@ -26,135 +24,9 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { | ... | @@ -26,135 +24,9 @@ class InputProfilThirdThreeActivity : AppCompatActivity() { |
26 | startActivity(intent) | 24 | startActivity(intent) |
27 | } | 25 | } |
28 | 26 | ||
29 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
30 | - val editor: SharedPreferences.Editor=prof.edit() | ||
31 | - | ||
32 | nextButton.setOnClickListener { | 27 | nextButton.setOnClickListener { |
33 | - if(nothingButton.isChecked){ editor.putInt("c4_11",1); editor.commit()} | ||
34 | - if(mipilButton.isChecked){ editor.putInt("c4_2",1); editor.commit()} | ||
35 | - if(myunjaeButton.isChecked){ editor.putInt("c4_3",1); editor.commit()} | ||
36 | - if(jobsoldierButton.isChecked){ editor.putInt("c4_4",1); editor.commit()} | ||
37 | - if(bokmoojoongButton.isChecked){ editor.putInt("c4_5",1); editor.commit()} | ||
38 | - if(mangijedaeButton.isChecked){ editor.putInt("c4_6",1); editor.commit()} | ||
39 | - if(specialmanryoButton.isChecked){ editor.putInt("c4_7",1); editor.commit()} | ||
40 | - if(specialbokmoosanupButton.isChecked){ editor.putInt("c4_8",1); editor.commit()} | ||
41 | - if(specialbokmoojeonmoonButton.isChecked){ editor.putInt("c4_9",1); editor.commit()} | ||
42 | - if(jedaeguitarButton.isChecked){ editor.putInt("c4_10",1); editor.commit()} | ||
43 | - | ||
44 | var intent = Intent(this, InputProfilThirdFourActivity::class.java) | 28 | var intent = Intent(this, InputProfilThirdFourActivity::class.java) |
45 | startActivity(intent) | 29 | startActivity(intent) |
46 | } | 30 | } |
47 | - | ||
48 | - nothingButton.setOnClickListener { | ||
49 | - mipilButton.isChecked=false | ||
50 | - myunjaeButton.isChecked=false | ||
51 | - jobsoldierButton.isChecked=false | ||
52 | - bokmoojoongButton.isChecked=false | ||
53 | - mangijedaeButton.isChecked=false | ||
54 | - specialmanryoButton.isChecked=false | ||
55 | - specialbokmoosanupButton.isChecked=false | ||
56 | - specialbokmoojeonmoonButton.isChecked=false | ||
57 | - jedaeguitarButton.isChecked=false | ||
58 | - } | ||
59 | - mipilButton.setOnClickListener { | ||
60 | - nothingButton.isChecked=false | ||
61 | - myunjaeButton.isChecked=false | ||
62 | - jobsoldierButton.isChecked=false | ||
63 | - bokmoojoongButton.isChecked=false | ||
64 | - mangijedaeButton.isChecked=false | ||
65 | - specialmanryoButton.isChecked=false | ||
66 | - specialbokmoosanupButton.isChecked=false | ||
67 | - specialbokmoojeonmoonButton.isChecked=false | ||
68 | - jedaeguitarButton.isChecked=false | ||
69 | - } | ||
70 | - myunjaeButton.setOnClickListener { | ||
71 | - nothingButton.isChecked=false | ||
72 | - mipilButton.isChecked=false | ||
73 | - jobsoldierButton.isChecked=false | ||
74 | - bokmoojoongButton.isChecked=false | ||
75 | - mangijedaeButton.isChecked=false | ||
76 | - specialmanryoButton.isChecked=false | ||
77 | - specialbokmoosanupButton.isChecked=false | ||
78 | - specialbokmoojeonmoonButton.isChecked=false | ||
79 | - jedaeguitarButton.isChecked=false | ||
80 | - } | ||
81 | - jobsoldierButton.setOnClickListener { | ||
82 | - nothingButton.isChecked=false | ||
83 | - mipilButton.isChecked=false | ||
84 | - myunjaeButton.isChecked=false | ||
85 | - bokmoojoongButton.isChecked=false | ||
86 | - mangijedaeButton.isChecked=false | ||
87 | - specialmanryoButton.isChecked=false | ||
88 | - specialbokmoosanupButton.isChecked=false | ||
89 | - specialbokmoojeonmoonButton.isChecked=false | ||
90 | - jedaeguitarButton.isChecked=false | ||
91 | - } | ||
92 | - bokmoojoongButton.setOnClickListener { | ||
93 | - nothingButton.isChecked=false | ||
94 | - mipilButton.isChecked=false | ||
95 | - myunjaeButton.isChecked=false | ||
96 | - jobsoldierButton.isChecked=false | ||
97 | - mangijedaeButton.isChecked=false | ||
98 | - specialmanryoButton.isChecked=false | ||
99 | - specialbokmoosanupButton.isChecked=false | ||
100 | - specialbokmoojeonmoonButton.isChecked=false | ||
101 | - jedaeguitarButton.isChecked=false | ||
102 | - } | ||
103 | - mangijedaeButton.setOnClickListener { | ||
104 | - nothingButton.isChecked=false | ||
105 | - mipilButton.isChecked=false | ||
106 | - myunjaeButton.isChecked=false | ||
107 | - jobsoldierButton.isChecked=false | ||
108 | - bokmoojoongButton.isChecked=false | ||
109 | - specialmanryoButton.isChecked=false | ||
110 | - specialbokmoosanupButton.isChecked=false | ||
111 | - specialbokmoojeonmoonButton.isChecked=false | ||
112 | - jedaeguitarButton.isChecked=false | ||
113 | - } | ||
114 | - specialmanryoButton.setOnClickListener { | ||
115 | - nothingButton.isChecked=false | ||
116 | - mipilButton.isChecked=false | ||
117 | - myunjaeButton.isChecked=false | ||
118 | - jobsoldierButton.isChecked=false | ||
119 | - bokmoojoongButton.isChecked=false | ||
120 | - mangijedaeButton.isChecked=false | ||
121 | - specialbokmoosanupButton.isChecked=false | ||
122 | - specialbokmoojeonmoonButton.isChecked=false | ||
123 | - jedaeguitarButton.isChecked=false | ||
124 | - } | ||
125 | - specialbokmoosanupButton.setOnClickListener { | ||
126 | - nothingButton.isChecked=false | ||
127 | - mipilButton.isChecked=false | ||
128 | - myunjaeButton.isChecked=false | ||
129 | - jobsoldierButton.isChecked=false | ||
130 | - bokmoojoongButton.isChecked=false | ||
131 | - mangijedaeButton.isChecked=false | ||
132 | - specialmanryoButton.isChecked=false | ||
133 | - specialbokmoojeonmoonButton.isChecked=false | ||
134 | - jedaeguitarButton.isChecked=false | ||
135 | - } | ||
136 | - specialbokmoojeonmoonButton.setOnClickListener { | ||
137 | - nothingButton.isChecked=false | ||
138 | - mipilButton.isChecked=false | ||
139 | - myunjaeButton.isChecked=false | ||
140 | - jobsoldierButton.isChecked=false | ||
141 | - bokmoojoongButton.isChecked=false | ||
142 | - mangijedaeButton.isChecked=false | ||
143 | - specialmanryoButton.isChecked=false | ||
144 | - specialbokmoosanupButton.isChecked=false | ||
145 | - jedaeguitarButton.isChecked=false | ||
146 | - } | ||
147 | - jedaeguitarButton.setOnClickListener { | ||
148 | - nothingButton.isChecked=false | ||
149 | - mipilButton.isChecked=false | ||
150 | - myunjaeButton.isChecked=false | ||
151 | - jobsoldierButton.isChecked=false | ||
152 | - bokmoojoongButton.isChecked=false | ||
153 | - mangijedaeButton.isChecked=false | ||
154 | - specialmanryoButton.isChecked=false | ||
155 | - specialbokmoosanupButton.isChecked=false | ||
156 | - specialbokmoojeonmoonButton.isChecked=false | ||
157 | - } | ||
158 | - | ||
159 | } | 31 | } |
160 | } | 32 | } | ... | ... |
1 | package com.example.vip | 1 | package com.example.vip |
2 | 2 | ||
3 | -import android.content.Context | ||
4 | import android.content.Intent | 3 | import android.content.Intent |
5 | -import android.content.SharedPreferences | ||
6 | import androidx.appcompat.app.AppCompatActivity | 4 | import androidx.appcompat.app.AppCompatActivity |
7 | import android.os.Bundle | 5 | import android.os.Bundle |
8 | -import android.view.View.GONE | ||
9 | -import android.view.View.VISIBLE | ||
10 | import kotlinx.android.synthetic.main.activity_input_profil_third_two.* | 6 | import kotlinx.android.synthetic.main.activity_input_profil_third_two.* |
11 | 7 | ||
12 | class InputProfilThirdTwoActivity : AppCompatActivity() { | 8 | class InputProfilThirdTwoActivity : AppCompatActivity() { |
... | @@ -28,48 +24,9 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { | ... | @@ -28,48 +24,9 @@ class InputProfilThirdTwoActivity : AppCompatActivity() { |
28 | startActivity(intent) | 24 | startActivity(intent) |
29 | } | 25 | } |
30 | 26 | ||
31 | - val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE) | ||
32 | - val editor: SharedPreferences.Editor=prof.edit() | ||
33 | - | ||
34 | nextButton.setOnClickListener { | 27 | nextButton.setOnClickListener { |
35 | - if(companyButton.isChecked){ editor.putInt("c5_6",1); editor.commit()} | ||
36 | - if(workerButton.isChecked){ editor.putInt("c5_7",1); editor.commit()} | ||
37 | - if(entireButton.isChecked){ editor.putInt("c5_9",1); editor.commit()} | ||
38 | - if(startupButton.isChecked){ editor.putInt("c5_5",1); editor.commit()} | ||
39 | - if(seekButton.isChecked){ editor.putInt("c5_5",1); editor.commit()} | ||
40 | - //창업예정자랑 취준생이랑 같은 카테고리 맞음???? | ||
41 | - | ||
42 | var intent = Intent(this, InputProfilThirdThreeActivity::class.java) | 28 | var intent = Intent(this, InputProfilThirdThreeActivity::class.java) |
43 | startActivity(intent) | 29 | startActivity(intent) |
44 | } | 30 | } |
45 | - | ||
46 | - jobButton.setOnClickListener { | ||
47 | - nojobButton.isChecked=false | ||
48 | - sixoneLayout.visibility=VISIBLE | ||
49 | - sixtwoLayout.visibility= GONE | ||
50 | - } | ||
51 | - nojobButton.setOnClickListener { | ||
52 | - jobButton.isChecked=false | ||
53 | - sixoneLayout.visibility=GONE | ||
54 | - sixtwoLayout.visibility= VISIBLE | ||
55 | - } | ||
56 | - companyButton.setOnClickListener { | ||
57 | - workerButton.isChecked=false | ||
58 | - } | ||
59 | - workerButton.setOnClickListener { | ||
60 | - companyButton.isChecked=false | ||
61 | - } | ||
62 | - entireButton.setOnClickListener { | ||
63 | - startupButton.isChecked=false | ||
64 | - seekButton.isChecked=false | ||
65 | - } | ||
66 | - startupButton.setOnClickListener { | ||
67 | - entireButton.isChecked=false | ||
68 | - seekButton.isChecked=false | ||
69 | - } | ||
70 | - seekButton.setOnClickListener { | ||
71 | - entireButton.isChecked=false | ||
72 | - startupButton.isChecked=false | ||
73 | - } | ||
74 | } | 31 | } |
75 | } | 32 | } | ... | ... |
... | @@ -26,9 +26,6 @@ class MainActivity : AppCompatActivity() { | ... | @@ -26,9 +26,6 @@ class MainActivity : AppCompatActivity() { |
26 | 26 | ||
27 | override fun onCreate(savedInstanceState: Bundle?) { | 27 | override fun onCreate(savedInstanceState: Bundle?) { |
28 | super.onCreate(savedInstanceState) | 28 | super.onCreate(savedInstanceState) |
29 | - | ||
30 | - | ||
31 | - | ||
32 | //onboarding start | 29 | //onboarding start |
33 | 30 | ||
34 | //onboarding end | 31 | //onboarding end | ... | ... |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import kotlinx.android.synthetic.main.activity_notice.* | ||
7 | + | ||
8 | +class NoticeActivity : AppCompatActivity() { | ||
9 | + | ||
10 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
11 | + super.onCreate(savedInstanceState) | ||
12 | + setContentView(R.layout.activity_notice) | ||
13 | + | ||
14 | + | ||
15 | + } | ||
16 | +} |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import android.webkit.WebView | ||
7 | +import kotlinx.android.synthetic.main.activity_privacy_policy.* | ||
8 | + | ||
9 | +class PrivacyPolicyActivity : AppCompatActivity() { | ||
10 | + | ||
11 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
12 | + super.onCreate(savedInstanceState) | ||
13 | + setContentView(R.layout.activity_privacy_policy) | ||
14 | + | ||
15 | + val web : WebView = findViewById(R.id.privacy) | ||
16 | + val summary = "<Wello> 개인정보 처리방침\n" + | ||
17 | + "\n" + | ||
18 | + " <Wello>는 개인정보 보호법 제30조에 따라 정보주체의 개인정보를 보호하고 이와 관련한 고충을 신속하고 원활하게 처리할 수 있도록 하기 위하여 다음과 같이 개인정보 처리지침을 수립․공개합니다. \n" + | ||
19 | + "\n" + | ||
20 | + "제1조(개인정보의 처리목적) Wello는 다음의 목적을 위하여 개인정보를 처리합니다. 처리하고 있는 개인정보는 다음의 목적 이외의 용도로는 이용되지 않으며, 이용 목적이 변경되는 경우에는 개인정보 보호법 제18조에 따라 별도의 동의를 받는 등 필요한 조치를 이행할 예정입니다. \n" + | ||
21 | + "\n" + | ||
22 | + " 1. 홈페이지 회원 가입 및 관리 \n" + | ||
23 | + " 회원 가입의사 확인, 회원제 서비스 제공에 따른 본인 식별․인증, 회원자격 유지․관리, 제한적 본인확인제 시행에 따른 본인확인, 서비스 부정이용 방지, 만 14세 미만 아동의 개인정보 처리시 법정대리인의 동의여부 확인, 각종 고지․통지, 고충처리 등을 목적으로 개인정보를 처리합니다. \n" + | ||
24 | + " 2. 재화 또는 서비스 제공 \n" + | ||
25 | + " 서비스 제공, 계약서․청구서 발송, 콘텐츠 제공, 맞춤서비스 제공, 본인인증, 연령인증 등을 목적으로 개인정보를 처리합니다. \n" + | ||
26 | + " 3. 회원정보\t\n" + | ||
27 | + " 근거: 사회보장급여의 이용.제공 및 수급권자 발굴에 관한 법률 제25조(대국민포털 구축 등), 동법 시행령 27조(민감정보 및 고유식별정보 처리)\n" + | ||
28 | + " 목적: 개인별 맞춤형 복지서비스 정보 등 회원제 서비스 이용, 복지서비스 상세 검색 이력 저장 및 확인\n" + | ||
29 | + " 4. 고충처리 \n" + | ||
30 | + " 민원인의 신원 확인, 민원사항 확인, 사실조사를 위한 연락․통지, 처리결과 통보 등의 목적으로 개인정보를 처리합니다. \n" + | ||
31 | + "\n" + | ||
32 | + "\n" + | ||
33 | + "\n" + | ||
34 | + "\n" + | ||
35 | + "\n" + | ||
36 | + "\n" + | ||
37 | + " 제2조(개인정보의 처리 및 보유기간) ① Wello는 법령에 따른 개인정보 보유․이용기간 또는 정보주체로부터 개인정보를 수집시에 동의받은 개인정보 보유․이용기간 내에서 개인정보를 처리․보유합니다. \n" + | ||
38 | + "\n" + | ||
39 | + " ② 각각의 개인정보 처리 및 보유 기간은 다음과 같습니다. \n" + | ||
40 | + "\n" + | ||
41 | + " 1. 홈페이지 회원 가입 및 관리 : 사업자/단체 홈페이지 탈퇴시까지 \n" + | ||
42 | + " 다만, 다음의 사유에 해당하는 경우에는 해당 사유 종료 시까지 \n" + | ||
43 | + " 1) 관계 법령 위반에 따른 수사․조사 등이 진행 중인 경우에는 해당 수사․조사 종료 시까지 \n" + | ||
44 | + " 2) 홈페이지 이용에 따른 채권․채무관계 잔존 시에는 해당 채권․채무관계 정산 시까지 \n" + | ||
45 | + "\n" + | ||
46 | + " 2. 재화 또는 서비스 제공 : 재화․서비스 공급완료 및 요금결제․정산 완료시까지\n" + | ||
47 | + " 다만, 다음의 사유에 해당하는 경우에는 해당 기간 종료 시까지 \n" + | ||
48 | + " 1) 「전자상거래 등에서의 소비자 보호에 관한 법률」에 따른 표시․광고, 계약내용 및 이행 등 거래에 관한 기록 \n" + | ||
49 | + " - 표시․광고에 관한 기록 : 6월 \n" + | ||
50 | + " - 계약 또는 청약철회, 대금결제, 재화 등의 공급기록 : 5년 \n" + | ||
51 | + " - 소비자 불만 또는 분쟁처리에 관한 기록 : 3년 \n" + | ||
52 | + " 2) 「통신비밀보호법」제41조에 따른 통신사실확인자료 보관\n" + | ||
53 | + " - 가입자 전기통신일시, 개시․종료시간, 상대방 가입자번호, 사용도수, 발신기지국 위치추적자료 : 1년 \n" + | ||
54 | + " - 컴퓨터통신, 인터넷 로그기록자료, 접속지 추적자료 : 3개월\n" + | ||
55 | + "\n" + | ||
56 | + " 제3조(정보주체의 권리․의무 및 행사방법) ① 정보주체는 Wello에 대해 언제든지 다음 각 호의 개인정보 보호 관련 권리를 행사할 수 있습니다. \n" + | ||
57 | + " 1. 개인정보 열람요구\n" + | ||
58 | + " 2. 오류 등이 있을 경우 정정 요구\n" + | ||
59 | + " 3. 삭제요구 \n" + | ||
60 | + " 4. 처리정지 요구 \n" + | ||
61 | + " ② 제1항에 따른 권리 행사는 Wello에 대해 서면, 전화, 전자우편, 모사전송(FAX) 등을 통하여 하실 수 있으며 Wello는 이에 대해 지체없이 조치하겠습니다. \n" + | ||
62 | + " ③ 정보주체가 개인정보의 오류 등에 대한 정정 또는 삭제를 요구한 경우에는 Wello는 정정 또는 삭제를 완료할 때까지 당해 개인정보를 이용하거나 제공하지 않습니다. \n" + | ||
63 | + " ④ 제1항에 따른 권리 행사는 정보주체의 법정대리인이나 위임을 받은 자 등 대리인을 통하여 하실 수 있습니다. 이 경우 개인정보 보호법 시행규칙 별지 제11호 서식에 따른 위임장을 제출하셔야 합니다. \n" + | ||
64 | + " ⑤ 정보주체는 개인정보 보호법 등 관계법령을 위반하여 Wello가 처리하고 있는 정보주체 본인이나 타인의 개인정보 및 사생활을 침해하여서는 아니됩니다. \n" + | ||
65 | + "\n" + | ||
66 | + " 제4조(처리하는 개인정보 항목) Wello는 다음의 개인정보 항목을 처리하고 있습니다. \n" + | ||
67 | + " 1. 홈페이지 회원 가입 및 관리 \n" + | ||
68 | + " ․필수항목 : 생년월일, 아이디, 비밀번호, 주소, 전화번호, 성별, 이메일주소 \n" + | ||
69 | + " ․선택항목 : 결혼여부, 관심분야 \n" + | ||
70 | + "\n" + | ||
71 | + " 2. 재화 또는 서비스 제공 \n" + | ||
72 | + " ․필수항목 : 생년월일, 아이디, 성별, 주소(주거지)\n" + | ||
73 | + " ․선택항목 : 생년월일, 아이디, 성별, 주소(주거지), 가족구성원, 가구상황, 월평균소득, 건강보험료, 재산, 관심분야\n" + | ||
74 | + "\n" + | ||
75 | + " 3. 인터넷 서비스 이용과정에서 아래 개인정보 항목이 자동으로 생성되어 수집될 수 있습니다. \n" + | ||
76 | + " ․IP주소, 쿠키, MAC주소, 서비스 이용기록, 방문기록, 불량 이용기록 등 \n" + | ||
77 | + "\n" + | ||
78 | + " 제5조(개인정보의 파기) ① Wello는 개인정보 보유기간의 경과, 처리목적 달성 등 개인정보가 불필요하게 되었을 때에는 지체없이 해당 개인정보를 파기합니다. \n" + | ||
79 | + " ② 정보주체로부터 동의받은 개인정보 보유기간이 경과하거나 처리목적이 달성되었음에도 불구하고 다른 법령에 따라 개인정보를 계속 보존하여야 하는 경우에는, 해당 개인정보를 별도의 데이터베이스(DB)로 옮기거나 보관장소를 달리하여 보존합니다. \n" + | ||
80 | + " ③ 개인정보 파기의 절차 및 방법은 다음과 같습니다. \n" + | ||
81 | + " 1. 파기절차 \n" + | ||
82 | + " Wello는 파기 사유가 발생한 개인정보를 선정하고, Wello의 개인정보 보호책임자의 승인을 받아 개인정보를 파기합니다. \n" + | ||
83 | + " 2. 파기방법 \n" + | ||
84 | + " Wello는 전자적 파일 형태로 기록․저장된 개인정보는 기록을 재생할 수 없도록 로우레밸포멧(Low Level Format) 등의 방법을 이용하여 파기하며, 종이 문서에 기록․저장된 개인정보는 분쇄기로 분쇄하거나 소각하여 파기합니다. \n" + | ||
85 | + "\n" + | ||
86 | + " 제6조(개인정보의 안전성 확보조치) Wello는 개인정보의 안전성 확보를 위해 다음과 같은 조치를 취하고 있습니다. \n" + | ||
87 | + " 1. 관리적 조치 : 내부관리계획 수립․시행, 정기적 직원 교육 등 \n" + | ||
88 | + " 2. 기술적 조치 : 개인정보처리시스템 등의 접근권한 관리, 접근통제시스템 설치, 고유식별정보 등의 암호화, 보안프로그램 설치 \n" + | ||
89 | + " 3. 물리적 조치 : 전산실, 자료보관실 등의 접근통제 \n" + | ||
90 | + "\n" + | ||
91 | + " 제7조(개인정보 자동 수집 장치의 설치∙운영 및 거부에 관한 사항) \n" + | ||
92 | + " ① Wello는 이용자에게 개별적인 맞춤서비스를 제공하기 위해 이용정보를 저장하고 수시로 불러오는 ‘쿠키(cookie)’를 사용합니다.\n" + | ||
93 | + " ② 쿠키는 웹사이트를 운영하는데 이용되는 서버(http)가 이용자의 컴퓨터 브라우저에게 보내는 소량의 정보이며 이용자들의 PC 컴퓨터내의 하드디스크에 저장되기도 합니다.\n" + | ||
94 | + " 가. 쿠키의 사용목적: 이용자가 방문한 각 서비스와 웹 사이트들에 대한 방문 및 이용형태, 인기 검색어, 보안접속 여부, 등을 파악하여 이용자에게 최적화된 정보 제공을 위해 사용됩니다.\n" + | ||
95 | + " 나. 쿠키의 설치∙운영 및 거부 : 웹브라우저 상단의 도구>인터넷 옵션>개인정보 메뉴의 옵션 설정을 통해 쿠키 저장을 거부 할 수 있습니다.\n" + | ||
96 | + " 다. 쿠키 저장을 거부할 경우 맞춤형 서비스 이용에 어려움이 발생할 수 있습니다.\n" + | ||
97 | + "\n" + | ||
98 | + " 제8조(개인정보 보호책임자) ① Wello는 개인정보 처리에 관한 업무를 총괄해서 책임지고, 개인정보 처리와 관련한 정보주체의 불만처리 및 피해구제 등을 위하여 아래와 같이 개인정보 보호책임자를 지정하고 있습니다. \n" + | ||
99 | + " ▶ 개인정보 보호책임자 \n" + | ||
100 | + " 성명 : 김유리안나\n" + | ||
101 | + " 직책 : 대표자\n" + | ||
102 | + " 연락처 : <010-8248-7729>, <lady192@naver.com>\n" + | ||
103 | + " ※ 개인정보 보호 담당부서로 연결됩니다. \n" + | ||
104 | + "\n" + | ||
105 | + " 제9조(권익침해 구제방법) 정보주체는 아래의 기관에 대해 개인정보 침해에 대한 피해구제, 상담 등을 문의하실 수 있습니다. \n" + | ||
106 | + "\n" + | ||
107 | + " <아래의 기관은 Wello와는 별개의 기관으로서, Wello의 자체적인 개인정보 불만처리, 피해구제 결과에 만족하지 못하시거나 보다 자세한 도움이 필요하시면 문의하여 주시기 바랍니다>\n" + | ||
108 | + " \n" + | ||
109 | + " ▶ 개인정보 침해신고센터 (한국인터넷진흥원 운영) \n" + | ||
110 | + " - 소관업무 : 개인정보 침해사실 신고, 상담 신청 \n" + | ||
111 | + " - 홈페이지 : privacy.kisa.or.kr \n" + | ||
112 | + " - 전화 : (국번없이) 118 \n" + | ||
113 | + " - 주소 : (58324) 전남 나주시 진흥길 9(빛가람동 301-2) 3층 개인정보침해신고센터\n" + | ||
114 | + "\n" + | ||
115 | + " ▶ 개인정보 분쟁조정위원회\n" + | ||
116 | + " - 소관업무 : 개인정보 분쟁조정신청, 집단분쟁조정 (민사적 해결) \n" + | ||
117 | + " - 홈페이지 : www.kopico.go.kr \n" + | ||
118 | + " - 전화 : (국번없이) 1833-6972\n" + | ||
119 | + " - 주소 : (03171)서울특별시 종로구 세종대로 209 정부서울청사 4층\n" + | ||
120 | + "\n" + | ||
121 | + " ▶ 대검찰청 사이버범죄수사단 : 02-3480-3573 (www.spo.go.kr)\n" + | ||
122 | + "\n" + | ||
123 | + " ▶ 경찰청 사이버안전국 : 182 (http://cyberbureau.police.go.kr)\n" + | ||
124 | + "\n" + | ||
125 | + " 제10조(개인정보 처리방침 변경) ① 이 개인정보 처리방침은 20XX. X. X부터 적용됩니다.\n" + | ||
126 | + " ② 이전의 개인정보 처리방침은 아래에서 확인하실 수 있습니다. \n" + | ||
127 | + " - 20XX. X. X ~ 20XX. X. X 적용 (클릭) \n" + | ||
128 | + " - 20XX. X. X ~ 20XX. X. X 적용 (클릭) \n" | ||
129 | + web.loadData(summary, "text/html", "UTF-8") | ||
130 | + | ||
131 | + } | ||
132 | +} |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import kotlinx.android.synthetic.main.activity_push_alarm.* | ||
7 | + | ||
8 | +class PushInfoActivity : AppCompatActivity() { | ||
9 | + | ||
10 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
11 | + super.onCreate(savedInstanceState) | ||
12 | + setContentView(R.layout.activity_push_alarm) | ||
13 | + | ||
14 | + | ||
15 | + } | ||
16 | +} |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Context | ||
4 | +import android.view.LayoutInflater | ||
5 | +import android.view.View | ||
6 | +import android.view.ViewGroup | ||
7 | +import android.widget.ImageView | ||
8 | +import android.widget.TextView | ||
9 | +import androidx.core.view.isGone | ||
10 | +import androidx.recyclerview.widget.RecyclerView | ||
11 | +import kotlinx.android.synthetic.main.qna_rv_item.view.* | ||
12 | + | ||
13 | + | ||
14 | +class QnAAdapter : RecyclerView.Adapter<QnAAdapter.MainViewHolder>() { | ||
15 | + | ||
16 | + var items: MutableList<QnAItem> = mutableListOf( | ||
17 | + QnAItem("1. 버그가 있어요.", "\n사용 중에 버그를 발견하셨다면\n" + | ||
18 | + "‘wello.khu@gmail.com’을 통해 건의해주세요.\n" + | ||
19 | + "보다 나은 서비스를 제공하기 위해 늘 노력하는 wello팀이 되도록 노력하겠습니다.\n", "asdf"), | ||
20 | + QnAItem("2. 회원탈퇴는 어떻게 하나요?", "\n아래 메뉴를 통해 회원탈퇴가 가능합니다.\n" + | ||
21 | + "\n" + | ||
22 | + "홈 화면 오른쪽 하단의 \n" + | ||
23 | + "내 정보> 설정 > 계정설정 > 회원탈퇴 \n" + | ||
24 | + "\n" + | ||
25 | + "wello 서비스에 불편한 점을 느끼셨다면\n" + | ||
26 | + "회원탈퇴 경로 및 wello.khu@gmail.com를 통해 건의해주세요.\n" + | ||
27 | + "보다 나은 서비스를 제공하기 위해 늘 노력하는 wello팀이 되도록 노력하겠습니다.\n", "asdff"), | ||
28 | + QnAItem("3. 'Wello'가 무슨 뜻인가요?", "\n‘Wello’는 ‘복지(Welfare) + 안녕(Hello)’의 합성어로, \n" + | ||
29 | + "\n" + | ||
30 | + "1) 당신만을 위한 복지정보를 만날 수 있는 어플리케이션\n" + | ||
31 | + "2) 전국민의 복지의 안녕을 챙기는 어플리케이션\n" + | ||
32 | + "\n" + | ||
33 | + "이 되겠다는 Wello의 다짐을 담고 있습니다.\n", "asdff"), | ||
34 | + QnAItem("4. 'Wello'는 어떤 어플인가요?", "\nWello는 복지정책알림 통합 어플리케이션으로, 사용자에게 적합한 복지정책을 알려주는 서비스를 제공합니다. \n 주요 기능으로는 1) 프로필 정보 입력 2) 추천정책리스트 3) 정책 찜하기 4) 푸시알림 등이 있습니다.\n", "asdff"), | ||
35 | + QnAItem("5. 프로필정보를 왜 수집하나요?", "\n수집한 사용자의 프로필정보는 보다 정확한 복지정책을 추천하기 위해 사용됩니다.\n", "asdff"), | ||
36 | + QnAItem("6. 추천정책리스트는 어떤 서비스인가요?", "\n추천정책리스트를 통해 자신이 수혜 받을 수 있는 정책 정보를 한 눈에 확인할 수 있습니다.\n", "asdff"), | ||
37 | + QnAItem("7. 푸시 알림설정/해제는 어떻게 하나요?", "\n아래 메뉴를 통해 푸시 알림설정/해제를 할 수 있습니다.\n" + | ||
38 | + "\n" + | ||
39 | + "홈 화면 오른쪽 하단의 \n" + | ||
40 | + "내 정보> 설정> 푸시 알림> 찜한 목록 소식받기에서 설정/해제 가능합니다.\n", "asdff"), | ||
41 | + QnAItem("8. 푸시 알림은 어떤 내용인가요?", "\n‘사용자의 찜한 목록에 있는 정책의 마감일’과 ‘새로 업데이트된 정책’에 대한 내용이 알림으로 가게 됩니다.\n", "asdff"), | ||
42 | + QnAItem("9. 푸시 알림은 언제 받을 수 있나요?", "\n푸시 알림은 3일에 한 번씩, 9:00~18:00 사이에 보내드립니다.\n", "asdff"), | ||
43 | + QnAItem("10. 정책 찜하기는 어떤 기능인가요?", "\n마감일을 확인하고 싶은 정책, 좀 더 관심이 가는 정책 등 사용자가 한 번 더 확인하고 싶은 정책을 체크해두는 기능입니다.\n", "asdff"), | ||
44 | + | ||
45 | + QnAItem("11. 민간 복지서비스 등록은 어떻게 하나요?", "\n현재 서비스 준비 중에 있습니다.\n", "adffff")) | ||
46 | + | ||
47 | + override fun onCreateViewHolder(parent: ViewGroup, p1: Int) = MainViewHolder(parent) | ||
48 | + | ||
49 | + | ||
50 | + override fun getItemCount(): Int = items.size | ||
51 | + | ||
52 | + override fun onBindViewHolder(holer: MainViewHolder, position: Int) { | ||
53 | + items[position].let { item -> | ||
54 | + with(holer) { | ||
55 | + tvTitle.text = item.answer | ||
56 | + tvContent.text = item.question | ||
57 | + tvSecond.setOnClickListener{ | ||
58 | + tvTitle.setVisibility(View.GONE) | ||
59 | + } | ||
60 | + | ||
61 | +/* if (item.arrow != "") { | ||
62 | + val resourceId = context.resources.getIdentifier(dog.photo, "drawable", context.packageName) | ||
63 | + tvSecond?.setImageResource(resourceId) | ||
64 | + } else { | ||
65 | + tvSecond?.setImageResource(R.mipmap.ic_launcher) | ||
66 | + }*/ | ||
67 | + } | ||
68 | + } | ||
69 | + } | ||
70 | + | ||
71 | + inner class MainViewHolder(parent: ViewGroup) : RecyclerView.ViewHolder( | ||
72 | + LayoutInflater.from(parent.context).inflate(R.layout.qna_rv_item, parent, false)) { | ||
73 | + val tvTitle = itemView.answerText | ||
74 | + val tvContent = itemView.questionText | ||
75 | + val tvSecond = itemView.bottomArrow | ||
76 | + } | ||
77 | +} | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import androidx.recyclerview.widget.LinearLayoutManager | ||
7 | +import kotlinx.android.synthetic.main.activity_questions.* | ||
8 | + | ||
9 | +var QnAList = arrayListOf<QnAItem>() | ||
10 | + | ||
11 | +class QuestionsActivity : AppCompatActivity() { | ||
12 | + | ||
13 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
14 | + super.onCreate(savedInstanceState) | ||
15 | + setContentView(R.layout.activity_questions) | ||
16 | + | ||
17 | + qna_rv.adapter = QnAAdapter() | ||
18 | + qna_rv.layoutManager = LinearLayoutManager(this) | ||
19 | + | ||
20 | + } | ||
21 | +} |
... | @@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() { | ... | @@ -61,7 +61,7 @@ class RecommendActivity : AppCompatActivity() { |
61 | policyList.add( | 61 | policyList.add( |
62 | PolicyItem( | 62 | PolicyItem( |
63 | ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, | 63 | ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, |
64 | - memo!!.Policy, | 64 | + "상시", |
65 | memo!!.Policy, | 65 | memo!!.Policy, |
66 | memo!!.Policy, | 66 | memo!!.Policy, |
67 | 4.toFloat(), | 67 | 4.toFloat(), |
... | @@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() { | ... | @@ -89,7 +89,7 @@ class RecommendActivity : AppCompatActivity() { |
89 | policyList.add( | 89 | policyList.add( |
90 | PolicyItem( | 90 | PolicyItem( |
91 | ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, | 91 | ContextCompat.getDrawable(this@RecommendActivity, R.drawable.image01)!!, |
92 | - memo!!.Policy, | 92 | + "상시", |
93 | memo!!.Policy, | 93 | memo!!.Policy, |
94 | memo!!.Policy, | 94 | memo!!.Policy, |
95 | 4.toFloat(), | 95 | 4.toFloat(), |
... | @@ -98,6 +98,7 @@ class RecommendActivity : AppCompatActivity() { | ... | @@ -98,6 +98,7 @@ class RecommendActivity : AppCompatActivity() { |
98 | ) | 98 | ) |
99 | ) | 99 | ) |
100 | } | 100 | } |
101 | + | ||
101 | val adapter = PolicyAdapter(policyList) | 102 | val adapter = PolicyAdapter(policyList) |
102 | policyRecyclerView.adapter = adapter | 103 | policyRecyclerView.adapter = adapter |
103 | } | 104 | } | ... | ... |
... | @@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() { | ... | @@ -66,10 +66,12 @@ class SearchActivity : AppCompatActivity() { |
66 | } | 66 | } |
67 | override fun onDataChange(dataSnapshot: DataSnapshot) { | 67 | override fun onDataChange(dataSnapshot: DataSnapshot) { |
68 | if (dataSnapshot.exists() == false){ // 값 없을 때 | 68 | if (dataSnapshot.exists() == false){ // 값 없을 때 |
69 | + policy_scroll_view.setVisibility(View.GONE) | ||
69 | no_search.setVisibility(View.VISIBLE) | 70 | no_search.setVisibility(View.VISIBLE) |
70 | } | 71 | } |
71 | else { | 72 | else { |
72 | no_search.setVisibility(View.GONE) | 73 | no_search.setVisibility(View.GONE) |
74 | + policy_scroll_view.setVisibility(View.VISIBLE) | ||
73 | } | 75 | } |
74 | 76 | ||
75 | for (memoSnapshot in dataSnapshot.children){ | 77 | for (memoSnapshot in dataSnapshot.children){ | ... | ... |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import kotlinx.android.synthetic.main.activity_settings_in_form.* | ||
7 | + | ||
8 | +class SettingsInForm : AppCompatActivity() { | ||
9 | + | ||
10 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
11 | + super.onCreate(savedInstanceState) | ||
12 | + setContentView(R.layout.activity_settings_in_form) | ||
13 | + | ||
14 | + accountBtn.setOnClickListener { | ||
15 | + var intent = Intent(this, AccountSettingActivity::class.java) | ||
16 | + startActivity(intent) | ||
17 | + } | ||
18 | + | ||
19 | + info_push.setOnClickListener { | ||
20 | + var intent = Intent(this, PushInfoActivity::class.java) | ||
21 | + startActivity(intent) | ||
22 | + // 설정 눌렀을 때 | ||
23 | + } | ||
24 | + terms_of_use.setOnClickListener{ | ||
25 | + var intent = Intent(this, TermsOfUserActivity::class.java) | ||
26 | + startActivity(intent) | ||
27 | + } | ||
28 | + } | ||
29 | +} |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import android.webkit.WebView | ||
7 | +import kotlinx.android.synthetic.main.activity_terms_detail.* | ||
8 | + | ||
9 | +class TermsDetailActivity : AppCompatActivity() { | ||
10 | + | ||
11 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
12 | + super.onCreate(savedInstanceState) | ||
13 | + setContentView(R.layout.activity_terms_detail) | ||
14 | + | ||
15 | + val web : WebView = findViewById(R.id.use_terms) | ||
16 | + val summary = "전자상거래(인터넷사이버몰) 표준약관\n" + | ||
17 | + "\n" + | ||
18 | + "\n" + | ||
19 | + "제1조(목적) 이 약관은 WELLO 회사(전자상거래 사업자)가 운영하는 WELLO 사이버 몰(이하 “몰”이라 한다)에서 제공하는 인터넷 관련 서비스(이하 “서비스”라 한다)를 이용함에 있어 사이버 몰과 이용자의 권리․의무 및 책임사항을 규정함을 목적으로 합니다.\n" + | ||
20 | + "\n" + | ||
21 | + " ※「PC통신, 무선 등을 이용하는 전자상거래에 대해서도 그 성질에 반하지 않는 한 이 약관을 준용합니다.」\n" + | ||
22 | + "\n" + | ||
23 | + "제2조(정의)\n" + | ||
24 | + "\n" + | ||
25 | + " ① “몰”이란 WELLO 회사가 재화 또는 용역(이하 “재화 등”이라 함)을 이용자에게 제공하기 위하여 컴퓨터 등 정보통신설비를 이용하여 재화 등을 거래할 수 있도록 설정한 가상의 영업장을 말하며, 아울러 사이버몰을 운영하는 사업자의 의미로도 사용합니다.\n" + | ||
26 | + "\n" + | ||
27 | + " ② “이용자”란 “몰”에 접속하여 이 약관에 따라 “몰”이 제공하는 서비스를 받는 회원 및 비회원을 말합니다.\n" + | ||
28 | + "\n" + | ||
29 | + " ③ ‘회원’이라 함은 “몰”에 회원등록을 한 자로서, 계속적으로 “몰”이 제공하는 서비스를 이용할 수 있는 자를 말합니다.\n" + | ||
30 | + "\n" + | ||
31 | + " ④ ‘비회원’이라 함은 회원에 가입하지 않고 “몰”이 제공하는 서비스를 이용하는 자를 말합니다.\n" + | ||
32 | + "\n" + | ||
33 | + "제3조 (약관 등의 명시와 설명 및 개정) \n" + | ||
34 | + "\n" + | ||
35 | + " ① “몰”은 이 약관의 내용과 상호 및 대표자 성명, 영업소 소재지 주소(소비자의 불만을 처리할 수 있는 곳의 주소를 포함), 전화번호․모사전송번호․전자우편주소, 사업자등록번호, 통신판매업 신고번호, 개인정보관리책임자등을 이용자가 쉽게 알 수 있도록 WELLO 사이버몰의 초기 서비스화면(전면)에 게시합니다. 다만, 약관의 내용은 이용자가 연결화면을 통하여 볼 수 있도록 할 수 있습니다.\n" + | ||
36 | + "\n" + | ||
37 | + " ② “몰은 이용자가 약관에 동의하기에 앞서 약관에 정하여져 있는 내용 중 청약철회․배송책임․환불조건 등과 같은 중요한 내용을 이용자가 이해할 수 있도록 별도의 연결화면 또는 팝업화면 등을 제공하여 이용자의 확인을 구하여야 합니다.\n" + | ||
38 | + "\n" + | ||
39 | + " ③ “몰”은 「전자상거래 등에서의 소비자보호에 관한 법률」, 「약관의 규제에 관한 법률」, 「전자문서 및 전자거래기본법」, 「전자금융거래법」, 「전자서명법」, 「정보통신망 이용촉진 및 정보보호 등에 관한 법률」, 「방문판매 등에 관한 법률」, 「소비자기본법」 등 관련 법을 위배하지 않는 범위에서 이 약관을 개정할 수 있습니다.\n" + | ||
40 | + "\n" + | ||
41 | + " ④ “몰”이 약관을 개정할 경우에는 적용일자 및 개정사유를 명시하여 현행약관과 함께 몰의 초기화면에 그 적용일자 7일 이전부터 적용일자 전일까지 공지합니다. 다만, 이용자에게 불리하게 약관내용을 변경하는 경우에는 최소한 30일 이상의 사전 유예기간을 두고 공지합니다. 이 경우 \"몰“은 개정 전 내용과 개정 후 내용을 명확하게 비교하여 이용자가 알기 쉽도록 표시합니다. \n" + | ||
42 | + "\n" + | ||
43 | + " ⑤ “몰”이 약관을 개정할 경우에는 그 개정약관은 그 적용일자 이후에 체결되는 계약에만 적용되고 그 이전에 이미 체결된 계약에 대해서는 개정 전의 약관조항이 그대로 적용됩니다. 다만 이미 계약을 체결한 이용자가 개정약관 조항의 적용을 받기를 원하는 뜻을 제3항에 의한 개정약관의 공지기간 내에 “몰”에 송신하여 “몰”의 동의를 받은 경우에는 개정약관 조항이 적용됩니다.\n" + | ||
44 | + "\n" + | ||
45 | + " ⑥ 이 약관에서 정하지 아니한 사항과 이 약관의 해석에 관하여는 전자상거래 등에서의 소비자보호에 관한 법률, 약관의 규제 등에 관한 법률, 공정거래위원회가 정하는 전자상거래 등에서의 소비자 보호지침 및 관계법령 또는 상관례에 따릅니다.\n" + | ||
46 | + "\n" + | ||
47 | + "제4조(서비스의 제공 및 변경) \n" + | ||
48 | + "\n" + | ||
49 | + " ① “몰”은 다음과 같은 업무를 수행합니다.\n" + | ||
50 | + "\n" + | ||
51 | + " 1. 재화 또는 용역에 대한 정보 제공 및 구매계약의 체결\n" + | ||
52 | + " 2. 구매계약이 체결된 재화 또는 용역의 배송\n" + | ||
53 | + " 3. 기타 “몰”이 정하는 업무\n" + | ||
54 | + "\n" + | ||
55 | + " ② “몰”은 재화 또는 용역의 품절 또는 기술적 사양의 변경 등의 경우에는 장차 체결되는 계약에 의해 제공할 재화 또는 용역의 내용을 변경할 수 있습니다. 이 경우에는 변경된 재화 또는 용역의 내용 및 제공일자를 명시하여 현재의 재화 또는 용역의 내용을 게시한 곳에 즉시 공지합니다.\n" + | ||
56 | + "\n" + | ||
57 | + " ③ “몰”이 제공하기로 이용자와 계약을 체결한 서비스의 내용을 재화등의 품절 또는 기술적 사양의 변경 등의 사유로 변경할 경우에는 그 사유를 이용자에게 통지 가능한 주소로 즉시 통지합니다.\n" + | ||
58 | + "\n" + | ||
59 | + " ④ 전항의 경우 “몰”은 이로 인하여 이용자가 입은 손해를 배상합니다. 다만, “몰”이 고의 또는 과실이 없음을 입증하는 경우에는 그러하지 아니합니다.\n" + | ||
60 | + "\n" + | ||
61 | + "제5조(서비스의 중단) \n" + | ||
62 | + "\n" + | ||
63 | + " ① “몰”은 컴퓨터 등 정보통신설비의 보수점검․교체 및 고장, 통신의 두절 등의 사유가 발생한 경우에는 서비스의 제공을 일시적으로 중단할 수 있습니다.\n" + | ||
64 | + "\n" + | ||
65 | + " ② “몰”은 제1항의 사유로 서비스의 제공이 일시적으로 중단됨으로 인하여 이용자 또는 제3자가 입은 손해에 대하여 배상합니다. 단, “몰”이 고의 또는 과실이 없음을 입증하는 경우에는 그러하지 아니합니다.\n" + | ||
66 | + "\n" + | ||
67 | + " ③ 사업종목의 전환, 사업의 포기, 업체 간의 통합 등의 이유로 서비스를 제공할 수 없게 되는 경우에는 “몰”은 제8조에 정한 방법으로 이용자에게 통지하고 당초 “몰”에서 제시한 조건에 따라 소비자에게 보상합니다. 다만, “몰”이 보상기준 등을 고지하지 아니한 경우에는 이용자들의 마일리지 또는 적립금 등을 “몰”에서 통용되는 통화가치에 상응하는 현물 또는 현금으로 이용자에게 지급합니다.\n" + | ||
68 | + "\n" + | ||
69 | + "제6조(회원가입) \n" + | ||
70 | + "\n" + | ||
71 | + " ① 이용자는 “몰”이 정한 가입 양식에 따라 회원정보를 기입한 후 이 약관에 동의한다는 의사표시를 함으로서 회원가입을 신청합니다.\n" + | ||
72 | + "\n" + | ||
73 | + " ② “몰”은 제1항과 같이 회원으로 가입할 것을 신청한 이용자 중 다음 각 호에 해당하지 않는 한 회원으로 등록합니다.\n" + | ||
74 | + "\n" + | ||
75 | + " 1. 가입신청자가 이 약관 제7조제3항에 의하여 이전에 회원자격을 상실한 적이 있는 경우, 다만 제7조제3항에 의한 회원자격 상실 후 3년이 경과한 자로서 “몰”의 회원재가입 승낙을 얻은 경우에는 예외로 한다.\n" + | ||
76 | + " 2. 등록 내용에 허위, 기재누락, 오기가 있는 경우\n" + | ||
77 | + " 3. 기타 회원으로 등록하는 것이 “몰”의 기술상 현저히 지장이 있다고 판단되는 경우\n" + | ||
78 | + "\n" + | ||
79 | + " ③ 회원가입계약의 성립 시기는 “몰”의 승낙이 회원에게 도달한 시점으로 합니다.\n" + | ||
80 | + "\n" + | ||
81 | + " ④ 회원은 회원가입 시 등록한 사항에 변경이 있는 경우, 상당한 기간 이내에 “몰”에 대하여 회원정보 수정 등의 방법으로 그 변경사항을 알려야 합니다.\n" + | ||
82 | + "\n" + | ||
83 | + "제7조(회원 탈퇴 및 자격 상실 등) \n" + | ||
84 | + "\n" + | ||
85 | + " ① 회원은 “몰”에 언제든지 탈퇴를 요청할 수 있으며 “몰”은 즉시 회원탈퇴를 처리합니다.\n" + | ||
86 | + "\n" + | ||
87 | + " ② 회원이 다음 각 호의 사유에 해당하는 경우, “몰”은 회원자격을 제한 및 정지시킬 수 있습니다.\n" + | ||
88 | + "\n" + | ||
89 | + " 1. 가입 신청 시에 허위 내용을 등록한 경우\n" + | ||
90 | + " 2. “몰”을 이용하여 구입한 재화 등의 대금, 기타 “몰”이용에 관련하여 회원이 부담하는 채무를 기일에 지급하지 않는 경우\n" + | ||
91 | + " 3. 다른 사람의 “몰” 이용을 방해하거나 그 정보를 도용하는 등 전자상거래 질서를 위협하는 경우\n" + | ||
92 | + " 4. “몰”을 이용하여 법령 또는 이 약관이 금지하거나 공서양속에 반하는 행위를 하는 경우\n" + | ||
93 | + "\n" + | ||
94 | + " ③ “몰”이 회원 자격을 제한․정지 시킨 후, 동일한 행위가 2회 이상 반복되거나 30일 이내에 그 사유가 시정되지 아니하는 경우 “몰”은 회원자격을 상실시킬 수 있습니다.\n" + | ||
95 | + "\n" + | ||
96 | + " ④ “몰”이 회원자격을 상실시키는 경우에는 회원등록을 말소합니다. 이 경우 회원에게 이를 통지하고, 회원등록 말소 전에 최소한 30일 이상의 기간을 정하여 소명할 기회를 부여합니다.\n" + | ||
97 | + "\n" + | ||
98 | + "제8조(회원에 대한 통지)\n" + | ||
99 | + "\n" + | ||
100 | + " ① “몰”이 회원에 대한 통지를 하는 경우, 회원이 “몰”과 미리 약정하여 지정한 전자우편 주소로 할 수 있습니다.\n" + | ||
101 | + "\n" + | ||
102 | + " ② “몰”은 불특정다수 회원에 대한 통지의 경우 1주일이상 “몰” 게시판에 게시함으로서 개별 통지에 갈음할 수 있습니다. 다만, 회원 본인의 거래와 관련하여 중대한 영향을 미치는 사항에 대하여는 개별통지를 합니다.\n" + | ||
103 | + "\n" + | ||
104 | + "제9조(구매신청 및 개인정보 제공 동의 등) \n" + | ||
105 | + "\n" + | ||
106 | + " ① “몰”이용자는 “몰”상에서 다음 또는 이와 유사한 방법에 의하여 구매를 신청하며, “몰”은 이용자가 구매신청을 함에 있어서 다음의 각 내용을 알기 쉽게 제공하여야 합니다. \n" + | ||
107 | + " 1. 재화 등의 검색 및 선택\n" + | ||
108 | + " 2. 받는 사람의 성명, 주소, 전화번호, 전자우편주소(또는 이동전화번호) 등의 입력\n" + | ||
109 | + " 3. 약관내용, 청약철회권이 제한되는 서비스, 배송료․설치비 등의 비용부담과 관련한 내용에 대한 확인\n" + | ||
110 | + " 4. 이 약관에 동의하고 위 3.호의 사항을 확인하거나 거부하는 표시\n" + | ||
111 | + " (예, 마우스 클릭)\n" + | ||
112 | + " 5. 재화등의 구매신청 및 이에 관한 확인 또는 “몰”의 확인에 대한 동의\n" + | ||
113 | + " 6. 결제방법의 선택\n" + | ||
114 | + "\n" + | ||
115 | + " ② “몰”이 제3자에게 구매자 개인정보를 제공할 필요가 있는 경우 1) 개인정보를 제공받는 자, 2)개인정보를 제공받는 자의 개인정보 이용목적, 3) 제공하는 개인정보의 항목, 4) 개인정보를 제공받는 자의 개인정보 보유 및 이용기간을 구매자에게 알리고 동의를 받아야 합니다. (동의를 받은 사항이 변경되는 경우에도 같습니다.)\n" + | ||
116 | + "\n" + | ||
117 | + "\n" + | ||
118 | + " ③ “몰”이 제3자에게 구매자의 개인정보를 취급할 수 있도록 업무를 위탁하는 경우에는 1) 개인정보 취급위탁을 받는 자, 2) 개인정보 취급위탁을 하는 업무의 내용을 구매자에게 알리고 동의를 받아야 합니다. (동의를 받은 사항이 변경되는 경우에도 같습니다.) 다만, 서비스제공에 관한 계약이행을 위해 필요하고 구매자의 편의증진과 관련된 경우에는 「정보통신망 이용촉진 및 정보보호 등에 관한 법률」에서 정하고 있는 방법으로 개인정보 취급방침을 통해 알림으로써 고지절차와 동의절차를 거치지 않아도 됩니다.\n" + | ||
119 | + "\n" + | ||
120 | + "\n" + | ||
121 | + "제10조 (계약의 성립)\n" + | ||
122 | + "\n" + | ||
123 | + " ① “몰”은 제9조와 같은 구매신청에 대하여 다음 각 호에 해당하면 승낙하지 않을 수 있습니다. 다만, 미성년자와 계약을 체결하는 경우에는 법정대리인의 동의를 얻지 못하면 미성년자 본인 또는 법정대리인이 계약을 취소할 수 있다는 내용을 고지하여야 합니다.\n" + | ||
124 | + "\n" + | ||
125 | + " 1. 신청 내용에 허위, 기재누락, 오기가 있는 경우\n" + | ||
126 | + " 2. 미성년자가 담배, 주류 등 청소년보호법에서 금지하는 재화 및 용역을 구매하는 경우\n" + | ||
127 | + " 3. 기타 구매신청에 승낙하는 것이 “몰” 기술상 현저히 지장이 있다고 판단하는 경우\n" + | ||
128 | + "\n" + | ||
129 | + " ② “몰”의 승낙이 제12조제1항의 수신확인통지형태로 이용자에게 도달한 시점에 계약이 성립한 것으로 봅니다.\n" + | ||
130 | + "\n" + | ||
131 | + " ③ “몰”의 승낙의 의사표시에는 이용자의 구매 신청에 대한 확인 및 판매가능 여부, 구매신청의 정정 취소 등에 관한 정보 등을 포함하여야 합니다.\n" + | ||
132 | + "\n" + | ||
133 | + "제11조(지급방법) “몰”에서 구매한 재화 또는 용역에 대한 대금지급방법은 다음 각 호의 방법중 가용한 방법으로 할 수 있습니다. 단, “몰”은 이용자의 지급방법에 대하여 재화 등의 대금에 어떠한 명목의 수수료도 추가하여 징수할 수 없습니다.\n" + | ||
134 | + "\n" + | ||
135 | + " 1. 폰뱅킹, 인터넷뱅킹, 메일 뱅킹 등의 각종 계좌이체 \n" + | ||
136 | + " 2. 선불카드, 직불카드, 신용카드 등의 각종 카드 결제\n" + | ||
137 | + " 3. 온라인무통장입금\n" + | ||
138 | + " 4. 전자화폐에 의한 결제\n" + | ||
139 | + " 5. 수령 시 대금지급\n" + | ||
140 | + " 6. 마일리지 등 “몰”이 지급한 포인트에 의한 결제\n" + | ||
141 | + " 7. “몰”과 계약을 맺었거나 “몰”이 인정한 상품권에 의한 결제 \n" + | ||
142 | + " 8. 기타 전자적 지급 방법에 의한 대금 지급 등\n" + | ||
143 | + "\n" + | ||
144 | + "제12조(수신확인통지․구매신청 변경 및 취소)\n" + | ||
145 | + "\n" + | ||
146 | + " ① “몰”은 이용자의 구매신청이 있는 경우 이용자에게 수신확인통지를 합니다.\n" + | ||
147 | + "\n" + | ||
148 | + " ② 수신확인통지를 받은 이용자는 의사표시의 불일치 등이 있는 경우에는 수신확인통지를 받은 후 즉시 구매신청 변경 및 취소를 요청할 수 있고 “몰”은 배송 전에 이용자의 요청이 있는 경우에는 지체 없이 그 요청에 따라 처리하여야 합니다. 다만 이미 대금을 지불한 경우에는 제15조의 청약철회 등에 관한 규정에 따릅니다.\n" + | ||
149 | + "\n" + | ||
150 | + "제13조(재화 등의 공급)\n" + | ||
151 | + "\n" + | ||
152 | + " ① “몰”은 이용자와 재화 등의 공급시기에 관하여 별도의 약정이 없는 이상, 이용자가 청약을 한 날부터 7일 이내에 재화 등을 배송할 수 있도록 주문제작, 포장 등 기타의 필요한 조치를 취합니다. 다만, “몰”이 이미 재화 등의 대금의 전부 또는 일부를 받은 경우에는 대금의 전부 또는 일부를 받은 날부터 3영업일 이내에 조치를 취합니다. 이때 “몰”은 이용자가 재화 등의 공급 절차 및 진행 사항을 확인할 수 있도록 적절한 조치를 합니다.\n" + | ||
153 | + "\n" + | ||
154 | + " ② “몰”은 이용자가 구매한 재화에 대해 배송수단, 수단별 배송비용 부담자, 수단별 배송기간 등을 명시합니다. 만약 “몰”이 약정 배송기간을 초과한 경우에는 그로 인한 이용자의 손해를 배상하여야 합니다. 다만 “몰”이 고의․과실이 없음을 입증한 경우에는 그러하지 아니합니다.\n" + | ||
155 | + "\n" + | ||
156 | + "제14조(환급) “몰”은 이용자가 구매신청한 재화 등이 품절 등의 사유로 인도 또는 제공을 할 수 없을 때에는 지체 없이 그 사유를 이용자에게 통지하고 사전에 재화 등의 대금을 받은 경우에는 대금을 받은 날부터 3영업일 이내에 환급하거나 환급에 필요한 조치를 취합니다.\n" + | ||
157 | + "\n" + | ||
158 | + "제15조(청약철회 등)\n" + | ||
159 | + "\n" + | ||
160 | + " ① “몰”과 재화등의 구매에 관한 계약을 체결한 이용자는 「전자상거래 등에서의 소비자보호에 관한 법률」 제13조 제2항에 따른 계약내용에 관한 서면을 받은 날(그 서면을 받은 때보다 재화 등의 공급이 늦게 이루어진 경우에는 재화 등을 공급받거나 재화 등의 공급이 시작된 날을 말합니다)부터 7일 이내에는 청약의 철회를 할 수 있습니다. 다만, 청약철회에 관하여 「전자상거래 등에서의 소비자보호에 관한 법률」에 달리 정함이 있는 경우에는 동 법 규정에 따릅니다. \n" + | ||
161 | + "\n" + | ||
162 | + " ② 이용자는 재화 등을 배송 받은 경우 다음 각 호의 1에 해당하는 경우에는 반품 및 교환을 할 수 없습니다.\n" + | ||
163 | + "\n" + | ||
164 | + " 1. 이용자에게 책임 있는 사유로 재화 등이 멸실 또는 훼손된 경우(다만, 재화 등의 내용을 확인하기 위하여 포장 등을 훼손한 경우에는 청약철회를 할 수 있습니다)\n" + | ||
165 | + " 2. 이용자의 사용 또는 일부 소비에 의하여 재화 등의 가치가 현저히 감소한 경우\n" + | ||
166 | + " 3. 시간의 경과에 의하여 재판매가 곤란할 정도로 재화등의 가치가 현저히 감소한 경우\n" + | ||
167 | + " 4. 같은 성능을 지닌 재화 등으로 복제가 가능한 경우 그 원본인 재화 등의 포장을 훼손한 경우\n" + | ||
168 | + "\n" + | ||
169 | + " ③ 제2항제2호 내지 제4호의 경우에 “몰”이 사전에 청약철회 등이 제한되는 사실을 소비자가 쉽게 알 수 있는 곳에 명기하거나 시용상품을 제공하는 등의 조치를 하지 않았다면 이용자의 청약철회 등이 제한되지 않습니다.\n" + | ||
170 | + "\n" + | ||
171 | + " ④ 이용자는 제1항 및 제2항의 규정에 불구하고 재화 등의 내용이 표시·광고 내용과 다르거나 계약내용과 다르게 이행된 때에는 당해 재화 등을 공급받은 날부터 3월 이내, 그 사실을 안 날 또는 알 수 있었던 날부터 30일 이내에 청약철회 등을 할 수 있습니다.\n" + | ||
172 | + "\n" + | ||
173 | + "제16조(청약철회 등의 효과)\n" + | ||
174 | + "\n" + | ||
175 | + " ① “몰”은 이용자로부터 재화 등을 반환받은 경우 3영업일 이내에 이미 지급받은 재화 등의 대금을 환급합니다. 이 경우 “몰”이 이용자에게 재화등의 환급을 지연한때에는 그 지연기간에 대하여 「전자상거래 등에서의 소비자보호에 관한 법률 시행령」제21조의2에서 정하는 지연이자율을 곱하여 산정한 지연이자를 지급합니다.\n" + | ||
176 | + "\n" + | ||
177 | + " ② “몰”은 위 대금을 환급함에 있어서 이용자가 신용카드 또는 전자화폐 등의 결제수단으로 재화 등의 대금을 지급한 때에는 지체 없이 당해 결제수단을 제공한 사업자로 하여금 재화 등의 대금의 청구를 정지 또는 취소하도록 요청합니다.\n" + | ||
178 | + "\n" + | ||
179 | + " ③ 청약철회 등의 경우 공급받은 재화 등의 반환에 필요한 비용은 이용자가 부담합니다. “몰”은 이용자에게 청약철회 등을 이유로 위약금 또는 손해배상을 청구하지 않습니다. 다만 재화 등의 내용이 표시·광고 내용과 다르거나 계약내용과 다르게 이행되어 청약철회 등을 하는 경우 재화 등의 반환에 필요한 비용은 “몰”이 부담합니다.\n" + | ||
180 | + "\n" + | ||
181 | + " ④ 이용자가 재화 등을 제공받을 때 발송비를 부담한 경우에 “몰”은 청약철회 시 그 비용을 누가 부담하는지를 이용자가 알기 쉽도록 명확하게 표시합니다.\n" + | ||
182 | + "\n" + | ||
183 | + "제17조(개인정보보호)\n" + | ||
184 | + "\n" + | ||
185 | + " ① “몰”은 이용자의 개인정보 수집시 서비스제공을 위하여 필요한 범위에서 최소한의 개인정보를 수집합니다. \n" + | ||
186 | + "\n" + | ||
187 | + " ② “몰”은 회원가입시 구매계약이행에 필요한 정보를 미리 수집하지 않습니다. 다만, 관련 법령상 의무이행을 위하여 구매계약 이전에 본인확인이 필요한 경우로서 최소한의 특정 개인정보를 수집하는 경우에는 그러하지 아니합니다.\n" + | ||
188 | + "\n" + | ||
189 | + " ③ “몰”은 이용자의 개인정보를 수집·이용하는 때에는 당해 이용자에게 그 목적을 고지하고 동의를 받습니다. \n" + | ||
190 | + "\n" + | ||
191 | + " ④ “몰”은 수집된 개인정보를 목적외의 용도로 이용할 수 없으며, 새로운 이용목적이 발생한 경우 또는 제3자에게 제공하는 경우에는 이용·제공단계에서 당해 이용자에게 그 목적을 고지하고 동의를 받습니다. 다만, 관련 법령에 달리 정함이 있는 경우에는 예외로 합니다.\n" + | ||
192 | + "\n" + | ||
193 | + " ⑤ “몰”이 제2항과 제3항에 의해 이용자의 동의를 받아야 하는 경우에는 개인정보관리 책임자의 신원(소속, 성명 및 전화번호, 기타 연락처), 정보의 수집목적 및 이용목적, 제3자에 대한 정보제공 관련사항(제공받은자, 제공목적 및 제공할 정보의 내용) 등 「정보통신망 이용촉진 및 정보보호 등에 관한 법률」 제22조제2항이 규정한 사항을 미리 명시하거나 고지해야 하며 이용자는 언제든지 이 동의를 철회할 수 있습니다.\n" + | ||
194 | + "\n" + | ||
195 | + " ⑥ 이용자는 언제든지 “몰”이 가지고 있는 자신의 개인정보에 대해 열람 및 오류정정을 요구할 수 있으며 “몰”은 이에 대해 지체 없이 필요한 조치를 취할 의무를 집니다. 이용자가 오류의 정정을 요구한 경우에는 “몰”은 그 오류를 정정할 때까지 당해 개인정보를 이용하지 않습니다.\n" + | ||
196 | + " \n" + | ||
197 | + " ⑦ “몰”은 개인정보 보호를 위하여 이용자의 개인정보를 취급하는 자를 최소한으로 제한하여야 하며 신용카드, 은행계좌 등을 포함한 이용자의 개인정보의 분실, 도난, 유출, 동의 없는 제3자 제공, 변조 등으로 인한 이용자의 손해에 대하여 모든 책임을 집니다.\n" + | ||
198 | + "\n" + | ||
199 | + " ⑧ “몰” 또는 그로부터 개인정보를 제공받은 제3자는 개인정보의 수집목적 또는 제공받은 목적을 달성한 때에는 당해 개인정보를 지체 없이 파기합니다.\n" + | ||
200 | + "\n" + | ||
201 | + " ⑨ “몰”은 개인정보의 수집·이용·제공에 관한 동의 란을 미리 선택한 것으로 설정해두지 않습니다. 또한 개인정보의 수집·이용·제공에 관한 이용자의 동의거절시 제한되는 서비스를 구체적으로 명시하고, 필수수집항목이 아닌 개인정보의 수집·이용·제공에 관한 이용자의 동의 거절을 이유로 회원가입 등 서비스 제공을 제한하거나 거절하지 않습니다.\n" + | ||
202 | + "\n" + | ||
203 | + "제18조(“몰“의 의무)\n" + | ||
204 | + "\n" + | ||
205 | + " ① “몰”은 법령과 이 약관이 금지하거나 공서양속에 반하는 행위를 하지 않으며 이 약관이 정하는 바에 따라 지속적이고, 안정적으로 재화․용역을 제공하는데 최선을 다하여야 합니다.\n" + | ||
206 | + "\n" + | ||
207 | + " ② “몰”은 이용자가 안전하게 인터넷 서비스를 이용할 수 있도록 이용자의 개인정보(신용정보 포함)보호를 위한 보안 시스템을 갖추어야 합니다.\n" + | ||
208 | + "\n" + | ||
209 | + " ③ “몰”이 상품이나 용역에 대하여 「표시․광고의 공정화에 관한 법률」 제3조 소정의 부당한 표시․광고행위를 함으로써 이용자가 손해를 입은 때에는 이를 배상할 책임을 집니다.\n" + | ||
210 | + "\n" + | ||
211 | + " ④ “몰”은 이용자가 원하지 않는 영리목적의 광고성 전자우편을 발송하지 않습니다.\n" + | ||
212 | + "\n" + | ||
213 | + "제19조(회원의 ID 및 비밀번호에 대한 의무)\n" + | ||
214 | + "\n" + | ||
215 | + " ① 제17조의 경우를 제외한 ID와 비밀번호에 관한 관리책임은 회원에게 있습니다.\n" + | ||
216 | + "\n" + | ||
217 | + " ② 회원은 자신의 ID 및 비밀번호를 제3자에게 이용하게 해서는 안됩니다.\n" + | ||
218 | + "\n" + | ||
219 | + " ③ 회원이 자신의 ID 및 비밀번호를 도난당하거나 제3자가 사용하고 있음을 인지한 경우에는 바로 “몰”에 통보하고 “몰”의 안내가 있는 경우에는 그에 따라야 합니다.\n" + | ||
220 | + "\n" + | ||
221 | + "제20조(이용자의 의무) 이용자는 다음 행위를 하여서는 안 됩니다.\n" + | ||
222 | + "\n" + | ||
223 | + " 1. 신청 또는 변경시 허위 내용의 등록\n" + | ||
224 | + " 2. 타인의 정보 도용\n" + | ||
225 | + " 3. “몰”에 게시된 정보의 변경\n" + | ||
226 | + " 4. “몰”이 정한 정보 이외의 정보(컴퓨터 프로그램 등) 등의 송신 또는 게시\n" + | ||
227 | + " 5. “몰” 기타 제3자의 저작권 등 지적재산권에 대한 침해\n" + | ||
228 | + " 6. “몰” 기타 제3자의 명예를 손상시키거나 업무를 방해하는 행위\n" + | ||
229 | + " 7. 외설 또는 폭력적인 메시지, 화상, 음성, 기타 공서양속에 반하는 정보를 몰에 공개 또는 게시하는 행위\n" + | ||
230 | + "\n" + | ||
231 | + "제21조(연결“몰”과 피연결“몰” 간의 관계)\n" + | ||
232 | + "\n" + | ||
233 | + " ① 상위 “몰”과 하위 “몰”이 하이퍼링크(예: 하이퍼링크의 대상에는 문자, 그림 및 동화상 등이 포함됨)방식 등으로 연결된 경우, 전자를 연결 “몰”(웹 사이트)이라고 하고 후자를 피연결 “몰”(웹사이트)이라고 합니다.\n" + | ||
234 | + "\n" + | ||
235 | + " ② 연결“몰”은 피연결“몰”이 독자적으로 제공하는 재화 등에 의하여 이용자와 행하는 거래에 대해서 보증 책임을 지지 않는다는 뜻을 연결“몰”의 초기화면 또는 연결되는 시점의 팝업화면으로 명시한 경우에는 그 거래에 대한 보증 책임을 지지 않습니다.\n" + | ||
236 | + "\n" + | ||
237 | + "제22조(저작권의 귀속 및 이용제한)\n" + | ||
238 | + "\n" + | ||
239 | + " ① “몰“이 작성한 저작물에 대한 저작권 기타 지적재산권은 ”몰“에 귀속합니다.\n" + | ||
240 | + "\n" + | ||
241 | + " ② 이용자는 “몰”을 이용함으로써 얻은 정보 중 “몰”에게 지적재산권이 귀속된 정보를 “몰”의 사전 승낙 없이 복제, 송신, 출판, 배포, 방송 기타 방법에 의하여 영리목적으로 이용하거나 제3자에게 이용하게 하여서는 안됩니다.\n" + | ||
242 | + "\n" + | ||
243 | + " ③ “몰”은 약정에 따라 이용자에게 귀속된 저작권을 사용하는 경우 당해 이용자에게 통보하여야 합니다.\n" + | ||
244 | + "\n" + | ||
245 | + "제23조(분쟁해결)\n" + | ||
246 | + "\n" + | ||
247 | + " ① “몰”은 이용자가 제기하는 정당한 의견이나 불만을 반영하고 그 피해를 보상처리하기 위하여 피해보상처리기구를 설치․운영합니다.\n" + | ||
248 | + "\n" + | ||
249 | + " ② “몰”은 이용자로부터 제출되는 불만사항 및 의견은 우선적으로 그 사항을 처리합니다. 다만, 신속한 처리가 곤란한 경우에는 이용자에게 그 사유와 처리일정을 즉시 통보해 드립니다.\n" + | ||
250 | + "\n" + | ||
251 | + " ③ “몰”과 이용자 간에 발생한 전자상거래 분쟁과 관련하여 이용자의 피해구제신청이 있는 경우에는 공정거래위원회 또는 시·도지사가 의뢰하는 분쟁조정기관의 조정에 따를 수 있습니다.\n" + | ||
252 | + "\n" + | ||
253 | + "제24조(재판권 및 준거법)\n" + | ||
254 | + "\n" + | ||
255 | + " ① “몰”과 이용자 간에 발생한 전자상거래 분쟁에 관한 소송은 제소 당시의 이용자의 주소에 의하고, 주소가 없는 경우에는 거소를 관할하는 지방법원의 전속관할로 합니다. 다만, 제소 당시 이용자의 주소 또는 거소가 분명하지 않거나 외국 거주자의 경우에는 민사소송법상의 관할법원에 제기합니다.\n" + | ||
256 | + "\n" + | ||
257 | + " ② “몰”과 이용자 간에 제기된 전자상거래 소송에는 한국법을 적용합니다.\n" + | ||
258 | + "\n" + | ||
259 | + "\n" + | ||
260 | + "\n" + | ||
261 | + "\n" + | ||
262 | + "\n" + | ||
263 | + "\n" + | ||
264 | + "\n" | ||
265 | + web.loadData(summary, "text/html", "UTF-8") | ||
266 | + | ||
267 | + } | ||
268 | +} |
1 | +package com.example.vip | ||
2 | + | ||
3 | +import android.content.Intent | ||
4 | +import androidx.appcompat.app.AppCompatActivity | ||
5 | +import android.os.Bundle | ||
6 | +import kotlinx.android.synthetic.main.activity_terms_of_use.* | ||
7 | + | ||
8 | +class TermsOfUserActivity : AppCompatActivity() { | ||
9 | + | ||
10 | + override fun onCreate(savedInstanceState: Bundle?) { | ||
11 | + super.onCreate(savedInstanceState) | ||
12 | + setContentView(R.layout.activity_terms_of_use) | ||
13 | + | ||
14 | + terms_use.setOnClickListener{ | ||
15 | + var intent = Intent(this, TermsDetailActivity::class.java) | ||
16 | + startActivity(intent) | ||
17 | + } | ||
18 | + terms_use2.setOnClickListener { | ||
19 | + var intent = Intent(this, PrivacyPolicyActivity::class.java) | ||
20 | + startActivity(intent) | ||
21 | + } | ||
22 | + } | ||
23 | +} |
... | @@ -12,9 +12,9 @@ class ViewPagerAdapter(private val context : Context) : PagerAdapter() { | ... | @@ -12,9 +12,9 @@ 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.temp_view_pager_image, | 15 | + R.drawable.image01, |
16 | - R.drawable.temp_view_pager_image, | 16 | + R.drawable.image02, |
17 | - R.drawable.temp_view_pager_image | 17 | + R.drawable.image03 |
18 | ) | 18 | ) |
19 | 19 | ||
20 | 20 | ... | ... |
... | @@ -14,8 +14,6 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { | ... | @@ -14,8 +14,6 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() { |
14 | val Image = arrayOf( | 14 | val Image = arrayOf( |
15 | R.drawable.hwajilgooji1, | 15 | R.drawable.hwajilgooji1, |
16 | R.drawable.hwajilgooji2, | 16 | R.drawable.hwajilgooji2, |
17 | - R.drawable.hwajilgooji3, | ||
18 | - R.drawable.hwajilgooji3, | ||
19 | R.drawable.hwajilgooji3 | 17 | R.drawable.hwajilgooji3 |
20 | ) | 18 | ) |
21 | 19 | ... | ... |
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
532 Bytes
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
326 Bytes
6.77 KB
4.27 KB
46.7 KB
130 Bytes
386 Bytes
434 Bytes
24.5 KB
8.33 KB
7.73 KB
235 Bytes
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
46.7 KB
130 Bytes
386 Bytes
24.5 KB
8.33 KB
3.67 KB
235 Bytes
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
46.7 KB
130 Bytes
386 Bytes
24.5 KB
8.33 KB
5.23 KB
235 Bytes
13.5 KB
8.53 KB
... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
2 | <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | <!-- 배경 --> | 3 | <!-- 배경 --> |
4 | <item | 4 | <item |
5 | - android:drawable="@color/splashfilling"/> | 5 | + android:drawable="@color/colorPrimary"/> |
6 | <!-- 로고 --> | 6 | <!-- 로고 --> |
7 | <item> | 7 | <item> |
8 | <bitmap | 8 | <bitmap |
9 | android:gravity="center" | 9 | android:gravity="center" |
10 | - android:src="@drawable/final_splash" /> | 10 | + android:src="@drawable/splash_main"/> |
11 | </item> | 11 | </item> |
12 | </layer-list> | 12 | </layer-list> | ... | ... |
13.5 KB
46.7 KB
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
130 Bytes
386 Bytes
24.5 KB
8.33 KB
235 Bytes
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
130 Bytes
386 Bytes
24.5 KB
8.33 KB
235 Bytes
8.53 KB
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <!-- 배경 --> | ||
4 | + <item | ||
5 | + android:drawable="@color/colorPrimary"/> | ||
6 | + <!-- 로고 --> | ||
7 | + <item> | ||
8 | + <bitmap | ||
9 | + android:gravity="center" | ||
10 | + android:src="@drawable/splash_main"/> | ||
11 | + </item> | ||
12 | +</layer-list> |
208 Bytes
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
2 | + xmlns:aapt="http://schemas.android.com/aapt" | ||
3 | + android:width="108dp" | ||
4 | + android:height="108dp" | ||
5 | + android:viewportWidth="108" | ||
6 | + android:viewportHeight="108"> | ||
7 | + <path | ||
8 | + android:fillType="evenOdd" | ||
9 | + android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z" | ||
10 | + android:strokeWidth="1" | ||
11 | + android:strokeColor="#00000000"> | ||
12 | + <aapt:attr name="android:fillColor"> | ||
13 | + <gradient | ||
14 | + android:endX="78.5885" | ||
15 | + android:endY="90.9159" | ||
16 | + android:startX="48.7653" | ||
17 | + android:startY="61.0927" | ||
18 | + android:type="linear"> | ||
19 | + <item | ||
20 | + android:color="#44000000" | ||
21 | + android:offset="0.0" /> | ||
22 | + <item | ||
23 | + android:color="#00000000" | ||
24 | + android:offset="1.0" /> | ||
25 | + </gradient> | ||
26 | + </aapt:attr> | ||
27 | + </path> | ||
28 | + <path | ||
29 | + android:fillColor="#FFFFFF" | ||
30 | + android:fillType="nonZero" | ||
31 | + android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z" | ||
32 | + android:strokeWidth="1" | ||
33 | + android:strokeColor="#00000000" /> | ||
34 | +</vector> |
193 KB
79.9 KB
81.1 KB
70.2 KB
111 KB
93.5 KB
103 KB
95.9 KB
173 KB
81.9 KB
480 Bytes
179 Bytes
14.5 KB
130 Bytes
386 Bytes
24.5 KB
8.33 KB
235 Bytes
472 Bytes
4.05 KB
... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
2 | <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> |
3 | <!-- 배경 --> | 3 | <!-- 배경 --> |
4 | <item | 4 | <item |
5 | - android:drawable="@color/splashfilling"/> | 5 | + android:drawable="@color/colorPrimary"/> |
6 | <!-- 로고 --> | 6 | <!-- 로고 --> |
7 | <item> | 7 | <item> |
8 | <bitmap | 8 | <bitmap |
9 | android:gravity="center" | 9 | android:gravity="center" |
10 | - android:src="@drawable/final_splash"/> | 10 | + android:src="@drawable/splash_main"/> |
11 | </item> | 11 | </item> |
12 | </layer-list> | 12 | </layer-list> | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <item> | ||
4 | + <shape android:shape="rectangle"> | ||
5 | + <solid android:color="#d7d7d7" /> | ||
6 | + </shape> | ||
7 | + </item> | ||
8 | + <item android:bottom="1dp"> | ||
9 | + <shape android:shape="rectangle"> | ||
10 | + <solid android:color="#ffffff" /> | ||
11 | + </shape> | ||
12 | + </item> | ||
13 | +</layer-list> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <solid android:color="#29ABE2"/> | ||
4 | + | ||
5 | + <stroke android:width="0dp" | ||
6 | + android:color="#29ABE2" | ||
7 | + /> | ||
8 | + | ||
9 | + <padding android:left="0dp" | ||
10 | + android:top="0dp" | ||
11 | + android:right="0dp" | ||
12 | + android:bottom="0dp" | ||
13 | + /> | ||
14 | + | ||
15 | + <corners android:bottomRightRadius="13dp" android:bottomLeftRadius="0dp" | ||
16 | + android:topLeftRadius="0dp" android:topRightRadius="0dp"/> | ||
17 | +</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | - android:shape="rectangle"> | ||
4 | - <stroke | ||
5 | - android:width="5dp" | ||
6 | - android:color="#29ABE2" /> | ||
7 | - <corners | ||
8 | - android:bottomRightRadius="25dp" | ||
9 | - android:bottomLeftRadius="25dp" | ||
10 | - android:topLeftRadius="25dp" | ||
11 | - android:topRightRadius="25dp"/> | ||
12 | - <padding | ||
13 | - android:left="10dp" | ||
14 | - android:top="10dp" | ||
15 | - android:right="10dp" | ||
16 | - android:bottom="10dp" /> | ||
17 | - <solid | ||
18 | - android:color="#29ABE2"/> | ||
19 | -</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -<?xml version="1.0" encoding="utf-8"?> | ||
2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | - | ||
4 | - <item android:state_checked="false" android:drawable="@drawable/button_x" /> | ||
5 | - <item android:state_checked="true" android:drawable="@drawable/button_o" /> | ||
6 | -</selector> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | - android:shape="rectangle"> | ||
4 | - <stroke | ||
5 | - android:width="5dp" | ||
6 | - android:color="#F4F4F4" /> | ||
7 | - <corners | ||
8 | - android:bottomRightRadius="25dp" | ||
9 | - android:bottomLeftRadius="25dp" | ||
10 | - android:topLeftRadius="25dp" | ||
11 | - android:topRightRadius="25dp"/> | ||
12 | - <padding | ||
13 | - android:left="10dp" | ||
14 | - android:top="10dp" | ||
15 | - android:right="10dp" | ||
16 | - android:bottom="10dp" /> | ||
17 | - <solid | ||
18 | - android:color="#F4F4F4"/> | ||
19 | -</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | - android:shape="oval"> | ||
4 | - <stroke | ||
5 | - android:width="1dp" | ||
6 | - android:color="#29ABE2" /> | ||
7 | - <!-- | ||
8 | - <corners | ||
9 | - android:bottomRightRadius="25dp" | ||
10 | - android:bottomLeftRadius="25dp" | ||
11 | - android:topLeftRadius="25dp" | ||
12 | - android:topRightRadius="25dp"/> | ||
13 | - | ||
14 | - <padding | ||
15 | - android:left="10dp" | ||
16 | - android:top="10dp" | ||
17 | - android:right="10dp" | ||
18 | - android:bottom="10dp" /> | ||
19 | - --> | ||
20 | - <solid | ||
21 | - android:color="#FFFFFF"/> | ||
22 | -</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
343 Bytes
1 | -<?xml version="1.0" encoding="utf-8"?> | ||
2 | -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | - <item | ||
4 | - android:top="32dp"> | ||
5 | - <shape android:shape="line"> | ||
6 | - <stroke | ||
7 | - android:width="5dp" | ||
8 | - android:color="#29ABE2"/> | ||
9 | - </shape> | ||
10 | - </item> | ||
11 | -</layer-list> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
6.38 KB
30.3 KB
243 Bytes
665 Bytes
1.33 KB
13.5 KB
46.7 KB
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <solid android:color="#FFF"/> | ||
4 | + | ||
5 | + <stroke android:width="1dp" | ||
6 | + android:color="#E6E6E6" | ||
7 | + /> | ||
8 | + | ||
9 | + <padding android:left="0dp" | ||
10 | + android:top="0dp" | ||
11 | + android:right="0dp" | ||
12 | + android:bottom="0dp" | ||
13 | + /> | ||
14 | + | ||
15 | + <corners android:bottomRightRadius="4dp" android:bottomLeftRadius="4dp" | ||
16 | + android:topLeftRadius="4dp" android:topRightRadius="4dp"/> | ||
17 | +</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
3 | + <solid android:color="#FFF"/> | ||
4 | + | ||
5 | + <stroke android:width="0dp" | ||
6 | + android:color="#FFF" | ||
7 | + /> | ||
8 | + | ||
9 | + <padding android:left="0dp" | ||
10 | + android:top="0dp" | ||
11 | + android:right="0dp" | ||
12 | + android:bottom="0dp" | ||
13 | + /> | ||
14 | + | ||
15 | + <corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp" | ||
16 | + android:topLeftRadius="5dp" android:topRightRadius="5dp"/> | ||
17 | +</shape> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
585 Bytes
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + xmlns:tools="http://schemas.android.com/tools" | ||
6 | + android:layout_height="match_parent"> | ||
7 | + | ||
8 | + <androidx.appcompat.widget.Toolbar | ||
9 | + android:id="@+id/toolbar" | ||
10 | + android:layout_width="fill_parent" | ||
11 | + android:layout_height="wrap_content" | ||
12 | + android:layout_gravity="center" | ||
13 | + android:layout_marginBottom="11dp" | ||
14 | + android:background="#FFF" | ||
15 | + android:elevation="5dp" | ||
16 | + android:gravity="center" | ||
17 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
18 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
19 | + | ||
20 | + <TextView | ||
21 | + android:layout_width="77dp" | ||
22 | + android:layout_height="44dp" | ||
23 | + android:layout_gravity="center" | ||
24 | + android:gravity="center" | ||
25 | + android:text="계정 설정" | ||
26 | + android:textColor="#000" | ||
27 | + android:textSize="16dp" /> | ||
28 | + </androidx.appcompat.widget.Toolbar> | ||
29 | + | ||
30 | + <LinearLayout | ||
31 | + android:layout_width="match_parent" | ||
32 | + android:layout_height="match_parent" | ||
33 | + android:layout_weight="1" | ||
34 | + android:background="#fff" | ||
35 | + android:orientation="vertical"> | ||
36 | + | ||
37 | + <LinearLayout | ||
38 | + android:layout_width="match_parent" | ||
39 | + android:layout_height="wrap_content" | ||
40 | + android:orientation="vertical"></LinearLayout> | ||
41 | + | ||
42 | + <Button | ||
43 | + android:id="@+id/button" | ||
44 | + style="?android:attr/borderlessButtonStyle" | ||
45 | + android:layout_width="match_parent" | ||
46 | + android:layout_height="65dp" | ||
47 | + android:layout_marginLeft="11dp" | ||
48 | + android:layout_marginRight="11dp" | ||
49 | + android:background="@drawable/bottom_border" | ||
50 | + android:gravity="left|center_vertical" | ||
51 | + android:paddingLeft="33dp" | ||
52 | + android:text="정보 수정 (준비중)" | ||
53 | + android:textSize="17dp" /> | ||
54 | + | ||
55 | + <Button | ||
56 | + android:id="@+id/info_push" | ||
57 | + style="?android:attr/borderlessButtonStyle" | ||
58 | + android:layout_width="match_parent" | ||
59 | + android:layout_height="65dp" | ||
60 | + android:layout_marginLeft="11dp" | ||
61 | + android:layout_marginRight="11dp" | ||
62 | + android:background="@drawable/bottom_border" | ||
63 | + android:gravity="left|center_vertical" | ||
64 | + android:paddingLeft="33dp" | ||
65 | + android:text="로그아웃 (준비중)" | ||
66 | + android:textSize="17dp" /> | ||
67 | + | ||
68 | + <Button | ||
69 | + android:id="@+id/terms_of_use" | ||
70 | + style="?android:attr/borderlessButtonStyle" | ||
71 | + android:layout_width="match_parent" | ||
72 | + android:layout_height="65dp" | ||
73 | + android:layout_marginLeft="11dp" | ||
74 | + android:layout_marginRight="11dp" | ||
75 | + android:background="@drawable/bottom_border" | ||
76 | + android:gravity="left|center_vertical" | ||
77 | + android:paddingLeft="33dp" | ||
78 | + android:text="회원 탈퇴 (준비중)" | ||
79 | + android:textSize="17dp" /> | ||
80 | + | ||
81 | + </LinearLayout> | ||
82 | + | ||
83 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
84 | + android:id="@+id/bottomNavigation" | ||
85 | + android:layout_width="match_parent" | ||
86 | + android:layout_height="wrap_content" | ||
87 | + android:layout_gravity="bottom" | ||
88 | + android:background="#FFF" | ||
89 | + app:itemIconTint="#29ABE2" | ||
90 | + app:itemTextColor="#29ABE2" | ||
91 | + app:labelVisibilityMode="labeled" | ||
92 | + app:menu="@menu/bottom_nav_menu" /> | ||
93 | + | ||
94 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -4,6 +4,7 @@ | ... | @@ -4,6 +4,7 @@ |
4 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
5 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
6 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
7 | + android:background="#fff" | ||
7 | tools:context=".RecommendActivity"> | 8 | tools:context=".RecommendActivity"> |
8 | 9 | ||
9 | 10 | ||
... | @@ -23,7 +24,6 @@ | ... | @@ -23,7 +24,6 @@ |
23 | android:layout_height="wrap_content" | 24 | android:layout_height="wrap_content" |
24 | android:layout_marginBottom="11dp" | 25 | android:layout_marginBottom="11dp" |
25 | android:background="#FFF" | 26 | android:background="#FFF" |
26 | - android:elevation="5dp" | ||
27 | android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | 27 | android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" |
28 | app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | 28 | app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> |
29 | 29 | ||
... | @@ -37,8 +37,13 @@ | ... | @@ -37,8 +37,13 @@ |
37 | <ScrollView | 37 | <ScrollView |
38 | android:layout_width="match_parent" | 38 | android:layout_width="match_parent" |
39 | android:layout_height="match_parent" | 39 | android:layout_height="match_parent" |
40 | + android:layout_marginLeft="8dp" | ||
41 | + android:layout_marginRight="8dp" | ||
42 | + android:layout_weight="1" | ||
43 | + android:background="@drawable/round_ratangle" | ||
44 | + android:elevation="3dp" | ||
40 | android:fillViewport="true" | 45 | android:fillViewport="true" |
41 | - android:layout_weight="1"> | 46 | + android:padding="7dp"> |
42 | 47 | ||
43 | <LinearLayout | 48 | <LinearLayout |
44 | android:layout_width="match_parent" | 49 | android:layout_width="match_parent" |
... | @@ -49,43 +54,55 @@ | ... | @@ -49,43 +54,55 @@ |
49 | android:id="@+id/policyImageDetail" | 54 | android:id="@+id/policyImageDetail" |
50 | android:layout_width="match_parent" | 55 | android:layout_width="match_parent" |
51 | android:layout_height="200dp" | 56 | android:layout_height="200dp" |
57 | + android:background="@drawable/round_ratangle" | ||
58 | + android:elevation="5dp" | ||
52 | android:scaleType="fitXY" | 59 | android:scaleType="fitXY" |
53 | - tools:srcCompat="@tools:sample/avatars" /> | 60 | + app:srcCompat="@drawable/image03" /> |
54 | 61 | ||
55 | <LinearLayout | 62 | <LinearLayout |
56 | android:layout_width="match_parent" | 63 | android:layout_width="match_parent" |
57 | android:layout_height="match_parent" | 64 | android:layout_height="match_parent" |
65 | + android:elevation="7dp" | ||
58 | android:orientation="vertical"> | 66 | android:orientation="vertical"> |
59 | 67 | ||
60 | <TextView | 68 | <TextView |
61 | android:id="@+id/policyDdayDetail" | 69 | android:id="@+id/policyDdayDetail" |
62 | android:layout_width="77dp" | 70 | android:layout_width="77dp" |
63 | - android:layout_height="44dp" | 71 | + android:layout_height="39dp" |
64 | - android:background="#9949ADF9" | 72 | + android:background="@drawable/broken_rectangle" |
65 | android:gravity="center" | 73 | android:gravity="center" |
66 | android:text="TextView" | 74 | android:text="TextView" |
67 | android:textColor="#FFF" | 75 | android:textColor="#FFF" |
68 | android:textSize="18sp" /> | 76 | android:textSize="18sp" /> |
69 | 77 | ||
70 | <TextView | 78 | <TextView |
79 | + android:id="@+id/policyFavorDetail" | ||
80 | + android:layout_width="wrap_content" | ||
81 | + android:layout_height="wrap_content" | ||
82 | + android:layout_marginTop="5dp" | ||
83 | + android:text="TextView" /> | ||
84 | + | ||
85 | + <TextView | ||
71 | android:id="@+id/policyTitleDetail" | 86 | android:id="@+id/policyTitleDetail" |
72 | android:layout_width="match_parent" | 87 | android:layout_width="match_parent" |
73 | android:layout_height="wrap_content" | 88 | android:layout_height="wrap_content" |
74 | android:layout_marginLeft="11dp" | 89 | android:layout_marginLeft="11dp" |
75 | - android:layout_marginBottom="5dp" | 90 | + android:layout_marginBottom="4dp" |
76 | android:text="Textw" | 91 | android:text="Textw" |
77 | android:textSize="30sp" /> | 92 | android:textSize="30sp" /> |
78 | 93 | ||
79 | <RatingBar | 94 | <RatingBar |
80 | android:id="@+id/policyScoreDetail" | 95 | android:id="@+id/policyScoreDetail" |
81 | - android:layout_width="wrap_content" | 96 | + style="?android:attr/ratingBarStyleIndicator" |
82 | - android:layout_height="wrap_content" /> | ||
83 | - | ||
84 | - <TextView | ||
85 | - android:id="@+id/policyFavorDetail" | ||
86 | android:layout_width="wrap_content" | 97 | android:layout_width="wrap_content" |
87 | android:layout_height="wrap_content" | 98 | android:layout_height="wrap_content" |
88 | - android:text="TextView" /> | 99 | + android:layout_marginLeft="11dp" |
100 | + android:max="5" | ||
101 | + android:rating="3.5" | ||
102 | + android:scaleX=".5" | ||
103 | + android:scaleY="0.5" | ||
104 | + android:transformPivotX="0dp" | ||
105 | + android:transformPivotY="0dp" /> | ||
89 | 106 | ||
90 | <WebView | 107 | <WebView |
91 | android:id="@+id/policy_context" | 108 | android:id="@+id/policy_context" |
... | @@ -94,23 +111,58 @@ | ... | @@ -94,23 +111,58 @@ |
94 | </LinearLayout> | 111 | </LinearLayout> |
95 | </LinearLayout> | 112 | </LinearLayout> |
96 | </ScrollView> | 113 | </ScrollView> |
114 | + | ||
97 | <FrameLayout | 115 | <FrameLayout |
116 | + android:id="@+id/fragmentContainer" | ||
98 | android:layout_width="match_parent" | 117 | android:layout_width="match_parent" |
99 | android:layout_height="wrap_content" | 118 | android:layout_height="wrap_content" |
100 | - android:id="@+id/fragmentContainer" | 119 | + android:elevation="4dp" |
101 | - app:layout_constraintBottom_toBottomOf="parent" | 120 | + app:layout_constraintBottom_toBottomOf="parent"> |
102 | - > | ||
103 | 121 | ||
104 | - <com.google.android.material.bottomnavigation.BottomNavigationView | 122 | + <LinearLayout |
105 | - android:id="@+id/bottomNavigation" | ||
106 | android:layout_width="match_parent" | 123 | android:layout_width="match_parent" |
107 | - android:layout_height="wrap_content" | 124 | + android:layout_height="match_parent" |
108 | - android:layout_gravity="bottom" | 125 | + android:elevation="5dp" |
109 | - android:background="#FFF" | 126 | + android:orientation="horizontal"> |
110 | - app:itemIconTint="#29ABE2" | 127 | + |
111 | - app:itemTextColor="#29ABE2" | 128 | + <LinearLayout |
112 | - app:labelVisibilityMode="labeled" | 129 | + android:layout_width="match_parent" |
113 | - app:menu="@menu/detailpage_navigation" /> | 130 | + android:layout_height="match_parent" |
131 | + android:layout_weight="1.2" | ||
132 | + android:orientation="horizontal"> | ||
133 | + | ||
134 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
135 | + android:id="@+id/leftBottomBVW" | ||
136 | + android:layout_width="wrap_content" | ||
137 | + android:layout_height="wrap_content" | ||
138 | + android:layout_gravity="bottom" | ||
139 | + android:background="#FFF" | ||
140 | + android:elevation="5dp" | ||
141 | + app:itemIconTint="#DDDDDD" | ||
142 | + app:labelVisibilityMode="unlabeled" | ||
143 | + app:menu="@menu/detailpage_navigation" /> | ||
144 | + </LinearLayout> | ||
145 | + | ||
146 | + <LinearLayout | ||
147 | + android:layout_width="match_parent" | ||
148 | + android:layout_height="match_parent" | ||
149 | + android:layout_weight="1" | ||
150 | + android:orientation="horizontal"> | ||
151 | + | ||
152 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
153 | + android:id="@+id/rightBottomBVW" | ||
154 | + android:layout_width="match_parent" | ||
155 | + android:layout_height="wrap_content" | ||
156 | + android:layout_gravity="bottom" | ||
157 | + android:background="@drawable/link2" | ||
158 | + android:elevation="5dp" | ||
159 | + app:itemIconTint="#FFF" | ||
160 | + app:itemTextColor="#FFF" | ||
161 | + app:labelVisibilityMode="unlabeled" | ||
162 | + app:menu="@menu/link_navigation" /> | ||
163 | + </LinearLayout> | ||
164 | + </LinearLayout> | ||
165 | + | ||
114 | </FrameLayout> | 166 | </FrameLayout> |
115 | 167 | ||
116 | </LinearLayout> | 168 | </LinearLayout> | ... | ... |
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | + | ||
2 | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | 3 | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | xmlns:app="http://schemas.android.com/apk/res-auto" | 4 | xmlns:app="http://schemas.android.com/apk/res-auto" |
4 | xmlns:tools="http://schemas.android.com/tools" | 5 | xmlns:tools="http://schemas.android.com/tools" |
... | @@ -11,43 +12,41 @@ | ... | @@ -11,43 +12,41 @@ |
11 | android:layout_height="match_parent" | 12 | android:layout_height="match_parent" |
12 | android:orientation="vertical"> | 13 | android:orientation="vertical"> |
13 | 14 | ||
14 | - <androidx.appcompat.widget.Toolbar | ||
15 | - android:id="@+id/toolbar" | ||
16 | - android:layout_width="fill_parent" | ||
17 | - android:layout_height="wrap_content" | ||
18 | - android:layout_marginBottom="11dp" | ||
19 | - android:background="#FFF" | ||
20 | - android:elevation="5dp" | ||
21 | - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
22 | - app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
23 | - | ||
24 | - <ImageView | ||
25 | - android:layout_width="77dp" | ||
26 | - android:layout_height="44dp" | ||
27 | - android:layout_gravity="center" | ||
28 | - android:src="@drawable/toolbar_logo" /> | ||
29 | - </androidx.appcompat.widget.Toolbar> | ||
30 | - | ||
31 | <LinearLayout | 15 | <LinearLayout |
32 | android:layout_width="match_parent" | 16 | android:layout_width="match_parent" |
33 | - android:layout_height="wrap_content" | 17 | + android:layout_height="195dp" |
34 | - android:layout_weight="1" | ||
35 | android:orientation="vertical"> | 18 | android:orientation="vertical"> |
36 | 19 | ||
20 | + <androidx.appcompat.widget.Toolbar | ||
21 | + android:id="@+id/toolbar" | ||
22 | + android:layout_width="fill_parent" | ||
23 | + android:layout_height="wrap_content" | ||
24 | + android:background="#F1F9FF" | ||
25 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
26 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
27 | + | ||
28 | + <ImageView | ||
29 | + android:layout_width="77dp" | ||
30 | + android:layout_height="44dp" | ||
31 | + android:layout_gravity="center" | ||
32 | + android:src="@drawable/toolbar_logo" /> | ||
33 | + </androidx.appcompat.widget.Toolbar> | ||
34 | + | ||
37 | <LinearLayout | 35 | <LinearLayout |
38 | android:layout_width="match_parent" | 36 | android:layout_width="match_parent" |
39 | android:layout_height="wrap_content" | 37 | android:layout_height="wrap_content" |
40 | android:layout_gravity="center" | 38 | android:layout_gravity="center" |
41 | android:layout_weight="1" | 39 | android:layout_weight="1" |
40 | + android:background="#F1F9FF" | ||
42 | android:orientation="horizontal"> | 41 | android:orientation="horizontal"> |
43 | 42 | ||
44 | <ImageView | 43 | <ImageView |
45 | android:id="@+id/infoAccountImage" | 44 | android:id="@+id/infoAccountImage" |
46 | android:layout_width="50dp" | 45 | android:layout_width="50dp" |
47 | - android:layout_height="50dp" | 46 | + android:layout_height="99dp" |
48 | android:layout_gravity="center" | 47 | android:layout_gravity="center" |
49 | android:layout_weight="1" | 48 | android:layout_weight="1" |
50 | - tools:srcCompat="@tools:sample/avatars" /> | 49 | + android:src="@drawable/user_default" /> |
51 | 50 | ||
52 | <LinearLayout | 51 | <LinearLayout |
53 | android:layout_width="wrap_content" | 52 | android:layout_width="wrap_content" |
... | @@ -55,153 +54,139 @@ | ... | @@ -55,153 +54,139 @@ |
55 | android:layout_weight="1" | 54 | android:layout_weight="1" |
56 | android:orientation="vertical"> | 55 | android:orientation="vertical"> |
57 | 56 | ||
58 | - <TextView | 57 | + <LinearLayout |
59 | - android:id="@+id/InfoNickname" | 58 | + android:layout_width="match_parent" |
60 | - android:layout_width="wrap_content" | 59 | + android:layout_height="match_parent" |
61 | - android:layout_height="wrap_content" | ||
62 | - android:layout_gravity="center" | ||
63 | - android:layout_weight="1" | ||
64 | - android:gravity="center" | ||
65 | - android:text="GRACE" /> | ||
66 | - | ||
67 | - <TextView | ||
68 | - android:id="@+id/InfoEmail" | ||
69 | - android:layout_width="wrap_content" | ||
70 | - android:layout_height="wrap_content" | ||
71 | - android:layout_gravity="center" | ||
72 | android:layout_weight="1" | 60 | android:layout_weight="1" |
73 | - android:gravity="center" | 61 | + android:orientation="horizontal"> |
74 | - android:text="grace@naver.com" /> | 62 | + |
75 | - | 63 | + <LinearLayout |
76 | - <TextView | 64 | + android:layout_width="match_parent" |
77 | - android:id="@+id/InfoProfilProgress" | 65 | + android:layout_height="match_parent" |
78 | - android:layout_width="wrap_content" | 66 | + android:layout_gravity="center" |
79 | - android:layout_height="wrap_content" | 67 | + android:layout_weight="3.5" |
80 | - android:layout_gravity="center" | 68 | + android:gravity="center" |
81 | - android:layout_weight="1" | 69 | + android:orientation="vertical"> |
82 | - android:gravity="center" | 70 | + |
83 | - android:text="프로필정보입력15/20" /> | 71 | + <TextView |
72 | + android:id="@+id/textView4" | ||
73 | + android:layout_width="wrap_content" | ||
74 | + android:layout_height="wrap_content" | ||
75 | + android:layout_gravity="center|right" | ||
76 | + android:layout_weight="1" | ||
77 | + android:gravity="center" | ||
78 | + android:text="이메일" | ||
79 | + android:textColor="#29ABE2" | ||
80 | + android:textSize="13dp" /> | ||
81 | + | ||
82 | + <TextView | ||
83 | + android:id="@+id/textView5" | ||
84 | + android:layout_width="wrap_content" | ||
85 | + android:layout_height="wrap_content" | ||
86 | + android:layout_gravity="right" | ||
87 | + android:layout_weight="1" | ||
88 | + android:gravity="center" | ||
89 | + android:text="성별" | ||
90 | + android:textColor="#29ABE2" | ||
91 | + android:textSize="13dp" /> | ||
92 | + </LinearLayout> | ||
93 | + | ||
94 | + <LinearLayout | ||
95 | + android:layout_width="match_parent" | ||
96 | + android:layout_height="match_parent" | ||
97 | + android:layout_weight="1" | ||
98 | + android:orientation="vertical"> | ||
99 | + | ||
100 | + <TextView | ||
101 | + android:id="@+id/InfoEmail" | ||
102 | + android:layout_width="wrap_content" | ||
103 | + android:layout_height="wrap_content" | ||
104 | + android:layout_gravity="center" | ||
105 | + android:layout_weight="1" | ||
106 | + android:gravity="center" | ||
107 | + android:text="wello@gmail.com" | ||
108 | + android:textSize="16dp" /> | ||
109 | + | ||
110 | + <TextView | ||
111 | + android:id="@+id/InfoProfilProgress" | ||
112 | + android:layout_width="wrap_content" | ||
113 | + android:layout_height="wrap_content" | ||
114 | + android:layout_gravity="center" | ||
115 | + android:layout_weight="1" | ||
116 | + android:gravity="center" | ||
117 | + android:text="gender" | ||
118 | + android:textSize="16dp" /> | ||
119 | + </LinearLayout> | ||
120 | + | ||
121 | + </LinearLayout> | ||
84 | 122 | ||
85 | </LinearLayout> | 123 | </LinearLayout> |
86 | 124 | ||
87 | - <ImageView | ||
88 | - android:id="@+id/InfoProfilImage" | ||
89 | - android:layout_width="50dp" | ||
90 | - android:layout_height="50dp" | ||
91 | - android:layout_gravity="center" | ||
92 | - android:layout_weight="1" | ||
93 | - tools:srcCompat="@tools:sample/avatars" /> | ||
94 | </LinearLayout> | 125 | </LinearLayout> |
95 | 126 | ||
96 | - <LinearLayout | 127 | + </LinearLayout> |
97 | - android:layout_width="match_parent" | ||
98 | - android:layout_height="wrap_content" | ||
99 | - android:layout_gravity="center" | ||
100 | - android:layout_weight="1" | ||
101 | - android:gravity="center" | ||
102 | - android:orientation="vertical"> | ||
103 | - | ||
104 | - <TextView | ||
105 | - android:id="@+id/InfoProfilModify" | ||
106 | - android:layout_width="match_parent" | ||
107 | - android:layout_height="wrap_content" | ||
108 | - android:layout_gravity="center" | ||
109 | - android:gravity="center" | ||
110 | - android:text="프로필 정보 수정" /> | ||
111 | - | ||
112 | - <ProgressBar | ||
113 | - android:id="@+id/InfoProgress" | ||
114 | - style="?android:attr/progressBarStyleHorizontal" | ||
115 | - android:layout_width="match_parent" | ||
116 | - android:layout_height="wrap_content" | ||
117 | - android:layout_gravity="center" /> | ||
118 | - | ||
119 | - <TextView | ||
120 | - android:id="@+id/InfoExplain" | ||
121 | - android:layout_width="match_parent" | ||
122 | - android:layout_height="wrap_content" | ||
123 | - android:layout_gravity="center" | ||
124 | - android:gravity="center" | ||
125 | - android:text="많이입력해야정확해요" /> | ||
126 | - | ||
127 | - <TextView | ||
128 | - android:id="@+id/InfoStep" | ||
129 | - android:layout_width="match_parent" | ||
130 | - android:layout_height="wrap_content" | ||
131 | - android:layout_gravity="center" | ||
132 | - android:gravity="center" | ||
133 | - android:text="STEP 15/20" /> | ||
134 | - </LinearLayout> | ||
135 | - | ||
136 | - <LinearLayout | ||
137 | - android:layout_width="match_parent" | ||
138 | - android:layout_height="wrap_content" | ||
139 | - android:layout_weight="1" | ||
140 | - android:gravity="center" | ||
141 | - android:orientation="horizontal"> | ||
142 | - | ||
143 | - <Button | ||
144 | - android:id="@+id/InfoButtonApp" | ||
145 | - android:layout_width="match_parent" | ||
146 | - android:layout_height="wrap_content" | ||
147 | - android:text="APP 정보" /> | ||
148 | - </LinearLayout> | ||
149 | 128 | ||
150 | - <LinearLayout | 129 | + <TextView |
151 | - android:layout_width="match_parent" | 130 | + android:id="@+id/InfoProfilModify" |
152 | - android:layout_height="wrap_content" | 131 | + android:layout_width="match_parent" |
153 | - android:layout_weight="1" | 132 | + android:layout_height="55dp" |
154 | - android:gravity="center" | 133 | + android:layout_gravity="center" |
155 | - android:orientation="horizontal"> | 134 | + android:background="#29ABE2" |
135 | + android:gravity="center" | ||
136 | + android:text="프로필 입력하기" | ||
137 | + android:textColor="#FFF" | ||
138 | + android:textSize="16dp" /> | ||
156 | 139 | ||
157 | - <Button | 140 | + <LinearLayout |
158 | - android:id="@+id/InfoButtonLaw" | 141 | + android:layout_width="match_parent" |
159 | - android:layout_width="match_parent" | 142 | + android:layout_height="wrap_content" |
160 | - android:layout_height="wrap_content" | 143 | + android:layout_weight="1" |
161 | - android:text="개인정보처리방침" /> | 144 | + android:background="#fff" |
162 | - </LinearLayout> | 145 | + android:orientation="vertical"> |
163 | 146 | ||
164 | - <LinearLayout | 147 | + <Button |
148 | + android:id="@+id/InfoButtonSettings" | ||
149 | + style="?android:attr/borderlessButtonStyle" | ||
165 | android:layout_width="match_parent" | 150 | android:layout_width="match_parent" |
166 | android:layout_height="wrap_content" | 151 | android:layout_height="wrap_content" |
167 | - android:layout_weight="1" | 152 | + android:layout_marginTop="31dp" |
168 | - android:gravity="center" | 153 | + android:background="#FFF" |
169 | - android:orientation="horizontal"> | 154 | + android:drawableLeft="@drawable/settings" |
170 | - | 155 | + android:drawablePadding="22dp" |
171 | - <Button | 156 | + android:elevation="0dp" |
172 | - android:id="@+id/InfoButtonSettings" | 157 | + android:gravity="left|center_vertical" |
173 | - android:layout_width="match_parent" | 158 | + android:paddingLeft="33dp" |
174 | - android:layout_height="wrap_content" | 159 | + android:text="설정" |
175 | - android:text="환경설정" /> | 160 | + android:textSize="20dp" /> |
176 | - </LinearLayout> | 161 | + |
177 | - | 162 | + <Button |
178 | - <LinearLayout | 163 | + android:id="@+id/InfoButtonNotice" |
179 | android:layout_width="match_parent" | 164 | android:layout_width="match_parent" |
180 | android:layout_height="wrap_content" | 165 | android:layout_height="wrap_content" |
181 | - android:layout_weight="1" | 166 | + android:layout_marginTop="22dp" |
182 | - android:gravity="center" | 167 | + android:background="#FFF" |
183 | - android:orientation="horizontal"> | 168 | + style="?android:attr/borderlessButtonStyle" |
184 | - | 169 | + android:drawableLeft="@drawable/_alert" |
185 | - <Button | 170 | + android:drawablePadding="22dp" |
186 | - android:id="@+id/InfoButtonFAQ" | 171 | + android:gravity="left|center_vertical" |
187 | - android:layout_width="match_parent" | 172 | + android:paddingLeft="33dp" |
188 | - android:layout_height="wrap_content" | 173 | + android:text="공지사항" |
189 | - android:text="자주 묻는 질문" /> | 174 | + android:textSize="20dp" /> |
190 | - </LinearLayout> | 175 | + |
191 | - | 176 | + <Button |
192 | - <LinearLayout | 177 | + android:id="@+id/InfoButtonFAQ" |
193 | android:layout_width="match_parent" | 178 | android:layout_width="match_parent" |
194 | android:layout_height="wrap_content" | 179 | android:layout_height="wrap_content" |
195 | - android:layout_weight="1" | 180 | + android:layout_marginTop="22dp" |
196 | - android:gravity="center" | 181 | + android:background="#FFF" |
197 | - android:orientation="horizontal"> | 182 | + android:elevation="0dp" |
198 | - | 183 | + style="?android:attr/borderlessButtonStyle" |
199 | - <Button | 184 | + android:drawableLeft="@drawable/help" |
200 | - android:id="@+id/InfoButtonNotice" | 185 | + android:drawablePadding="22dp" |
201 | - android:layout_width="match_parent" | 186 | + android:gravity="left|center_vertical" |
202 | - android:layout_height="wrap_content" | 187 | + android:paddingLeft="33dp" |
203 | - android:text="공지사항" /> | 188 | + android:text="자주 묻는 질문" |
204 | - </LinearLayout> | 189 | + android:textSize="20dp" /> |
205 | 190 | ||
206 | </LinearLayout> | 191 | </LinearLayout> |
207 | 192 | ... | ... |
... | @@ -81,10 +81,13 @@ | ... | @@ -81,10 +81,13 @@ |
81 | android:layout_height="wrap_content" | 81 | android:layout_height="wrap_content" |
82 | android:text="시/도" /> | 82 | android:text="시/도" /> |
83 | 83 | ||
84 | - <Spinner | 84 | + <EditText |
85 | - android:id="@+id/doSpinner" | 85 | + android:id="@+id/doEditText" |
86 | - android:layout_width="fill_parent" | 86 | + android:layout_width="match_parent" |
87 | - android:layout_height="wrap_content" /> | 87 | + android:layout_height="wrap_content" |
88 | + android:ems="10" | ||
89 | + android:hint="ex1) 서울시 ex2)경기도" | ||
90 | + android:inputType="textPersonName" /> | ||
88 | 91 | ||
89 | <TextView | 92 | <TextView |
90 | android:id="@+id/cityTextView" | 93 | android:id="@+id/cityTextView" |
... | @@ -92,10 +95,27 @@ | ... | @@ -92,10 +95,27 @@ |
92 | android:layout_height="wrap_content" | 95 | android:layout_height="wrap_content" |
93 | android:text="시/군/구" /> | 96 | android:text="시/군/구" /> |
94 | 97 | ||
95 | - <Spinner | 98 | + <EditText |
96 | - android:id="@+id/gooSpinner" | 99 | + android:id="@+id/cityEditText" |
97 | - android:layout_width="fill_parent" | 100 | + android:layout_width="match_parent" |
98 | - android:layout_height="wrap_content" /> | 101 | + android:layout_height="wrap_content" |
102 | + android:ems="10" | ||
103 | + android:hint="ex) 동대문구" | ||
104 | + android:inputType="textPersonName" /> | ||
105 | + | ||
106 | + <TextView | ||
107 | + android:id="@+id/dongTextView" | ||
108 | + android:layout_width="match_parent" | ||
109 | + android:layout_height="wrap_content" | ||
110 | + android:text="읍/면/동" /> | ||
111 | + | ||
112 | + <EditText | ||
113 | + android:id="@+id/dongEditText" | ||
114 | + android:layout_width="match_parent" | ||
115 | + android:layout_height="wrap_content" | ||
116 | + android:ems="10" | ||
117 | + android:hint="ex) 회기동" | ||
118 | + android:inputType="textPersonName" /> | ||
99 | 119 | ||
100 | </LinearLayout> | 120 | </LinearLayout> |
101 | 121 | ... | ... |
... | @@ -76,7 +76,7 @@ | ... | @@ -76,7 +76,7 @@ |
76 | android:orientation="vertical"> | 76 | android:orientation="vertical"> |
77 | 77 | ||
78 | <ToggleButton | 78 | <ToggleButton |
79 | - android:id="@+id/gagoojooButton" | 79 | + android:id="@+id/inmanButton" |
80 | android:layout_width="match_parent" | 80 | android:layout_width="match_parent" |
81 | android:layout_height="wrap_content" | 81 | android:layout_height="wrap_content" |
82 | android:background="@drawable/profil_selector" | 82 | android:background="@drawable/profil_selector" |
... | @@ -85,7 +85,7 @@ | ... | @@ -85,7 +85,7 @@ |
85 | android:textOn="가구주" /> | 85 | android:textOn="가구주" /> |
86 | 86 | ||
87 | <ToggleButton | 87 | <ToggleButton |
88 | - android:id="@+id/gagoowonButton" | 88 | + android:id="@+id/outmanButton" |
89 | android:layout_width="match_parent" | 89 | android:layout_width="match_parent" |
90 | android:layout_height="wrap_content" | 90 | android:layout_height="wrap_content" |
91 | android:background="@drawable/profil_selector" | 91 | android:background="@drawable/profil_selector" | ... | ... |
... | @@ -219,7 +219,7 @@ | ... | @@ -219,7 +219,7 @@ |
219 | android:layout_height="wrap_content" | 219 | android:layout_height="wrap_content" |
220 | android:layout_weight="1" | 220 | android:layout_weight="1" |
221 | android:orientation="vertical" | 221 | android:orientation="vertical" |
222 | - android:visibility="gone"> | 222 | + android:visibility="visible"> |
223 | 223 | ||
224 | <LinearLayout | 224 | <LinearLayout |
225 | android:layout_width="match_parent" | 225 | android:layout_width="match_parent" |
... | @@ -349,28 +349,27 @@ | ... | @@ -349,28 +349,27 @@ |
349 | 349 | ||
350 | </LinearLayout> | 350 | </LinearLayout> |
351 | 351 | ||
352 | - </LinearLayout> | 352 | + <LinearLayout |
353 | - </ScrollView> | 353 | + android:layout_width="match_parent" |
354 | - | 354 | + android:layout_height="wrap_content" |
355 | - <LinearLayout | 355 | + android:orientation="horizontal"> |
356 | - android:layout_width="match_parent" | ||
357 | - android:layout_height="wrap_content" | ||
358 | - android:orientation="horizontal"> | ||
359 | 356 | ||
360 | - <Button | 357 | + <Button |
361 | - android:id="@+id/previousButton" | 358 | + android:id="@+id/previousButton" |
362 | - android:layout_width="10dp" | 359 | + android:layout_width="10dp" |
363 | - android:layout_height="wrap_content" | 360 | + android:layout_height="wrap_content" |
364 | - android:layout_weight="1" | 361 | + android:layout_weight="1" |
365 | - android:text="이전 단계로" /> | 362 | + android:text="이전 단계로" /> |
366 | 363 | ||
367 | - <Button | 364 | + <Button |
368 | - android:id="@+id/nextButton" | 365 | + android:id="@+id/nextButton" |
369 | - android:layout_width="10dp" | 366 | + android:layout_width="10dp" |
370 | - android:layout_height="wrap_content" | 367 | + android:layout_height="wrap_content" |
371 | - android:layout_weight="1" | 368 | + android:layout_weight="1" |
372 | - android:text="다음 단계로" /> | 369 | + android:text="다음 단계로" /> |
373 | - </LinearLayout> | 370 | + </LinearLayout> |
371 | + </LinearLayout> | ||
372 | + </ScrollView> | ||
374 | 373 | ||
375 | </LinearLayout> | 374 | </LinearLayout> |
376 | </LinearLayout> | 375 | </LinearLayout> | ... | ... |
... | @@ -131,7 +131,6 @@ | ... | @@ -131,7 +131,6 @@ |
131 | <LinearLayout | 131 | <LinearLayout |
132 | android:layout_width="match_parent" | 132 | android:layout_width="match_parent" |
133 | android:layout_height="wrap_content" | 133 | android:layout_height="wrap_content" |
134 | - android:layout_gravity="center" | ||
135 | android:orientation="vertical"> | 134 | android:orientation="vertical"> |
136 | 135 | ||
137 | <LinearLayout | 136 | <LinearLayout |
... | @@ -215,12 +214,10 @@ | ... | @@ -215,12 +214,10 @@ |
215 | </LinearLayout> | 214 | </LinearLayout> |
216 | 215 | ||
217 | <LinearLayout | 216 | <LinearLayout |
218 | - android:id="@+id/subLayout" | ||
219 | android:layout_width="match_parent" | 217 | android:layout_width="match_parent" |
220 | android:layout_height="wrap_content" | 218 | android:layout_height="wrap_content" |
221 | android:layout_weight="1" | 219 | android:layout_weight="1" |
222 | - android:orientation="vertical" | 220 | + android:orientation="vertical"> |
223 | - android:visibility="gone"> | ||
224 | 221 | ||
225 | <LinearLayout | 222 | <LinearLayout |
226 | android:layout_width="match_parent" | 223 | android:layout_width="match_parent" |
... | @@ -350,28 +347,27 @@ | ... | @@ -350,28 +347,27 @@ |
350 | 347 | ||
351 | </LinearLayout> | 348 | </LinearLayout> |
352 | 349 | ||
353 | - </LinearLayout> | 350 | + <LinearLayout |
354 | - </ScrollView> | 351 | + android:layout_width="match_parent" |
355 | - | 352 | + android:layout_height="wrap_content" |
356 | - <LinearLayout | 353 | + android:orientation="horizontal"> |
357 | - android:layout_width="match_parent" | ||
358 | - android:layout_height="wrap_content" | ||
359 | - android:orientation="horizontal"> | ||
360 | 354 | ||
361 | - <Button | 355 | + <Button |
362 | - android:id="@+id/previousButton" | 356 | + android:id="@+id/previousButton" |
363 | - android:layout_width="10dp" | 357 | + android:layout_width="10dp" |
364 | - android:layout_height="wrap_content" | 358 | + android:layout_height="wrap_content" |
365 | - android:layout_weight="1" | 359 | + android:layout_weight="1" |
366 | - android:text="이전 단계로" /> | 360 | + android:text="이전 단계로" /> |
367 | 361 | ||
368 | - <Button | 362 | + <Button |
369 | - android:id="@+id/nextButton" | 363 | + android:id="@+id/nextButton" |
370 | - android:layout_width="10dp" | 364 | + android:layout_width="10dp" |
371 | - android:layout_height="wrap_content" | 365 | + android:layout_height="wrap_content" |
372 | - android:layout_weight="1" | 366 | + android:layout_weight="1" |
373 | - android:text="다음 단계로" /> | 367 | + android:text="다음 단계로" /> |
374 | - </LinearLayout> | 368 | + </LinearLayout> |
369 | + </LinearLayout> | ||
370 | + </ScrollView> | ||
375 | 371 | ||
376 | </LinearLayout> | 372 | </LinearLayout> |
377 | </LinearLayout> | 373 | </LinearLayout> | ... | ... |
... | @@ -12,6 +12,7 @@ | ... | @@ -12,6 +12,7 @@ |
12 | android:orientation="vertical"> | 12 | android:orientation="vertical"> |
13 | 13 | ||
14 | 14 | ||
15 | + | ||
15 | <androidx.appcompat.widget.Toolbar | 16 | <androidx.appcompat.widget.Toolbar |
16 | android:id="@+id/toolbar" | 17 | android:id="@+id/toolbar" |
17 | android:layout_width="fill_parent" | 18 | android:layout_width="fill_parent" |
... | @@ -32,32 +33,28 @@ | ... | @@ -32,32 +33,28 @@ |
32 | android:layout_width="10dp" | 33 | android:layout_width="10dp" |
33 | android:layout_height="match_parent" | 34 | android:layout_height="match_parent" |
34 | android:layout_weight="1.5" | 35 | android:layout_weight="1.5" |
35 | - android:text="건너뛰기" /> | 36 | + android:text="건너뛰기"/> |
36 | - | ||
37 | <LinearLayout | 37 | <LinearLayout |
38 | android:layout_width="10dp" | 38 | android:layout_width="10dp" |
39 | android:layout_height="match_parent" | 39 | android:layout_height="match_parent" |
40 | - android:layout_weight="1" | 40 | + android:orientation="horizontal" |
41 | - android:orientation="horizontal" /> | 41 | + android:layout_weight="1"/> |
42 | - | ||
43 | <ImageView | 42 | <ImageView |
44 | android:layout_width="77dp" | 43 | android:layout_width="77dp" |
45 | android:layout_height="44dp" | 44 | android:layout_height="44dp" |
46 | android:layout_gravity="center" | 45 | android:layout_gravity="center" |
47 | android:layout_weight="1" | 46 | android:layout_weight="1" |
48 | android:src="@drawable/toolbar_logo" /> | 47 | android:src="@drawable/toolbar_logo" /> |
49 | - | ||
50 | <LinearLayout | 48 | <LinearLayout |
51 | android:layout_width="10dp" | 49 | android:layout_width="10dp" |
52 | android:layout_height="match_parent" | 50 | android:layout_height="match_parent" |
53 | - android:layout_weight="1" | 51 | + android:orientation="horizontal" |
54 | - android:orientation="horizontal" /> | 52 | + android:layout_weight="1"/> |
55 | - | ||
56 | <LinearLayout | 53 | <LinearLayout |
57 | android:layout_width="10dp" | 54 | android:layout_width="10dp" |
58 | android:layout_height="match_parent" | 55 | android:layout_height="match_parent" |
59 | - android:layout_weight="1.5" | 56 | + android:orientation="horizontal" |
60 | - android:orientation="horizontal" /> | 57 | + android:layout_weight="1.5"/> |
61 | 58 | ||
62 | </LinearLayout> | 59 | </LinearLayout> |
63 | 60 | ||
... | @@ -121,10 +118,22 @@ | ... | @@ -121,10 +118,22 @@ |
121 | 118 | ||
122 | <LinearLayout | 119 | <LinearLayout |
123 | android:layout_width="match_parent" | 120 | android:layout_width="match_parent" |
124 | - android:layout_height="wrap_content" | 121 | + android:layout_height="10dp" |
122 | + android:orientation="vertical"></LinearLayout> | ||
123 | + | ||
124 | + <LinearLayout | ||
125 | + android:layout_width="match_parent" | ||
126 | + android:layout_height="50dp" | ||
125 | android:layout_weight="1" | 127 | android:layout_weight="1" |
126 | android:orientation="vertical"> | 128 | android:orientation="vertical"> |
127 | 129 | ||
130 | + <LinearLayout | ||
131 | + android:layout_width="match_parent" | ||
132 | + android:layout_height="10dp" | ||
133 | + android:orientation="vertical"> | ||
134 | + | ||
135 | + </LinearLayout> | ||
136 | + | ||
128 | <ScrollView | 137 | <ScrollView |
129 | android:layout_width="match_parent" | 138 | android:layout_width="match_parent" |
130 | android:layout_height="match_parent" | 139 | android:layout_height="match_parent" |
... | @@ -133,14 +142,23 @@ | ... | @@ -133,14 +142,23 @@ |
133 | <LinearLayout | 142 | <LinearLayout |
134 | android:layout_width="match_parent" | 143 | android:layout_width="match_parent" |
135 | android:layout_height="wrap_content" | 144 | android:layout_height="wrap_content" |
136 | - android:orientation="vertical" | 145 | + android:orientation="vertical"> |
137 | - android:weightSum="1"> | 146 | + |
147 | + <LinearLayout | ||
148 | + android:layout_width="match_parent" | ||
149 | + android:layout_height="wrap_content" | ||
150 | + android:orientation="vertical"></LinearLayout> | ||
138 | 151 | ||
139 | <TextView | 152 | <TextView |
140 | android:id="@+id/mainTextView" | 153 | android:id="@+id/mainTextView" |
141 | android:layout_width="match_parent" | 154 | android:layout_width="match_parent" |
142 | android:layout_height="wrap_content" | 155 | android:layout_height="wrap_content" |
143 | - android:text="4-2. 총 형제자매 수를 입력해주세요." /> | 156 | + android:text="4-2. 가족구성원 '형제/자매' 선택 시 총 형제/자매 수를 입력해주세요." /> |
157 | + | ||
158 | + <LinearLayout | ||
159 | + android:layout_width="match_parent" | ||
160 | + android:layout_height="wrap_content" | ||
161 | + android:orientation="vertical"></LinearLayout> | ||
144 | 162 | ||
145 | <LinearLayout | 163 | <LinearLayout |
146 | android:layout_width="match_parent" | 164 | android:layout_width="match_parent" |
... | @@ -148,53 +166,477 @@ | ... | @@ -148,53 +166,477 @@ |
148 | android:orientation="horizontal"> | 166 | android:orientation="horizontal"> |
149 | 167 | ||
150 | <EditText | 168 | <EditText |
151 | - android:id="@+id/bsNumberEditText" | 169 | + android:id="@+id/brotherNumberEditText" |
152 | android:layout_width="wrap_content" | 170 | android:layout_width="wrap_content" |
153 | android:layout_height="wrap_content" | 171 | android:layout_height="wrap_content" |
154 | android:layout_weight="1" | 172 | android:layout_weight="1" |
155 | android:ems="10" | 173 | android:ems="10" |
156 | android:hint="ex) 3" | 174 | android:hint="ex) 3" |
157 | - android:inputType="number|textPersonName" /> | 175 | + android:inputType="textPersonName" /> |
158 | 176 | ||
159 | <Button | 177 | <Button |
160 | - android:id="@+id/bsNumberInputButton" | 178 | + android:id="@+id/brotherNumberInputButton" |
161 | android:layout_width="wrap_content" | 179 | android:layout_width="wrap_content" |
162 | android:layout_height="wrap_content" | 180 | android:layout_height="wrap_content" |
163 | android:layout_weight="1" | 181 | android:layout_weight="1" |
164 | android:text="입 력" /> | 182 | android:text="입 력" /> |
165 | </LinearLayout> | 183 | </LinearLayout> |
166 | 184 | ||
167 | - <androidx.recyclerview.widget.RecyclerView | 185 | + <LinearLayout |
168 | - android:id="@+id/bsRecyclerView" | ||
169 | android:layout_width="match_parent" | 186 | android:layout_width="match_parent" |
170 | android:layout_height="wrap_content" | 187 | android:layout_height="wrap_content" |
171 | - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" | 188 | + android:orientation="vertical"> |
172 | - tools:listitem="@layout/item_child" /> | ||
173 | 189 | ||
174 | - </LinearLayout> | 190 | + <LinearLayout |
175 | - </ScrollView> | 191 | + android:id="@+id/brother1LinearLayout" |
176 | - </LinearLayout> | 192 | + android:layout_width="match_parent" |
193 | + android:layout_height="wrap_content" | ||
194 | + android:orientation="vertical"> | ||
195 | + | ||
196 | + <TextView | ||
197 | + android:id="@+id/brother1TextView" | ||
198 | + android:layout_width="match_parent" | ||
199 | + android:layout_height="wrap_content" | ||
200 | + android:text="형제자매 1" /> | ||
201 | + | ||
202 | + <LinearLayout | ||
203 | + android:layout_width="match_parent" | ||
204 | + android:layout_height="match_parent" | ||
205 | + android:orientation="vertical"></LinearLayout> | ||
206 | + | ||
207 | + <TextView | ||
208 | + android:id="@+id/brother1BirthTextView" | ||
209 | + android:layout_width="match_parent" | ||
210 | + android:layout_height="wrap_content" | ||
211 | + android:text="생년월일" /> | ||
212 | + | ||
213 | + <LinearLayout | ||
214 | + android:layout_width="match_parent" | ||
215 | + android:layout_height="match_parent" | ||
216 | + android:orientation="horizontal"> | ||
217 | + | ||
218 | + <EditText | ||
219 | + android:id="@+id/brother1BirthEditText" | ||
220 | + android:layout_width="wrap_content" | ||
221 | + android:layout_height="wrap_content" | ||
222 | + android:layout_weight="1" | ||
223 | + android:ems="10" | ||
224 | + android:inputType="textPersonName" /> | ||
225 | + | ||
226 | + <Button | ||
227 | + android:id="@+id/brother1BirthInputButton" | ||
228 | + android:layout_width="wrap_content" | ||
229 | + android:layout_height="wrap_content" | ||
230 | + android:layout_weight="1" | ||
231 | + android:text="입력" /> | ||
232 | + | ||
233 | + </LinearLayout> | ||
234 | + | ||
235 | + <LinearLayout | ||
236 | + android:layout_width="match_parent" | ||
237 | + android:layout_height="match_parent" | ||
238 | + android:orientation="vertical"></LinearLayout> | ||
239 | + | ||
240 | + <TextView | ||
241 | + android:id="@+id/brother1SexTextView" | ||
242 | + android:layout_width="match_parent" | ||
243 | + android:layout_height="wrap_content" | ||
244 | + android:text="TextView" /> | ||
245 | + | ||
246 | + <LinearLayout | ||
247 | + android:layout_width="match_parent" | ||
248 | + android:layout_height="match_parent" | ||
249 | + android:orientation="horizontal"> | ||
250 | + | ||
251 | + <ToggleButton | ||
252 | + android:id="@+id/brother1SexManButton" | ||
253 | + android:layout_width="wrap_content" | ||
254 | + android:layout_height="wrap_content" | ||
255 | + android:layout_weight="1" | ||
256 | + android:background="@drawable/profil_selector" | ||
257 | + android:text="ToggleButton" | ||
258 | + android:textOff="남자" | ||
259 | + android:textOn="남자" /> | ||
260 | + | ||
261 | + <ToggleButton | ||
262 | + android:id="@+id/brother1SexWomanButton" | ||
263 | + android:layout_width="wrap_content" | ||
264 | + android:layout_height="wrap_content" | ||
265 | + android:layout_weight="1" | ||
266 | + android:background="@drawable/profil_selector" | ||
267 | + android:text="ToggleButton" | ||
268 | + android:textOff="여자" | ||
269 | + android:textOn="여자" /> | ||
270 | + </LinearLayout> | ||
271 | + | ||
272 | + </LinearLayout> | ||
273 | + | ||
274 | + | ||
275 | + <LinearLayout | ||
276 | + android:id="@+id/brother2LinearLayout" | ||
277 | + android:layout_width="match_parent" | ||
278 | + android:layout_height="wrap_content" | ||
279 | + android:orientation="vertical"> | ||
280 | + | ||
281 | + <TextView | ||
282 | + android:id="@+id/brother2TextView" | ||
283 | + android:layout_width="match_parent" | ||
284 | + android:layout_height="wrap_content" | ||
285 | + android:text="형제자매 2" /> | ||
286 | + | ||
287 | + <LinearLayout | ||
288 | + android:layout_width="match_parent" | ||
289 | + android:layout_height="match_parent" | ||
290 | + android:orientation="vertical"></LinearLayout> | ||
291 | + | ||
292 | + <TextView | ||
293 | + android:id="@+id/brother2BirthTextView" | ||
294 | + android:layout_width="match_parent" | ||
295 | + android:layout_height="wrap_content" | ||
296 | + android:text="생년월일" /> | ||
297 | + | ||
298 | + <LinearLayout | ||
299 | + android:layout_width="match_parent" | ||
300 | + android:layout_height="match_parent" | ||
301 | + android:orientation="horizontal"> | ||
302 | + | ||
303 | + <EditText | ||
304 | + android:id="@+id/brother2BirthEditText" | ||
305 | + android:layout_width="wrap_content" | ||
306 | + android:layout_height="wrap_content" | ||
307 | + android:layout_weight="1" | ||
308 | + android:ems="10" | ||
309 | + android:inputType="textPersonName" /> | ||
310 | + | ||
311 | + <Button | ||
312 | + android:id="@+id/brother2BirthInputButton" | ||
313 | + android:layout_width="wrap_content" | ||
314 | + android:layout_height="wrap_content" | ||
315 | + android:layout_weight="1" | ||
316 | + android:text="입력" /> | ||
317 | + | ||
318 | + </LinearLayout> | ||
319 | + | ||
320 | + <LinearLayout | ||
321 | + android:layout_width="match_parent" | ||
322 | + android:layout_height="match_parent" | ||
323 | + android:orientation="vertical"></LinearLayout> | ||
324 | + | ||
325 | + <TextView | ||
326 | + android:id="@+id/brother2SexTextView" | ||
327 | + android:layout_width="match_parent" | ||
328 | + android:layout_height="wrap_content" | ||
329 | + android:text="TextView" /> | ||
330 | + | ||
331 | + <LinearLayout | ||
332 | + android:layout_width="match_parent" | ||
333 | + android:layout_height="match_parent" | ||
334 | + android:orientation="horizontal"> | ||
335 | + | ||
336 | + <ToggleButton | ||
337 | + android:id="@+id/brother2SexManButton" | ||
338 | + android:layout_width="wrap_content" | ||
339 | + android:layout_height="wrap_content" | ||
340 | + android:layout_weight="1" | ||
341 | + android:background="@drawable/profil_selector" | ||
342 | + android:text="ToggleButton" | ||
343 | + android:textOff="남자" | ||
344 | + android:textOn="남자" /> | ||
345 | + | ||
346 | + <ToggleButton | ||
347 | + android:id="@+id/brother2SexWomanButton" | ||
348 | + android:layout_width="wrap_content" | ||
349 | + android:layout_height="wrap_content" | ||
350 | + android:layout_weight="1" | ||
351 | + android:background="@drawable/profil_selector" | ||
352 | + android:text="ToggleButton" | ||
353 | + android:textOff="여자" | ||
354 | + android:textOn="여자" /> | ||
355 | + </LinearLayout> | ||
356 | + | ||
357 | + </LinearLayout> | ||
358 | + | ||
359 | + | ||
360 | + <LinearLayout | ||
361 | + android:id="@+id/brother3LinearLayout" | ||
362 | + android:layout_width="match_parent" | ||
363 | + android:layout_height="wrap_content" | ||
364 | + android:orientation="vertical"> | ||
365 | + | ||
366 | + <TextView | ||
367 | + android:id="@+id/brother3TextView" | ||
368 | + android:layout_width="match_parent" | ||
369 | + android:layout_height="wrap_content" | ||
370 | + android:text="형제자매 3" /> | ||
371 | + | ||
372 | + <LinearLayout | ||
373 | + android:layout_width="match_parent" | ||
374 | + android:layout_height="match_parent" | ||
375 | + android:orientation="vertical"></LinearLayout> | ||
376 | + | ||
377 | + <TextView | ||
378 | + android:id="@+id/brother3BirthTextView" | ||
379 | + android:layout_width="match_parent" | ||
380 | + android:layout_height="wrap_content" | ||
381 | + android:text="생년월일" /> | ||
382 | + | ||
383 | + <LinearLayout | ||
384 | + android:layout_width="match_parent" | ||
385 | + android:layout_height="match_parent" | ||
386 | + android:orientation="horizontal"> | ||
387 | + | ||
388 | + <EditText | ||
389 | + android:id="@+id/brother3BirthEditText" | ||
390 | + android:layout_width="wrap_content" | ||
391 | + android:layout_height="wrap_content" | ||
392 | + android:layout_weight="1" | ||
393 | + android:ems="10" | ||
394 | + android:inputType="textPersonName" /> | ||
395 | + | ||
396 | + <Button | ||
397 | + android:id="@+id/brother3BirthInputButton" | ||
398 | + android:layout_width="wrap_content" | ||
399 | + android:layout_height="wrap_content" | ||
400 | + android:layout_weight="1" | ||
401 | + android:text="입력" /> | ||
402 | + | ||
403 | + </LinearLayout> | ||
404 | + | ||
405 | + <LinearLayout | ||
406 | + android:layout_width="match_parent" | ||
407 | + android:layout_height="match_parent" | ||
408 | + android:orientation="vertical"></LinearLayout> | ||
409 | + | ||
410 | + <TextView | ||
411 | + android:id="@+id/brother3SexTextView" | ||
412 | + android:layout_width="match_parent" | ||
413 | + android:layout_height="wrap_content" | ||
414 | + android:text="TextView" /> | ||
415 | + | ||
416 | + <LinearLayout | ||
417 | + android:layout_width="match_parent" | ||
418 | + android:layout_height="match_parent" | ||
419 | + android:orientation="horizontal"> | ||
420 | + | ||
421 | + <ToggleButton | ||
422 | + android:id="@+id/brother3SexManButton" | ||
423 | + android:layout_width="wrap_content" | ||
424 | + android:layout_height="wrap_content" | ||
425 | + android:layout_weight="1" | ||
426 | + android:background="@drawable/profil_selector" | ||
427 | + android:text="ToggleButton" | ||
428 | + android:textOff="남자" | ||
429 | + android:textOn="남자" /> | ||
430 | + | ||
431 | + <ToggleButton | ||
432 | + android:id="@+id/brother3SexWomanButton" | ||
433 | + android:layout_width="wrap_content" | ||
434 | + android:layout_height="wrap_content" | ||
435 | + android:layout_weight="1" | ||
436 | + android:background="@drawable/profil_selector" | ||
437 | + android:text="ToggleButton" | ||
438 | + android:textOff="여자" | ||
439 | + android:textOn="여자" /> | ||
440 | + </LinearLayout> | ||
441 | + | ||
442 | + </LinearLayout> | ||
443 | + | ||
444 | + | ||
445 | + <LinearLayout | ||
446 | + android:id="@+id/brother4LinearLayout" | ||
447 | + android:layout_width="match_parent" | ||
448 | + android:layout_height="wrap_content" | ||
449 | + android:orientation="vertical"> | ||
450 | + | ||
451 | + <TextView | ||
452 | + android:id="@+id/brother4TextView" | ||
453 | + android:layout_width="match_parent" | ||
454 | + android:layout_height="wrap_content" | ||
455 | + android:text="형제자매 4" /> | ||
456 | + | ||
457 | + <LinearLayout | ||
458 | + android:layout_width="match_parent" | ||
459 | + android:layout_height="match_parent" | ||
460 | + android:orientation="vertical"></LinearLayout> | ||
461 | + | ||
462 | + <TextView | ||
463 | + android:id="@+id/brother4BirthTextView" | ||
464 | + android:layout_width="match_parent" | ||
465 | + android:layout_height="wrap_content" | ||
466 | + android:text="생년월일" /> | ||
467 | + | ||
468 | + <LinearLayout | ||
469 | + android:layout_width="match_parent" | ||
470 | + android:layout_height="match_parent" | ||
471 | + android:orientation="horizontal"> | ||
472 | + | ||
473 | + <EditText | ||
474 | + android:id="@+id/brother4BirthEditText" | ||
475 | + android:layout_width="wrap_content" | ||
476 | + android:layout_height="wrap_content" | ||
477 | + android:layout_weight="1" | ||
478 | + android:ems="10" | ||
479 | + android:inputType="textPersonName" /> | ||
480 | + | ||
481 | + <Button | ||
482 | + android:id="@+id/brother4BirthInputButton" | ||
483 | + android:layout_width="wrap_content" | ||
484 | + android:layout_height="wrap_content" | ||
485 | + android:layout_weight="1" | ||
486 | + android:text="입력" /> | ||
487 | + | ||
488 | + </LinearLayout> | ||
489 | + | ||
490 | + <LinearLayout | ||
491 | + android:layout_width="match_parent" | ||
492 | + android:layout_height="match_parent" | ||
493 | + android:orientation="vertical"></LinearLayout> | ||
494 | + | ||
495 | + <TextView | ||
496 | + android:id="@+id/brother4SexTextView" | ||
497 | + android:layout_width="match_parent" | ||
498 | + android:layout_height="wrap_content" | ||
499 | + android:text="TextView" /> | ||
500 | + | ||
501 | + <LinearLayout | ||
502 | + android:layout_width="match_parent" | ||
503 | + android:layout_height="match_parent" | ||
504 | + android:orientation="horizontal"> | ||
505 | + | ||
506 | + <ToggleButton | ||
507 | + android:id="@+id/brother4SexManButton" | ||
508 | + android:layout_width="wrap_content" | ||
509 | + android:layout_height="wrap_content" | ||
510 | + android:layout_weight="1" | ||
511 | + android:background="@drawable/profil_selector" | ||
512 | + android:text="ToggleButton" | ||
513 | + android:textOff="남자" | ||
514 | + android:textOn="남자" /> | ||
515 | + | ||
516 | + <ToggleButton | ||
517 | + android:id="@+id/brother4SexWomanButton" | ||
518 | + android:layout_width="wrap_content" | ||
519 | + android:layout_height="wrap_content" | ||
520 | + android:layout_weight="1" | ||
521 | + android:background="@drawable/profil_selector" | ||
522 | + android:text="ToggleButton" | ||
523 | + android:textOff="여자" | ||
524 | + android:textOn="여자" /> | ||
525 | + </LinearLayout> | ||
526 | + | ||
527 | + </LinearLayout> | ||
528 | + | ||
529 | + | ||
530 | + <LinearLayout | ||
531 | + android:id="@+id/brother5LinearLayout" | ||
532 | + android:layout_width="match_parent" | ||
533 | + android:layout_height="wrap_content" | ||
534 | + android:orientation="vertical"> | ||
535 | + | ||
536 | + <TextView | ||
537 | + android:id="@+id/brother5TextView" | ||
538 | + android:layout_width="match_parent" | ||
539 | + android:layout_height="wrap_content" | ||
540 | + android:text="형제자매 5" /> | ||
541 | + | ||
542 | + <LinearLayout | ||
543 | + android:layout_width="match_parent" | ||
544 | + android:layout_height="match_parent" | ||
545 | + android:orientation="vertical"></LinearLayout> | ||
546 | + | ||
547 | + <TextView | ||
548 | + android:id="@+id/brother5BirthTextView" | ||
549 | + android:layout_width="match_parent" | ||
550 | + android:layout_height="wrap_content" | ||
551 | + android:text="생년월일" /> | ||
552 | + | ||
553 | + <LinearLayout | ||
554 | + android:layout_width="match_parent" | ||
555 | + android:layout_height="match_parent" | ||
556 | + android:orientation="horizontal"> | ||
557 | + | ||
558 | + <EditText | ||
559 | + android:id="@+id/brother5BirthEditText" | ||
560 | + android:layout_width="wrap_content" | ||
561 | + android:layout_height="wrap_content" | ||
562 | + android:layout_weight="1" | ||
563 | + android:ems="10" | ||
564 | + android:inputType="textPersonName" /> | ||
565 | + | ||
566 | + <Button | ||
567 | + android:id="@+id/brother5BirthInputButton" | ||
568 | + android:layout_width="wrap_content" | ||
569 | + android:layout_height="wrap_content" | ||
570 | + android:layout_weight="1" | ||
571 | + android:text="입력" /> | ||
572 | + | ||
573 | + </LinearLayout> | ||
574 | + | ||
575 | + <LinearLayout | ||
576 | + android:layout_width="match_parent" | ||
577 | + android:layout_height="match_parent" | ||
578 | + android:orientation="vertical"></LinearLayout> | ||
579 | + | ||
580 | + <TextView | ||
581 | + android:id="@+id/brother5SexTextView" | ||
582 | + android:layout_width="match_parent" | ||
583 | + android:layout_height="wrap_content" | ||
584 | + android:text="TextView" /> | ||
585 | + | ||
586 | + <LinearLayout | ||
587 | + android:layout_width="match_parent" | ||
588 | + android:layout_height="match_parent" | ||
589 | + android:orientation="horizontal"> | ||
590 | + | ||
591 | + <ToggleButton | ||
592 | + android:id="@+id/brother5SexManButton" | ||
593 | + android:layout_width="wrap_content" | ||
594 | + android:layout_height="wrap_content" | ||
595 | + android:layout_weight="1" | ||
596 | + android:background="@drawable/profil_selector" | ||
597 | + android:text="ToggleButton" | ||
598 | + android:textOff="남자" | ||
599 | + android:textOn="남자" /> | ||
600 | + | ||
601 | + <ToggleButton | ||
602 | + android:id="@+id/brother5SexWomanButton" | ||
603 | + android:layout_width="wrap_content" | ||
604 | + android:layout_height="wrap_content" | ||
605 | + android:layout_weight="1" | ||
606 | + android:background="@drawable/profil_selector" | ||
607 | + android:text="ToggleButton" | ||
608 | + android:textOff="여자" | ||
609 | + android:textOn="여자" /> | ||
610 | + </LinearLayout> | ||
611 | + | ||
612 | + </LinearLayout> | ||
177 | 613 | ||
178 | - <LinearLayout | ||
179 | - android:layout_width="match_parent" | ||
180 | - android:layout_height="wrap_content" | ||
181 | - android:layout_gravity="bottom" | ||
182 | - android:orientation="horizontal"> | ||
183 | 614 | ||
184 | - <Button | 615 | + </LinearLayout> |
185 | - android:id="@+id/previousButton" | ||
186 | - android:layout_width="10dp" | ||
187 | - android:layout_height="wrap_content" | ||
188 | - android:layout_weight="1" | ||
189 | - android:text="이전 단계로" /> | ||
190 | 616 | ||
191 | - <Button | 617 | + <LinearLayout |
192 | - android:id="@+id/nextButton" | 618 | + android:layout_width="match_parent" |
193 | - android:layout_width="10dp" | 619 | + android:layout_height="wrap_content" |
194 | - android:layout_height="wrap_content" | 620 | + android:orientation="horizontal"> |
195 | - android:layout_weight="1" | 621 | + |
196 | - android:text="다음 단계로" /> | 622 | + <Button |
197 | - </LinearLayout> | 623 | + android:id="@+id/previousButton" |
624 | + android:layout_width="10dp" | ||
625 | + android:layout_height="wrap_content" | ||
626 | + android:layout_weight="1" | ||
627 | + android:text="이전 단계로" /> | ||
198 | 628 | ||
629 | + <Button | ||
630 | + android:id="@+id/nextButton" | ||
631 | + android:layout_width="10dp" | ||
632 | + android:layout_height="wrap_content" | ||
633 | + android:layout_weight="1" | ||
634 | + android:text="다음 단계로" /> | ||
635 | + </LinearLayout> | ||
636 | + | ||
637 | + </LinearLayout> | ||
638 | + </ScrollView> | ||
639 | + | ||
640 | + </LinearLayout> | ||
199 | </LinearLayout> | 641 | </LinearLayout> |
200 | </androidx.constraintlayout.widget.ConstraintLayout> | 642 | </androidx.constraintlayout.widget.ConstraintLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -12,6 +12,7 @@ | ... | @@ -12,6 +12,7 @@ |
12 | android:orientation="vertical"> | 12 | android:orientation="vertical"> |
13 | 13 | ||
14 | 14 | ||
15 | + | ||
15 | <androidx.appcompat.widget.Toolbar | 16 | <androidx.appcompat.widget.Toolbar |
16 | android:id="@+id/toolbar" | 17 | android:id="@+id/toolbar" |
17 | android:layout_width="fill_parent" | 18 | android:layout_width="fill_parent" |
... | @@ -32,32 +33,28 @@ | ... | @@ -32,32 +33,28 @@ |
32 | android:layout_width="10dp" | 33 | android:layout_width="10dp" |
33 | android:layout_height="match_parent" | 34 | android:layout_height="match_parent" |
34 | android:layout_weight="1.5" | 35 | android:layout_weight="1.5" |
35 | - android:text="건너뛰기" /> | 36 | + android:text="건너뛰기"/> |
36 | - | ||
37 | <LinearLayout | 37 | <LinearLayout |
38 | android:layout_width="10dp" | 38 | android:layout_width="10dp" |
39 | android:layout_height="match_parent" | 39 | android:layout_height="match_parent" |
40 | - android:layout_weight="1" | 40 | + android:orientation="horizontal" |
41 | - android:orientation="horizontal" /> | 41 | + android:layout_weight="1"/> |
42 | - | ||
43 | <ImageView | 42 | <ImageView |
44 | android:layout_width="77dp" | 43 | android:layout_width="77dp" |
45 | android:layout_height="44dp" | 44 | android:layout_height="44dp" |
46 | android:layout_gravity="center" | 45 | android:layout_gravity="center" |
47 | android:layout_weight="1" | 46 | android:layout_weight="1" |
48 | android:src="@drawable/toolbar_logo" /> | 47 | android:src="@drawable/toolbar_logo" /> |
49 | - | ||
50 | <LinearLayout | 48 | <LinearLayout |
51 | android:layout_width="10dp" | 49 | android:layout_width="10dp" |
52 | android:layout_height="match_parent" | 50 | android:layout_height="match_parent" |
53 | - android:layout_weight="1" | 51 | + android:orientation="horizontal" |
54 | - android:orientation="horizontal" /> | 52 | + android:layout_weight="1"/> |
55 | - | ||
56 | <LinearLayout | 53 | <LinearLayout |
57 | android:layout_width="10dp" | 54 | android:layout_width="10dp" |
58 | android:layout_height="match_parent" | 55 | android:layout_height="match_parent" |
59 | - android:layout_weight="1.5" | 56 | + android:orientation="horizontal" |
60 | - android:orientation="horizontal" /> | 57 | + android:layout_weight="1.5"/> |
61 | 58 | ||
62 | </LinearLayout> | 59 | </LinearLayout> |
63 | 60 | ||
... | @@ -121,10 +118,22 @@ | ... | @@ -121,10 +118,22 @@ |
121 | 118 | ||
122 | <LinearLayout | 119 | <LinearLayout |
123 | android:layout_width="match_parent" | 120 | android:layout_width="match_parent" |
124 | - android:layout_height="wrap_content" | 121 | + android:layout_height="10dp" |
122 | + android:orientation="vertical"></LinearLayout> | ||
123 | + | ||
124 | + <LinearLayout | ||
125 | + android:layout_width="match_parent" | ||
126 | + android:layout_height="50dp" | ||
125 | android:layout_weight="1" | 127 | android:layout_weight="1" |
126 | android:orientation="vertical"> | 128 | android:orientation="vertical"> |
127 | 129 | ||
130 | + <LinearLayout | ||
131 | + android:layout_width="match_parent" | ||
132 | + android:layout_height="10dp" | ||
133 | + android:orientation="vertical"> | ||
134 | + | ||
135 | + </LinearLayout> | ||
136 | + | ||
128 | <ScrollView | 137 | <ScrollView |
129 | android:layout_width="match_parent" | 138 | android:layout_width="match_parent" |
130 | android:layout_height="match_parent" | 139 | android:layout_height="match_parent" |
... | @@ -133,8 +142,12 @@ | ... | @@ -133,8 +142,12 @@ |
133 | <LinearLayout | 142 | <LinearLayout |
134 | android:layout_width="match_parent" | 143 | android:layout_width="match_parent" |
135 | android:layout_height="wrap_content" | 144 | android:layout_height="wrap_content" |
136 | - android:orientation="vertical" | 145 | + android:orientation="vertical"> |
137 | - android:weightSum="1"> | 146 | + |
147 | + <LinearLayout | ||
148 | + android:layout_width="match_parent" | ||
149 | + android:layout_height="wrap_content" | ||
150 | + android:orientation="vertical"></LinearLayout> | ||
138 | 151 | ||
139 | <TextView | 152 | <TextView |
140 | android:id="@+id/mainTextView" | 153 | android:id="@+id/mainTextView" |
... | @@ -145,6 +158,11 @@ | ... | @@ -145,6 +158,11 @@ |
145 | <LinearLayout | 158 | <LinearLayout |
146 | android:layout_width="match_parent" | 159 | android:layout_width="match_parent" |
147 | android:layout_height="wrap_content" | 160 | android:layout_height="wrap_content" |
161 | + android:orientation="vertical"></LinearLayout> | ||
162 | + | ||
163 | + <LinearLayout | ||
164 | + android:layout_width="match_parent" | ||
165 | + android:layout_height="wrap_content" | ||
148 | android:orientation="horizontal"> | 166 | android:orientation="horizontal"> |
149 | 167 | ||
150 | <EditText | 168 | <EditText |
... | @@ -154,7 +172,7 @@ | ... | @@ -154,7 +172,7 @@ |
154 | android:layout_weight="1" | 172 | android:layout_weight="1" |
155 | android:ems="10" | 173 | android:ems="10" |
156 | android:hint="ex) 3" | 174 | android:hint="ex) 3" |
157 | - android:inputType="number|textPersonName" /> | 175 | + android:inputType="textPersonName" /> |
158 | 176 | ||
159 | <Button | 177 | <Button |
160 | android:id="@+id/childNumberInputButton" | 178 | android:id="@+id/childNumberInputButton" |
... | @@ -164,37 +182,466 @@ | ... | @@ -164,37 +182,466 @@ |
164 | android:text="입 력" /> | 182 | android:text="입 력" /> |
165 | </LinearLayout> | 183 | </LinearLayout> |
166 | 184 | ||
167 | - <androidx.recyclerview.widget.RecyclerView | 185 | + <LinearLayout |
168 | - android:id="@+id/childRecyclerView" | ||
169 | android:layout_width="match_parent" | 186 | android:layout_width="match_parent" |
170 | android:layout_height="wrap_content" | 187 | android:layout_height="wrap_content" |
171 | - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" | 188 | + android:orientation="vertical"> |
172 | - tools:listitem="@layout/item_child" /> | ||
173 | 189 | ||
174 | - </LinearLayout> | 190 | + <LinearLayout |
175 | - </ScrollView> | 191 | + android:id="@+id/child1LinearLayout" |
176 | - </LinearLayout> | 192 | + android:layout_width="match_parent" |
193 | + android:layout_height="wrap_content" | ||
194 | + android:orientation="vertical" | ||
195 | + android:visibility="gone"> | ||
196 | + | ||
197 | + <TextView | ||
198 | + android:id="@+id/child1TextView" | ||
199 | + android:layout_width="match_parent" | ||
200 | + android:layout_height="wrap_content" | ||
201 | + android:text="자녀 1" /> | ||
202 | + | ||
203 | + <LinearLayout | ||
204 | + android:layout_width="match_parent" | ||
205 | + android:layout_height="match_parent" | ||
206 | + android:orientation="vertical"></LinearLayout> | ||
207 | + | ||
208 | + <TextView | ||
209 | + android:id="@+id/child1BirthTextView" | ||
210 | + android:layout_width="match_parent" | ||
211 | + android:layout_height="wrap_content" | ||
212 | + android:text="생년월일" /> | ||
213 | + | ||
214 | + <LinearLayout | ||
215 | + android:layout_width="match_parent" | ||
216 | + android:layout_height="match_parent" | ||
217 | + android:orientation="horizontal"> | ||
218 | + | ||
219 | + <EditText | ||
220 | + android:id="@+id/child1BirthEditText" | ||
221 | + android:layout_width="wrap_content" | ||
222 | + android:layout_height="wrap_content" | ||
223 | + android:layout_weight="1" | ||
224 | + android:ems="10" | ||
225 | + android:inputType="textPersonName" /> | ||
226 | + | ||
227 | + <Button | ||
228 | + android:id="@+id/child1BirthInputButton" | ||
229 | + android:layout_width="wrap_content" | ||
230 | + android:layout_height="wrap_content" | ||
231 | + android:layout_weight="1" | ||
232 | + android:text="입력" /> | ||
233 | + | ||
234 | + </LinearLayout> | ||
235 | + | ||
236 | + <LinearLayout | ||
237 | + android:layout_width="match_parent" | ||
238 | + android:layout_height="match_parent" | ||
239 | + android:orientation="vertical"></LinearLayout> | ||
240 | + | ||
241 | + <TextView | ||
242 | + android:id="@+id/child1SexTextView" | ||
243 | + android:layout_width="match_parent" | ||
244 | + android:layout_height="wrap_content" | ||
245 | + android:text="TextView" /> | ||
246 | + | ||
247 | + <LinearLayout | ||
248 | + android:layout_width="match_parent" | ||
249 | + android:layout_height="match_parent" | ||
250 | + android:orientation="horizontal"> | ||
251 | + | ||
252 | + <ToggleButton | ||
253 | + android:id="@+id/child1SexManButton" | ||
254 | + android:layout_width="wrap_content" | ||
255 | + android:layout_height="wrap_content" | ||
256 | + android:layout_weight="1" | ||
257 | + android:background="@drawable/profil_selector" | ||
258 | + android:text="ToggleButton" | ||
259 | + android:textOff="남자" | ||
260 | + android:textOn="남자" /> | ||
261 | + | ||
262 | + <ToggleButton | ||
263 | + android:id="@+id/child1SexWomanButton" | ||
264 | + android:layout_width="wrap_content" | ||
265 | + android:layout_height="wrap_content" | ||
266 | + android:layout_weight="1" | ||
267 | + android:background="@drawable/profil_selector" | ||
268 | + android:text="ToggleButton" | ||
269 | + android:textOff="여자" | ||
270 | + android:textOn="여자" /> | ||
271 | + </LinearLayout> | ||
272 | + | ||
273 | + </LinearLayout> | ||
274 | + | ||
275 | + | ||
276 | + <LinearLayout | ||
277 | + android:id="@+id/child2LinearLayout" | ||
278 | + android:layout_width="match_parent" | ||
279 | + android:layout_height="wrap_content" | ||
280 | + android:orientation="vertical" | ||
281 | + android:visibility="gone"> | ||
282 | + | ||
283 | + <TextView | ||
284 | + android:id="@+id/child2TextView" | ||
285 | + android:layout_width="match_parent" | ||
286 | + android:layout_height="wrap_content" | ||
287 | + android:text="자녀 2" /> | ||
288 | + | ||
289 | + <LinearLayout | ||
290 | + android:layout_width="match_parent" | ||
291 | + android:layout_height="match_parent" | ||
292 | + android:orientation="vertical"></LinearLayout> | ||
293 | + | ||
294 | + <TextView | ||
295 | + android:id="@+id/child2BirthTextView" | ||
296 | + android:layout_width="match_parent" | ||
297 | + android:layout_height="wrap_content" | ||
298 | + android:text="생년월일" /> | ||
299 | + | ||
300 | + <LinearLayout | ||
301 | + android:layout_width="match_parent" | ||
302 | + android:layout_height="match_parent" | ||
303 | + android:orientation="horizontal"> | ||
304 | + | ||
305 | + <EditText | ||
306 | + android:id="@+id/child2BirthEditText" | ||
307 | + android:layout_width="wrap_content" | ||
308 | + android:layout_height="wrap_content" | ||
309 | + android:layout_weight="1" | ||
310 | + android:ems="10" | ||
311 | + android:inputType="textPersonName" /> | ||
312 | + | ||
313 | + <Button | ||
314 | + android:id="@+id/child2BirthInputButton" | ||
315 | + android:layout_width="wrap_content" | ||
316 | + android:layout_height="wrap_content" | ||
317 | + android:layout_weight="1" | ||
318 | + android:text="입력" /> | ||
319 | + | ||
320 | + </LinearLayout> | ||
321 | + | ||
322 | + <LinearLayout | ||
323 | + android:layout_width="match_parent" | ||
324 | + android:layout_height="match_parent" | ||
325 | + android:orientation="vertical"></LinearLayout> | ||
326 | + | ||
327 | + <TextView | ||
328 | + android:id="@+id/child2SexTextView" | ||
329 | + android:layout_width="match_parent" | ||
330 | + android:layout_height="wrap_content" | ||
331 | + android:text="TextView" /> | ||
332 | + | ||
333 | + <LinearLayout | ||
334 | + android:layout_width="match_parent" | ||
335 | + android:layout_height="match_parent" | ||
336 | + android:orientation="horizontal"> | ||
337 | + | ||
338 | + <ToggleButton | ||
339 | + android:id="@+id/child2SexManButton" | ||
340 | + android:layout_width="wrap_content" | ||
341 | + android:layout_height="wrap_content" | ||
342 | + android:layout_weight="1" | ||
343 | + android:background="@drawable/profil_selector" | ||
344 | + android:text="ToggleButton" | ||
345 | + android:textOff="남자" | ||
346 | + android:textOn="남자" /> | ||
347 | + | ||
348 | + <ToggleButton | ||
349 | + android:id="@+id/child2SexWomanButton" | ||
350 | + android:layout_width="wrap_content" | ||
351 | + android:layout_height="wrap_content" | ||
352 | + android:layout_weight="1" | ||
353 | + android:background="@drawable/profil_selector" | ||
354 | + android:text="ToggleButton" | ||
355 | + android:textOff="여자" | ||
356 | + android:textOn="여자" /> | ||
357 | + </LinearLayout> | ||
358 | + | ||
359 | + </LinearLayout> | ||
360 | + | ||
361 | + | ||
362 | + <LinearLayout | ||
363 | + android:id="@+id/child3LinearLayout" | ||
364 | + android:layout_width="match_parent" | ||
365 | + android:layout_height="wrap_content" | ||
366 | + android:orientation="vertical" | ||
367 | + android:visibility="gone"> | ||
368 | + | ||
369 | + <TextView | ||
370 | + android:id="@+id/child3TextView" | ||
371 | + android:layout_width="match_parent" | ||
372 | + android:layout_height="wrap_content" | ||
373 | + android:text="자녀 3" /> | ||
374 | + | ||
375 | + <LinearLayout | ||
376 | + android:layout_width="match_parent" | ||
377 | + android:layout_height="match_parent" | ||
378 | + android:orientation="vertical"></LinearLayout> | ||
379 | + | ||
380 | + <TextView | ||
381 | + android:id="@+id/child3BirthTextView" | ||
382 | + android:layout_width="match_parent" | ||
383 | + android:layout_height="wrap_content" | ||
384 | + android:text="생년월일" /> | ||
385 | + | ||
386 | + <LinearLayout | ||
387 | + android:layout_width="match_parent" | ||
388 | + android:layout_height="match_parent" | ||
389 | + android:orientation="horizontal"> | ||
390 | + | ||
391 | + <EditText | ||
392 | + android:id="@+id/child3BirthEditText" | ||
393 | + android:layout_width="wrap_content" | ||
394 | + android:layout_height="wrap_content" | ||
395 | + android:layout_weight="1" | ||
396 | + android:ems="10" | ||
397 | + android:inputType="textPersonName" /> | ||
398 | + | ||
399 | + <Button | ||
400 | + android:id="@+id/child3BirthInputButton" | ||
401 | + android:layout_width="wrap_content" | ||
402 | + android:layout_height="wrap_content" | ||
403 | + android:layout_weight="1" | ||
404 | + android:text="입력" /> | ||
405 | + | ||
406 | + </LinearLayout> | ||
407 | + | ||
408 | + <LinearLayout | ||
409 | + android:layout_width="match_parent" | ||
410 | + android:layout_height="match_parent" | ||
411 | + android:orientation="vertical"></LinearLayout> | ||
412 | + | ||
413 | + <TextView | ||
414 | + android:id="@+id/child3SexTextView" | ||
415 | + android:layout_width="match_parent" | ||
416 | + android:layout_height="wrap_content" | ||
417 | + android:text="TextView" /> | ||
418 | + | ||
419 | + <LinearLayout | ||
420 | + android:layout_width="match_parent" | ||
421 | + android:layout_height="match_parent" | ||
422 | + android:orientation="horizontal"> | ||
423 | + | ||
424 | + <ToggleButton | ||
425 | + android:id="@+id/child3SexManButton" | ||
426 | + android:layout_width="wrap_content" | ||
427 | + android:layout_height="wrap_content" | ||
428 | + android:layout_weight="1" | ||
429 | + android:background="@drawable/profil_selector" | ||
430 | + android:text="ToggleButton" | ||
431 | + android:textOff="남자" | ||
432 | + android:textOn="남자" /> | ||
433 | + | ||
434 | + <ToggleButton | ||
435 | + android:id="@+id/child3SexWomanButton" | ||
436 | + android:layout_width="wrap_content" | ||
437 | + android:layout_height="wrap_content" | ||
438 | + android:layout_weight="1" | ||
439 | + android:background="@drawable/profil_selector" | ||
440 | + android:text="ToggleButton" | ||
441 | + android:textOff="여자" | ||
442 | + android:textOn="여자" /> | ||
443 | + </LinearLayout> | ||
444 | + | ||
445 | + </LinearLayout> | ||
446 | + | ||
447 | + | ||
448 | + <LinearLayout | ||
449 | + android:id="@+id/child4LinearLayout" | ||
450 | + android:layout_width="match_parent" | ||
451 | + android:layout_height="wrap_content" | ||
452 | + android:orientation="vertical" | ||
453 | + android:visibility="gone"> | ||
454 | + | ||
455 | + <TextView | ||
456 | + android:id="@+id/child4TextView" | ||
457 | + android:layout_width="match_parent" | ||
458 | + android:layout_height="wrap_content" | ||
459 | + android:text="자녀 4" /> | ||
460 | + | ||
461 | + <LinearLayout | ||
462 | + android:layout_width="match_parent" | ||
463 | + android:layout_height="match_parent" | ||
464 | + android:orientation="vertical"></LinearLayout> | ||
465 | + | ||
466 | + <TextView | ||
467 | + android:id="@+id/child4BirthTextView" | ||
468 | + android:layout_width="match_parent" | ||
469 | + android:layout_height="wrap_content" | ||
470 | + android:text="생년월일" /> | ||
471 | + | ||
472 | + <LinearLayout | ||
473 | + android:layout_width="match_parent" | ||
474 | + android:layout_height="match_parent" | ||
475 | + android:orientation="horizontal"> | ||
476 | + | ||
477 | + <EditText | ||
478 | + android:id="@+id/child4BirthEditText" | ||
479 | + android:layout_width="wrap_content" | ||
480 | + android:layout_height="wrap_content" | ||
481 | + android:layout_weight="1" | ||
482 | + android:ems="10" | ||
483 | + android:inputType="textPersonName" /> | ||
484 | + | ||
485 | + <Button | ||
486 | + android:id="@+id/child4BirthInputButton" | ||
487 | + android:layout_width="wrap_content" | ||
488 | + android:layout_height="wrap_content" | ||
489 | + android:layout_weight="1" | ||
490 | + android:text="입력" /> | ||
491 | + | ||
492 | + </LinearLayout> | ||
493 | + | ||
494 | + <LinearLayout | ||
495 | + android:layout_width="match_parent" | ||
496 | + android:layout_height="match_parent" | ||
497 | + android:orientation="vertical"></LinearLayout> | ||
498 | + | ||
499 | + <TextView | ||
500 | + android:id="@+id/child4SexTextView" | ||
501 | + android:layout_width="match_parent" | ||
502 | + android:layout_height="wrap_content" | ||
503 | + android:text="TextView" /> | ||
504 | + | ||
505 | + <LinearLayout | ||
506 | + android:layout_width="match_parent" | ||
507 | + android:layout_height="match_parent" | ||
508 | + android:orientation="horizontal"> | ||
509 | + | ||
510 | + <ToggleButton | ||
511 | + android:id="@+id/child4SexManButton" | ||
512 | + android:layout_width="wrap_content" | ||
513 | + android:layout_height="wrap_content" | ||
514 | + android:layout_weight="1" | ||
515 | + android:background="@drawable/profil_selector" | ||
516 | + android:text="ToggleButton" | ||
517 | + android:textOff="남자" | ||
518 | + android:textOn="남자" /> | ||
519 | + | ||
520 | + <ToggleButton | ||
521 | + android:id="@+id/child4SexWomanButton" | ||
522 | + android:layout_width="wrap_content" | ||
523 | + android:layout_height="wrap_content" | ||
524 | + android:layout_weight="1" | ||
525 | + android:background="@drawable/profil_selector" | ||
526 | + android:text="ToggleButton" | ||
527 | + android:textOff="여자" | ||
528 | + android:textOn="여자" /> | ||
529 | + </LinearLayout> | ||
530 | + | ||
531 | + </LinearLayout> | ||
532 | + | ||
533 | + | ||
534 | + <LinearLayout | ||
535 | + android:id="@+id/child5LinearLayout" | ||
536 | + android:layout_width="match_parent" | ||
537 | + android:layout_height="wrap_content" | ||
538 | + android:orientation="vertical" | ||
539 | + android:visibility="gone"> | ||
540 | + | ||
541 | + <TextView | ||
542 | + android:id="@+id/child5TextView" | ||
543 | + android:layout_width="match_parent" | ||
544 | + android:layout_height="wrap_content" | ||
545 | + android:text="자녀 5" /> | ||
546 | + | ||
547 | + <LinearLayout | ||
548 | + android:layout_width="match_parent" | ||
549 | + android:layout_height="match_parent" | ||
550 | + android:orientation="vertical"></LinearLayout> | ||
551 | + | ||
552 | + <TextView | ||
553 | + android:id="@+id/child5BirthTextView" | ||
554 | + android:layout_width="match_parent" | ||
555 | + android:layout_height="wrap_content" | ||
556 | + android:text="생년월일" /> | ||
557 | + | ||
558 | + <LinearLayout | ||
559 | + android:layout_width="match_parent" | ||
560 | + android:layout_height="match_parent" | ||
561 | + android:orientation="horizontal"> | ||
562 | + | ||
563 | + <EditText | ||
564 | + android:id="@+id/child5BirthEditText" | ||
565 | + android:layout_width="wrap_content" | ||
566 | + android:layout_height="wrap_content" | ||
567 | + android:layout_weight="1" | ||
568 | + android:ems="10" | ||
569 | + android:inputType="textPersonName" /> | ||
570 | + | ||
571 | + <Button | ||
572 | + android:id="@+id/child5BirthInputButton" | ||
573 | + android:layout_width="wrap_content" | ||
574 | + android:layout_height="wrap_content" | ||
575 | + android:layout_weight="1" | ||
576 | + android:text="입력" /> | ||
577 | + | ||
578 | + </LinearLayout> | ||
579 | + | ||
580 | + <LinearLayout | ||
581 | + android:layout_width="match_parent" | ||
582 | + android:layout_height="match_parent" | ||
583 | + android:orientation="vertical"></LinearLayout> | ||
584 | + | ||
585 | + <TextView | ||
586 | + android:id="@+id/child5SexTextView" | ||
587 | + android:layout_width="match_parent" | ||
588 | + android:layout_height="wrap_content" | ||
589 | + android:text="TextView" /> | ||
590 | + | ||
591 | + <LinearLayout | ||
592 | + android:layout_width="match_parent" | ||
593 | + android:layout_height="match_parent" | ||
594 | + android:orientation="horizontal"> | ||
595 | + | ||
596 | + <ToggleButton | ||
597 | + android:id="@+id/child5SexManButton" | ||
598 | + android:layout_width="wrap_content" | ||
599 | + android:layout_height="wrap_content" | ||
600 | + android:layout_weight="1" | ||
601 | + android:background="@drawable/profil_selector" | ||
602 | + android:text="ToggleButton" | ||
603 | + android:textOff="남자" | ||
604 | + android:textOn="남자" /> | ||
605 | + | ||
606 | + <ToggleButton | ||
607 | + android:id="@+id/child5SexWomanButton" | ||
608 | + android:layout_width="wrap_content" | ||
609 | + android:layout_height="wrap_content" | ||
610 | + android:layout_weight="1" | ||
611 | + android:background="@drawable/profil_selector" | ||
612 | + android:text="ToggleButton" | ||
613 | + android:textOff="여자" | ||
614 | + android:textOn="여자" /> | ||
615 | + </LinearLayout> | ||
616 | + | ||
617 | + </LinearLayout> | ||
177 | 618 | ||
178 | - <LinearLayout | ||
179 | - android:layout_width="match_parent" | ||
180 | - android:layout_height="wrap_content" | ||
181 | - android:layout_gravity="bottom" | ||
182 | - android:orientation="horizontal"> | ||
183 | 619 | ||
184 | - <Button | 620 | + </LinearLayout> |
185 | - android:id="@+id/previousButton" | ||
186 | - android:layout_width="10dp" | ||
187 | - android:layout_height="wrap_content" | ||
188 | - android:layout_weight="1" | ||
189 | - android:text="이전 단계로" /> | ||
190 | 621 | ||
191 | - <Button | 622 | + <LinearLayout |
192 | - android:id="@+id/nextButton" | 623 | + android:layout_width="match_parent" |
193 | - android:layout_width="10dp" | 624 | + android:layout_height="wrap_content" |
194 | - android:layout_height="wrap_content" | 625 | + android:orientation="horizontal"> |
195 | - android:layout_weight="1" | 626 | + |
196 | - android:text="다음 단계로" /> | 627 | + <Button |
197 | - </LinearLayout> | 628 | + android:id="@+id/previousButton" |
629 | + android:layout_width="10dp" | ||
630 | + android:layout_height="wrap_content" | ||
631 | + android:layout_weight="1" | ||
632 | + android:text="이전 단계로" /> | ||
198 | 633 | ||
634 | + <Button | ||
635 | + android:id="@+id/nextButton" | ||
636 | + android:layout_width="10dp" | ||
637 | + android:layout_height="wrap_content" | ||
638 | + android:layout_weight="1" | ||
639 | + android:text="다음 단계로" /> | ||
640 | + </LinearLayout> | ||
641 | + | ||
642 | + </LinearLayout> | ||
643 | + </ScrollView> | ||
644 | + | ||
645 | + </LinearLayout> | ||
199 | </LinearLayout> | 646 | </LinearLayout> |
200 | </androidx.constraintlayout.widget.ConstraintLayout> | 647 | </androidx.constraintlayout.widget.ConstraintLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -213,12 +213,10 @@ | ... | @@ -213,12 +213,10 @@ |
213 | </LinearLayout> | 213 | </LinearLayout> |
214 | 214 | ||
215 | <LinearLayout | 215 | <LinearLayout |
216 | - android:id="@+id/eightoneLayout" | ||
217 | android:layout_width="match_parent" | 216 | android:layout_width="match_parent" |
218 | android:layout_height="wrap_content" | 217 | android:layout_height="wrap_content" |
219 | android:layout_weight="1" | 218 | android:layout_weight="1" |
220 | - android:orientation="vertical" | 219 | + android:orientation="vertical"> |
221 | - android:visibility="gone"> | ||
222 | 220 | ||
223 | <LinearLayout | 221 | <LinearLayout |
224 | android:layout_width="match_parent" | 222 | android:layout_width="match_parent" |
... | @@ -454,12 +452,10 @@ | ... | @@ -454,12 +452,10 @@ |
454 | </LinearLayout> | 452 | </LinearLayout> |
455 | 453 | ||
456 | <LinearLayout | 454 | <LinearLayout |
457 | - android:id="@+id/eighttwoLayout" | ||
458 | android:layout_width="match_parent" | 455 | android:layout_width="match_parent" |
459 | android:layout_height="wrap_content" | 456 | android:layout_height="wrap_content" |
460 | android:layout_weight="1" | 457 | android:layout_weight="1" |
461 | - android:orientation="vertical" | 458 | + android:orientation="vertical"> |
462 | - android:visibility="gone"> | ||
463 | 459 | ||
464 | <LinearLayout | 460 | <LinearLayout |
465 | android:layout_width="match_parent" | 461 | android:layout_width="match_parent" |
... | @@ -589,28 +585,27 @@ | ... | @@ -589,28 +585,27 @@ |
589 | 585 | ||
590 | </LinearLayout> | 586 | </LinearLayout> |
591 | 587 | ||
592 | - </LinearLayout> | 588 | + <LinearLayout |
593 | - </ScrollView> | 589 | + android:layout_width="match_parent" |
594 | - | 590 | + android:layout_height="wrap_content" |
595 | - <LinearLayout | 591 | + android:orientation="horizontal"> |
596 | - android:layout_width="match_parent" | ||
597 | - android:layout_height="wrap_content" | ||
598 | - android:orientation="horizontal"> | ||
599 | 592 | ||
600 | - <Button | 593 | + <Button |
601 | - android:id="@+id/previousButton" | 594 | + android:id="@+id/previousButton" |
602 | - android:layout_width="10dp" | 595 | + android:layout_width="10dp" |
603 | - android:layout_height="wrap_content" | 596 | + android:layout_height="wrap_content" |
604 | - android:layout_weight="1" | 597 | + android:layout_weight="1" |
605 | - android:text="이전 단계로" /> | 598 | + android:text="이전 단계로" /> |
606 | 599 | ||
607 | - <Button | 600 | + <Button |
608 | - android:id="@+id/nextButton" | 601 | + android:id="@+id/nextButton" |
609 | - android:layout_width="10dp" | 602 | + android:layout_width="10dp" |
610 | - android:layout_height="wrap_content" | 603 | + android:layout_height="wrap_content" |
611 | - android:layout_weight="1" | 604 | + android:layout_weight="1" |
612 | - android:text="다음 단계로" /> | 605 | + android:text="다음 단계로" /> |
613 | - </LinearLayout> | 606 | + </LinearLayout> |
607 | + </LinearLayout> | ||
608 | + </ScrollView> | ||
614 | 609 | ||
615 | </LinearLayout> | 610 | </LinearLayout> |
616 | </LinearLayout> | 611 | </LinearLayout> | ... | ... |
... | @@ -120,17 +120,22 @@ | ... | @@ -120,17 +120,22 @@ |
120 | android:layout_width="match_parent" | 120 | android:layout_width="match_parent" |
121 | android:layout_height="wrap_content" | 121 | android:layout_height="wrap_content" |
122 | android:layout_weight="1" | 122 | android:layout_weight="1" |
123 | - android:gravity="center" | ||
124 | android:orientation="vertical"> | 123 | android:orientation="vertical"> |
125 | 124 | ||
126 | <LinearLayout | 125 | <LinearLayout |
127 | android:layout_width="match_parent" | 126 | android:layout_width="match_parent" |
128 | android:layout_height="wrap_content" | 127 | android:layout_height="wrap_content" |
128 | + android:layout_weight="1" | ||
129 | + android:orientation="horizontal"></LinearLayout> | ||
130 | + | ||
131 | + <LinearLayout | ||
132 | + android:layout_width="match_parent" | ||
133 | + android:layout_height="wrap_content" | ||
129 | android:orientation="vertical"> | 134 | android:orientation="vertical"> |
130 | 135 | ||
131 | <RelativeLayout | 136 | <RelativeLayout |
132 | android:layout_width="match_parent" | 137 | android:layout_width="match_parent" |
133 | - android:layout_height="wrap_content"> | 138 | + android:layout_height="match_parent"> |
134 | 139 | ||
135 | <TextView | 140 | <TextView |
136 | android:id="@+id/explainTextView" | 141 | android:id="@+id/explainTextView" |
... | @@ -152,65 +157,62 @@ | ... | @@ -152,65 +157,62 @@ |
152 | android:text=" ? " | 157 | android:text=" ? " |
153 | android:textSize="8sp" /> | 158 | android:textSize="8sp" /> |
154 | </RelativeLayout> | 159 | </RelativeLayout> |
160 | + </LinearLayout> | ||
161 | + | ||
162 | + <LinearLayout | ||
163 | + android:layout_width="match_parent" | ||
164 | + android:layout_height="wrap_content" | ||
165 | + android:orientation="vertical"> | ||
155 | 166 | ||
156 | <LinearLayout | 167 | <LinearLayout |
157 | - android:layout_width="match_parent" | 168 | + android:layout_width="wrap_content" |
158 | android:layout_height="wrap_content" | 169 | android:layout_height="wrap_content" |
170 | + android:layout_gravity="center" | ||
171 | + android:gravity="center" | ||
159 | android:orientation="vertical"> | 172 | android:orientation="vertical"> |
160 | 173 | ||
161 | <LinearLayout | 174 | <LinearLayout |
162 | - android:layout_width="wrap_content" | 175 | + android:layout_width="match_parent" |
163 | - android:layout_height="wrap_content" | 176 | + android:layout_height="match_parent" |
164 | - android:layout_gravity="center" | 177 | + android:orientation="horizontal"> |
165 | - android:gravity="center" | ||
166 | - android:orientation="vertical"> | ||
167 | - | ||
168 | - <LinearLayout | ||
169 | - android:layout_width="match_parent" | ||
170 | - android:layout_height="match_parent" | ||
171 | - android:orientation="horizontal"> | ||
172 | - | ||
173 | - <ToggleButton | ||
174 | - android:id="@+id/jobButton" | ||
175 | - android:layout_width="300dp" | ||
176 | - android:layout_height="wrap_content" | ||
177 | - android:layout_weight="1" | ||
178 | - android:background="@drawable/profil_selector" | ||
179 | - android:text="있음" | ||
180 | - android:textOff="있음" | ||
181 | - android:textOn="있음" /> | ||
182 | 178 | ||
183 | - </LinearLayout> | 179 | + <ToggleButton |
180 | + android:id="@+id/jobButton" | ||
181 | + android:layout_width="300dp" | ||
182 | + android:layout_height="wrap_content" | ||
183 | + android:layout_weight="1" | ||
184 | + android:background="@drawable/profil_selector" | ||
185 | + android:text="있음" | ||
186 | + android:textOff="있음" | ||
187 | + android:textOn="있음" /> | ||
184 | 188 | ||
189 | + </LinearLayout> | ||
185 | 190 | ||
186 | - <LinearLayout | ||
187 | - android:layout_width="match_parent" | ||
188 | - android:layout_height="match_parent" | ||
189 | - android:orientation="horizontal"> | ||
190 | 191 | ||
191 | - <ToggleButton | 192 | + <LinearLayout |
192 | - android:id="@+id/nojobButton" | 193 | + android:layout_width="match_parent" |
193 | - android:layout_width="300dp" | 194 | + android:layout_height="match_parent" |
194 | - android:layout_height="wrap_content" | 195 | + android:orientation="horizontal"> |
195 | - android:layout_weight="1" | ||
196 | - android:background="@drawable/profil_selector" | ||
197 | - android:text="없음" | ||
198 | - android:textOff="없음" | ||
199 | - android:textOn="없음" /> | ||
200 | - </LinearLayout> | ||
201 | 196 | ||
197 | + <ToggleButton | ||
198 | + android:id="@+id/nojobButton" | ||
199 | + android:layout_width="300dp" | ||
200 | + android:layout_height="wrap_content" | ||
201 | + android:layout_weight="1" | ||
202 | + android:background="@drawable/profil_selector" | ||
203 | + android:text="없음" | ||
204 | + android:textOff="없음" | ||
205 | + android:textOn="없음" /> | ||
202 | </LinearLayout> | 206 | </LinearLayout> |
203 | - </LinearLayout> | ||
204 | 207 | ||
208 | + </LinearLayout> | ||
205 | </LinearLayout> | 209 | </LinearLayout> |
206 | 210 | ||
207 | <LinearLayout | 211 | <LinearLayout |
208 | - android:id="@+id/sixoneLayout" | ||
209 | android:layout_width="match_parent" | 212 | android:layout_width="match_parent" |
210 | android:layout_height="50dp" | 213 | android:layout_height="50dp" |
211 | android:layout_weight="1" | 214 | android:layout_weight="1" |
212 | - android:orientation="vertical" | 215 | + android:orientation="vertical"> |
213 | - android:visibility="gone"> | ||
214 | 216 | ||
215 | <LinearLayout | 217 | <LinearLayout |
216 | android:layout_width="match_parent" | 218 | android:layout_width="match_parent" |
... | @@ -295,12 +297,10 @@ | ... | @@ -295,12 +297,10 @@ |
295 | </LinearLayout> | 297 | </LinearLayout> |
296 | 298 | ||
297 | <LinearLayout | 299 | <LinearLayout |
298 | - android:id="@+id/sixtwoLayout" | ||
299 | android:layout_width="match_parent" | 300 | android:layout_width="match_parent" |
300 | android:layout_height="100dp" | 301 | android:layout_height="100dp" |
301 | android:layout_weight="1" | 302 | android:layout_weight="1" |
302 | - android:orientation="vertical" | 303 | + android:orientation="vertical"> |
303 | - android:visibility="gone"> | ||
304 | 304 | ||
305 | <LinearLayout | 305 | <LinearLayout |
306 | android:layout_width="match_parent" | 306 | android:layout_width="match_parent" |
... | @@ -400,29 +400,25 @@ | ... | @@ -400,29 +400,25 @@ |
400 | 400 | ||
401 | </LinearLayout> | 401 | </LinearLayout> |
402 | 402 | ||
403 | - </LinearLayout> | 403 | + <LinearLayout |
404 | - | 404 | + android:layout_width="match_parent" |
405 | - <LinearLayout | ||
406 | - android:layout_width="match_parent" | ||
407 | - android:layout_height="wrap_content" | ||
408 | - android:layout_gravity="bottom" | ||
409 | - android:gravity="bottom" | ||
410 | - android:orientation="horizontal"> | ||
411 | - | ||
412 | - <Button | ||
413 | - android:id="@+id/previousButton" | ||
414 | - android:layout_width="10dp" | ||
415 | android:layout_height="wrap_content" | 405 | android:layout_height="wrap_content" |
416 | - android:layout_weight="1" | 406 | + android:orientation="horizontal"> |
417 | - android:text="이전 단계로" /> | ||
418 | 407 | ||
419 | - <Button | 408 | + <Button |
420 | - android:id="@+id/nextButton" | 409 | + android:id="@+id/previousButton" |
421 | - android:layout_width="10dp" | 410 | + android:layout_width="10dp" |
422 | - android:layout_height="wrap_content" | 411 | + android:layout_height="wrap_content" |
423 | - android:layout_weight="1" | 412 | + android:layout_weight="1" |
424 | - android:text="다음 단계로" /> | 413 | + android:text="이전 단계로" /> |
425 | - </LinearLayout> | ||
426 | 414 | ||
415 | + <Button | ||
416 | + android:id="@+id/nextButton" | ||
417 | + android:layout_width="10dp" | ||
418 | + android:layout_height="wrap_content" | ||
419 | + android:layout_weight="1" | ||
420 | + android:text="다음 단계로" /> | ||
421 | + </LinearLayout> | ||
422 | + </LinearLayout> | ||
427 | </LinearLayout> | 423 | </LinearLayout> |
428 | </androidx.constraintlayout.widget.ConstraintLayout> | 424 | </androidx.constraintlayout.widget.ConstraintLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -6,7 +6,6 @@ | ... | @@ -6,7 +6,6 @@ |
6 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
7 | tools:context=".MainActivity"> | 7 | tools:context=".MainActivity"> |
8 | 8 | ||
9 | - | ||
10 | <LinearLayout | 9 | <LinearLayout |
11 | android:layout_width="match_parent" | 10 | android:layout_width="match_parent" |
12 | android:layout_height="match_parent" | 11 | android:layout_height="match_parent" |
... | @@ -16,102 +15,72 @@ | ... | @@ -16,102 +15,72 @@ |
16 | android:layout_width="match_parent" | 15 | android:layout_width="match_parent" |
17 | android:layout_height="10dp" | 16 | android:layout_height="10dp" |
18 | android:layout_weight="1" | 17 | android:layout_weight="1" |
19 | - android:gravity="center" | 18 | + android:orientation="vertical"></LinearLayout> |
20 | - android:orientation="vertical"> | ||
21 | - | ||
22 | - <LinearLayout | ||
23 | - android:layout_width="wrap_content" | ||
24 | - android:layout_height="wrap_content" | ||
25 | - android:layout_gravity="center" | ||
26 | - android:gravity="center" | ||
27 | - android:orientation="vertical"> | ||
28 | - | ||
29 | - <TextView | ||
30 | - android:id="@+id/textView6" | ||
31 | - android:layout_width="match_parent" | ||
32 | - android:layout_height="wrap_content" | ||
33 | - android:text="복지야, 안녕!" | ||
34 | - android:textSize="15dp" /> | ||
35 | - | ||
36 | - <ImageView | ||
37 | - android:id="@+id/imageView2" | ||
38 | - android:layout_width="wrap_content" | ||
39 | - android:layout_height="wrap_content" | ||
40 | - tools:srcCompat="@tools:sample/avatars" | ||
41 | - android:src="@drawable/final_logo"/> | ||
42 | - </LinearLayout> | ||
43 | - | ||
44 | - </LinearLayout> | ||
45 | 19 | ||
46 | <LinearLayout | 20 | <LinearLayout |
47 | android:layout_width="match_parent" | 21 | android:layout_width="match_parent" |
48 | android:layout_height="wrap_content" | 22 | android:layout_height="wrap_content" |
49 | - android:gravity="center" | 23 | + android:orientation="vertical"> |
50 | - android:orientation="vertical" | ||
51 | - android:padding="10dp"> | ||
52 | - | ||
53 | - <TextView | ||
54 | - android:id="@+id/textView4" | ||
55 | - android:layout_width="350dp" | ||
56 | - android:layout_height="wrap_content" | ||
57 | - android:text="이메일" | ||
58 | - android:textColor="#29ABE2" | ||
59 | - android:textSize="13dp" /> | ||
60 | 24 | ||
61 | <EditText | 25 | <EditText |
62 | android:id="@+id/edit_email" | 26 | android:id="@+id/edit_email" |
63 | - android:layout_width="350dp" | 27 | + android:layout_width="match_parent" |
64 | - android:layout_height="wrap_content" | ||
65 | - | ||
66 | - android:inputType="textEmailAddress" | ||
67 | - android:theme="@style/EditTheme" /> | ||
68 | - | ||
69 | - <TextView | ||
70 | - android:id="@+id/textView5" | ||
71 | - android:layout_width="350dp" | ||
72 | android:layout_height="wrap_content" | 28 | android:layout_height="wrap_content" |
73 | - android:text="비밀번호" | 29 | + android:layout_marginStart="16dp" |
74 | - android:textColor="#29ABE2" | 30 | + android:layout_marginLeft="16dp" |
75 | - android:textSize="13dp" /> | 31 | + android:layout_marginTop="8dp" |
32 | + android:layout_marginEnd="16dp" | ||
33 | + android:layout_marginRight="16dp" | ||
34 | + android:ems="10" | ||
35 | + android:hint="Email" | ||
36 | + android:inputType="textEmailAddress" /> | ||
76 | 37 | ||
77 | <EditText | 38 | <EditText |
78 | android:id="@+id/edit_password" | 39 | android:id="@+id/edit_password" |
79 | - android:layout_width="350dp" | 40 | + android:layout_width="match_parent" |
80 | android:layout_height="wrap_content" | 41 | android:layout_height="wrap_content" |
81 | - | 42 | + android:layout_marginStart="16dp" |
82 | - android:inputType="textPassword" | 43 | + android:layout_marginLeft="16dp" |
83 | - android:theme="@style/EditTheme" /> | 44 | + android:layout_marginTop="8dp" |
45 | + android:layout_marginEnd="16dp" | ||
46 | + android:layout_marginRight="16dp" | ||
47 | + android:ems="10" | ||
48 | + android:hint="Password" | ||
49 | + android:inputType="textPassword" /> | ||
84 | 50 | ||
85 | <Button | 51 | <Button |
86 | android:id="@+id/emailSigninBtn" | 52 | android:id="@+id/emailSigninBtn" |
87 | - android:layout_width="350dp" | 53 | + android:layout_width="match_parent" |
88 | android:layout_height="wrap_content" | 54 | android:layout_height="wrap_content" |
89 | android:layout_marginStart="16dp" | 55 | android:layout_marginStart="16dp" |
90 | android:layout_marginLeft="16dp" | 56 | android:layout_marginLeft="16dp" |
91 | android:layout_marginTop="8dp" | 57 | android:layout_marginTop="8dp" |
92 | android:layout_marginEnd="16dp" | 58 | android:layout_marginEnd="16dp" |
93 | android:layout_marginRight="16dp" | 59 | android:layout_marginRight="16dp" |
94 | - android:background="@drawable/button_x" | 60 | + android:background="@color/colorPrimary" |
95 | android:text="로그인" | 61 | android:text="로그인" |
96 | - android:textColor="#DDDDDD" /> | 62 | + android:textColor="@color/common_google_signin_btn_text_dark_default" /> |
97 | - | ||
98 | - </LinearLayout> | ||
99 | - | ||
100 | - <LinearLayout | ||
101 | - android:layout_width="match_parent" | ||
102 | - android:layout_height="10dp" | ||
103 | - android:layout_weight="1" | ||
104 | - android:gravity="bottom" | ||
105 | - android:orientation="vertical"> | ||
106 | 63 | ||
107 | <Button | 64 | <Button |
108 | android:id="@+id/emailSignupBtn" | 65 | android:id="@+id/emailSignupBtn" |
109 | android:layout_width="match_parent" | 66 | android:layout_width="match_parent" |
110 | android:layout_height="wrap_content" | 67 | android:layout_height="wrap_content" |
111 | - android:background="#29ABE2" | 68 | + android:layout_marginStart="16dp" |
69 | + android:layout_marginLeft="16dp" | ||
70 | + android:layout_marginTop="8dp" | ||
71 | + android:layout_marginEnd="16dp" | ||
72 | + android:layout_marginRight="16dp" | ||
73 | + android:background="@color/colorPrimary" | ||
112 | android:text="회원가입" | 74 | android:text="회원가입" |
113 | android:textColor="@color/common_google_signin_btn_text_dark_default" /> | 75 | android:textColor="@color/common_google_signin_btn_text_dark_default" /> |
76 | + | ||
114 | </LinearLayout> | 77 | </LinearLayout> |
78 | + | ||
79 | + <LinearLayout | ||
80 | + android:layout_width="match_parent" | ||
81 | + android:layout_height="10dp" | ||
82 | + android:layout_weight="1" | ||
83 | + android:orientation="vertical"></LinearLayout> | ||
115 | </LinearLayout> | 84 | </LinearLayout> |
116 | 85 | ||
117 | </androidx.constraintlayout.widget.ConstraintLayout> | 86 | </androidx.constraintlayout.widget.ConstraintLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <androidx.appcompat.widget.Toolbar | ||
8 | + android:id="@+id/toolbar" | ||
9 | + android:layout_width="fill_parent" | ||
10 | + android:layout_height="wrap_content" | ||
11 | + android:layout_gravity="center" | ||
12 | + android:layout_marginBottom="11dp" | ||
13 | + android:background="#FFF" | ||
14 | + android:elevation="5dp" | ||
15 | + android:gravity="center" | ||
16 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
17 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
18 | + | ||
19 | + <TextView | ||
20 | + android:layout_width="wrap_content" | ||
21 | + android:layout_height="44dp" | ||
22 | + android:layout_gravity="center" | ||
23 | + android:gravity="center" | ||
24 | + android:text="공지사항" | ||
25 | + android:textColor="#000" | ||
26 | + android:textSize="16dp" /> | ||
27 | + </androidx.appcompat.widget.Toolbar> | ||
28 | + | ||
29 | + <LinearLayout | ||
30 | + android:layout_width="match_parent" | ||
31 | + android:layout_height="match_parent" | ||
32 | + android:layout_weight="1" | ||
33 | + android:background="#fff" | ||
34 | + android:orientation="vertical"> | ||
35 | + | ||
36 | + <LinearLayout | ||
37 | + android:layout_width="match_parent" | ||
38 | + android:layout_height="wrap_content" | ||
39 | + android:layout_marginLeft="11dp" | ||
40 | + android:layout_marginRight="11dp" | ||
41 | + android:background="@drawable/bottom_border" | ||
42 | + | ||
43 | + android:orientation="horizontal"> | ||
44 | + | ||
45 | + <Button | ||
46 | + android:id="@+id/notice4" | ||
47 | + style="?android:attr/borderlessButtonStyle" | ||
48 | + android:layout_width="match_parent" | ||
49 | + android:layout_height="65dp" | ||
50 | + android:layout_weight="1" | ||
51 | + android:gravity="left|center_vertical" | ||
52 | + android:paddingLeft="33dp" | ||
53 | + android:text="공지4" | ||
54 | + android:textSize="17dp" /> | ||
55 | + | ||
56 | + <ImageView | ||
57 | + android:id="@+id/notice4_img" | ||
58 | + android:layout_width="match_parent" | ||
59 | + android:layout_height="wrap_content" | ||
60 | + android:layout_gravity="center|right" | ||
61 | + android:layout_weight="6" | ||
62 | + app:srcCompat="@drawable/down_arrow" /> | ||
63 | + </LinearLayout> | ||
64 | + | ||
65 | + <LinearLayout | ||
66 | + android:layout_width="match_parent" | ||
67 | + android:layout_height="wrap_content" | ||
68 | + android:layout_marginLeft="11dp" | ||
69 | + android:layout_marginRight="11dp" | ||
70 | + android:background="@drawable/bottom_border" | ||
71 | + | ||
72 | + android:orientation="horizontal"> | ||
73 | + | ||
74 | + <Button | ||
75 | + android:id="@+id/notice3" | ||
76 | + style="?android:attr/borderlessButtonStyle" | ||
77 | + android:layout_width="match_parent" | ||
78 | + android:layout_height="65dp" | ||
79 | + android:layout_weight="1" | ||
80 | + android:gravity="left|center_vertical" | ||
81 | + android:paddingLeft="33dp" | ||
82 | + android:text="공지3" | ||
83 | + android:textSize="17dp" /> | ||
84 | + | ||
85 | + <ImageView | ||
86 | + android:id="@+id/notice3_img" | ||
87 | + android:layout_width="match_parent" | ||
88 | + android:layout_height="wrap_content" | ||
89 | + android:layout_gravity="center|right" | ||
90 | + android:layout_weight="6" | ||
91 | + app:srcCompat="@drawable/down_arrow" /> | ||
92 | + </LinearLayout> | ||
93 | + | ||
94 | + <LinearLayout | ||
95 | + android:layout_width="match_parent" | ||
96 | + android:layout_height="wrap_content" | ||
97 | + android:layout_marginLeft="11dp" | ||
98 | + android:layout_marginRight="11dp" | ||
99 | + android:background="@drawable/bottom_border" | ||
100 | + android:orientation="horizontal" | ||
101 | + android:stateListAnimator="@null"> | ||
102 | + | ||
103 | + <Button | ||
104 | + android:id="@+id/notice2" | ||
105 | + style="?android:attr/borderlessButtonStyle" | ||
106 | + android:layout_width="match_parent" | ||
107 | + android:layout_height="65dp" | ||
108 | + android:layout_weight="1" | ||
109 | + android:gravity="left|center_vertical" | ||
110 | + android:paddingLeft="33dp" | ||
111 | + android:stateListAnimator="@null" | ||
112 | + android:text="공지2" | ||
113 | + android:textSize="17dp" /> | ||
114 | + | ||
115 | + <ImageView | ||
116 | + android:id="@+id/notice2_img" | ||
117 | + android:layout_width="match_parent" | ||
118 | + android:layout_height="wrap_content" | ||
119 | + android:layout_gravity="center|right" | ||
120 | + android:layout_weight="6" | ||
121 | + app:srcCompat="@drawable/down_arrow" /> | ||
122 | + | ||
123 | + </LinearLayout> | ||
124 | + | ||
125 | + <LinearLayout | ||
126 | + android:layout_width="match_parent" | ||
127 | + android:layout_height="wrap_content" | ||
128 | + android:layout_marginLeft="11dp" | ||
129 | + android:layout_marginRight="11dp" | ||
130 | + android:background="@drawable/bottom_border" | ||
131 | + | ||
132 | + android:orientation="horizontal"> | ||
133 | + | ||
134 | + <Button | ||
135 | + android:id="@+id/notice1" | ||
136 | + style="?android:attr/borderlessButtonStyle" | ||
137 | + android:layout_width="match_parent" | ||
138 | + android:layout_height="65dp" | ||
139 | + android:layout_weight="1" | ||
140 | + android:gravity="left|center_vertical" | ||
141 | + android:paddingLeft="33dp" | ||
142 | + android:text="공지1" | ||
143 | + android:textSize="17dp" /> | ||
144 | + | ||
145 | + <ImageView | ||
146 | + android:id="@+id/notice1_img" | ||
147 | + android:layout_width="match_parent" | ||
148 | + android:layout_height="wrap_content" | ||
149 | + android:layout_gravity="center|right" | ||
150 | + android:layout_weight="6" | ||
151 | + app:srcCompat="@drawable/down_arrow" /> | ||
152 | + </LinearLayout> | ||
153 | + | ||
154 | + </LinearLayout> | ||
155 | + | ||
156 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
157 | + android:id="@+id/bottomNavigation" | ||
158 | + android:layout_width="match_parent" | ||
159 | + android:layout_height="wrap_content" | ||
160 | + android:layout_gravity="bottom" | ||
161 | + android:background="#FFF" | ||
162 | + app:itemIconTint="#29ABE2" | ||
163 | + app:itemTextColor="#29ABE2" | ||
164 | + app:labelVisibilityMode="labeled" | ||
165 | + app:menu="@menu/bottom_nav_menu" /> | ||
166 | + | ||
167 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <androidx.appcompat.widget.Toolbar | ||
8 | + android:id="@+id/toolbar" | ||
9 | + android:layout_width="fill_parent" | ||
10 | + android:layout_height="wrap_content" | ||
11 | + android:layout_gravity="center" | ||
12 | + android:layout_marginBottom="11dp" | ||
13 | + android:background="#FFF" | ||
14 | + android:elevation="5dp" | ||
15 | + android:gravity="center" | ||
16 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
17 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
18 | + | ||
19 | + <TextView | ||
20 | + android:layout_width="wrap_content" | ||
21 | + android:layout_height="44dp" | ||
22 | + android:layout_gravity="center" | ||
23 | + android:gravity="center" | ||
24 | + android:text="개인정보 처리방침" | ||
25 | + android:textColor="#000" | ||
26 | + android:textSize="16dp" /> | ||
27 | + </androidx.appcompat.widget.Toolbar> | ||
28 | + | ||
29 | + <LinearLayout | ||
30 | + android:layout_width="match_parent" | ||
31 | + android:layout_height="match_parent" | ||
32 | + android:layout_weight="1" | ||
33 | + android:background="#fff" | ||
34 | + android:orientation="vertical"> | ||
35 | + | ||
36 | + <WebView | ||
37 | + android:id="@+id/privacy" | ||
38 | + android:layout_width="match_parent" | ||
39 | + android:layout_height="match_parent" /> | ||
40 | + </LinearLayout> | ||
41 | + | ||
42 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
43 | + android:id="@+id/bottomNavigation" | ||
44 | + android:layout_width="match_parent" | ||
45 | + android:layout_height="wrap_content" | ||
46 | + android:layout_gravity="bottom" | ||
47 | + android:background="#FFF" | ||
48 | + app:itemIconTint="#29ABE2" | ||
49 | + app:itemTextColor="#29ABE2" | ||
50 | + app:labelVisibilityMode="labeled" | ||
51 | + app:menu="@menu/bottom_nav_menu" /> | ||
52 | + | ||
53 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + xmlns:tools="http://schemas.android.com/tools" | ||
6 | + android:layout_height="match_parent"> | ||
7 | + | ||
8 | + <androidx.appcompat.widget.Toolbar | ||
9 | + android:id="@+id/toolbar" | ||
10 | + android:layout_width="fill_parent" | ||
11 | + android:layout_height="wrap_content" | ||
12 | + android:layout_gravity="center" | ||
13 | + android:layout_marginBottom="11dp" | ||
14 | + android:background="#FFF" | ||
15 | + android:elevation="5dp" | ||
16 | + android:gravity="center" | ||
17 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
18 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
19 | + | ||
20 | + <TextView | ||
21 | + android:layout_width="77dp" | ||
22 | + android:layout_height="44dp" | ||
23 | + android:layout_gravity="center" | ||
24 | + android:gravity="center" | ||
25 | + android:text="설정" | ||
26 | + android:textColor="#000" | ||
27 | + android:textSize="16dp" /> | ||
28 | + </androidx.appcompat.widget.Toolbar> | ||
29 | + | ||
30 | + <LinearLayout | ||
31 | + android:layout_width="match_parent" | ||
32 | + android:layout_height="match_parent" | ||
33 | + android:layout_weight="1" | ||
34 | + android:background="#fff" | ||
35 | + android:orientation="vertical"> | ||
36 | + | ||
37 | + <LinearLayout | ||
38 | + android:layout_width="match_parent" | ||
39 | + android:layout_height="wrap_content" | ||
40 | + android:orientation="vertical"> | ||
41 | + | ||
42 | + <Switch | ||
43 | + android:id="@+id/switch3" | ||
44 | + android:layout_width="match_parent" | ||
45 | + android:layout_height="65dp" | ||
46 | + android:layout_marginLeft="11dp" | ||
47 | + android:layout_marginRight="11dp" | ||
48 | + android:background="@drawable/bottom_border" | ||
49 | + android:gravity="left|center_vertical" | ||
50 | + android:paddingLeft="33dp" | ||
51 | + android:textSize="17dp" | ||
52 | + android:checked="true" | ||
53 | + android:text="이용정보 알림 수신" /> | ||
54 | + | ||
55 | + <Switch | ||
56 | + android:id="@+id/switch4" | ||
57 | + android:layout_width="match_parent" | ||
58 | + android:layout_height="65dp" | ||
59 | + android:layout_marginLeft="11dp" | ||
60 | + android:layout_marginRight="11dp" | ||
61 | + android:background="@drawable/bottom_border" | ||
62 | + android:gravity="left|center_vertical" | ||
63 | + android:paddingLeft="33dp" | ||
64 | + android:checked="true" | ||
65 | + android:text="찜한목록 소식받기" | ||
66 | + android:textSize="17dp" /> | ||
67 | + | ||
68 | + <TextView | ||
69 | + android:id="@+id/textView7" | ||
70 | + android:layout_width="match_parent" | ||
71 | + android:layout_height="wrap_content" | ||
72 | + android:layout_marginLeft="33dp" | ||
73 | + android:layout_marginTop="17dp" | ||
74 | + android:lineSpacingExtra="6dp" | ||
75 | + android:text="* 푸시알림은 3일에 한 번씩, \n\t\t오전 9시부터 저녁 6시 사이로 보내드립니다." | ||
76 | + android:textSize="13dp" /> | ||
77 | + | ||
78 | + </LinearLayout> | ||
79 | + | ||
80 | + </LinearLayout> | ||
81 | + | ||
82 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
83 | + android:id="@+id/bottomNavigation" | ||
84 | + android:layout_width="match_parent" | ||
85 | + android:layout_height="wrap_content" | ||
86 | + android:layout_gravity="bottom" | ||
87 | + android:background="#FFF" | ||
88 | + app:itemIconTint="#29ABE2" | ||
89 | + app:itemTextColor="#29ABE2" | ||
90 | + app:labelVisibilityMode="labeled" | ||
91 | + app:menu="@menu/bottom_nav_menu" /> | ||
92 | + | ||
93 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <androidx.appcompat.widget.Toolbar | ||
8 | + android:id="@+id/toolbar" | ||
9 | + android:layout_width="fill_parent" | ||
10 | + android:layout_height="wrap_content" | ||
11 | + android:layout_gravity="center" | ||
12 | + android:layout_marginBottom="11dp" | ||
13 | + android:background="#FFF" | ||
14 | + android:elevation="5dp" | ||
15 | + android:gravity="center" | ||
16 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
17 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
18 | + | ||
19 | + <TextView | ||
20 | + android:layout_width="wrap_content" | ||
21 | + android:layout_height="44dp" | ||
22 | + android:layout_gravity="center" | ||
23 | + android:gravity="center" | ||
24 | + android:text="서비스 이용 약관" | ||
25 | + android:textColor="#000" | ||
26 | + android:textSize="16dp" /> | ||
27 | + </androidx.appcompat.widget.Toolbar> | ||
28 | + | ||
29 | + <LinearLayout | ||
30 | + android:layout_width="match_parent" | ||
31 | + android:layout_height="match_parent" | ||
32 | + android:layout_weight="1" | ||
33 | + android:background="#fff" | ||
34 | + android:orientation="vertical"> | ||
35 | + | ||
36 | + <Button | ||
37 | + android:id="@+id/discription" | ||
38 | + style="?android:attr/borderlessButtonStyle" | ||
39 | + android:layout_width="match_parent" | ||
40 | + android:layout_height="44dp" | ||
41 | + android:gravity="left|center_vertical" | ||
42 | + android:paddingLeft="33dp" | ||
43 | + android:text="TOP 11" | ||
44 | + android:textSize="17dp" /> | ||
45 | + | ||
46 | + <androidx.recyclerview.widget.RecyclerView | ||
47 | + android:id="@+id/qna_rv" | ||
48 | + android:layout_width="match_parent" | ||
49 | + android:layout_height="match_parent" /> | ||
50 | + | ||
51 | + <LinearLayout | ||
52 | + android:layout_width="match_parent" | ||
53 | + android:layout_height="wrap_content" | ||
54 | + android:layout_marginLeft="11dp" | ||
55 | + android:layout_marginRight="11dp" | ||
56 | + android:background="@drawable/bottom_border" | ||
57 | + | ||
58 | + android:orientation="horizontal"> | ||
59 | + | ||
60 | + <Button | ||
61 | + android:id="@+id/terms_use" | ||
62 | + style="?android:attr/borderlessButtonStyle" | ||
63 | + android:layout_width="match_parent" | ||
64 | + android:layout_height="65dp" | ||
65 | + android:layout_weight="1" | ||
66 | + android:gravity="left|center_vertical" | ||
67 | + android:paddingLeft="33dp" | ||
68 | + android:text="이용 약관" | ||
69 | + android:textSize="17dp" /> | ||
70 | + | ||
71 | + <ImageView | ||
72 | + android:id="@+id/ef" | ||
73 | + android:layout_width="match_parent" | ||
74 | + android:layout_height="wrap_content" | ||
75 | + android:layout_gravity="center|right" | ||
76 | + android:layout_weight="6" | ||
77 | + app:srcCompat="@drawable/down_arrow" /> | ||
78 | + | ||
79 | + </LinearLayout> | ||
80 | + </LinearLayout> | ||
81 | + | ||
82 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
83 | + android:id="@+id/bottomNavigation" | ||
84 | + android:layout_width="match_parent" | ||
85 | + android:layout_height="wrap_content" | ||
86 | + android:layout_gravity="bottom" | ||
87 | + android:background="#FFF" | ||
88 | + app:itemIconTint="#29ABE2" | ||
89 | + app:itemTextColor="#29ABE2" | ||
90 | + app:labelVisibilityMode="labeled" | ||
91 | + app:menu="@menu/bottom_nav_menu" > | ||
92 | + | ||
93 | + </com.google.android.material.bottomnavigation.BottomNavigationView> | ||
94 | + | ||
95 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + xmlns:tools="http://schemas.android.com/tools" | ||
6 | + android:layout_height="match_parent"> | ||
7 | + | ||
8 | + <androidx.appcompat.widget.Toolbar | ||
9 | + android:id="@+id/toolbar" | ||
10 | + android:layout_width="fill_parent" | ||
11 | + android:layout_height="wrap_content" | ||
12 | + android:layout_gravity="center" | ||
13 | + android:layout_marginBottom="11dp" | ||
14 | + android:background="#FFF" | ||
15 | + android:elevation="5dp" | ||
16 | + android:gravity="center" | ||
17 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
18 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
19 | + | ||
20 | + <TextView | ||
21 | + android:layout_width="77dp" | ||
22 | + android:layout_height="44dp" | ||
23 | + android:layout_gravity="center" | ||
24 | + android:gravity="center" | ||
25 | + android:text="설정" | ||
26 | + android:textColor="#000" | ||
27 | + android:textSize="16dp" /> | ||
28 | + </androidx.appcompat.widget.Toolbar> | ||
29 | + | ||
30 | + <LinearLayout | ||
31 | + android:layout_width="match_parent" | ||
32 | + android:layout_height="match_parent" | ||
33 | + android:layout_weight="1" | ||
34 | + android:background="#fff" | ||
35 | + android:orientation="vertical"> | ||
36 | + | ||
37 | + <LinearLayout | ||
38 | + android:layout_width="match_parent" | ||
39 | + android:layout_height="wrap_content" | ||
40 | + android:orientation="vertical"></LinearLayout> | ||
41 | + | ||
42 | + <Button | ||
43 | + android:id="@+id/accountBtn" | ||
44 | + style="?android:attr/borderlessButtonStyle" | ||
45 | + android:layout_width="match_parent" | ||
46 | + android:layout_height="65dp" | ||
47 | + android:layout_marginLeft="11dp" | ||
48 | + android:layout_marginRight="11dp" | ||
49 | + android:background="@drawable/bottom_border" | ||
50 | + android:gravity="left|center_vertical" | ||
51 | + android:paddingLeft="33dp" | ||
52 | + android:text="계정 설정" | ||
53 | + android:textSize="17dp" /> | ||
54 | + | ||
55 | + <Button | ||
56 | + android:id="@+id/info_push" | ||
57 | + android:textSize="17dp" | ||
58 | + style="?android:attr/borderlessButtonStyle" | ||
59 | + android:layout_marginLeft="11dp" | ||
60 | + android:layout_marginRight="11dp" | ||
61 | + android:layout_width="match_parent" | ||
62 | + android:layout_height="65dp" | ||
63 | + android:gravity="left|center_vertical" | ||
64 | + android:paddingLeft="33dp" | ||
65 | + android:background="@drawable/bottom_border" | ||
66 | + android:text="푸시 알림" /> | ||
67 | + | ||
68 | + <Button | ||
69 | + android:id="@+id/button3" | ||
70 | + style="?android:attr/borderlessButtonStyle" | ||
71 | + android:layout_width="match_parent" | ||
72 | + android:layout_height="65dp" | ||
73 | + android:layout_marginLeft="11dp" | ||
74 | + android:layout_marginRight="11dp" | ||
75 | + android:background="@drawable/bottom_border" | ||
76 | + android:gravity="left|center_vertical" | ||
77 | + android:paddingLeft="33dp" | ||
78 | + android:text="접근권한 설정 (준비중)" | ||
79 | + android:textSize="17dp" /> | ||
80 | + | ||
81 | + <Button | ||
82 | + android:id="@+id/terms_of_use" | ||
83 | + android:textSize="17dp" | ||
84 | + android:layout_marginLeft="11dp" | ||
85 | + android:layout_marginRight="11dp" | ||
86 | + style="?android:attr/borderlessButtonStyle" | ||
87 | + android:layout_width="match_parent" | ||
88 | + android:layout_height="65dp" | ||
89 | + android:gravity="left|center_vertical" | ||
90 | + android:paddingLeft="33dp" | ||
91 | + android:background="@drawable/bottom_border" | ||
92 | + android:text="서비스 이용 약관" /> | ||
93 | + | ||
94 | + <LinearLayout | ||
95 | + android:layout_width="match_parent" | ||
96 | + android:layout_height="wrap_content" | ||
97 | + android:layout_marginLeft="11dp" | ||
98 | + android:layout_marginRight="11dp" | ||
99 | + android:background="@drawable/bottom_border" | ||
100 | + | ||
101 | + android:orientation="horizontal"> | ||
102 | + | ||
103 | + <Button | ||
104 | + android:id="@+id/terms_use" | ||
105 | + style="?android:attr/borderlessButtonStyle" | ||
106 | + android:layout_width="match_parent" | ||
107 | + android:layout_height="65dp" | ||
108 | + android:layout_weight="1" | ||
109 | + android:gravity="left|center_vertical" | ||
110 | + android:paddingLeft="33dp" | ||
111 | + android:text="버전 정보" | ||
112 | + android:textSize="17dp" /> | ||
113 | + | ||
114 | + <TextView | ||
115 | + android:id="@+id/textView6" | ||
116 | + android:layout_width="match_parent" | ||
117 | + android:layout_height="wrap_content" | ||
118 | + android:layout_weight="1" | ||
119 | + android:gravity="right|center_vertical" | ||
120 | + android:paddingRight="33dp" | ||
121 | + android:text="v1.0.0" /> | ||
122 | + </LinearLayout> | ||
123 | + | ||
124 | + </LinearLayout> | ||
125 | + | ||
126 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
127 | + android:id="@+id/bottomNavigation" | ||
128 | + android:layout_width="match_parent" | ||
129 | + android:layout_height="wrap_content" | ||
130 | + android:layout_gravity="bottom" | ||
131 | + android:background="#FFF" | ||
132 | + app:itemIconTint="#29ABE2" | ||
133 | + app:itemTextColor="#29ABE2" | ||
134 | + app:labelVisibilityMode="labeled" | ||
135 | + app:menu="@menu/bottom_nav_menu" /> | ||
136 | + | ||
137 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -11,6 +11,7 @@ | ... | @@ -11,6 +11,7 @@ |
11 | android:id="@+id/linearLayout" | 11 | android:id="@+id/linearLayout" |
12 | android:layout_width="match_parent" | 12 | android:layout_width="match_parent" |
13 | android:layout_height="match_parent" | 13 | android:layout_height="match_parent" |
14 | + android:background="#FFF" | ||
14 | android:orientation="vertical" | 15 | android:orientation="vertical" |
15 | app:layout_constraintBottom_toBottomOf="parent" | 16 | app:layout_constraintBottom_toBottomOf="parent" |
16 | app:layout_constraintEnd_toEndOf="parent" | 17 | app:layout_constraintEnd_toEndOf="parent" |
... | @@ -21,7 +22,6 @@ | ... | @@ -21,7 +22,6 @@ |
21 | android:id="@+id/toolbar" | 22 | android:id="@+id/toolbar" |
22 | android:layout_width="fill_parent" | 23 | android:layout_width="fill_parent" |
23 | android:layout_height="wrap_content" | 24 | android:layout_height="wrap_content" |
24 | - android:layout_marginBottom="11dp" | ||
25 | android:background="#FFF" | 25 | android:background="#FFF" |
26 | android:elevation="5dp" | 26 | android:elevation="5dp" |
27 | android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | 27 | android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" |
... | @@ -36,24 +36,42 @@ | ... | @@ -36,24 +36,42 @@ |
36 | 36 | ||
37 | <androidx.viewpager.widget.ViewPager | 37 | <androidx.viewpager.widget.ViewPager |
38 | android:id="@+id/welcomeViewPager" | 38 | android:id="@+id/welcomeViewPager" |
39 | - android:layout_width="400dp" | 39 | + android:layout_width="match_parent" |
40 | - android:layout_height="220dp" | 40 | + android:layout_height="262dp" |
41 | android:layout_gravity="center" | 41 | android:layout_gravity="center" |
42 | app:layout_constraintEnd_toEndOf="parent" | 42 | app:layout_constraintEnd_toEndOf="parent" |
43 | app:layout_constraintStart_toStartOf="parent" | 43 | app:layout_constraintStart_toStartOf="parent" |
44 | - app:layout_constraintTop_toTopOf="parent"></androidx.viewpager.widget.ViewPager> | 44 | + app:layout_constraintTop_toTopOf="parent"> |
45 | + | ||
46 | + </androidx.viewpager.widget.ViewPager> | ||
45 | 47 | ||
46 | - <androidx.recyclerview.widget.RecyclerView | 48 | + <LinearLayout |
47 | - android:id="@+id/policyFieldRecyclerView" | 49 | + android:layout_width="match_parent" |
48 | - android:layout_width="400dp" | ||
49 | android:layout_height="wrap_content" | 50 | android:layout_height="wrap_content" |
50 | - android:layout_gravity="center|center_vertical" | 51 | + android:layout_gravity="center" |
52 | + android:layout_marginLeft="16dp" | ||
53 | + android:layout_marginRight="16dp" | ||
51 | android:layout_weight="1" | 54 | android:layout_weight="1" |
52 | - android:padding="20dp" | 55 | + android:foregroundGravity="center" |
53 | - app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" | 56 | + android:gravity="center" |
54 | - app:layout_constraintBottom_toBottomOf="@id/bottomNavigation" | 57 | + android:orientation="vertical"> |
55 | - app:spanCount="3" | 58 | + |
56 | - tools:listitem="@layout/item_policyfield" /> | 59 | + <androidx.recyclerview.widget.RecyclerView |
60 | + android:id="@+id/policyFieldRecyclerView" | ||
61 | + android:layout_width="match_parent" | ||
62 | + android:layout_height="wrap_content" | ||
63 | + | ||
64 | + android:layout_gravity="center|center_horizontal" | ||
65 | + android:layout_marginTop="11dp" | ||
66 | + android:layout_marginBottom="11dp" | ||
67 | + android:layout_weight="1" | ||
68 | + android:background="@drawable/round_ractagle_solid" | ||
69 | + android:foregroundGravity="center" | ||
70 | + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" | ||
71 | + app:layout_constraintBottom_toBottomOf="@id/bottomNavigation" | ||
72 | + app:spanCount="3" | ||
73 | + tools:listitem="@layout/item_policyfield" /> | ||
74 | + </LinearLayout> | ||
57 | 75 | ||
58 | <com.google.android.material.bottomnavigation.BottomNavigationView | 76 | <com.google.android.material.bottomnavigation.BottomNavigationView |
59 | android:id="@+id/bottomNavigation" | 77 | android:id="@+id/bottomNavigation" |
... | @@ -61,6 +79,7 @@ | ... | @@ -61,6 +79,7 @@ |
61 | android:layout_height="wrap_content" | 79 | android:layout_height="wrap_content" |
62 | android:layout_gravity="bottom" | 80 | android:layout_gravity="bottom" |
63 | android:background="#FFF" | 81 | android:background="#FFF" |
82 | + android:elevation="8dp" | ||
64 | app:itemIconTint="#29ABE2" | 83 | app:itemIconTint="#29ABE2" |
65 | app:itemTextColor="#29ABE2" | 84 | app:itemTextColor="#29ABE2" |
66 | app:labelVisibilityMode="labeled" | 85 | app:labelVisibilityMode="labeled" | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <androidx.appcompat.widget.Toolbar | ||
8 | + android:id="@+id/toolbar" | ||
9 | + android:layout_width="fill_parent" | ||
10 | + android:layout_height="wrap_content" | ||
11 | + android:layout_gravity="center" | ||
12 | + android:layout_marginBottom="11dp" | ||
13 | + android:background="#FFF" | ||
14 | + android:elevation="5dp" | ||
15 | + android:gravity="center" | ||
16 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
17 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
18 | + | ||
19 | + <TextView | ||
20 | + android:layout_width="wrap_content" | ||
21 | + android:layout_height="44dp" | ||
22 | + android:layout_gravity="center" | ||
23 | + android:gravity="center" | ||
24 | + android:text="이용약관" | ||
25 | + android:textColor="#000" | ||
26 | + android:textSize="16dp" /> | ||
27 | + </androidx.appcompat.widget.Toolbar> | ||
28 | + | ||
29 | + <LinearLayout | ||
30 | + android:layout_width="match_parent" | ||
31 | + android:layout_height="match_parent" | ||
32 | + android:layout_weight="1" | ||
33 | + android:background="#fff" | ||
34 | + android:orientation="vertical"> | ||
35 | + | ||
36 | + <WebView | ||
37 | + android:id="@+id/use_terms" | ||
38 | + android:layout_width="match_parent" | ||
39 | + android:layout_height="match_parent" /> | ||
40 | + </LinearLayout> | ||
41 | + | ||
42 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
43 | + android:id="@+id/bottomNavigation" | ||
44 | + android:layout_width="match_parent" | ||
45 | + android:layout_height="wrap_content" | ||
46 | + android:layout_gravity="bottom" | ||
47 | + android:background="#FFF" | ||
48 | + app:itemIconTint="#29ABE2" | ||
49 | + app:itemTextColor="#29ABE2" | ||
50 | + app:labelVisibilityMode="labeled" | ||
51 | + app:menu="@menu/bottom_nav_menu" /> | ||
52 | + | ||
53 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + android:orientation="vertical" android:layout_width="match_parent" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + android:layout_height="match_parent"> | ||
6 | + | ||
7 | + <androidx.appcompat.widget.Toolbar | ||
8 | + android:id="@+id/toolbar" | ||
9 | + android:layout_width="fill_parent" | ||
10 | + android:layout_height="wrap_content" | ||
11 | + android:layout_gravity="center" | ||
12 | + android:layout_marginBottom="11dp" | ||
13 | + android:background="#FFF" | ||
14 | + android:elevation="5dp" | ||
15 | + android:gravity="center" | ||
16 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
17 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
18 | + | ||
19 | + <TextView | ||
20 | + android:layout_width="wrap_content" | ||
21 | + android:layout_height="44dp" | ||
22 | + android:layout_gravity="center" | ||
23 | + android:gravity="center" | ||
24 | + android:text="서비스 이용 약관" | ||
25 | + android:textColor="#000" | ||
26 | + android:textSize="16dp" /> | ||
27 | + </androidx.appcompat.widget.Toolbar> | ||
28 | + | ||
29 | + <LinearLayout | ||
30 | + android:layout_width="match_parent" | ||
31 | + android:layout_height="match_parent" | ||
32 | + android:layout_weight="1" | ||
33 | + android:background="#fff" | ||
34 | + android:orientation="vertical"> | ||
35 | + | ||
36 | + <LinearLayout | ||
37 | + android:layout_width="match_parent" | ||
38 | + android:layout_height="wrap_content" | ||
39 | + android:orientation="vertical"></LinearLayout> | ||
40 | + | ||
41 | + <LinearLayout | ||
42 | + android:layout_width="match_parent" | ||
43 | + android:layout_height="wrap_content" | ||
44 | + android:layout_marginLeft="11dp" | ||
45 | + android:layout_marginRight="11dp" | ||
46 | + android:background="@drawable/bottom_border" | ||
47 | + | ||
48 | + android:orientation="horizontal"> | ||
49 | + | ||
50 | + <Button | ||
51 | + android:id="@+id/terms_use" | ||
52 | + style="?android:attr/borderlessButtonStyle" | ||
53 | + android:layout_width="match_parent" | ||
54 | + android:layout_height="65dp" | ||
55 | + android:layout_weight="1" | ||
56 | + android:gravity="left|center_vertical" | ||
57 | + android:paddingLeft="33dp" | ||
58 | + android:text="이용 약관" | ||
59 | + android:textSize="17dp" /> | ||
60 | + | ||
61 | + <ImageView | ||
62 | + android:id="@+id/ef" | ||
63 | + android:layout_width="match_parent" | ||
64 | + android:layout_height="wrap_content" | ||
65 | + android:layout_gravity="center|right" | ||
66 | + android:layout_weight="6" | ||
67 | + app:srcCompat="@drawable/foward_arrow" /> | ||
68 | + </LinearLayout> | ||
69 | + <LinearLayout | ||
70 | + android:layout_width="match_parent" | ||
71 | + android:layout_height="wrap_content" | ||
72 | + android:layout_marginLeft="11dp" | ||
73 | + android:layout_marginRight="11dp" | ||
74 | + android:background="@drawable/bottom_border" | ||
75 | + android:stateListAnimator="@null" | ||
76 | + android:orientation="horizontal"> | ||
77 | + | ||
78 | + <Button | ||
79 | + android:id="@+id/terms_use2" | ||
80 | + style="?android:attr/borderlessButtonStyle" | ||
81 | + android:layout_width="match_parent" | ||
82 | + android:layout_height="65dp" | ||
83 | + android:layout_weight="1" | ||
84 | + android:gravity="left|center_vertical" | ||
85 | + android:paddingLeft="33dp" | ||
86 | + android:stateListAnimator="@null" | ||
87 | + android:text="개인정보 처리방침" | ||
88 | + android:textSize="17dp" /> | ||
89 | + | ||
90 | + <ImageView | ||
91 | + android:id="@+id/ef2" | ||
92 | + android:layout_width="match_parent" | ||
93 | + android:layout_height="wrap_content" | ||
94 | + android:layout_gravity="center|right" | ||
95 | + android:layout_weight="6" | ||
96 | + app:srcCompat="@drawable/foward_arrow" /> | ||
97 | + | ||
98 | + </LinearLayout> | ||
99 | + | ||
100 | + </LinearLayout> | ||
101 | + | ||
102 | + <com.google.android.material.bottomnavigation.BottomNavigationView | ||
103 | + android:id="@+id/bottomNavigation" | ||
104 | + android:layout_width="match_parent" | ||
105 | + android:layout_height="wrap_content" | ||
106 | + android:layout_gravity="bottom" | ||
107 | + android:background="#FFF" | ||
108 | + app:itemIconTint="#29ABE2" | ||
109 | + app:itemTextColor="#29ABE2" | ||
110 | + app:labelVisibilityMode="labeled" | ||
111 | + app:menu="@menu/bottom_nav_menu" /> | ||
112 | + | ||
113 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -27,10 +27,7 @@ | ... | @@ -27,10 +27,7 @@ |
27 | android:layout_width="wrap_content" | 27 | android:layout_width="wrap_content" |
28 | android:layout_height="70dp" | 28 | android:layout_height="70dp" |
29 | android:layout_weight="1" | 29 | android:layout_weight="1" |
30 | - android:background="#FF29ABE2" | 30 | + android:text="시작하기" /> |
31 | - android:text="회원가입/로그인하기" | ||
32 | - android:textColor="@android:color/white" | ||
33 | - android:textSize="16dp" /> | ||
34 | 31 | ||
35 | </LinearLayout> | 32 | </LinearLayout> |
36 | </LinearLayout> | 33 | </LinearLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
1 | -<?xml version="1.0" encoding="utf-8"?> | ||
2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | - xmlns:app="http://schemas.android.com/apk/res-auto" | ||
4 | - xmlns:tools="http://schemas.android.com/tools" | ||
5 | - android:layout_width="match_parent" | ||
6 | - android:layout_height="wrap_content" | ||
7 | - android:orientation="vertical" | ||
8 | - android:padding="25dp" | ||
9 | - tools:context=".BSAdapter"> | ||
10 | - | ||
11 | - <LinearLayout | ||
12 | - android:layout_width="match_parent" | ||
13 | - android:layout_height="wrap_content" | ||
14 | - android:orientation="horizontal" | ||
15 | - android:padding="2dp"> | ||
16 | - | ||
17 | - <Button | ||
18 | - android:id="@+id/circleformButton" | ||
19 | - android:layout_width="20dp" | ||
20 | - android:layout_height="20dp" | ||
21 | - android:layout_gravity="center" | ||
22 | - android:layout_margin="3dp" | ||
23 | - android:background="@drawable/circle_shape" | ||
24 | - android:textColor="#29ABE2" | ||
25 | - android:textSize="10dp" /> | ||
26 | - | ||
27 | - <TextView | ||
28 | - android:id="@+id/bsTextView" | ||
29 | - android:layout_width="wrap_content" | ||
30 | - android:layout_height="wrap_content" | ||
31 | - android:text="내용" | ||
32 | - android:textColor="#29ABE2" | ||
33 | - android:textSize="20dp" /> | ||
34 | - | ||
35 | - </LinearLayout> | ||
36 | - | ||
37 | - <TextView | ||
38 | - android:id="@+id/textView8" | ||
39 | - android:layout_width="match_parent" | ||
40 | - android:layout_height="wrap_content" | ||
41 | - android:layout_margin="10dp" | ||
42 | - android:text="생년월일" | ||
43 | - android:textColor="#29ABE2" | ||
44 | - android:textSize="13dp" /> | ||
45 | - | ||
46 | - <EditText | ||
47 | - android:id="@+id/bsBirthEditText" | ||
48 | - android:layout_width="match_parent" | ||
49 | - android:layout_height="wrap_content" | ||
50 | - android:layout_margin="10dp" | ||
51 | - android:ems="10" | ||
52 | - android:hint="ex)19951029" | ||
53 | - android:inputType="number" | ||
54 | - android:theme="@style/EditTheme" /> | ||
55 | - | ||
56 | - <TextView | ||
57 | - android:id="@+id/textView9" | ||
58 | - android:layout_width="match_parent" | ||
59 | - android:layout_height="wrap_content" | ||
60 | - android:layout_margin="10dp" | ||
61 | - android:text="성별 *" | ||
62 | - android:textColor="#29ABE2" | ||
63 | - android:textSize="13dp" /> | ||
64 | - | ||
65 | - <LinearLayout | ||
66 | - android:layout_width="match_parent" | ||
67 | - android:layout_height="wrap_content" | ||
68 | - android:orientation="horizontal"> | ||
69 | - | ||
70 | - <ToggleButton | ||
71 | - android:id="@+id/womanButton" | ||
72 | - android:layout_width="wrap_content" | ||
73 | - android:layout_height="wrap_content" | ||
74 | - android:layout_margin="10dp" | ||
75 | - android:layout_weight="1" | ||
76 | - android:background="@drawable/button_selector" | ||
77 | - android:textOff="여성" | ||
78 | - android:textOn="여성" /> | ||
79 | - | ||
80 | - <ToggleButton | ||
81 | - android:id="@+id/manButton" | ||
82 | - android:layout_width="wrap_content" | ||
83 | - android:layout_height="wrap_content" | ||
84 | - android:layout_margin="10dp" | ||
85 | - android:layout_weight="1" | ||
86 | - android:background="@drawable/button_selector" | ||
87 | - android:textOff="남성" | ||
88 | - android:textOn="남성" /> | ||
89 | - </LinearLayout> | ||
90 | -</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
1 | -<?xml version="1.0" encoding="utf-8"?> | ||
2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | - xmlns:app="http://schemas.android.com/apk/res-auto" | ||
4 | - xmlns:tools="http://schemas.android.com/tools" | ||
5 | - android:layout_width="match_parent" | ||
6 | - android:layout_height="wrap_content" | ||
7 | - android:orientation="vertical" | ||
8 | - android:padding="25dp" | ||
9 | - tools:context=".ChildAdapter"> | ||
10 | - | ||
11 | - <LinearLayout | ||
12 | - android:layout_width="match_parent" | ||
13 | - android:layout_height="wrap_content" | ||
14 | - android:orientation="horizontal" | ||
15 | - android:padding="2dp"> | ||
16 | - | ||
17 | - <Button | ||
18 | - android:id="@+id/circleformButton" | ||
19 | - android:layout_width="20dp" | ||
20 | - android:layout_height="20dp" | ||
21 | - android:layout_gravity="center" | ||
22 | - android:layout_margin="3dp" | ||
23 | - android:background="@drawable/circle_shape" | ||
24 | - android:textColor="#29ABE2" | ||
25 | - android:textSize="10dp" /> | ||
26 | - | ||
27 | - <TextView | ||
28 | - android:id="@+id/childTextView" | ||
29 | - android:layout_width="wrap_content" | ||
30 | - android:layout_height="wrap_content" | ||
31 | - android:text="내용" | ||
32 | - android:textColor="#29ABE2" | ||
33 | - android:textSize="20dp" /> | ||
34 | - | ||
35 | - </LinearLayout> | ||
36 | - | ||
37 | - <TextView | ||
38 | - android:id="@+id/textView8" | ||
39 | - android:layout_width="match_parent" | ||
40 | - android:layout_height="wrap_content" | ||
41 | - android:layout_margin="10dp" | ||
42 | - android:text="생년월일" | ||
43 | - android:textColor="#29ABE2" | ||
44 | - android:textSize="13dp" /> | ||
45 | - | ||
46 | - <EditText | ||
47 | - android:id="@+id/childBirthEditText" | ||
48 | - android:layout_width="match_parent" | ||
49 | - android:layout_height="wrap_content" | ||
50 | - android:layout_margin="10dp" | ||
51 | - android:ems="10" | ||
52 | - android:hint="ex)19951029" | ||
53 | - android:inputType="number" | ||
54 | - android:theme="@style/EditTheme" /> | ||
55 | - | ||
56 | - <TextView | ||
57 | - android:id="@+id/textView9" | ||
58 | - android:layout_width="match_parent" | ||
59 | - android:layout_height="wrap_content" | ||
60 | - android:layout_margin="10dp" | ||
61 | - android:text="성별 *" | ||
62 | - android:textColor="#29ABE2" | ||
63 | - android:textSize="13dp" /> | ||
64 | - | ||
65 | - <LinearLayout | ||
66 | - android:layout_width="match_parent" | ||
67 | - android:layout_height="wrap_content" | ||
68 | - android:orientation="horizontal"> | ||
69 | - | ||
70 | - <ToggleButton | ||
71 | - android:id="@+id/womanButton" | ||
72 | - android:layout_width="wrap_content" | ||
73 | - android:layout_height="wrap_content" | ||
74 | - android:layout_margin="10dp" | ||
75 | - android:layout_weight="1" | ||
76 | - android:background="@drawable/button_selector" | ||
77 | - android:textOff="여성" | ||
78 | - android:textOn="여성" /> | ||
79 | - | ||
80 | - <ToggleButton | ||
81 | - android:id="@+id/manButton" | ||
82 | - android:layout_width="wrap_content" | ||
83 | - android:layout_height="wrap_content" | ||
84 | - android:layout_margin="10dp" | ||
85 | - android:layout_weight="1" | ||
86 | - android:background="@drawable/button_selector" | ||
87 | - android:textOff="남성" | ||
88 | - android:textOn="남성" /> | ||
89 | - </LinearLayout> | ||
90 | -</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -3,18 +3,18 @@ | ... | @@ -3,18 +3,18 @@ |
3 | xmlns:app="http://schemas.android.com/apk/res-auto" | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" |
4 | xmlns:tools="http://schemas.android.com/tools" | 4 | xmlns:tools="http://schemas.android.com/tools" |
5 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
6 | - android:layout_height="200dp" | 6 | + android:layout_height="150dp" |
7 | - android:layout_margin="10dp" | 7 | + android:layout_margin="7dp" |
8 | - android:background="@drawable/edgemaking" | 8 | + android:background="@drawable/round_ractagle_solid" |
9 | - android:orientation="horizontal" | 9 | + android:orientation="horizontal"> |
10 | - android:padding="10dp"> | ||
11 | 10 | ||
12 | 11 | ||
13 | <ImageView | 12 | <ImageView |
14 | android:id="@+id/policyImage" | 13 | android:id="@+id/policyImage" |
15 | - android:layout_width="100dp" | 14 | + android:layout_width="120dp" |
16 | android:layout_height="match_parent" | 15 | android:layout_height="match_parent" |
17 | android:layout_weight="1" | 16 | android:layout_weight="1" |
17 | + android:paddingLeft="7dp" | ||
18 | tools:srcCompat="@tools:sample/avatars" /> | 18 | tools:srcCompat="@tools:sample/avatars" /> |
19 | 19 | ||
20 | <LinearLayout | 20 | <LinearLayout |
... | @@ -23,7 +23,7 @@ | ... | @@ -23,7 +23,7 @@ |
23 | android:layout_weight="2" | 23 | android:layout_weight="2" |
24 | android:orientation="vertical"> | 24 | android:orientation="vertical"> |
25 | 25 | ||
26 | - <LinearLayout | 26 | + <RelativeLayout |
27 | android:layout_width="match_parent" | 27 | android:layout_width="match_parent" |
28 | android:layout_height="10dp" | 28 | android:layout_height="10dp" |
29 | android:layout_weight="1" | 29 | android:layout_weight="1" |
... | @@ -31,44 +31,64 @@ | ... | @@ -31,44 +31,64 @@ |
31 | 31 | ||
32 | <TextView | 32 | <TextView |
33 | android:id="@+id/policyDday" | 33 | android:id="@+id/policyDday" |
34 | - android:layout_width="wrap_content" | 34 | + android:layout_width="77dp" |
35 | - android:layout_height="wrap_content" | 35 | + android:layout_height="39dp" |
36 | - android:layout_weight="1" | 36 | + android:background="@drawable/broken_rectangle" |
37 | - android:text="TextView" /> | 37 | + android:gravity="center" |
38 | + android:text="TextView" | ||
39 | + android:textColor="#FFF" | ||
40 | + android:textSize="18sp" /> | ||
41 | + | ||
38 | 42 | ||
39 | <ToggleButton | 43 | <ToggleButton |
40 | android:id="@+id/policyFavor" | 44 | android:id="@+id/policyFavor" |
41 | - android:layout_width="30dp" | 45 | + android:layout_width="22dp" |
42 | - android:layout_height="30dp" | 46 | + android:layout_height="25dp" |
47 | + android:layout_alignParentRight="true" | ||
48 | + android:layout_gravity="right" | ||
49 | + android:layout_marginTop="11dp" | ||
50 | + android:layout_marginRight="20dp" | ||
43 | android:layout_weight="0" | 51 | android:layout_weight="0" |
44 | android:background="@drawable/toggle_selector" | 52 | android:background="@drawable/toggle_selector" |
45 | android:checked="false" | 53 | android:checked="false" |
46 | android:textOff="" | 54 | android:textOff="" |
47 | android:textOn="" /> | 55 | android:textOn="" /> |
48 | - </LinearLayout> | 56 | + </RelativeLayout> |
49 | 57 | ||
50 | <TextView | 58 | <TextView |
51 | android:id="@+id/policyHost" | 59 | android:id="@+id/policyHost" |
52 | android:layout_width="match_parent" | 60 | android:layout_width="match_parent" |
53 | android:layout_height="10dp" | 61 | android:layout_height="10dp" |
54 | - android:layout_weight="1" | 62 | + android:layout_marginLeft="14dp" |
55 | - android:gravity="center" | 63 | + android:layout_weight="0.7" |
56 | - android:text="TextView" /> | 64 | + android:gravity="bottom|left|center_vertical" |
65 | + android:text="TextView" | ||
66 | + android:textColor="#C04A4A4A" | ||
67 | + android:textSize="13dp" /> | ||
57 | 68 | ||
58 | <TextView | 69 | <TextView |
59 | android:id="@+id/policyTitle" | 70 | android:id="@+id/policyTitle" |
60 | android:layout_width="match_parent" | 71 | android:layout_width="match_parent" |
61 | android:layout_height="10dp" | 72 | android:layout_height="10dp" |
73 | + android:layout_marginLeft="11dp" | ||
62 | android:layout_weight="1" | 74 | android:layout_weight="1" |
63 | - android:gravity="center" | 75 | + android:gravity="left|center_vertical" |
64 | - android:text="TextView" /> | 76 | + android:text="TextView" |
77 | + android:textColor="#000" | ||
78 | + android:textSize="18dp" /> | ||
65 | 79 | ||
66 | <RatingBar | 80 | <RatingBar |
67 | android:id="@+id/policyScore" | 81 | android:id="@+id/policyScore" |
68 | android:layout_width="240dp" | 82 | android:layout_width="240dp" |
69 | - android:layout_height="10dp" | 83 | + android:layout_height="22dp" |
70 | android:layout_gravity="center" | 84 | android:layout_gravity="center" |
71 | - android:layout_weight="1" /> | 85 | + android:layout_weight="1" |
86 | + android:max="5" | ||
87 | + android:rating="3.5" | ||
88 | + android:scaleX=".5" | ||
89 | + android:scaleY="0.5" | ||
90 | + android:transformPivotX="0dp" | ||
91 | + android:transformPivotY="0dp" /> | ||
72 | </LinearLayout> | 92 | </LinearLayout> |
73 | 93 | ||
74 | </LinearLayout> | 94 | </LinearLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -4,10 +4,8 @@ | ... | @@ -4,10 +4,8 @@ |
4 | android:layout_width="100dp" | 4 | android:layout_width="100dp" |
5 | android:layout_height="100dp" | 5 | android:layout_height="100dp" |
6 | android:layout_gravity="center" | 6 | android:layout_gravity="center" |
7 | - android:layout_margin="10dp" | ||
8 | android:gravity="center" | 7 | android:gravity="center" |
9 | - android:orientation="vertical" | 8 | + android:orientation="vertical"> |
10 | - android:padding="3dp"> | ||
11 | 9 | ||
12 | 10 | ||
13 | <ImageView | 11 | <ImageView | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
4 | + xmlns:tools="http://schemas.android.com/tools" | ||
5 | + android:layout_width="match_parent" | ||
6 | + android:layout_height="wrap_content" | ||
7 | + android:layout_margin="10dp" | ||
8 | + android:background="@drawable/bottom_border" | ||
9 | + android:orientation="horizontal" | ||
10 | + android:padding="7dp"> | ||
11 | + | ||
12 | + | ||
13 | + <LinearLayout | ||
14 | + android:layout_width="wrap_content" | ||
15 | + android:layout_height="match_parent" | ||
16 | + android:layout_weight="1" | ||
17 | + android:orientation="vertical"> | ||
18 | + | ||
19 | + <LinearLayout | ||
20 | + android:layout_width="match_parent" | ||
21 | + android:layout_height="wrap_content" | ||
22 | + android:orientation="horizontal"> | ||
23 | + | ||
24 | + <TextView | ||
25 | + android:id="@+id/questionText" | ||
26 | + android:layout_width="wrap_content" | ||
27 | + android:layout_height="65dp" | ||
28 | + android:layout_gravity="center|right" | ||
29 | + android:layout_weight="1" | ||
30 | + android:gravity="center|left" | ||
31 | + android:text="TextView" | ||
32 | + android:textSize="16dp" /> | ||
33 | + | ||
34 | + <ImageView | ||
35 | + android:id="@+id/bottomArrow" | ||
36 | + android:layout_width="wrap_content" | ||
37 | + android:layout_height="wrap_content" | ||
38 | + android:layout_gravity="center|right" | ||
39 | + android:layout_weight="0.1" | ||
40 | + android:foregroundGravity="left" | ||
41 | + app:srcCompat="@drawable/down_arrow" /> | ||
42 | + | ||
43 | + </LinearLayout> | ||
44 | + | ||
45 | + <TextView | ||
46 | + android:id="@+id/answerText" | ||
47 | + android:layout_width="match_parent" | ||
48 | + android:layout_height="wrap_content" | ||
49 | + android:background="#F1F9FF" | ||
50 | + android:paddingLeft="11dp" | ||
51 | + android:text="TextView" | ||
52 | + android:lineSpacingExtra="6dp" | ||
53 | + android:textSize="13dp" /> | ||
54 | + | ||
55 | + </LinearLayout> | ||
56 | + | ||
57 | +</LinearLayout> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
... | @@ -32,230 +32,265 @@ | ... | @@ -32,230 +32,265 @@ |
32 | android:layout_height="match_parent" | 32 | android:layout_height="match_parent" |
33 | android:orientation="vertical"> | 33 | android:orientation="vertical"> |
34 | 34 | ||
35 | - <LinearLayout | 35 | + <SearchView |
36 | - android:layout_width="match_parent" | 36 | + android:id="@+id/searchForm" |
37 | - android:layout_height="200dp" | ||
38 | - android:layout_weight="1" | ||
39 | - android:orientation="vertical"> | ||
40 | - | ||
41 | - <SearchView | ||
42 | - android:id="@+id/searchForm" | ||
43 | - android:layout_width="match_parent" | ||
44 | - android:layout_height="wrap_content" | ||
45 | - android:layout_marginLeft="9dp" | ||
46 | - android:layout_marginTop="30dp" | ||
47 | - android:layout_marginRight="9dp" | ||
48 | - android:layout_marginBottom="9dp" | ||
49 | - android:background="@drawable/searchview_edge" | ||
50 | - android:focusable="false" | ||
51 | - android:layoutDirection="rtl" | ||
52 | - android:paddingStart="7dp" | ||
53 | - android:queryHint=" 정책명, 대상, 키워드를 입력하세요" | ||
54 | - app:iconifiedByDefault="false" | ||
55 | - app:showAsAction="always" /> | ||
56 | - | ||
57 | - <androidx.recyclerview.widget.RecyclerView | ||
58 | - android:id="@+id/searchRecyclerView" | ||
59 | - android:layout_width="match_parent" | ||
60 | - android:layout_height="match_parent" | ||
61 | - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" | ||
62 | - tools:listitem="@layout/item_search"> | ||
63 | - | ||
64 | - </androidx.recyclerview.widget.RecyclerView> | ||
65 | - </LinearLayout> | ||
66 | - | ||
67 | - <ImageView | ||
68 | - android:id="@+id/no_matching" | ||
69 | android:layout_width="match_parent" | 37 | android:layout_width="match_parent" |
70 | android:layout_height="wrap_content" | 38 | android:layout_height="wrap_content" |
71 | - android:layout_gravity="center" | 39 | + android:layout_marginLeft="9dp" |
72 | - android:contentDescription="img" | 40 | + android:layout_marginTop="30dp" |
73 | - android:visibility="gone" | 41 | + android:layout_marginRight="9dp" |
74 | - app:srcCompat="@drawable/not_matching" | 42 | + android:layout_marginBottom="9dp" |
75 | - tools:srcCompat="@drawable/not_matching" /> | 43 | + android:background="@drawable/searchview_edge" |
44 | + android:focusable="false" | ||
45 | + | ||
46 | + android:layoutDirection="rtl" | ||
47 | + android:paddingStart="7dp" | ||
48 | + android:queryBackground="@android:color/transparent" | ||
49 | + android:queryHint=" 정책명, 대상, 키워드를 입력하세요" | ||
50 | + app:iconifiedByDefault="false" | ||
51 | + app:showAsAction="always" > | ||
52 | + | ||
53 | + </SearchView> | ||
76 | 54 | ||
77 | <LinearLayout | 55 | <LinearLayout |
78 | - android:id="@+id/hashtag_linear" | ||
79 | android:layout_width="match_parent" | 56 | android:layout_width="match_parent" |
80 | - android:layout_height="200dp" | 57 | + android:layout_height="match_parent" |
81 | - android:layout_weight="1.1" | ||
82 | android:orientation="vertical"> | 58 | android:orientation="vertical"> |
83 | 59 | ||
84 | - <FrameLayout | 60 | + <LinearLayout |
85 | - android:layout_width="wrap_content" | 61 | + android:id="@+id/policy_scroll_view" |
86 | - android:layout_height="wrap_content"> | 62 | + android:layout_width="match_parent" |
63 | + android:layout_height="200dp" | ||
64 | + android:layout_weight="1" | ||
65 | + android:orientation="vertical"> | ||
87 | 66 | ||
88 | - <View | 67 | + <androidx.recyclerview.widget.RecyclerView |
89 | - android:id="@+id/view2" | 68 | + android:id="@+id/searchRecyclerView" |
90 | android:layout_width="match_parent" | 69 | android:layout_width="match_parent" |
91 | android:layout_height="match_parent" | 70 | android:layout_height="match_parent" |
92 | - android:background="#6629ABE2" /> | 71 | + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" |
93 | - | 72 | + tools:listitem="@layout/item_search"> |
94 | - <FrameLayout | ||
95 | - android:layout_width="match_parent" | ||
96 | - android:layout_height="match_parent"> | ||
97 | 73 | ||
98 | - <com.google.android.material.chip.ChipGroup | 74 | + </androidx.recyclerview.widget.RecyclerView> |
99 | - android:layout_width="match_parent" | ||
100 | - android:layout_height="wrap_content" | ||
101 | - android:layout_gravity="center|center_horizontal|center_vertical" | ||
102 | - android:layout_marginStart="17dp" | ||
103 | - android:foregroundGravity="center_vertical|center|center_horizontal"> | ||
104 | - | ||
105 | - | ||
106 | - <com.google.android.material.chip.ChipGroup | ||
107 | - android:layout_width="match_parent" | ||
108 | - android:layout_height="wrap_content"> | ||
109 | - | ||
110 | - <TextView | ||
111 | - android:id="@+id/textView" | ||
112 | - android:layout_width="wrap_content" | ||
113 | - android:layout_height="wrap_content" | ||
114 | - android:text="가구상황별" /> | ||
115 | 75 | ||
76 | + </LinearLayout> | ||
116 | 77 | ||
117 | - <com.google.android.material.chip.ChipGroup | 78 | + <ImageView |
118 | - android:layout_width="match_parent" | 79 | + android:id="@+id/no_matching" |
119 | - android:layout_height="wrap_content"> | 80 | + android:layout_width="278dp" |
120 | - | 81 | + android:layout_height="278dp" |
121 | - <com.google.android.material.chip.Chip | 82 | + android:layout_gravity="center_horizontal" |
122 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 83 | + android:layout_weight="1" |
123 | - android:layout_width="wrap_content" | 84 | + android:contentDescription="img" |
124 | - app:chipBackgroundColor="#C6FFFFFF" | 85 | + android:visibility="gone" |
125 | - android:layout_height="wrap_content" | 86 | + app:srcCompat="@drawable/not_matching" /> |
126 | - android:layout_marginBottom="5dp" | ||
127 | - android:checkable="false" | ||
128 | - android:text="# 장애인" | ||
129 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | ||
130 | - | ||
131 | - <com.google.android.material.chip.Chip | ||
132 | - style="@style/Widget.MaterialComponents.Chip.Choice" | ||
133 | - android:layout_width="wrap_content" | ||
134 | - android:layout_height="wrap_content" | ||
135 | - android:layout_marginBottom="5dp" | ||
136 | - android:checkable="false" | ||
137 | - app:chipBackgroundColor="#C6FFFFFF" | ||
138 | - android:text="# 한부모" | ||
139 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | ||
140 | - | ||
141 | 87 | ||
142 | - <com.google.android.material.chip.Chip | 88 | + <LinearLayout |
143 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 89 | + android:id="@+id/hashtag_linear" |
144 | - android:layout_width="wrap_content" | 90 | + android:layout_width="match_parent" |
145 | - android:layout_height="wrap_content" | 91 | + android:layout_height="200dp" |
146 | - android:layout_marginBottom="5dp" | 92 | + android:layout_weight="2.5" |
147 | - android:checkable="false" | 93 | + android:orientation="vertical"> |
148 | - app:chipBackgroundColor="#C6FFFFFF" | ||
149 | - android:text="# 다문화" | ||
150 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | ||
151 | - </com.google.android.material.chip.ChipGroup> | ||
152 | 94 | ||
153 | - <com.google.android.material.chip.ChipGroup | 95 | + <FrameLayout |
154 | - android:layout_width="match_parent" | 96 | + android:layout_width="wrap_content" |
155 | - android:layout_height="wrap_content"> | 97 | + android:layout_height="wrap_content"> |
156 | 98 | ||
157 | - <com.google.android.material.chip.Chip | 99 | + <View |
158 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 100 | + android:id="@+id/view2" |
159 | - android:layout_width="wrap_content" | 101 | + android:layout_width="match_parent" |
160 | - android:layout_height="wrap_content" | 102 | + android:layout_height="match_parent" |
161 | - android:checkable="false" | 103 | + android:background="#6629ABE2" /> |
162 | - app:chipBackgroundColor="#C6FFFFFF" | ||
163 | - android:text="# 저소득층" | ||
164 | - android:textAppearance="@style/TextAppearance.AppCompat" | ||
165 | - app:chipIcon="@drawable/image01" /> | ||
166 | - | ||
167 | - <com.google.android.material.chip.Chip | ||
168 | - style="@style/Widget.MaterialComponents.Chip.Choice" | ||
169 | - android:layout_width="wrap_content" | ||
170 | - android:layout_height="wrap_content" | ||
171 | - android:checkable="false" | ||
172 | - app:chipBackgroundColor="#C6FFFFFF" | ||
173 | - android:text="# 임신/출산" | ||
174 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | ||
175 | 104 | ||
176 | - </com.google.android.material.chip.ChipGroup> | 105 | + <FrameLayout |
177 | - </com.google.android.material.chip.ChipGroup> | 106 | + android:layout_width="match_parent" |
107 | + android:layout_height="match_parent"> | ||
178 | 108 | ||
179 | <com.google.android.material.chip.ChipGroup | 109 | <com.google.android.material.chip.ChipGroup |
180 | android:layout_width="match_parent" | 110 | android:layout_width="match_parent" |
181 | android:layout_height="wrap_content" | 111 | android:layout_height="wrap_content" |
182 | android:layout_gravity="center|center_horizontal|center_vertical" | 112 | android:layout_gravity="center|center_horizontal|center_vertical" |
113 | + android:layout_marginStart="22dp" | ||
183 | android:foregroundGravity="center_vertical|center|center_horizontal"> | 114 | android:foregroundGravity="center_vertical|center|center_horizontal"> |
184 | 115 | ||
185 | - <TextView | ||
186 | - android:id="@+id/textVㅇiew" | ||
187 | - android:layout_width="wrap_content" | ||
188 | - android:layout_height="wrap_content" | ||
189 | - android:text="\n생애주기별" /> | ||
190 | - | ||
191 | 116 | ||
192 | <com.google.android.material.chip.ChipGroup | 117 | <com.google.android.material.chip.ChipGroup |
193 | android:layout_width="match_parent" | 118 | android:layout_width="match_parent" |
194 | android:layout_height="wrap_content"> | 119 | android:layout_height="wrap_content"> |
195 | 120 | ||
196 | - <com.google.android.material.chip.Chip | 121 | + <TextView |
197 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 122 | + android:id="@+id/textView" |
198 | - android:layout_width="wrap_content" | ||
199 | - android:layout_height="wrap_content" | ||
200 | - android:layout_marginBottom="5dp" | ||
201 | - android:checkable="false" | ||
202 | - app:chipBackgroundColor="#C6FFFFFF" | ||
203 | - android:text="# 아동" | ||
204 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | ||
205 | - | ||
206 | - <com.google.android.material.chip.Chip | ||
207 | - style="@style/Widget.MaterialComponents.Chip.Choice" | ||
208 | android:layout_width="wrap_content" | 123 | android:layout_width="wrap_content" |
209 | - android:layout_height="wrap_content" | 124 | + android:layout_height="28dp" |
210 | - android:layout_marginBottom="5dp" | 125 | + android:text="> 가구상황별" |
211 | - android:checkable="false" | 126 | + android:textColor="#29ABE2" |
212 | - app:chipBackgroundColor="#C6FFFFFF" | 127 | + android:textSize="16dp" /> |
213 | - android:text="# 청소년" | 128 | + |
214 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | 129 | + |
215 | - | 130 | + <com.google.android.material.chip.ChipGroup |
216 | - | 131 | + android:layout_width="match_parent" |
217 | - <com.google.android.material.chip.Chip | 132 | + android:layout_height="wrap_content"> |
218 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 133 | + |
219 | - android:layout_width="wrap_content" | 134 | + <com.google.android.material.chip.Chip |
220 | - android:layout_height="wrap_content" | 135 | + style="@style/Widget.MaterialComponents.Chip.Choice" |
221 | - android:layout_marginBottom="5dp" | 136 | + android:layout_width="wrap_content" |
222 | - android:checkable="false" | 137 | + android:layout_height="wrap_content" |
223 | - app:chipBackgroundColor="#C6FFFFFF" | 138 | + android:layout_marginRight="5dp" |
224 | - android:text="# 청년" | 139 | + android:layout_marginBottom="5dp" |
225 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | 140 | + android:checkable="false" |
141 | + android:text="# 장애인" | ||
142 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
143 | + android:textSize="16dp" | ||
144 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
145 | + | ||
146 | + <com.google.android.material.chip.Chip | ||
147 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
148 | + android:layout_width="wrap_content" | ||
149 | + android:layout_height="wrap_content" | ||
150 | + android:layout_marginRight="5dp" | ||
151 | + android:layout_marginBottom="5dp" | ||
152 | + android:checkable="false" | ||
153 | + android:text="# 한부모" | ||
154 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
155 | + android:textSize="16dp" | ||
156 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
157 | + | ||
158 | + | ||
159 | + <com.google.android.material.chip.Chip | ||
160 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
161 | + android:layout_width="wrap_content" | ||
162 | + android:layout_height="wrap_content" | ||
163 | + android:layout_marginBottom="5dp" | ||
164 | + android:checkable="false" | ||
165 | + android:text="# 다문화" | ||
166 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
167 | + android:textSize="16dp" | ||
168 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
169 | + </com.google.android.material.chip.ChipGroup> | ||
170 | + | ||
171 | + <com.google.android.material.chip.ChipGroup | ||
172 | + android:layout_width="match_parent" | ||
173 | + android:layout_height="wrap_content"> | ||
174 | + | ||
175 | + <com.google.android.material.chip.Chip | ||
176 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
177 | + android:layout_width="wrap_content" | ||
178 | + android:layout_height="wrap_content" | ||
179 | + android:layout_marginRight="5dp" | ||
180 | + android:checkable="false" | ||
181 | + android:text="# 저소득층" | ||
182 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
183 | + android:textSize="16dp" | ||
184 | + app:chipBackgroundColor="#C6FFFFFF" | ||
185 | + app:chipIcon="@drawable/image01" /> | ||
186 | + | ||
187 | + <com.google.android.material.chip.Chip | ||
188 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
189 | + android:layout_width="wrap_content" | ||
190 | + android:layout_height="wrap_content" | ||
191 | + android:checkable="false" | ||
192 | + android:text="# 임신/출산" | ||
193 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
194 | + android:textSize="16dp" | ||
195 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
196 | + | ||
197 | + </com.google.android.material.chip.ChipGroup> | ||
226 | </com.google.android.material.chip.ChipGroup> | 198 | </com.google.android.material.chip.ChipGroup> |
227 | 199 | ||
228 | <com.google.android.material.chip.ChipGroup | 200 | <com.google.android.material.chip.ChipGroup |
229 | android:layout_width="match_parent" | 201 | android:layout_width="match_parent" |
230 | - android:layout_height="wrap_content"> | 202 | + android:layout_height="wrap_content" |
203 | + android:layout_gravity="center|center_horizontal|center_vertical" | ||
204 | + android:foregroundGravity="center_vertical|center|center_horizontal"> | ||
231 | 205 | ||
232 | - <com.google.android.material.chip.Chip | 206 | + <TextView |
233 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 207 | + android:id="@+id/textVㅇiew" |
234 | android:layout_width="wrap_content" | 208 | android:layout_width="wrap_content" |
235 | - android:layout_height="wrap_content" | 209 | + android:layout_height="44dp" |
236 | - android:checkable="false" | 210 | + android:text="\n> 생애주기별" |
237 | - app:chipBackgroundColor="#C6FFFFFF" | 211 | + android:textColor="#29ABE2" |
238 | - android:text="# 중장년" | 212 | + android:textSize="16dp" /> |
239 | - android:textAppearance="@style/TextAppearance.AppCompat" | 213 | + |
240 | - app:chipIcon="@drawable/image01" /> | 214 | + |
241 | - | 215 | + <com.google.android.material.chip.ChipGroup |
242 | - <com.google.android.material.chip.Chip | 216 | + android:layout_width="match_parent" |
243 | - style="@style/Widget.MaterialComponents.Chip.Choice" | 217 | + android:layout_height="wrap_content"> |
244 | - android:layout_width="wrap_content" | 218 | + |
245 | - android:layout_height="wrap_content" | 219 | + <com.google.android.material.chip.Chip |
246 | - android:checkable="false" | 220 | + style="@style/Widget.MaterialComponents.Chip.Choice" |
247 | - app:chipBackgroundColor="#C6FFFFFF" | 221 | + android:layout_width="wrap_content" |
248 | - android:text="# 노년" | 222 | + android:layout_height="wrap_content" |
249 | - android:textAppearance="@style/TextAppearance.AppCompat" /> | 223 | + android:layout_marginRight="5dp" |
250 | - | 224 | + android:layout_marginBottom="5dp" |
225 | + android:checkable="false" | ||
226 | + android:text="# 아동" | ||
227 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
228 | + android:textSize="16dp" | ||
229 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
230 | + | ||
231 | + <com.google.android.material.chip.Chip | ||
232 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
233 | + android:layout_width="wrap_content" | ||
234 | + android:layout_height="wrap_content" | ||
235 | + android:layout_marginRight="5dp" | ||
236 | + android:layout_marginBottom="5dp" | ||
237 | + android:checkable="false" | ||
238 | + android:text="# 청소년" | ||
239 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
240 | + android:textSize="16dp" | ||
241 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
242 | + | ||
243 | + | ||
244 | + <com.google.android.material.chip.Chip | ||
245 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
246 | + android:layout_width="wrap_content" | ||
247 | + android:layout_height="wrap_content" | ||
248 | + android:layout_marginBottom="5dp" | ||
249 | + android:checkable="false" | ||
250 | + android:text="# 청년" | ||
251 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
252 | + android:textSize="16dp" | ||
253 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
254 | + </com.google.android.material.chip.ChipGroup> | ||
255 | + | ||
256 | + <com.google.android.material.chip.ChipGroup | ||
257 | + android:layout_width="match_parent" | ||
258 | + android:layout_height="wrap_content"> | ||
259 | + | ||
260 | + <com.google.android.material.chip.Chip | ||
261 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
262 | + android:layout_width="wrap_content" | ||
263 | + android:layout_height="wrap_content" | ||
264 | + android:layout_marginRight="5dp" | ||
265 | + android:checkable="false" | ||
266 | + android:text="# 중장년" | ||
267 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
268 | + android:textSize="16dp" | ||
269 | + app:chipBackgroundColor="#C6FFFFFF" | ||
270 | + app:chipIcon="@drawable/image01" /> | ||
271 | + | ||
272 | + <com.google.android.material.chip.Chip | ||
273 | + style="@style/Widget.MaterialComponents.Chip.Choice" | ||
274 | + android:layout_width="wrap_content" | ||
275 | + android:layout_height="wrap_content" | ||
276 | + android:checkable="false" | ||
277 | + android:text="# 노년" | ||
278 | + android:textAppearance="@style/TextAppearance.AppCompat" | ||
279 | + android:textSize="16dp" | ||
280 | + app:chipBackgroundColor="#C6FFFFFF" /> | ||
281 | + | ||
282 | + </com.google.android.material.chip.ChipGroup> | ||
251 | </com.google.android.material.chip.ChipGroup> | 283 | </com.google.android.material.chip.ChipGroup> |
252 | </com.google.android.material.chip.ChipGroup> | 284 | </com.google.android.material.chip.ChipGroup> |
253 | - </com.google.android.material.chip.ChipGroup> | ||
254 | 285 | ||
255 | - </FrameLayout> | 286 | + </FrameLayout> |
256 | 287 | ||
257 | - </FrameLayout> | 288 | + </FrameLayout> |
258 | 289 | ||
290 | + </LinearLayout> | ||
259 | </LinearLayout> | 291 | </LinearLayout> |
292 | + | ||
293 | + | ||
294 | + | ||
260 | </LinearLayout> | 295 | </LinearLayout> |
261 | </LinearLayout> | 296 | </LinearLayout> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -4,19 +4,14 @@ | ... | @@ -4,19 +4,14 @@ |
4 | <item | 4 | <item |
5 | android:id="@+id/shareBtn" | 5 | android:id="@+id/shareBtn" |
6 | android:enabled="true" | 6 | android:enabled="true" |
7 | - android:icon="@drawable/home" | 7 | + android:icon="@drawable/heart_fill" |
8 | android:title="Share" | 8 | android:title="Share" |
9 | app:showAsAction="ifRoom" /> | 9 | app:showAsAction="ifRoom" /> |
10 | <item | 10 | <item |
11 | android:id="@+id/favorBtn" | 11 | android:id="@+id/favorBtn" |
12 | android:enabled="true" | 12 | android:enabled="true" |
13 | - android:icon="@drawable/wish" | 13 | + android:icon="@drawable/share" |
14 | android:title="Heart" | 14 | android:title="Heart" |
15 | app:showAsAction="ifRoom" /> | 15 | app:showAsAction="ifRoom" /> |
16 | - <item | ||
17 | - android:id="@+id/linkBtn" | ||
18 | - android:enabled="true" | ||
19 | - android:icon="@drawable/instagram" | ||
20 | - android:title="Link" | ||
21 | - app:showAsAction="ifRoom" /> | ||
22 | -</menu> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
16 | +</menu> | ||
17 | + | ... | ... |
1 | +<?xml version="1.0" encoding="utf-8"?> | ||
2 | + | ||
3 | +<menu xmlns:android="http://schemas.android.com/apk/res/android" | ||
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
5 | + xmlns:tools="http://schemas.android.com/tools"> | ||
6 | + <item | ||
7 | + android:id="@+id/linkBtn" | ||
8 | + android:enabled="true" | ||
9 | + android:title="" | ||
10 | + app:showAsAction="ifRoom" /> | ||
11 | +</menu> | ||
12 | + |
... | @@ -3,11 +3,7 @@ | ... | @@ -3,11 +3,7 @@ |
3 | <color name="colorPrimary">#008577</color> | 3 | <color name="colorPrimary">#008577</color> |
4 | <color name="colorPrimaryDark">#00574B</color> | 4 | <color name="colorPrimaryDark">#00574B</color> |
5 | <color name="colorAccent">#D81B60</color> | 5 | <color name="colorAccent">#D81B60</color> |
6 | - | 6 | + <color name="infomainColor">#F1F9FF</color> |
7 | - <color name="splashfilling">#FFFFFF</color> | ||
8 | - | ||
9 | - <color name="cursorColor">#000000</color> | ||
10 | - <color name="nomalColor">#29ABE2</color> | ||
11 | 7 | ||
12 | <drawable name="profil_selected">#1E90FF</drawable> | 8 | <drawable name="profil_selected">#1E90FF</drawable> |
13 | <drawable name="profil_unselected">#FFFFFF</drawable> | 9 | <drawable name="profil_unselected">#FFFFFF</drawable> | ... | ... |
... | @@ -11,15 +11,8 @@ | ... | @@ -11,15 +11,8 @@ |
11 | </style> | 11 | </style> |
12 | 12 | ||
13 | <!-- Splash screen --> | 13 | <!-- Splash screen --> |
14 | - | ||
15 | <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> | 14 | <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> |
16 | <item name="android:windowBackground">@drawable/background_splash</item> | 15 | <item name="android:windowBackground">@drawable/background_splash</item> |
17 | </style> | 16 | </style> |
18 | 17 | ||
19 | - <style name="EditTheme" > | ||
20 | - <!--위에 에딧템 뒤에 parent="Theme.AppCompat.Light.NoActionBar"--> | ||
21 | - <item name="colorAccent">#29ABE2</item> | ||
22 | - <item name="android:colorControlNormal">#29ABE2</item> | ||
23 | - </style> | ||
24 | - | ||
25 | </resources> | 18 | </resources> | ... | ... |
-
Please register or login to post a comment