장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
3e871c38 1 parent 4c76b2c3

subsub

Inline Side-by-side
Showing 25 changed files with 208 additions and 55 deletions
......@@ -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" />
......
......@@ -34,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="가족구성원이란?"
......
......@@ -5,14 +5,9 @@ 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.widget.TextView
import androidx.appcompat.app.AlertDialog
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() {
......@@ -30,7 +25,7 @@ class InputProfilSecondOneActivity : 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="가족구성원이란?"
......
......@@ -26,12 +26,6 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
//onboarding start
//onboarding end
setContentView(R.layout.activity_main)
......@@ -40,6 +34,13 @@ class MainActivity : AppCompatActivity() {
}
textview2.setOnClickListener{
}
textview3.setOnClickListener{
}
emailSignupBtn.setOnClickListener {
var intent = Intent(this, SignUpActivity::class.java)
startActivity(intent)
......
......@@ -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
)
......
......@@ -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
<?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
......