장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
462c652d 1 parent 0edfb5cf

123 design

Expand all
Inline Side-by-side
Showing 16 changed files with 141 additions and 88 deletions
......@@ -9,7 +9,8 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/NoActionBar">
<activity android:name=".SignUpCompleteActivity"></activity>
<activity android:name=".InputProfilThirdFiveActivity"></activity>
<activity android:name=".SignUpCompleteActivity" />
<activity android:name=".ChildAdapter" />
<activity android:name=".InputProfilFifthFourActivity" />
<activity android:name=".InputProfilFifthThreeActivity" />
......
......@@ -175,25 +175,16 @@ class InputProfilThirdFourActivity : AppCompatActivity() {
if(japyeahButton.isChecked){editor.putInt("c9_15",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(jeongshinButton.isChecked){editor.putInt("c9_16",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(nothingButton.isChecked){editor.putInt("c8_1",1); editor.commit();editor.putString("third_four","done");editor.commit()}//DB,pref 뻑 주의
if(imshinButton.isChecked){editor.putInt("c7_2",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(nanchiButton.isChecked){editor.putInt("c9_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(oeButton.isChecked){editor.putInt("c9_18",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(yoyaangButton.isChecked){editor.putInt("c9_19",1); editor.commit();editor.putString("third_four","done");editor.commit()}
if(guitarButton.isChecked){editor.putInt("c8_17",1); editor.commit();editor.putString("third_four","done");editor.commit()}
var intent = Intent(this, InputProfilFourthOneActivity::class.java)
var intent = Intent(this, InputProfilThirdFiveActivity::class.java)
startActivity(intent)
}
yesButton.setOnClickListener {
eightoneLayout.visibility=VISIBLE
eighttwoLayout.visibility= GONE
}
noButton.setOnClickListener {
eightoneLayout.visibility= GONE
eighttwoLayout.visibility= VISIBLE
}
......
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:width="5dp"
android:color="#29ABE2" />
<solid
android:color="#29ABE2"/>
</shape>
\ No newline at end of file
<?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/circle_x" />
<item android:state_checked="true" android:drawable="@drawable/circle_o" />
</selector>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:width="5dp"
android:color="#F4F4F4" />
<solid
android:color="#F4F4F4"/>
</shape>
\ No newline at end of file
<?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>
<selector xmlns:android="http://schemas.android.com/apk/res/android"></selector>
......
<?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="#29ABE2"/>
<stroke android:width="0dp"
android:color="#29ABE2"
/>
<padding android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
</shape>
</item>
</layer-list>
......@@ -11,13 +11,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
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">
......@@ -32,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>
......@@ -75,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage_filling"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -85,9 +89,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="2" />
android:text="2"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView3"
......@@ -95,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"
......@@ -104,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"
......@@ -113,20 +122,18 @@
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>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:layout_weight="1">
<LinearLayout
......@@ -139,11 +146,14 @@
android:id="@+id/mainTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="4-2. 총 형제자매 수를 입력해주세요." />
android:gravity="center"
android:text="6-2. 총 형제/자매 수를 입력해주세요."
android:textSize="20dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="horizontal">
<EditText
......@@ -153,14 +163,18 @@
android:layout_weight="1"
android:ems="10"
android:hint="ex) 3"
android:inputType="number|textPersonName" />
android:inputType="number|textPersonName"
android:theme="@style/EditTheme" />
<Button
android:id="@+id/bsNumberInputButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="입 력" />
android:background="@drawable/button_o"
android:text="입 력"
android:textColor="#FFFFFF" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
......@@ -168,16 +182,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_child" />
tools:listitem="@layout/item_bs" />
</LinearLayout>
</ScrollView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="horizontal">
<Button
......@@ -185,14 +197,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>
......
......@@ -11,13 +11,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
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">
......@@ -32,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>
......@@ -75,9 +78,10 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:background="#1E90FF"
android:background="@drawable/profile_stage_filling"
android:gravity="center"
android:text="1" />
android:text="1"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView2"
......@@ -85,9 +89,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="2" />
android:text="2"
android:textColor="#FFFFFF" />
<TextView
android:id="@+id/stageTextView3"
......@@ -95,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"
......@@ -104,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"
......@@ -113,20 +122,18 @@
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>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp"
android:layout_marginBottom="30dp"
android:layout_weight="1">
<LinearLayout
......@@ -139,11 +146,14 @@
android:id="@+id/mainTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="4-1. 가족구성원 '자녀' 선택 시 총 자녀 수를 입력해주세요." />
android:gravity="center"
android:text="6-1. 총 자녀 수를 입력해주세요."
android:textSize="20dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20dp"
android:orientation="horizontal">
<EditText
......@@ -153,14 +163,18 @@
android:layout_weight="1"
android:ems="10"
android:hint="ex) 3"
android:inputType="number|textPersonName" />
android:inputType="number|textPersonName"
android:theme="@style/EditTheme" />
<Button
android:id="@+id/childNumberInputButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="입 력" />
android:background="@drawable/button_o"
android:text="입 력"
android:textColor="#FFFFFF" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
......@@ -172,12 +186,10 @@
</LinearLayout>
</ScrollView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="horizontal">
<Button
......@@ -185,14 +197,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>
......
This diff is collapsed. Click to expand it.