장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
신기성
9f7435f7 1 parent a64781e2

proto merging

Inline Side-by-side
Showing 6 changed files with 36 additions and 77 deletions
...@@ -16,12 +16,14 @@ class SplashActivity : AppCompatActivity() { ...@@ -16,12 +16,14 @@ class SplashActivity : AppCompatActivity() {
16 val editor: SharedPreferences.Editor = settings.edit() 16 val editor: SharedPreferences.Editor = settings.edit()
17 editor.putBoolean("isFirst", true) 17 editor.putBoolean("isFirst", true)
18 editor.commit() 18 editor.commit()
19 + Thread.sleep(2000)
19 val intent = Intent(this, WelcomeActivity::class.java) 20 val intent = Intent(this, WelcomeActivity::class.java)
20 startActivity(intent) 21 startActivity(intent)
21 finish() 22 finish()
22 } 23 }
23 else 24 else
24 { 25 {
26 + Thread.sleep(2000)
25 val intent = Intent(this, MainActivity::class.java) 27 val intent = Intent(this, MainActivity::class.java)
26 startActivity(intent) 28 startActivity(intent)
27 finish() 29 finish()
......

25.4 KB | W: | H:

30.6 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -11,60 +11,36 @@ ...@@ -11,60 +11,36 @@
11 android:layout_height="match_parent" 11 android:layout_height="match_parent"
12 android:orientation="vertical"> 12 android:orientation="vertical">
13 13
14 - <LinearLayout
15 - android:layout_width="match_parent"
16 - android:layout_height="50dp"
17 - android:layout_weight="1"
18 - android:orientation="vertical">
19 -
20 - </LinearLayout>
21 -
22 - <LinearLayout
23 - android:layout_width="wrap_content"
24 - android:layout_height="wrap_content"
25 - android:orientation="vertical">
26 -
27 <ImageView 14 <ImageView
28 android:id="@+id/imageView" 15 android:id="@+id/imageView"
29 android:layout_width="wrap_content" 16 android:layout_width="wrap_content"
30 android:layout_height="wrap_content" 17 android:layout_height="wrap_content"
31 android:layout_gravity="center" 18 android:layout_gravity="center"
19 + android:layout_margin="30dp"
20 + android:layout_weight="1"
32 android:background="@drawable/profile_logo" 21 android:background="@drawable/profile_logo"
33 android:scaleType="centerCrop" /> 22 android:scaleType="centerCrop" />
34 - </LinearLayout>
35 -
36 - <LinearLayout
37 - android:layout_width="match_parent"
38 - android:layout_height="30dp"
39 - android:layout_weight="1"
40 - android:gravity="center"
41 - android:orientation="vertical">
42 23
43 <TextView 24 <TextView
44 android:id="@+id/textView11" 25 android:id="@+id/textView11"
45 android:layout_width="wrap_content" 26 android:layout_width="wrap_content"
46 android:layout_height="wrap_content" 27 android:layout_height="wrap_content"
28 + android:layout_gravity="center"
29 + android:layout_margin="30dp"
47 android:gravity="center" 30 android:gravity="center"
48 android:text="WELLO는 프로필을 기반으로 동작해요\n더 정확한 맞춤형 결과를 위해 프로필을 입력해주세요!" /> 31 android:text="WELLO는 프로필을 기반으로 동작해요\n더 정확한 맞춤형 결과를 위해 프로필을 입력해주세요!" />
49 - </LinearLayout>
50 -
51 - <LinearLayout
52 - android:layout_width="match_parent"
53 - android:layout_height="wrap_content"
54 - android:layout_weight="1"
55 - android:orientation="vertical">
56 32
57 <Button 33 <Button
58 android:id="@+id/inputStartButton" 34 android:id="@+id/inputStartButton"
59 - android:layout_width="300dp" 35 + android:layout_width="match_parent"
60 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
61 android:layout_gravity="center" 37 android:layout_gravity="center"
38 + android:layout_margin="30dp"
62 android:background="@drawable/button_o" 39 android:background="@drawable/button_o"
63 android:gravity="center" 40 android:gravity="center"
64 android:text="프로필 정보 입력하기" 41 android:text="프로필 정보 입력하기"
65 android:textColor="#FFFFFF" 42 android:textColor="#FFFFFF"
66 android:textSize="20dp" /> 43 android:textSize="20dp" />
67 - </LinearLayout>
68 44
69 </LinearLayout> 45 </LinearLayout>
70 </androidx.constraintlayout.widget.ConstraintLayout> 46 </androidx.constraintlayout.widget.ConstraintLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
50 <androidx.viewpager.widget.ViewPager 50 <androidx.viewpager.widget.ViewPager
51 android:id="@+id/welcomeViewPager" 51 android:id="@+id/welcomeViewPager"
52 android:layout_width="match_parent" 52 android:layout_width="match_parent"
53 - android:layout_height="262dp" 53 + android:layout_height="280dp"
54 android:layout_gravity="top" 54 android:layout_gravity="top"
55 android:layout_weight="1" 55 android:layout_weight="1"
56 android:elevation="-7dp"> 56 android:elevation="-7dp">
......
...@@ -12,44 +12,35 @@ ...@@ -12,44 +12,35 @@
12 android:layout_height="match_parent" 12 android:layout_height="match_parent"
13 android:orientation="vertical"> 13 android:orientation="vertical">
14 14
15 - <LinearLayout
16 - android:layout_width="match_parent"
17 - android:layout_height="10dp"
18 - android:layout_weight="1"
19 - android:orientation="vertical">
20 -
21 - <LinearLayout
22 - android:layout_width="match_parent"
23 - android:layout_height="10dp"
24 - android:layout_weight="1"
25 - android:orientation="vertical">
26 -
27 - </LinearLayout>
28 -
29 <TextView 15 <TextView
30 android:id="@+id/becomeFamilyTextView" 16 android:id="@+id/becomeFamilyTextView"
31 - android:layout_width="match_parent" 17 + android:layout_width="wrap_content"
32 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
33 android:layout_gravity="center|center_horizontal|center_vertical" 19 android:layout_gravity="center|center_horizontal|center_vertical"
20 + android:layout_marginTop="30dp"
21 + android:layout_marginBottom="30dp"
34 android:gravity="center|center_horizontal|center_vertical" 22 android:gravity="center|center_horizontal|center_vertical"
35 - android:text="Wello의 가족이 되어주세요 ^^" 23 + android:text="Wello의 가족이 되어주세요"
36 android:textSize="30dp" /> 24 android:textSize="30dp" />
37 25
38 - <LinearLayout 26 + <ImageView
39 - android:layout_width="match_parent" 27 + android:id="@+id/imageView3"
40 - android:layout_height="10dp" 28 + android:layout_width="wrap_content"
29 + android:layout_height="wrap_content"
30 + android:layout_gravity="center"
41 android:layout_weight="1" 31 android:layout_weight="1"
42 - android:orientation="vertical"></LinearLayout> 32 + android:background="@drawable/signup_logo"
43 - 33 + tools:srcCompat="@tools:sample/avatars" />
44 - </LinearLayout>
45 34
46 <EditText 35 <EditText
47 android:id="@+id/edit_email_sign_up" 36 android:id="@+id/edit_email_sign_up"
48 android:layout_width="300dp" 37 android:layout_width="300dp"
49 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
50 android:layout_gravity="center" 39 android:layout_gravity="center"
51 - android:layout_marginStart="16dp" 40 + android:layout_marginLeft="20dp"
52 - android:layout_marginEnd="16dp" 41 + android:layout_marginTop="10dp"
42 + android:layout_marginRight="20dp"
43 + android:layout_marginBottom="10dp"
53 android:ems="10" 44 android:ems="10"
54 android:hint="Email" 45 android:hint="Email"
55 android:inputType="textEmailAddress" /> 46 android:inputType="textEmailAddress" />
...@@ -59,8 +50,10 @@ ...@@ -59,8 +50,10 @@
59 android:layout_width="300dp" 50 android:layout_width="300dp"
60 android:layout_height="wrap_content" 51 android:layout_height="wrap_content"
61 android:layout_gravity="center" 52 android:layout_gravity="center"
62 - android:layout_marginStart="16dp" 53 + android:layout_marginLeft="20dp"
63 - android:layout_marginEnd="16dp" 54 + android:layout_marginTop="10dp"
55 + android:layout_marginRight="20dp"
56 + android:layout_marginBottom="10dp"
64 android:ems="10" 57 android:ems="10"
65 android:hint="Password" 58 android:hint="Password"
66 android:inputType="textPassword" /> 59 android:inputType="textPassword" />
...@@ -71,38 +64,26 @@ ...@@ -71,38 +64,26 @@
71 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
72 android:layout_gravity="center" 65 android:layout_gravity="center"
73 android:layout_marginStart="16dp" 66 android:layout_marginStart="16dp"
67 + android:layout_marginLeft="20dp"
68 + android:layout_marginTop="10dp"
74 android:layout_marginEnd="16dp" 69 android:layout_marginEnd="16dp"
70 + android:layout_marginRight="20dp"
71 + android:layout_marginBottom="10dp"
75 android:background="@drawable/button_o" 72 android:background="@drawable/button_o"
76 android:gravity="center" 73 android:gravity="center"
77 android:text="회원가입" 74 android:text="회원가입"
78 android:textColor="@color/common_google_signin_btn_text_dark_default" /> 75 android:textColor="@color/common_google_signin_btn_text_dark_default" />
79 76
80 - <LinearLayout
81 - android:layout_width="match_parent"
82 - android:layout_height="10dp"
83 - android:layout_weight="1"
84 - android:orientation="vertical">
85 -
86 - <LinearLayout
87 - android:layout_width="match_parent"
88 - android:layout_height="10dp"
89 - android:layout_weight="1"
90 - android:orientation="vertical"></LinearLayout>
91 -
92 <TextView 77 <TextView
93 android:id="@+id/agreeTextView" 78 android:id="@+id/agreeTextView"
94 - android:layout_width="200dp" 79 + android:layout_width="wrap_content"
95 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
96 android:layout_gravity="center" 81 android:layout_gravity="center"
82 + android:layout_marginTop="20dp"
83 + android:layout_marginBottom="50dp"
97 android:gravity="center" 84 android:gravity="center"
98 - android:text="* 회원가입을 진행하실 경우, 서비스 이용약관, 개인 정보 취급 방침에 자동으로 동의하시게 됩니다." /> 85 + android:text="* 회원가입을 진행하실 경우, \n서비스 이용약관, 개인 정보 취급 방침에 \n자동으로 동의하시게 됩니다." />
99 86
100 - <LinearLayout
101 - android:layout_width="match_parent"
102 - android:layout_height="10dp"
103 - android:layout_weight="1"
104 - android:orientation="vertical"></LinearLayout>
105 - </LinearLayout>
106 </LinearLayout> 87 </LinearLayout>
107 88
108 89
......