soonmyeong2

make indicator

...@@ -14,6 +14,7 @@ import android.view.View ...@@ -14,6 +14,7 @@ import android.view.View
14 import android.view.ViewGroup 14 import android.view.ViewGroup
15 import android.widget.ImageView 15 import android.widget.ImageView
16 import android.widget.Toast 16 import android.widget.Toast
17 +import androidx.core.content.ContextCompat.startActivity
17 import com.google.android.gms.tasks.OnCompleteListener 18 import com.google.android.gms.tasks.OnCompleteListener
18 import com.google.firebase.auth.FirebaseAuth 19 import com.google.firebase.auth.FirebaseAuth
19 import com.google.firebase.iid.FirebaseInstanceId 20 import com.google.firebase.iid.FirebaseInstanceId
...@@ -32,7 +33,12 @@ class MainActivity : AppCompatActivity() { ...@@ -32,7 +33,12 @@ class MainActivity : AppCompatActivity() {
32 setContentView(R.layout.activity_main) 33 setContentView(R.layout.activity_main)
33 34
34 emailSigninBtn.setOnClickListener{ 35 emailSigninBtn.setOnClickListener{
35 - loginEmail() 36 + if (edit_email.text.toString() == "" || edit_password.text.toString() == "") {
37 + Toast.makeText(this@MainActivity, "로그인 정보를 입력 해 주세요", Toast.LENGTH_SHORT).show()
38 + }
39 + else {
40 + loginEmail()
41 + }
36 } 42 }
37 43
38 textview2.setOnClickListener{ 44 textview2.setOnClickListener{
......
...@@ -7,6 +7,7 @@ import androidx.viewpager.widget.ViewPager ...@@ -7,6 +7,7 @@ import androidx.viewpager.widget.ViewPager
7 import kotlinx.android.synthetic.main.activity_signin.* 7 import kotlinx.android.synthetic.main.activity_signin.*
8 import kotlinx.android.synthetic.main.activity_welcome.* 8 import kotlinx.android.synthetic.main.activity_welcome.*
9 9
10 +
10 class WelcomeActivity : AppCompatActivity() { 11 class WelcomeActivity : AppCompatActivity() {
11 12
12 internal lateinit var welcomeViewPager: ViewPager 13 internal lateinit var welcomeViewPager: ViewPager
...@@ -14,14 +15,34 @@ class WelcomeActivity : AppCompatActivity() { ...@@ -14,14 +15,34 @@ class WelcomeActivity : AppCompatActivity() {
14 super.onCreate(savedInstanceState) 15 super.onCreate(savedInstanceState)
15 setContentView(R.layout.activity_welcome) 16 setContentView(R.layout.activity_welcome)
16 17
17 - welcomeViewPager = findViewById(R.id.welcomeViewPager) as ViewPager
18 - val viewpageradapter = WelcomeViewPagerAdapter(this)
19 - welcomeViewPager.adapter = viewpageradapter
20 18
21 buttonGotIt.setOnClickListener{ 19 buttonGotIt.setOnClickListener{
22 var intent = Intent(this, MainActivity::class.java) 20 var intent = Intent(this, MainActivity::class.java)
23 startActivity(intent) 21 startActivity(intent)
24 finish() 22 finish()
25 } 23 }
24 +
25 +
26 + welcomeViewPager = findViewById(R.id.welcomeViewPager1) as ViewPager
27 + val viewpageradapter = WelcomeViewPagerAdapter(this)
28 + welcomeViewPager.adapter = viewpageradapter
29 +
30 +
31 + welcomeViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener{
32 + override fun onPageScrollStateChanged(p0: Int) {
33 +
34 + }
35 +
36 + override fun onPageScrolled(p0: Int, p1: Float, p2: Int) {
37 +
38 + }
39 +
40 + override fun onPageSelected(p0: Int) {
41 + ci2MainActivity.selectDot(p0)
42 + }
43 +
44 + })
45 +
46 + ci2MainActivity.createDotPanel(5, R.drawable.indicator_dot_off_onbording, R.drawable.indicator_dot_on, 0)
26 } 47 }
27 } 48 }
......
...@@ -7,14 +7,30 @@ ...@@ -7,14 +7,30 @@
7 android:orientation="vertical" 7 android:orientation="vertical"
8 tools:context=".WelcomeActivity"> 8 tools:context=".WelcomeActivity">
9 9
10 - <androidx.viewpager.widget.ViewPager 10 + <FrameLayout
11 - android:id="@+id/welcomeViewPager"
12 android:layout_width="match_parent" 11 android:layout_width="match_parent"
13 - android:layout_height="100dp" 12 + android:layout_height="wrap_content"
14 - android:layout_gravity="fill_vertical"
15 android:layout_weight="1"> 13 android:layout_weight="1">
16 14
17 - </androidx.viewpager.widget.ViewPager> 15 + <androidx.viewpager.widget.ViewPager
16 + android:id="@+id/welcomeViewPager1"
17 + android:layout_width="match_parent"
18 + android:layout_height="wrap_content"
19 + android:layout_gravity="fill_vertical"
20 + android:layout_weight="1">
21 +
22 + </androidx.viewpager.widget.ViewPager>
23 +
24 + <com.example.vip.CircleIndicator
25 + android:id="@+id/ci2MainActivity"
26 + android:layout_width="wrap_content"
27 + android:layout_height="wrap_content"
28 + android:layout_gravity="top|center_horizontal"
29 + android:layout_marginTop="39dp"
30 + app:layout_constraintBottom_toBottomOf="parent"
31 + app:layout_constraintEnd_toEndOf="parent"
32 + app:layout_constraintStart_toStartOf="parent" />
33 + </FrameLayout>
18 34
19 <LinearLayout 35 <LinearLayout
20 android:layout_width="match_parent" 36 android:layout_width="match_parent"
...@@ -26,7 +42,6 @@ ...@@ -26,7 +42,6 @@
26 android:id="@+id/buttonGotIt" 42 android:id="@+id/buttonGotIt"
27 android:layout_width="match_parent" 43 android:layout_width="match_parent"
28 android:layout_height="70dp" 44 android:layout_height="70dp"
29 - android:layout_weight="1"
30 android:background="#FF29ABE2" 45 android:background="#FF29ABE2"
31 android:text="회원가입/로그인하기" 46 android:text="회원가입/로그인하기"
32 android:textColor="@android:color/white" 47 android:textColor="@android:color/white"
......