신기성

merge done

Showing 24 changed files with 537 additions and 155 deletions
......@@ -2,6 +2,7 @@ package com.example.vip
import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.runner.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_input_profil_fifth_four.*
......@@ -16,7 +18,28 @@ class InputProfilFifthFourActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
editor.putInt("c1_1",1); editor.commit()
editor.putInt("c2_1",1); editor.commit()
editor.putInt("c3_1",1); editor.commit()
editor.putInt("c4_1",1); editor.commit()
editor.putInt("c5_1",1); editor.commit()
editor.putInt("c6_1",1); editor.commit()
editor.putInt("c7_1",1); editor.commit()
editor.putInt("c8_1",1); editor.commit()
editor.putInt("c9_1",1); editor.commit()
editor.putInt("c10_1",1); editor.commit()
editor.putInt("c11_1",1); editor.commit()
editor.putInt("c12_1",1); editor.commit()
editor.putInt("c13_1",1); editor.commit()
editor.putInt("c14_1",1); editor.commit()
editor.putInt("c15_1",1); editor.commit()
editor.putInt("c16_1",1); editor.commit()
var intent = Intent(this, SignInActivity::class.java)
startActivity(intent)
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_input_profil_fourth_five.*
......@@ -16,7 +18,36 @@ class InputProfilFourthFiveActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
if(iljaeButton.isChecked){editor.putInt("c8_12",1); editor.commit()}
if(specialpihaeButton.isChecked){editor.putInt("c8_13",1); editor.commit()}
if(sanuppihaeButton.isChecked){editor.putInt("c8_14",1); editor.commit()}
if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
//기타가 똑같은거 지정
editor.putInt("c1_1",1); editor.commit()
editor.putInt("c2_1",1); editor.commit()
editor.putInt("c3_1",1); editor.commit()
editor.putInt("c4_1",1); editor.commit()
editor.putInt("c5_1",1); editor.commit()
editor.putInt("c6_1",1); editor.commit()
editor.putInt("c7_1",1); editor.commit()
editor.putInt("c8_1",1); editor.commit()
editor.putInt("c9_1",1); editor.commit()
editor.putInt("c10_1",1); editor.commit()
editor.putInt("c11_1",1); editor.commit()
editor.putInt("c12_1",1); editor.commit()
editor.putInt("c13_1",1); editor.commit()
editor.putInt("c14_1",1); editor.commit()
editor.putInt("c15_1",1); editor.commit()
editor.putInt("c16_1",1); editor.commit()
var intent = Intent(this, InputProfilFifthOneActivity::class.java)
startActivity(intent)
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_input_profil_fourth_four.*
......@@ -16,11 +18,30 @@ class InputProfilFourthFourActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
if(pokryukButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
if(pihaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
if(kachoolButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
if(sagoButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
if(ihonButton.isChecked){editor.putInt("c8_15",1); editor.commit()}
if(jaehaeButton.isChecked){editor.putInt("c8_9",1); editor.commit()}
if(hakkyobaakButton.isChecked){editor.putInt("c8_16",1); editor.commit()}
if(siljikButton.isChecked){editor.putInt("c5_9",1); editor.commit()}
if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
var intent = Intent(this, InputProfilFourthFiveActivity::class.java)
startActivity(intent)
}
}
}
......
......@@ -5,6 +5,7 @@ import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View.GONE
import android.view.View.VISIBLE
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
......@@ -15,7 +16,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_input_profil_fourth_one)
//보유
//보유
//미보유 - 전세 월세 공공주택 무상임대 보장기관 기타
//소유
......@@ -59,48 +60,56 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
val prof: SharedPreferences=getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
noButton.setOnClickListener{
subLinearLayout.visibility=VISIBLE
}
previousButton.setOnClickListener {
var intent = Intent(this, InputProfilThirdFourActivity::class.java)
startActivity(intent)
}
yesButton.setOnClickListener {
subLinearLayout.visibility=GONE
noButton.isChecked=false
}
noButton.setOnClickListener {
subLinearLayout.visibility=VISIBLE
yesButton.isChecked=false
}
nextButton.setOnClickListener {
if(yesButton.isChecked){
editor.putInt("c7_2",1)
editor.putInt("c14_2",1)
editor.commit()
}
if(noButton.isChecked){
editor.putInt("c14_3",1)
editor.commit()
}
if(jeonsaeButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_2",1)
editor.commit()
}
if(wolseButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_3",1)
editor.commit()
}
if(kongkongButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_4",1)
editor.commit()
}
if(moosangButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_5",1)
editor.commit()
}
if(bojangButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_6",1)
editor.commit()
}
if(guitarButton.isChecked){
editor.putInt("c7_31",1)
editor.putInt("c16_7",1)
editor.commit()
}
var intent = Intent(this, InputProfilFourthTwoActivity::class.java)
startActivity(intent)
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_input_profil_fourth_three.*
......@@ -16,7 +18,24 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}
if(jeosodeukButton.isChecked){editor.putInt("c8_3",1); editor.commit()}
if(hanboomoButton.isChecked){editor.putInt("c8_7",1); editor.commit()}
if(oegookinButton.isChecked){editor.putInt("c8_5",1); editor.commit()}
if(damoonhwaButton.isChecked){editor.putInt("c8_4",1); editor.commit()}
if(jaangaeButton.isChecked){editor.putInt("c8_2",1); editor.commit()}
if(imshinchoolsanButton.isChecked){editor.putInt("c7_1",1); editor.commit()}
if(ipyaangButton.isChecked){editor.putInt("c8_10",1); editor.commit()}
if(gaajungButton.isChecked){editor.putInt("c8_11",1); editor.commit()}
if(bookhanButton.isChecked){editor.putInt("c8_6",1); editor.commit()}
if(gookgayoogongButton.isChecked){editor.putInt("c8_8",1); editor.commit()}
if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
var intent = Intent(this, InputProfilFourthFourActivity::class.java)
startActivity(intent)
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View.GONE
import android.view.View.VISIBLE
import kotlinx.android.synthetic.main.activity_input_profil_fourth_two.*
class InputProfilFourthTwoActivity : AppCompatActivity() {
......@@ -16,10 +20,31 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(yesButton.isChecked){editor.putInt("c15_2",1); editor.commit()}
if(noButton.isChecked){editor.putInt("c15_3",1); editor.commit()}
if(jeonsaeButton.isChecked){editor.putInt("c16_2",1); editor.commit()}
if(wolseButton.isChecked){editor.putInt("c16_3",1); editor.commit()}
if(kongkongButton.isChecked){editor.putInt("c16_4",1); editor.commit()}
if(moosangButton.isChecked){editor.putInt("c16_5",1); editor.commit()}
if(bojangButton.isChecked){editor.putInt("c16_6",1); editor.commit()}
if(guitarButton.isChecked){editor.putInt("c16_7",1); editor.commit()}
var intent = Intent(this, InputProfilFourthThreeActivity::class.java)
startActivity(intent)
}
yesButton.setOnClickListener {
subLayout.visibility=GONE
noButton.isChecked=false
}
noButton.setOnClickListener {
subLayout.visibility=VISIBLE
yesButton.isChecked=false
}
}
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View.GONE
import android.view.View.VISIBLE
import kotlinx.android.synthetic.main.activity_input_profil_third_four.*
class InputProfilThirdFourActivity : AppCompatActivity() {
......@@ -17,9 +21,51 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(yesButton.isChecked){
editor.putInt("c8_2",1); editor.commit()
}
if(jichaeButton.isChecked){editor.putInt("c9_2",1); editor.commit()}
if(noebyungbyunButton.isChecked){editor.putInt("c9_3",1); editor.commit()}
if(sigaakButton.isChecked){editor.putInt("c9_4",1); editor.commit()}
if(chungkaakButton.isChecked){editor.putInt("c9_5",1); editor.commit()}
if(unuhButton.isChecked){editor.putInt("c9_6",1); editor.commit()}
if(ahnmyunButton.isChecked){editor.putInt("c9_7",1); editor.commit()}
if(sinjaangButton.isChecked){editor.putInt("c9_8",1); editor.commit()}
if(simjaangButton.isChecked){editor.putInt("c9_9",1); editor.commit()}
if(gaanjaangButton.isChecked){editor.putInt("c9_10",1); editor.commit()}
if(jaangrooButton.isChecked){editor.putInt("c9_11",1); editor.commit()}
if(noejungjeungButton.isChecked){editor.putInt("c9_12",1); editor.commit()}
if(hoheupkiButton.isChecked){editor.putInt("c9_13",1); editor.commit()}
if(jijukButton.isChecked){editor.putInt("c9_14",1); editor.commit()}
if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit()}
if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit()}
if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit()}//DB,pref 뻑 주의
if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit()}
if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit()}
if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit()}
if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit()}
if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit()}
var intent = Intent(this, InputProfilFourthOneActivity::class.java)
startActivity(intent)
}
yesButton.setOnClickListener {
eightoneLayout.visibility=VISIBLE
eighttwoLayout.visibility= GONE
}
noButton.setOnClickListener {
eightoneLayout.visibility= GONE
eighttwoLayout.visibility= VISIBLE
}
}
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.Button
......@@ -83,7 +85,25 @@ class InputProfilThirdOneActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(elementaryButton.isChecked){
editor.putInt("c6_2",1); editor.commit()
}else if(middleButton.isChecked){
editor.putInt("c6_3",1); editor.commit()
}else if(highButton.isChecked){
editor.putInt("c6_4",1); editor.commit()
}else if(universityButton.isChecked){
editor.putInt("c6_5",1); editor.commit()
}else if(graduateButton.isChecked){
editor.putInt("c6_6",1); editor.commit()
}else if(nothingButton.isChecked){
editor.putInt("c6_7",1); editor.commit()
}else{
}
var intent = Intent(this, InputProfilThirdTwoActivity::class.java)
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_input_profil_third_three.*
......@@ -24,9 +26,135 @@ class InputProfilThirdThreeActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(nothingButton.isChecked){ editor.putInt("c4_11",1); editor.commit()}
if(mipilButton.isChecked){ editor.putInt("c4_2",1); editor.commit()}
if(myunjaeButton.isChecked){ editor.putInt("c4_3",1); editor.commit()}
if(jobsoldierButton.isChecked){ editor.putInt("c4_4",1); editor.commit()}
if(bokmoojoongButton.isChecked){ editor.putInt("c4_5",1); editor.commit()}
if(mangijedaeButton.isChecked){ editor.putInt("c4_6",1); editor.commit()}
if(specialmanryoButton.isChecked){ editor.putInt("c4_7",1); editor.commit()}
if(specialbokmoosanupButton.isChecked){ editor.putInt("c4_8",1); editor.commit()}
if(specialbokmoojeonmoonButton.isChecked){ editor.putInt("c4_9",1); editor.commit()}
if(jedaeguitarButton.isChecked){ editor.putInt("c4_10",1); editor.commit()}
var intent = Intent(this, InputProfilThirdFourActivity::class.java)
startActivity(intent)
}
nothingButton.setOnClickListener {
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
mipilButton.setOnClickListener {
nothingButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
myunjaeButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
jobsoldierButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
bokmoojoongButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
mangijedaeButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
specialmanryoButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
specialbokmoosanupButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
jedaeguitarButton.isChecked=false
}
specialbokmoojeonmoonButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
jedaeguitarButton.isChecked=false
}
jedaeguitarButton.setOnClickListener {
nothingButton.isChecked=false
mipilButton.isChecked=false
myunjaeButton.isChecked=false
jobsoldierButton.isChecked=false
bokmoojoongButton.isChecked=false
mangijedaeButton.isChecked=false
specialmanryoButton.isChecked=false
specialbokmoosanupButton.isChecked=false
specialbokmoojeonmoonButton.isChecked=false
}
}
}
......
package com.example.vip
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View.GONE
import android.view.View.VISIBLE
import kotlinx.android.synthetic.main.activity_input_profil_third_two.*
class InputProfilThirdTwoActivity : AppCompatActivity() {
......@@ -24,9 +28,48 @@ class InputProfilThirdTwoActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
if(companyButton.isChecked){ editor.putInt("c5_6",1); editor.commit()}
if(workerButton.isChecked){ editor.putInt("c5_7",1); editor.commit()}
if(entireButton.isChecked){ editor.putInt("c5_9",1); editor.commit()}
if(startupButton.isChecked){ editor.putInt("c5_5",1); editor.commit()}
if(seekButton.isChecked){ editor.putInt("c5_5",1); editor.commit()}
//창업예정자랑 취준생이랑 같은 카테고리 맞음????
var intent = Intent(this, InputProfilThirdThreeActivity::class.java)
startActivity(intent)
}
jobButton.setOnClickListener {
nojobButton.isChecked=false
sixoneLayout.visibility=VISIBLE
sixtwoLayout.visibility= GONE
}
nojobButton.setOnClickListener {
jobButton.isChecked=false
sixoneLayout.visibility=GONE
sixtwoLayout.visibility= VISIBLE
}
companyButton.setOnClickListener {
workerButton.isChecked=false
}
workerButton.setOnClickListener {
companyButton.isChecked=false
}
entireButton.setOnClickListener {
startupButton.isChecked=false
seekButton.isChecked=false
}
startupButton.setOnClickListener {
entireButton.isChecked=false
seekButton.isChecked=false
}
seekButton.setOnClickListener {
entireButton.isChecked=false
startupButton.isChecked=false
}
}
}
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
......@@ -2,11 +2,11 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 배경 -->
<item
android:drawable="@color/colorPrimary"/>
android:drawable="@color/splashfilling"/>
<!-- 로고 -->
<item>
<bitmap
android:gravity="center"
android:src="@drawable/splash_main"/>
android:src="@drawable/final_splash"/>
</item>
</layer-list>
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="false"
android:drawable="@drawable/heart_stroke" />
<item android:state_checked="true"
android:drawable="@drawable/heart_fill" />
<item android:state_checked="false"
android:drawable="@drawable/heart_stroke" />
<item android:state_checked="true"
android:drawable="@drawable/heart_fill" />
</selector>
\ No newline at end of file
......
......@@ -219,7 +219,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:visibility="visible">
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -349,28 +349,29 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -131,6 +131,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout
......@@ -214,10 +215,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/subLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -347,28 +350,29 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -213,10 +213,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/eightoneLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -452,10 +454,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/eighttwoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -585,28 +589,29 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -120,22 +120,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"></LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="wrap_content">
<TextView
android:id="@+id/explainTextView"
......@@ -157,62 +152,65 @@
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">
<ToggleButton
android:id="@+id/jobButton"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/profil_selector"
android:text="있음"
android:textOff="있음"
android:textOn="있음" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
</LinearLayout>
<ToggleButton
android:id="@+id/jobButton"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/profil_selector"
android:text="있음"
android:textOff="있음"
android:textOn="있음" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ToggleButton
android:id="@+id/nojobButton"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/profil_selector"
android:text="없음"
android:textOff="없음"
android:textOn="없음" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<ToggleButton
android:id="@+id/nojobButton"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/profil_selector"
android:text="없음"
android:textOff="없음"
android:textOn="없음" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/sixoneLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -297,10 +295,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/sixtwoLayout"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_weight="1"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -400,25 +400,29 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
</LinearLayout>
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="bottom"
android:orientation="horizontal">
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
<Button
android:id="@+id/previousButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......
......@@ -4,8 +4,10 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:layout_margin="10dp"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:padding="3dp">
<ImageView
......