장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
f2769331 1 parent 13c2a9c8

12345 slicing design

Inline Side-by-side
Showing 11 changed files with 95 additions and 54 deletions
......@@ -6,6 +6,8 @@ import android.content.SharedPreferences
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.view.View.GONE
import android.view.View.VISIBLE
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
......@@ -146,6 +148,45 @@ class InputProfilFifthTwoActivity : AppCompatActivity() {
.show()
}
jikjaangButton.setOnClickListener {
subLinearLayout.visibility=VISIBLE
jiyeokButton.isChecked=false
pibooyaangjiyeokButton.isChecked=false
pibooyaangjikjaangButton.isChecked=false
uieryoButton.isChecked=false
}
jiyeokButton.setOnClickListener {
subLinearLayout.visibility=VISIBLE
jikjaangButton.isChecked=false
pibooyaangjiyeokButton.isChecked=false
pibooyaangjikjaangButton.isChecked=false
uieryoButton.isChecked=false
}
pibooyaangjikjaangButton.setOnClickListener {
subLinearLayout.visibility= GONE
jikjaangButton.isChecked=false
jiyeokButton.isChecked=false
pibooyaangjiyeokButton.isChecked=false
uieryoButton.isChecked=false
}
pibooyaangjiyeokButton.setOnClickListener {
jikjaangButton.isChecked=false
jiyeokButton.isChecked=false
pibooyaangjiyeokButton.isChecked=false
uieryoButton.isChecked=false
subLinearLayout.visibility= GONE
}
uieryoButton.setOnClickListener {
jikjaangButton.isChecked=false
jiyeokButton.isChecked=false
pibooyaangjiyeokButton.isChecked=false
pibooyaangjikjaangButton.isChecked=false
subLinearLayout.visibility= GONE
}
previousButton.setOnClickListener {
var intent = Intent(this, InputProfilFifthOneActivity::class.java)
startActivity(intent)
......
......@@ -124,29 +124,6 @@ class InputProfilFourthThreeActivity : AppCompatActivity() {
startActivity(intent)
}
questionButton.setOnClickListener {
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 ->
/* 취소일 때 아무 액션이 없으므로 빈칸 */
}
*/
.show()
}
previousButton.setOnClickListener {
var intent = Intent(this, InputProfilFourthTwoActivity::class.java)
startActivity(intent)
......
......@@ -169,11 +169,11 @@ class InputProfilFourthTwoActivity : AppCompatActivity() {
}
yesButton.setOnClickListener {
subLayout.visibility=GONE
subLinearLayout.visibility=GONE
noButton.isChecked=false
}
noButton.setOnClickListener {
subLayout.visibility=VISIBLE
subLinearLayout.visibility=VISIBLE
yesButton.isChecked=false
}
......
......@@ -143,6 +143,12 @@
<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:gravity="center"
android:orientation="horizontal">
......
......@@ -143,6 +143,12 @@
<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:gravity="center"
android:orientation="horizontal">
......
......@@ -143,6 +143,12 @@
<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:gravity="center"
android:orientation="horizontal">
......
......@@ -131,7 +131,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_height="30dp"
android:orientation="horizontal"></LinearLayout>
<LinearLayout
......@@ -158,14 +158,6 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="1"
android:orientation="vertical">
</LinearLayout>
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
......@@ -290,8 +282,9 @@
<LinearLayout
android:id="@+id/subLinearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
......@@ -342,19 +335,19 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="50dp"
android:layout_weight="1"
android:orientation="vertical"></LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="15dp"
......
......@@ -186,25 +186,33 @@
<TextView
android:id="@+id/doTextView"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:text="시/도" />
<Spinner
android:id="@+id/doSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp" />
<TextView
android:id="@+id/cityTextView"
android:layout_width="match_parent"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp"
android:text="시/군/구" />
<Spinner
android:id="@+id/gooSpinner"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="10dp" />
</LinearLayout>
</ScrollView>
......
......@@ -29,7 +29,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
tools:srcCompat="@tools:sample/avatars" />
tools:srcCompat="@tools:sample/avatars"
android:background="@drawable/inputlogo"/>
</LinearLayout>
<LinearLayout
......@@ -45,11 +46,14 @@
<Button
android:id="@+id/inputStartButton"
android:layout_width="wrap_content"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/button_o"
android:gravity="center"
android:text="프로필 정보 입력하기" />
android:text="프로필 정보 입력하기"
android:textColor="#FFFFFF"
android:textSize="20dp" />
</LinearLayout>
<LinearLayout
......
......@@ -237,7 +237,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"
......@@ -304,10 +304,10 @@
android:layout_weight="1"
android:background="@drawable/circle_selector"
android:text="월세"
android:textColor="#757575"
android:textOff="월세"
android:textOn="월세"
android:textSize="16dp"
android:textColor="#757575" />
android:textSize="16dp" />
</LinearLayout>
......