장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
52f21f4f 1 parent 6d0d209d

subscribe done

Expand all
Inline Side-by-side
Showing 35 changed files with 473 additions and 256 deletions
......@@ -35,7 +35,8 @@ class InfoActivity : AppCompatActivity() {
Toast.LENGTH_SHORT).show()
InfoProfilModify.setOnClickListener {
var intent = Intent(this, SettingActivity::class.java)
var intent = Intent(this, InputProfilFirstOneActivity::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.widget.Toast
......@@ -13,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_input_profil_first_one.*
class InputProfilFirstOneActivity : AppCompatActivity() {
private val firebaseAuth = FirebaseAuth.getInstance()
val user_db = FirebaseDatabase.getInstance("https://capstone-vip-user.firebaseio.com/").reference
val user_db = FirebaseDatabase.getInstance("https://wello-topic.firebaseio.com/").reference
private fun sendToken(){
FirebaseInstanceId.getInstance().instanceId
......@@ -46,13 +48,50 @@ class InputProfilFirstOneActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_input_profil_first_one)
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
inputStartButton.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()
if(prof.getString("first_two","none")!="done"){var intent = Intent(this, InputProfilFirstTwoActivity::class.java);startActivity(intent)}
else if(prof.getString("first_three","none")!="done"){var intent = Intent(this, InputProfilFirstThreeActivity::class.java);startActivity(intent)}
else if(prof.getString("first_four","none")!="done"){var intent = Intent(this, InputProfilFirstFourActivity::class.java);startActivity(intent)}
else if(prof.getString("first_five","none")!="done"){var intent = Intent(this, InputProfilFirstFiveActivity::class.java);startActivity(intent)}
else if(prof.getString("first_six","none")!="done"){var intent = Intent(this, InputProfilFirstSixActivity::class.java);startActivity(intent)}
else if(prof.getString("second_one","none")!="done"){var intent = Intent(this, InputProfilSecondOneActivity::class.java);startActivity(intent)}
else if(prof.getString("second_two","none")!="done"){var intent = Intent(this, InputProfilSecondTwoActivity::class.java);startActivity(intent)}
else if(prof.getString("second_three","none")!="done"){var intent = Intent(this, InputProfilSecondThreeActivity::class.java);startActivity(intent)}
else if(prof.getString("third_one","none")!="done"){var intent = Intent(this, InputProfilThirdOneActivity::class.java);startActivity(intent)}
else if(prof.getString("third_two","none")!="done"){var intent = Intent(this, InputProfilThirdTwoActivity::class.java);startActivity(intent)}
else if(prof.getString("third_three","none")!="done"){var intent = Intent(this, InputProfilThirdThreeActivity::class.java);startActivity(intent)}
else if(prof.getString("third_four","none")!="done"){var intent = Intent(this, InputProfilThirdFourActivity::class.java);startActivity(intent)}
else if(prof.getString("fourth_one","none")!="done"){var intent = Intent(this, InputProfilFourthOneActivity::class.java);startActivity(intent)}
else if(prof.getString("fourth_two","none")!="done"){var intent = Intent(this, InputProfilFourthTwoActivity::class.java);startActivity(intent)}
else if(prof.getString("fourth_three","none")!="done"){var intent = Intent(this, InputProfilFourthThreeActivity::class.java);startActivity(intent)}
else if(prof.getString("fourth_four","none")!="done"){var intent = Intent(this, InputProfilFourthFourActivity::class.java);startActivity(intent)}
else if(prof.getString("fourth_five","none")!="done"){var intent = Intent(this, InputProfilFourthFiveActivity::class.java);startActivity(intent)}
else if(prof.getString("fifth_one","none")!="done"){var intent = Intent(this, InputProfilFifthOneActivity::class.java);startActivity(intent)}
else if(prof.getString("fifth_two","none")!="done"){var intent = Intent(this, InputProfilFifthTwoActivity::class.java);startActivity(intent)}
else if(prof.getString("fifth_three","none")!="done"){var intent = Intent(this, InputProfilFifthThreeActivity::class.java);startActivity(intent)}
else {var intent = Intent(this, InputProfilFifthFourActivity::class.java);startActivity(intent)}
inputStartButton.setOnClickListener {
var intent = Intent(this, InputProfilFirstTwoActivity::class.java)
startActivity(intent)
}
}
......
......@@ -31,6 +31,8 @@ class MainActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
emailSigninBtn.setOnClickListener{
loginEmail()
}
......@@ -49,8 +51,6 @@ class MainActivity : AppCompatActivity() {
}
private fun loginEmail(){
firebaseAuth!!.signInWithEmailAndPassword(edit_email.text.toString(), edit_password.text.toString())
.addOnCompleteListener(this) {
......@@ -59,7 +59,28 @@ class MainActivity : AppCompatActivity() {
Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show()
val user = firebaseAuth?.currentUser
val prof: SharedPreferences =getSharedPreferences("profdata", Context.MODE_PRIVATE)
val editor: SharedPreferences.Editor=prof.edit()
if (user!=null){
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)
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<shape android:shape="rectangle">
<solid android:color="#29ABE2"/>
<stroke android:width="0dp"
android:color="#29ABE2"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
</shape>
</selector>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<shape android:shape="rectangle">
<solid android:color="#F4F4F4"/>
<stroke android:width="0dp"
android:color="#F4F4F4"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
</shape>
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="#F4F4F4"/>
<stroke android:width="0dp"
android:color="#F4F4F4"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="0dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp" android:topRightRadius="0dp"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="#29ABE2"/>
<stroke android:width="0dp"
android:color="#29ABE2"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<corners android:bottomRightRadius="25dp" android:bottomLeftRadius="0dp"
android:topLeftRadius="0dp" android:topRightRadius="25dp"/>
</shape>
</item>
</layer-list>
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".InputProfilFourthFiveActivity">
tools:context=".InputProfilFirstFiveActivity">
<LinearLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:background="#0000001A"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -31,31 +31,35 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="#FFFFFF"
android:background="#00000000"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<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:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1.5"/>
android:layout_weight="1.5"
android:orientation="horizontal" />
</LinearLayout>
......@@ -74,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -84,9 +89,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="2" />
android:text="2"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView3"
......@@ -94,9 +100,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="3" />
android:text="3"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView4"
......@@ -104,9 +111,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="4" />
android:text="4"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView5"
......@@ -114,8 +122,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="5" />
android:text="5"
android:textColor="#DDDDDD" />
</LinearLayout>
......@@ -129,35 +139,32 @@
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_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="4. 자신의 내/외국민 여부를 \n 선택해주세요."
android:textColor="#4A4A4A"
android:textSize="20dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="4. 내/외국인 여부를 선택해주세요." />
<Button
android:id="@+id/questionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_toRightOf="@id/explainTextView"
android:backgroundTint="#1E90FF"
android:gravity="center"
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -174,29 +181,40 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="30dp"
android:gravity="center"
android:orientation="vertical">
<ToggleButton
android:id="@+id/inmanButton"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:background="@drawable/profil_selector"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/button_selector"
android:text="내국인"
android:textColor="#757575"
android:textOff="내국인"
android:textOn="내국인" />
android:textOn="내국인"
android:textSize="20dp" />
<ToggleButton
android:id="@+id/outmanButton"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:background="@drawable/profil_selector"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/button_selector"
android:text="외국인"
android:textColor="#757575"
android:textOff="외국인"
android:textOn="외국인" />
</LinearLayout>
android:textOn="외국인"
android:textSize="20dp" />
</LinearLayout>
</ScrollView>
<LinearLayout
......@@ -215,14 +233,18 @@
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
android:background="#F4F4F4"
android:text="이전 단계로"
android:textColor="#757575" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
android:background="#29ABE2"
android:text="다음 단계로"
android:textColor="#FFFFFF" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".InputProfilFourthFiveActivity">
tools:context=".InputProfilFirstFourActivity">
<LinearLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:background="#0000001A"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -31,31 +31,35 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="#FFFFFF"
android:background="#00000000"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<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:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1.5"/>
android:layout_weight="1.5"
android:orientation="horizontal" />
</LinearLayout>
......@@ -74,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -84,9 +89,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="2" />
android:text="2"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView3"
......@@ -94,9 +100,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="3" />
android:text="3"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView4"
......@@ -104,9 +111,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="4" />
android:text="4"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView5"
......@@ -114,8 +122,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="5" />
android:text="5"
android:textColor="#DDDDDD" />
</LinearLayout>
......@@ -129,37 +139,32 @@
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_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="3. 자신의 주민등록상의 \n 거주지를 선택해주세요."
android:textColor="#4A4A4A"
android:textSize="20dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:gravity="center"
android:text="3. 자신의 주민등록상 거주지를 선택해주세요." />
<Button
android:id="@+id/questionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_toRightOf="@id/explainTextView"
android:backgroundTint="#1E90FF"
android:gravity="center"
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -179,27 +184,27 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/doTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="시/도" />
<TextView
android:id="@+id/doTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="시/도" />
<Spinner
android:id="@+id/doSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<Spinner
android:id="@+id/doSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/cityTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="시/군/구" />
<TextView
android:id="@+id/cityTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="시/군/구" />
<Spinner
android:id="@+id/gooSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<Spinner
android:id="@+id/gooSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</ScrollView>
......@@ -219,14 +224,18 @@
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
android:background="#F4F4F4"
android:text="이전 단계로"
android:textColor="#757575" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
android:background="#29ABE2"
android:text="다음 단계로"
android:textColor="#FFFFFF" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".InputProfilFourthFiveActivity">
tools:context=".InputProfilFirstSixActivity">
<LinearLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:background="#0000001A"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -31,31 +31,35 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="#FFFFFF"
android:background="#00000000"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<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:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1.5"/>
android:layout_weight="1.5"
android:orientation="horizontal" />
</LinearLayout>
......@@ -74,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -84,9 +89,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="2" />
android:text="2"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView3"
......@@ -94,9 +100,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="3" />
android:text="3"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView4"
......@@ -104,9 +111,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="4" />
android:text="4"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView5"
......@@ -114,8 +122,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="5" />
android:text="5"
android:textColor="#DDDDDD" />
</LinearLayout>
......@@ -129,35 +139,32 @@
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_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="5. 자신의 가구주 여부를 선택해주세요."
android:textColor="#4A4A4A"
android:textSize="20dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="5. 가구주 여부를 선택해 주세요" />
<Button
android:id="@+id/questionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_toRightOf="@id/explainTextView"
android:backgroundTint="#1E90FF"
android:gravity="center"
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -174,26 +181,38 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_margin="30dp"
android:gravity="center"
android:orientation="vertical">
<ToggleButton
android:id="@+id/gagoojooButton"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:background="@drawable/profil_selector"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/button_selector"
android:text="가구주"
android:textColor="#757575"
android:textOff="가구주"
android:textOn="가구주" />
android:textOn="가구주"
android:textSize="20dp" />
<ToggleButton
android:id="@+id/gagoowonButton"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:background="@drawable/profil_selector"
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/button_selector"
android:text="가구원"
android:textColor="#757575"
android:textOff="가구원"
android:textOn="가구원" />
android:textOn="가구원"
android:textSize="20dp" />
</LinearLayout>
</ScrollView>
......@@ -214,14 +233,18 @@
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
android:background="#F4F4F4"
android:text="이전 단계로"
android:textColor="#757575" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
android:background="#29ABE2"
android:text="다음 단계로"
android:textColor="#FFFFFF" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".InputProfilFourthFiveActivity">
tools:context=".InputProfilFirstTwoActivity">
<LinearLayout
android:layout_width="match_parent"
......@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:background="#0000001A"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -31,31 +31,35 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="#FFFFFF"
android:background="#00000000"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<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:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1.5"/>
android:layout_weight="1.5"
android:orientation="horizontal" />
</LinearLayout>
......@@ -74,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -84,9 +89,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="2" />
android:text="2"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView3"
......@@ -94,9 +100,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="3" />
android:text="3"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView4"
......@@ -104,9 +111,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="4" />
android:text="4"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView5"
......@@ -114,8 +122,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="5" />
android:text="5"
android:textColor="#DDDDDD" />
</LinearLayout>
......@@ -129,36 +139,32 @@
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_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/textView10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="(*필수항목)"
android:textColor="#29ABE2"
android:textSize="13dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="1. 생년월일을 입력해 주세요." />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="1. 생년월일을 입력해 주세요."
android:textColor="#4A4A4A"
android:textSize="20dp" />
<Button
android:id="@+id/questionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_toRightOf="@id/explainTextView"
android:backgroundTint="#1E90FF"
android:gravity="center"
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -176,16 +182,17 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical">
<EditText
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ems="10"
android:gravity="center"
android:inputType="date" />
android:inputType="date"
android:theme="@style/EditTheme" />
</LinearLayout>
......@@ -207,14 +214,18 @@
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
android:background="#F4F4F4"
android:text="이전 단계로"
android:textColor="#757575" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
android:background="#29ABE2"
android:text="다음 단계로"
android:textColor="#FFFFFF" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="11dp"
android:background="#FFF"
android:background="#0000001A"
android:elevation="5dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
......@@ -31,31 +31,35 @@
android:layout_width="10dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:background="#FFFFFF"
android:background="#00000000"
android:text="나가기"
android:textColor="#29ABE2"
android:textSize="16dp" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<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:orientation="horizontal"
android:layout_weight="1"/>
android:layout_weight="1"
android:orientation="horizontal" />
<LinearLayout
android:layout_width="10dp"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1.5"/>
android:layout_weight="1.5"
android:orientation="horizontal" />
</LinearLayout>
......@@ -74,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -84,9 +89,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="#F4F4F4"
android:gravity="center"
android:text="2" />
android:text="2"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView3"
......@@ -94,8 +100,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="3" />
android:text="3"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView4"
......@@ -103,8 +111,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="4" />
android:text="4"
android:textColor="#DDDDDD" />
<TextView
android:id="@+id/stageTextView5"
......@@ -112,8 +122,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#F4F4F4"
android:gravity="center"
android:text="5" />
android:text="5"
android:textColor="#DDDDDD" />
</LinearLayout>
......@@ -127,37 +139,31 @@
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_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="6. 자신의 가구 구성원을 \n 모두 선택해주세요."
android:textColor="#4A4A4A"
android:textSize="20dp" />
<TextView
android:id="@+id/explainTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:gravity="center"
android:text="1. 가구 구성원을 모두 선택해 주세요." />
<Button
android:id="@+id/questionButton"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="bottom"
android:background="@drawable/question_mark_image" />
<Button
android:id="@+id/questionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:layout_toRightOf="@id/explainTextView"
android:backgroundTint="#1E90FF"
android:gravity="center"
android:text=" ? "
android:textSize="8sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
......@@ -387,14 +393,18 @@
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="이전 단계로" />
android:background="#F4F4F4"
android:text="이전 단계로"
android:textColor="#757575" />
<Button
android:id="@+id/nextButton"
android:layout_width="10dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="다음 단계로" />
android:background="#29ABE2"
android:text="다음 단계로"
android:textColor="#FFFFFF" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -22,4 +22,5 @@
<item name="android:colorControlNormal">#29ABE2</item>
</style>
</resources>
......