신기성

design doing

...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 android:roundIcon="@mipmap/ic_launcher_round" 9 android:roundIcon="@mipmap/ic_launcher_round"
10 android:supportsRtl="true" 10 android:supportsRtl="true"
11 android:theme="@style/NoActionBar"> 11 android:theme="@style/NoActionBar">
12 - <activity android:name=".PushingActivity"></activity> 12 + <activity android:name=".OnboardingActivity"></activity>
13 + <activity android:name=".PushingActivity" />
13 <activity android:name=".DetailActivity" /> 14 <activity android:name=".DetailActivity" />
14 <activity android:name=".InfoActivity" /> 15 <activity android:name=".InfoActivity" />
15 <activity android:name=".FavoritesActivity" /> 16 <activity android:name=".FavoritesActivity" />
...@@ -28,8 +29,6 @@ ...@@ -28,8 +29,6 @@
28 <category android:name="android.intent.category.LAUNCHER" /> 29 <category android:name="android.intent.category.LAUNCHER" />
29 </intent-filter> 30 </intent-filter>
30 </activity> 31 </activity>
31 -
32 -
33 </application> 32 </application>
34 33
35 </manifest> 34 </manifest>
...\ No newline at end of file ...\ No newline at end of file
......
1 package com.example.vip 1 package com.example.vip
2 2
3 +import android.animation.Animator
4 +import android.animation.AnimatorInflater
3 import android.content.Intent 5 import android.content.Intent
4 import androidx.appcompat.app.AppCompatActivity 6 import androidx.appcompat.app.AppCompatActivity
5 import android.os.Bundle 7 import android.os.Bundle
8 +import android.preference.PreferenceManager
9 +import android.view.LayoutInflater
10 +import android.view.View
11 +import android.view.ViewGroup
12 +import android.widget.ImageView
6 import android.widget.Toast 13 import android.widget.Toast
7 import com.google.firebase.auth.FirebaseAuth 14 import com.google.firebase.auth.FirebaseAuth
8 import kotlinx.android.synthetic.main.activity_main.* 15 import kotlinx.android.synthetic.main.activity_main.*
9 import org.w3c.dom.Node 16 import org.w3c.dom.Node
17 +import java.lang.Boolean.getBoolean
10 18
11 19
12 class MainActivity : AppCompatActivity() { 20 class MainActivity : AppCompatActivity() {
...@@ -42,9 +50,9 @@ class MainActivity : AppCompatActivity() { ...@@ -42,9 +50,9 @@ class MainActivity : AppCompatActivity() {
42 50
43 override fun onCreate(savedInstanceState: Bundle?) { 51 override fun onCreate(savedInstanceState: Bundle?) {
44 super.onCreate(savedInstanceState) 52 super.onCreate(savedInstanceState)
45 -
46 setContentView(R.layout.activity_main) 53 setContentView(R.layout.activity_main)
47 54
55 +
48 emailSigninBtn.setOnClickListener{ 56 emailSigninBtn.setOnClickListener{
49 loginEmail() 57 loginEmail()
50 58
...@@ -55,7 +63,11 @@ class MainActivity : AppCompatActivity() { ...@@ -55,7 +63,11 @@ class MainActivity : AppCompatActivity() {
55 startActivity(intent) 63 startActivity(intent)
56 } 64 }
57 65
66 +
67 +
68 +
58 } 69 }
59 70
60 71
72 +
61 } 73 }
......
This diff is collapsed. Click to expand it.
...@@ -69,4 +69,5 @@ ...@@ -69,4 +69,5 @@
69 android:layout_gravity="center" 69 android:layout_gravity="center"
70 android:layout_weight="1" /> 70 android:layout_weight="1" />
71 </LinearLayout> 71 </LinearLayout>
72 +
72 </LinearLayout> 73 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,19 +4,25 @@ ...@@ -4,19 +4,25 @@
4 android:orientation="horizontal" 4 android:orientation="horizontal"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="wrap_content" 6 android:layout_height="wrap_content"
7 - android:layout_margin="20dp"> 7 + android:layout_margin="3dp"
8 + android:background="@drawable/edgemaking">
8 9
9 10
10 <ImageView 11 <ImageView
11 android:id="@+id/searchIcon" 12 android:id="@+id/searchIcon"
12 android:layout_width="100dp" 13 android:layout_width="100dp"
13 android:layout_height="wrap_content" 14 android:layout_height="wrap_content"
14 - android:adjustViewBounds="true"/> 15 + android:layout_gravity="center"
16 + android:layout_weight="0"
17 + android:adjustViewBounds="true" />
15 18
16 <TextView 19 <TextView
17 android:id="@+id/searchIconText" 20 android:id="@+id/searchIconText"
18 - android:layout_width="150dp" 21 + android:layout_width="wrap_content"
19 android:layout_height="wrap_content" 22 android:layout_height="wrap_content"
20 - android:textSize="20sp"/> 23 + android:layout_gravity="center"
24 + android:layout_weight="1"
25 + android:gravity="center"
26 + android:textSize="20sp" />
21 27
22 </LinearLayout> 28 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:orientation="vertical" 5 android:orientation="vertical"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 - android:layout_height="match_parent"> 7 + android:layout_height="wrap_content">
8 8
9 <SearchView 9 <SearchView
10 android:id="@+id/searchForm" 10 android:id="@+id/searchForm"
...@@ -18,9 +18,8 @@ ...@@ -18,9 +18,8 @@
18 <androidx.recyclerview.widget.RecyclerView 18 <androidx.recyclerview.widget.RecyclerView
19 android:id="@+id/searchRecyclerView" 19 android:id="@+id/searchRecyclerView"
20 android:layout_width="match_parent" 20 android:layout_width="match_parent"
21 - android:layout_height="340dp" 21 + android:layout_height="wrap_content"
22 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" 22 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
23 - app:spanCount="3"
24 - app:layout_constraintBottom_toBottomOf="@id/bottomNavigation"
25 tools:listitem="@layout/item_search" /> 23 tools:listitem="@layout/item_search" />
24 +
26 </LinearLayout> 25 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......