Toggle navigation
Toggle navigation
This project
Loading...
Sign in
장연우
/
WELLO
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
soonmyeong2
2019-11-21 09:24:03 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
2e85c91e2df24a157593608768172141125bb4aa
2e85c91e
1 parent
cc9b1dd9
make indicator
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
6 deletions
vip/app/src/main/java/com/example/vip/MainActivity.kt
vip/app/src/main/java/com/example/vip/WelcomeActivity.kt
vip/app/src/main/res/layout/activity_welcome.xml
vip/app/src/main/java/com/example/vip/MainActivity.kt
View file @
2e85c91
...
...
@@ -14,6 +14,7 @@ import android.view.View
import
android.view.ViewGroup
import
android.widget.ImageView
import
android.widget.Toast
import
androidx.core.content.ContextCompat.startActivity
import
com.google.android.gms.tasks.OnCompleteListener
import
com.google.firebase.auth.FirebaseAuth
import
com.google.firebase.iid.FirebaseInstanceId
...
...
@@ -32,8 +33,13 @@ class MainActivity : AppCompatActivity() {
setContentView
(
R
.
layout
.
activity_main
)
emailSigninBtn
.
setOnClickListener
{
if
(
edit_email
.
text
.
toString
()
==
""
||
edit_password
.
text
.
toString
()
==
""
)
{
Toast
.
makeText
(
this
@MainActivity
,
"로그인 정보를 입력 해 주세요"
,
Toast
.
LENGTH_SHORT
).
show
()
}
else
{
loginEmail
()
}
}
textview2
.
setOnClickListener
{
}
...
...
vip/app/src/main/java/com/example/vip/WelcomeActivity.kt
View file @
2e85c91
...
...
@@ -7,6 +7,7 @@ import androidx.viewpager.widget.ViewPager
import
kotlinx.android.synthetic.main.activity_signin.*
import
kotlinx.android.synthetic.main.activity_welcome.*
class
WelcomeActivity
:
AppCompatActivity
()
{
internal
lateinit
var
welcomeViewPager
:
ViewPager
...
...
@@ -14,14 +15,34 @@ class WelcomeActivity : AppCompatActivity() {
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
activity_welcome
)
welcomeViewPager
=
findViewById
(
R
.
id
.
welcomeViewPager
)
as
ViewPager
val
viewpageradapter
=
WelcomeViewPagerAdapter
(
this
)
welcomeViewPager
.
adapter
=
viewpageradapter
buttonGotIt
.
setOnClickListener
{
var
intent
=
Intent
(
this
,
MainActivity
::
class
.
java
)
startActivity
(
intent
)
finish
()
}
welcomeViewPager
=
findViewById
(
R
.
id
.
welcomeViewPager1
)
as
ViewPager
val
viewpageradapter
=
WelcomeViewPagerAdapter
(
this
)
welcomeViewPager
.
adapter
=
viewpageradapter
welcomeViewPager
.
addOnPageChangeListener
(
object
:
ViewPager
.
OnPageChangeListener
{
override
fun
onPageScrollStateChanged
(
p0
:
Int
)
{
}
override
fun
onPageScrolled
(
p0
:
Int
,
p1
:
Float
,
p2
:
Int
)
{
}
override
fun
onPageSelected
(
p0
:
Int
)
{
ci2MainActivity
.
selectDot
(
p0
)
}
})
ci2MainActivity
.
createDotPanel
(
5
,
R
.
drawable
.
indicator_dot_off_onbording
,
R
.
drawable
.
indicator_dot_on
,
0
)
}
}
...
...
vip/app/src/main/res/layout/activity_welcome.xml
View file @
2e85c91
...
...
@@ -7,15 +7,31 @@
android:orientation=
"vertical"
tools:context=
".WelcomeActivity"
>
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
>
<androidx.viewpager.widget.ViewPager
android:id=
"@+id/welcomeViewPager
"
android:id=
"@+id/welcomeViewPager1
"
android:layout_width=
"match_parent"
android:layout_height=
"100dp
"
android:layout_height=
"wrap_content
"
android:layout_gravity=
"fill_vertical"
android:layout_weight=
"1"
>
</androidx.viewpager.widget.ViewPager>
<com.example.vip.CircleIndicator
android:id=
"@+id/ci2MainActivity"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"top|center_horizontal"
android:layout_marginTop=
"39dp"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
</FrameLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
@@ -26,7 +42,6 @@
android:id=
"@+id/buttonGotIt"
android:layout_width=
"match_parent"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:background=
"#FF29ABE2"
android:text=
"회원가입/로그인하기"
android:textColor=
"@android:color/white"
...
...
Please
register
or
login
to post a comment