장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
f88ebb49 2 parents bf8c8215 44c75f02

Merge branch 'done' of http://khuhub.khu.ac.kr/2014104141/WELLO into done

Inline Side-by-side
Showing 60 changed files with 889 additions and 253 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
......
......@@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/NoActionBar">
<activity android:name=".ChildAdapter"></activity>
<activity android:name=".SignUpCompleteActivity"></activity>
<activity android:name=".ChildAdapter" />
<activity android:name=".InputProfilFifthFourActivity" />
<activity android:name=".InputProfilFifthThreeActivity" />
<activity android:name=".InputProfilFifthTwoActivity" />
......@@ -32,19 +33,19 @@
<activity android:name=".InputProfilFirstThreeActivity" />
<activity android:name=".InputProfilFirstTwoActivity" />
<activity android:name=".InputProfilFirstOneActivity" />
<activity android:name=".AccountSettingActivity"/>
<activity android:name=".PrivacyPolicyActivity"/>
<activity android:name=".TermsOfUserActivity"/>
<activity android:name=".NoticeActivity"/>
<activity android:name=".QuestionsActivity"/>
<activity android:name=".AccountSettingActivity" />
<activity android:name=".PrivacyPolicyActivity" />
<activity android:name=".TermsOfUserActivity" />
<activity android:name=".NoticeActivity" />
<activity android:name=".QuestionsActivity" />
<activity android:name=".WelcomeActivity" />
<activity android:name=".PushInfoActivity"/>
<activity android:name=".PushInfoActivity" />
<activity android:name=".SettingActivity" />
<activity android:name=".TermsDetailActivity"/>
<activity android:name=".TermsDetailActivity" />
<activity android:name=".DetailActivity" />
<activity android:name=".InfoActivity" />
<activity android:name=".FavoritesActivity" />
<activity android:name=".SettingsInForm"/>
<activity android:name=".SettingsInForm" />
<activity android:name=".RecommendActivity" />
<activity android:name=".SignInActivity" />
<activity android:name=".SignUpActivity" />
......
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)
//보유
//보유
//미보유 - 전세 월세 공공주택 무상임대 보장기관 기타
//소유
......@@ -33,7 +34,7 @@ class InputProfilFourthOneActivity : AppCompatActivity() {
questionButton.setOnClickListener {
val builder = AlertDialog.Builder(this)
val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null)
val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
//val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
//val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
......@@ -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
}
}
}
......
......@@ -5,32 +5,85 @@ import android.content.Intent
import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.Button
import android.widget.EditText
import android.widget.RatingBar
import android.util.Log
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import com.google.android.gms.tasks.OnCompleteListener
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.database.FirebaseDatabase
import com.google.firebase.iid.FirebaseInstanceId
import kotlinx.android.synthetic.main.activity_input_profil_second_one.*
import kotlinx.android.synthetic.main.family_member_dialog.*
import kotlinx.android.synthetic.main.family_member_dialog.view.*
class InputProfilSecondOneActivity : AppCompatActivity() {
private val firebaseAuth = FirebaseAuth.getInstance()
val user_db = FirebaseDatabase.getInstance("https://capstone-vip-user.firebaseio.com/").reference
private fun sendToken(){
FirebaseInstanceId.getInstance().instanceId
.addOnCompleteListener(OnCompleteListener { task ->
if (!task.isSuccessful) {
//Log.w(TAG, "getInstanceId failed", task.exception)
return@OnCompleteListener
}
// Get new Instance ID token
tkn = task.result!!.token
// Log and toast
val msg = getString(R.string.msg_token_fmt, tkn)
//Log.d(TAG, msg)
Toast.makeText(baseContext, msg, Toast.LENGTH_SHORT).show()
})
}
private fun writeNewUser(u_id: String, u_token: String, Policy: String?) {
val user = User(u_token, Policy!!)
user_db.child(u_id).setValue(user)/// .setValue(user)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_input_profil_second_one)
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
// 1. 툴바 사용 설정
setSupportActionBar(toolbar)
//pushing code start
intent.extras?.let {
for (key in it.keySet()) {
val value = intent.extras?.get(key)
//Log.d(TAG, "Key: $key Value: $value")
}
}
//pushing code end
skipButton.setOnClickListener {
var intent = Intent(this, InputProfilSecondOneActivity::class.java)
sendToken()
val user=firebaseAuth?.currentUser
val cat_list=listOf("c1_1")
val policy_string_list=listOf("")
var policy_string=""
prof.getInt("c1_1",1)
if(prof.getInt("c1_1",1)==1){
policy_string=policy_string
}
writeNewUser(user!!.uid,"$tkn",policy_string)
var intent = Intent(this, SignInActivity::class.java)
startActivity(intent)
}
questionButton.setOnClickListener {
val builder = AlertDialog.Builder(this)
val dialogView = layoutInflater.inflate(R.layout.family_member_dialog, null)
val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
//val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
//val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
dialogView.findViewById<TextView>(R.id.dialogTitle).text="가족구성원이란?"
......@@ -58,8 +111,7 @@ class InputProfilSecondOneActivity : AppCompatActivity() {
startActivity(intent)
}
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
nextButton.setOnClickListener {
......
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
}
}
}
......
......@@ -14,7 +14,10 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.Toast
import com.google.android.gms.tasks.OnCompleteListener
import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.iid.FirebaseInstanceId
import com.google.firebase.iid.FirebaseInstanceId.getInstance
import kotlinx.android.synthetic.main.activity_main.*
import org.w3c.dom.Node
import java.lang.Boolean.getBoolean
......@@ -26,20 +29,19 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
//onboarding start
//onboarding end
setContentView(R.layout.activity_main)
emailSigninBtn.setOnClickListener{
emailSigninBtn.setOnClickListener{
loginEmail()
}
textview2.setOnClickListener{
}
textview3.setOnClickListener{
}
emailSignupBtn.setOnClickListener {
var intent = Intent(this, SignUpActivity::class.java)
startActivity(intent)
......@@ -47,6 +49,8 @@ class MainActivity : AppCompatActivity() {
}
private fun loginEmail(){
firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString())
.addOnCompleteListener(this) {
......@@ -61,12 +65,13 @@ class MainActivity : AppCompatActivity() {
}
} else {
// If sign in fails, display a message to the user.
Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show()
}
}
}
......
......@@ -4,8 +4,10 @@ import android.content.Intent
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.ActionBar
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.viewpager.widget.ViewPager
......@@ -23,6 +25,27 @@ class SignInActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_signin)
val builder = AlertDialog.Builder(this)
val dialogView = layoutInflater.inflate(R.layout.dialog_example, null)
//val dialogText = dialogView.findViewById<EditText>(R.id.dialogEt)
//val dialogRatingBar = dialogView.findViewById<RatingBar>(R.id.dialogRb)
dialogView.findViewById<TextView>(R.id.dialogTitle).text="프로필을 입력해주세요!"
dialogView.findViewById<TextView>(R.id.dialogContent).text="정확한 정책 추천을 얻으려면 더 많은 프로필 정보가 필요해요!"
builder.setView(dialogView)
.setPositiveButton("다음에 하기") { dialogInterface, i ->
//mainTv.text = dialogText.text.toString()
//mainRb.rating = dialogRatingBar.rating
/* 확인일 때 main의 View의 값에 dialog View에 있는 값을 적용 */
}
.setNegativeButton("지금할게요 :)") { dialogInterface, i ->
/* 취소일 때 아무 액션이 없으므로 빈칸 */
val intent = Intent(this, InputProfilFirstOneActivity::class.java)
startActivity(intent)
}
.show()
val policyFieldList = ArrayList<PolicyFieldItem>()
policyFieldList.add(
......
......@@ -81,7 +81,7 @@ class SignUpActivity : AppCompatActivity() {
cnt ++
if(user!=null){
var intent = Intent(this, InputProfilFirstOneActivity::class.java)
var intent = Intent(this, SignUpCompleteActivity::class.java)
startActivity(intent)
}
} else {
......
package com.example.vip
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_sign_up_complete.*
class SignUpCompleteActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_sign_up_complete)
goToLoginButton.setOnClickListener {
var intent = Intent(this, MainActivity::class.java)
startActivity(intent)
}
}
}
......@@ -12,11 +12,11 @@ class WelcomeViewPagerAdapter(private val context : Context) : PagerAdapter() {
private var layoutInflater : LayoutInflater? = null
val Image = arrayOf(
R.drawable.hwajilgooji1,
R.drawable.hwajilgooji2,
R.drawable.hwajilgooji3,
R.drawable.hwajilgooji3,
R.drawable.hwajilgooji3
R.drawable.onboarding_1,
R.drawable.onboarding_2,
R.drawable.onboarding_3,
R.drawable.onboarding_4,
R.drawable.onboarding_5
)
......
......@@ -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
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......@@ -219,7 +222,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 +352,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
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......@@ -131,6 +134,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout
......@@ -214,10 +218,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 +353,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
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -32,32 +32,31 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기" />
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1"/>
<ImageView
android:layout_width="77dp"
android:layout_height="44dp"
android:layout_gravity="center"
android:layout_weight="1"
android:src="@drawable/toolbar_logo" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1"/>
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1.5"/>
</LinearLayout>
......
......@@ -32,32 +32,31 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기" />
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1"/>
<ImageView
android:layout_width="77dp"
android:layout_height="44dp"
android:layout_gravity="center"
android:layout_weight="1"
android:src="@drawable/toolbar_logo" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1"/>
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:orientation="horizontal" />
android:orientation="horizontal"
android:layout_weight="1.5"/>
</LinearLayout>
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......@@ -213,10 +216,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 +457,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 +592,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
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......
......@@ -31,7 +31,10 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:text="건너뛰기"/>
android:background="#FFFFFF"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
......@@ -120,22 +123,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 +155,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 +298,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 +403,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
......
......@@ -91,9 +91,9 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/button_x"
android:background="@drawable/button_o"
android:text="로그인"
android:textColor="#DDDDDD" />
android:textColor="#FFFFFF" />
</LinearLayout>
......@@ -104,6 +104,58 @@
android:gravity="bottom"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="10dp"
android:gravity="left"
android:orientation="horizontal"
android:padding="3dp">
<TextView
android:id="@+id/textview1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="*회원가입을 진행하실 경우, "
android:textColor="#757575"
android:textSize="7dp" />
<TextView
android:id="@+id/textview2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="서비스 이용약관, "
android:textColor="#757575"
android:textSize="7dp" />
<TextView
android:id="@+id/textview3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="개인 정보 취급 방침"
android:textColor="#757575"
android:textSize="7dp" />
<TextView
android:id="@+id/textview4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="에 동의하시게 됩니다."
android:textColor="#757575"
android:textSize="7dp" />
</LinearLayout>
<Button
android:id="@+id/emailSignupBtn"
android:layout_width="match_parent"
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".SignUpCompleteActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"></LinearLayout>
<ImageView
android:id="@+id/logoImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:src="@drawable/final_logo"
tools:srcCompat="@tools:sample/avatars" />
<ImageView
android:id="@+id/characterImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:src="@drawable/character_righthandsup"
tools:srcCompat="@tools:sample/avatars" />
<TextView
android:id="@+id/textView1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:gravity="center"
android:text="가입이 완료되었습니다 :)" />
<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:gravity="center"
android:text="wello의 가족이 된 걸 환영해요!" />
<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:gravity="center"
android:text="당신이 필요한 정책을 추천해 드릴게요." />
<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="horizontal">
<Button
android:id="@+id/goToLoginButton"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_gravity="bottom"
android:background="#FF29ABE2"
android:text="로그인 하기"
android:textColor="@android:color/white"
android:textSize="16dp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -51,7 +51,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:ems="10"
android:gravity="center"
android:hint="Email"
android:inputType="textEmailAddress" />
......@@ -63,7 +62,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:ems="10"
android:gravity="center"
android:hint="Password"
android:inputType="textPassword" />
......@@ -74,7 +72,7 @@
android:layout_gravity="center"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/colorPrimary"
android:background="@drawable/button_o"
android:gravity="center"
android:text="회원가입"
android:textColor="@color/common_google_signin_btn_text_dark_default" />
......
......@@ -29,4 +29,9 @@
android:gravity="center"
android:text="다이얼로그 내용" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"/>
</LinearLayout>
\ No newline at end of file
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/hwajilgooji1">
</LinearLayout>
\ 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
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/hwajilgooji2">
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/hwajilgooji3">
</LinearLayout>
\ No newline at end of file
......@@ -8,7 +8,7 @@
<ImageView
android:id="@+id/imageview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
tools:srcCompat="@tools:sample/avatars" />
</LinearLayout>
\ No newline at end of file
......