장연우 / WELLO

Go to a project
Toggle navigation Toggle navigation pinning
soonmyeong2
c67be547 1 parent f88ebb49

improve design

Inline Side-by-side
Showing 14 changed files with 22 additions and 31 deletions
...@@ -36,10 +36,8 @@ class MainActivity : AppCompatActivity() { ...@@ -36,10 +36,8 @@ class MainActivity : AppCompatActivity() {
36 } 36 }
37 37
38 textview2.setOnClickListener{ 38 textview2.setOnClickListener{
39 -
40 } 39 }
41 textview3.setOnClickListener{ 40 textview3.setOnClickListener{
42 -
43 } 41 }
44 42
45 emailSignupBtn.setOnClickListener { 43 emailSignupBtn.setOnClickListener {
...@@ -56,28 +54,18 @@ class MainActivity : AppCompatActivity() { ...@@ -56,28 +54,18 @@ class MainActivity : AppCompatActivity() {
56 .addOnCompleteListener(this) { 54 .addOnCompleteListener(this) {
57 if (it.isSuccessful) { 55 if (it.isSuccessful) {
58 // Sign in success, update UI with the signed-in user's information 56 // Sign in success, update UI with the signed-in user's information
59 - Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show() 57 + //Toast.makeText(this, "signInWithEmail success.",Toast.LENGTH_SHORT).show()
60 val user = firebaseAuth?.currentUser 58 val user = firebaseAuth?.currentUser
61 59
62 if (user!=null){ 60 if (user!=null){
63 var intent = Intent(this, SignInActivity::class.java) 61 var intent = Intent(this, SignInActivity::class.java)
64 startActivity(intent) 62 startActivity(intent)
65 -
66 } 63 }
67 64
68 } else { 65 } else {
69 // If sign in fails, display a message to the user. 66 // If sign in fails, display a message to the user.
70 - Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show() 67 + //Toast.makeText(this, "signInWithEmail failed.",Toast.LENGTH_SHORT).show()
71 -
72 } 68 }
73 -
74 -
75 } 69 }
76 } 70 }
77 -
78 -
79 -
80 -
81 -
82 -
83 } 71 }
......
...@@ -97,9 +97,9 @@ class SignInActivity : AppCompatActivity() { ...@@ -97,9 +97,9 @@ class SignInActivity : AppCompatActivity() {
97 setSupportActionBar(toolbar) 97 setSupportActionBar(toolbar)
98 98
99 // 2. 툴바 왼쪽 버튼 설정 99 // 2. 툴바 왼쪽 버튼 설정
100 - supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true 100 + //supportActionBar!!.setDisplayHomeAsUpEnabled(true) // 왼쪽 버튼 사용 여부 true
101 - supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정 101 + //supportActionBar!!.setHomeAsUpIndicator(R.drawable.return_page) // 왼쪽 버튼 아이콘 설정
102 - supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기 102 + //supportActionBar!!.setDisplayShowTitleEnabled(false) // 타이틀 안보이게 하기
103 103
104 ////bottom navigation view operation start 2 104 ////bottom navigation view operation start 2
105 bottomBar=supportActionBar!! 105 bottomBar=supportActionBar!!
......

386 Bytes | W: | H:

639 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

405 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

448 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

764 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

1.12 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

386 Bytes | W: | H:

1.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -20,25 +20,19 @@ ...@@ -20,25 +20,19 @@
20 android:orientation="vertical"> 20 android:orientation="vertical">
21 21
22 <LinearLayout 22 <LinearLayout
23 + android:id="@+id/sagin"
23 android:layout_width="wrap_content" 24 android:layout_width="wrap_content"
24 android:layout_height="wrap_content" 25 android:layout_height="wrap_content"
25 android:layout_gravity="center" 26 android:layout_gravity="center"
26 android:gravity="center" 27 android:gravity="center"
27 android:orientation="vertical"> 28 android:orientation="vertical">
28 29
29 - <TextView
30 - android:id="@+id/textView6"
31 - android:layout_width="match_parent"
32 - android:layout_height="wrap_content"
33 - android:text="복지야, 안녕!"
34 - android:textSize="15dp" />
35 -
36 <ImageView 30 <ImageView
37 android:id="@+id/imageView2" 31 android:id="@+id/imageView2"
38 android:layout_width="wrap_content" 32 android:layout_width="wrap_content"
39 android:layout_height="wrap_content" 33 android:layout_height="wrap_content"
40 - tools:srcCompat="@tools:sample/avatars" 34 + android:src="@drawable/final_logo1"
41 - android:src="@drawable/final_logo"/> 35 + tools:srcCompat="@tools:sample/avatars" />
42 </LinearLayout> 36 </LinearLayout>
43 37
44 </LinearLayout> 38 </LinearLayout>
...@@ -62,7 +56,9 @@ ...@@ -62,7 +56,9 @@
62 android:id="@+id/edit_email" 56 android:id="@+id/edit_email"
63 android:layout_width="350dp" 57 android:layout_width="350dp"
64 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
65 - 59 + android:drawableLeft="@drawable/profile"
60 + android:drawablePadding="11dp"
61 + android:paddingLeft="5dp"
66 android:inputType="textEmailAddress" 62 android:inputType="textEmailAddress"
67 android:theme="@style/EditTheme" /> 63 android:theme="@style/EditTheme" />
68 64
...@@ -70,15 +66,18 @@ ...@@ -70,15 +66,18 @@
70 android:id="@+id/textView5" 66 android:id="@+id/textView5"
71 android:layout_width="350dp" 67 android:layout_width="350dp"
72 android:layout_height="wrap_content" 68 android:layout_height="wrap_content"
69 + android:layout_marginTop="10dp"
73 android:text="비밀번호" 70 android:text="비밀번호"
74 android:textColor="#29ABE2" 71 android:textColor="#29ABE2"
75 android:textSize="13dp" /> 72 android:textSize="13dp" />
76 73
77 <EditText 74 <EditText
78 android:id="@+id/edit_password" 75 android:id="@+id/edit_password"
76 + android:drawableLeft="@drawable/lock"
79 android:layout_width="350dp" 77 android:layout_width="350dp"
80 android:layout_height="wrap_content" 78 android:layout_height="wrap_content"
81 - 79 + android:drawablePadding="11dp"
80 + android:paddingLeft="5dp"
82 android:inputType="textPassword" 81 android:inputType="textPassword"
83 android:theme="@style/EditTheme" /> 82 android:theme="@style/EditTheme" />
84 83
......
...@@ -58,15 +58,19 @@ ...@@ -58,15 +58,19 @@
58 58
59 <androidx.recyclerview.widget.RecyclerView 59 <androidx.recyclerview.widget.RecyclerView
60 android:id="@+id/policyFieldRecyclerView" 60 android:id="@+id/policyFieldRecyclerView"
61 - android:layout_width="match_parent" 61 + android:layout_width="wrap_content"
62 android:layout_height="wrap_content" 62 android:layout_height="wrap_content"
63 63
64 - android:layout_gravity="center|center_horizontal" 64 + android:layout_gravity="center_horizontal"
65 android:layout_marginTop="11dp" 65 android:layout_marginTop="11dp"
66 android:layout_marginBottom="11dp" 66 android:layout_marginBottom="11dp"
67 android:layout_weight="1" 67 android:layout_weight="1"
68 android:background="@drawable/round_ractagle_solid" 68 android:background="@drawable/round_ractagle_solid"
69 android:foregroundGravity="center" 69 android:foregroundGravity="center"
70 + android:paddingLeft="16dp"
71 + android:paddingTop="20dp"
72 + android:paddingRight="16dp"
73 + android:paddingBottom="20dp"
70 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" 74 app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
71 app:layout_constraintBottom_toBottomOf="@id/bottomNavigation" 75 app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
72 app:spanCount="3" 76 app:spanCount="3"
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 android:id="@+id/bottomFavorites" 17 android:id="@+id/bottomFavorites"
18 android:enabled="true" 18 android:enabled="true"
19 android:icon="@drawable/instagram" 19 android:icon="@drawable/instagram"
20 - android:title="찜 목록" 20 + android:title="찜한목록"
21 app:showAsAction="ifRoom" /> 21 app:showAsAction="ifRoom" />
22 <item 22 <item
23 android:id="@+id/bottomInfo" 23 android:id="@+id/bottomInfo"
......