Skip to content

Commit

Permalink
Merge pull request #20 from ttoklip/feat/#15_첫화면로그인_구현
Browse files Browse the repository at this point in the history
Feat/#15 첫화면로그인 구현
  • Loading branch information
40food authored Jan 23, 2024
2 parents 5dc06ca + 135c75a commit 773b1fb
Show file tree
Hide file tree
Showing 26 changed files with 1,499 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ dependencies {
implementation "com.google.dagger:hilt-android:2.47"
kapt "com.google.dagger:hilt-compiler:2.47"


//indicator : https://github.com/tommybuonomo/dotsindicator?utm_source=android-arsenal.com&utm_medium=referral&utm_campaign=7127
implementation "com.tbuonomo:dotsindicator:5.0"

Expand All @@ -103,6 +102,9 @@ dependencies {

implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.6'

//naver map
//implementation "com.naver.maps:map-sdk:3.16.2"
}
kapt {
correctErrorTypes true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.umc.ttoklip.presentation.intro

import android.content.Intent
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import com.umc.ttoklip.R
import com.umc.ttoklip.databinding.ActivitySplashBinding
import com.umc.ttoklip.presentation.base.BaseActivity

class IntroActivity:BaseActivity<ActivitySplashBinding>(R.layout.activity_intro){
override fun initView() {
val handler= Handler(Looper.getMainLooper())
handler.postDelayed({
//activity 이름 알아오기
//startActivity(Intent(this,MainActivity::class.java))
},2000)
}
override fun initObserver() {
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.umc.ttoklip.presentation.intro

import com.umc.ttoklip.R
import com.umc.ttoklip.databinding.ActivitySplashBinding
import com.umc.ttoklip.presentation.base.BaseActivity

class SplashActivity:BaseActivity<ActivitySplashBinding>(R.layout.activity_splash) {
override fun initView() {
}

override fun initObserver() {
}
}
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/ic_checkpre_off_16.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<group>
<clip-path
android:pathData="M0,0h16v16h-16z"/>
<path
android:pathData="M6.367,10.1L12.017,4.45C12.15,4.317 12.308,4.25 12.492,4.25C12.675,4.25 12.833,4.317 12.967,4.45C13.1,4.583 13.167,4.742 13.167,4.925C13.167,5.108 13.1,5.267 12.967,5.4L6.833,11.533C6.7,11.667 6.544,11.733 6.367,11.733C6.189,11.733 6.033,11.667 5.9,11.533L3.033,8.667C2.9,8.533 2.836,8.375 2.842,8.192C2.847,8.008 2.917,7.85 3.05,7.717C3.183,7.583 3.342,7.517 3.525,7.517C3.708,7.517 3.867,7.583 4,7.717L6.367,10.1Z"
android:fillColor="#D9D9D9"/>
</group>
</vector>
13 changes: 13 additions & 0 deletions app/src/main/res/drawable/ic_checkpre_on_16.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportWidth="16"
android:viewportHeight="16">
<group>
<clip-path
android:pathData="M0,0h16v16h-16z"/>
<path
android:pathData="M6.367,10.1L12.017,4.45C12.15,4.317 12.308,4.25 12.492,4.25C12.675,4.25 12.833,4.317 12.967,4.45C13.1,4.583 13.167,4.742 13.167,4.925C13.167,5.108 13.1,5.267 12.967,5.4L6.833,11.533C6.7,11.667 6.544,11.733 6.367,11.733C6.189,11.733 6.033,11.667 5.9,11.533L3.033,8.667C2.9,8.533 2.836,8.375 2.842,8.192C2.847,8.008 2.917,7.85 3.05,7.717C3.183,7.583 3.342,7.517 3.525,7.517C3.708,7.517 3.867,7.583 4,7.717L6.367,10.1Z"
android:fillColor="#FFCE00"/>
</group>
</vector>
24 changes: 24 additions & 0 deletions app/src/main/res/drawable/ic_kakaotalk_46.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46dp"
android:height="46dp"
android:viewportWidth="46"
android:viewportHeight="46">
<path
android:pathData="M23,23m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
android:fillColor="#FEE500"/>
<path
android:pathData="M23.067,11.101C15.911,11.101 10.14,15.717 10.14,21.322C10.14,24.959 12.541,28.145 16.142,29.964L14.923,34.516C14.9,34.584 14.896,34.658 14.913,34.728C14.929,34.798 14.965,34.862 15.015,34.913C15.089,34.978 15.184,35.014 15.283,35.014C15.365,35.008 15.442,34.976 15.505,34.922L20.749,31.386C21.523,31.493 22.304,31.548 23.085,31.552C30.232,31.552 36.012,26.935 36.012,21.322C36.012,15.708 30.213,11.101 23.067,11.101Z"
android:fillColor="#392020"/>
<path
android:pathData="M14.664,19.706H13.251C13.076,19.711 12.903,19.666 12.753,19.576C12.686,19.535 12.628,19.479 12.584,19.414C12.539,19.349 12.509,19.275 12.494,19.198C12.49,19.149 12.49,19.099 12.494,19.05C12.49,18.958 12.507,18.867 12.546,18.783C12.585,18.699 12.643,18.626 12.716,18.57C12.877,18.454 13.071,18.392 13.27,18.395H17.526C17.703,18.388 17.877,18.437 18.025,18.533C18.093,18.573 18.152,18.628 18.197,18.693C18.241,18.759 18.271,18.833 18.283,18.912C18.288,18.958 18.288,19.004 18.283,19.05C18.288,19.143 18.27,19.236 18.231,19.322C18.193,19.407 18.135,19.481 18.062,19.539C17.905,19.656 17.712,19.715 17.517,19.706H16.15V24.563C16.156,24.666 16.14,24.769 16.103,24.866C16.067,24.963 16.011,25.052 15.938,25.126C15.869,25.197 15.785,25.252 15.693,25.289C15.601,25.325 15.502,25.342 15.403,25.338C15.229,25.343 15.059,25.288 14.922,25.181C14.792,25.077 14.703,24.93 14.673,24.766C14.664,24.698 14.664,24.63 14.673,24.563L14.664,19.706Z"
android:fillColor="#FEE500"/>
<path
android:pathData="M18.691,18.755C18.732,18.603 18.827,18.471 18.959,18.385C19.099,18.306 19.259,18.267 19.42,18.275H19.771C19.942,18.268 20.112,18.31 20.261,18.395C20.418,18.501 20.531,18.662 20.575,18.847L22.421,24.064C22.469,24.2 22.509,24.339 22.541,24.479C22.545,24.538 22.545,24.596 22.541,24.655C22.544,24.745 22.528,24.834 22.493,24.917C22.458,25 22.405,25.074 22.338,25.135C22.274,25.201 22.196,25.253 22.11,25.288C22.024,25.323 21.932,25.34 21.84,25.338C21.697,25.352 21.554,25.318 21.434,25.241C21.313,25.164 21.222,25.049 21.175,24.913L20.787,23.778H18.359L17.971,24.913C17.925,25.051 17.833,25.169 17.71,25.246C17.587,25.324 17.441,25.356 17.297,25.338C17.141,25.342 16.988,25.293 16.863,25.199C16.741,25.103 16.659,24.965 16.632,24.812C16.627,24.76 16.627,24.707 16.632,24.655C16.616,24.563 16.616,24.469 16.632,24.378C16.632,24.276 16.697,24.165 16.734,24.064L18.691,18.755ZM19.614,19.964L18.737,22.734H20.482L19.614,19.964Z"
android:fillColor="#FEE500"/>
<path
android:pathData="M22.753,19.05C22.743,18.843 22.816,18.641 22.956,18.487C23.027,18.416 23.112,18.36 23.206,18.323C23.3,18.287 23.4,18.27 23.501,18.275C23.674,18.273 23.842,18.328 23.981,18.432C24.109,18.54 24.194,18.691 24.221,18.856C24.23,18.921 24.23,18.986 24.221,19.05V23.907H26.76C26.936,23.905 27.109,23.953 27.259,24.045C27.326,24.087 27.384,24.142 27.428,24.207C27.473,24.273 27.503,24.346 27.517,24.424C27.517,24.424 27.517,24.516 27.517,24.563C27.521,24.655 27.504,24.746 27.465,24.83C27.427,24.913 27.368,24.986 27.295,25.043C27.135,25.159 26.94,25.221 26.742,25.218H23.621C23.422,25.231 23.224,25.179 23.057,25.07C22.908,24.959 22.809,24.793 22.781,24.609C22.774,24.507 22.774,24.406 22.781,24.304L22.753,19.05Z"
android:fillColor="#FEE500"/>
<path
android:pathData="M27.683,19.05C27.678,18.844 27.75,18.643 27.886,18.487C28.025,18.361 28.202,18.287 28.389,18.277C28.576,18.267 28.76,18.322 28.911,18.432C29.042,18.539 29.131,18.69 29.161,18.856C29.165,18.921 29.165,18.986 29.161,19.05V21.313L31.497,18.616C31.587,18.524 31.682,18.438 31.783,18.358C31.878,18.301 31.986,18.272 32.097,18.275C32.258,18.274 32.416,18.322 32.549,18.413C32.612,18.455 32.666,18.51 32.707,18.573C32.748,18.637 32.776,18.708 32.789,18.783C32.793,18.801 32.793,18.82 32.789,18.838C32.785,18.859 32.785,18.881 32.789,18.903C32.789,19 32.764,19.095 32.715,19.18C32.667,19.269 32.608,19.353 32.54,19.429L31.007,21.109L32.854,23.972V24.064C32.95,24.196 33.025,24.343 33.076,24.498V24.544C33.086,24.651 33.071,24.759 33.031,24.859C32.99,24.958 32.927,25.047 32.845,25.117C32.691,25.233 32.502,25.295 32.309,25.292C32.181,25.297 32.054,25.269 31.94,25.209C31.817,25.126 31.716,25.016 31.644,24.886L29.927,22.116L29.105,22.975V24.516C29.111,24.723 29.038,24.924 28.902,25.08C28.829,25.151 28.742,25.207 28.647,25.243C28.552,25.28 28.45,25.296 28.348,25.292C28.178,25.296 28.011,25.24 27.877,25.135C27.747,25.031 27.658,24.884 27.628,24.72C27.619,24.652 27.619,24.584 27.628,24.516L27.683,19.05Z"
android:fillColor="#FEE500"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_map_marker_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,6.5C12.663,6.5 13.299,6.763 13.768,7.232C14.237,7.701 14.5,8.337 14.5,9C14.5,9.328 14.435,9.653 14.31,9.957C14.184,10.26 14,10.536 13.768,10.768C13.536,11 13.26,11.184 12.957,11.31C12.653,11.435 12.328,11.5 12,11.5C11.337,11.5 10.701,11.237 10.232,10.768C9.763,10.299 9.5,9.663 9.5,9C9.5,8.337 9.763,7.701 10.232,7.232C10.701,6.763 11.337,6.5 12,6.5ZM12,2C13.856,2 15.637,2.737 16.95,4.05C18.263,5.363 19,7.143 19,9C19,14.25 12,22 12,22C12,22 5,14.25 5,9C5,7.143 5.738,5.363 7.05,4.05C8.363,2.737 10.144,2 12,2ZM12,4C10.674,4 9.402,4.527 8.464,5.464C7.527,6.402 7,7.674 7,9C7,10 7,12 12,18.71C17,12 17,10 17,9C17,7.674 16.473,6.402 15.535,5.464C14.598,4.527 13.326,4 12,4Z"
android:fillColor="#000000"/>
</vector>
12 changes: 12 additions & 0 deletions app/src/main/res/drawable/ic_naver_46.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="46dp"
android:height="46dp"
android:viewportWidth="46"
android:viewportHeight="46">
<path
android:pathData="M23,0L23,0A23,23 0,0 1,46 23L46,23A23,23 0,0 1,23 46L23,46A23,23 0,0 1,0 23L0,23A23,23 0,0 1,23 0z"
android:fillColor="#03C75A"/>
<path
android:pathData="M26.034,23.599L19.717,14.481H14.481V31.519H19.966V22.399L26.283,31.519H31.518V14.481H26.034V23.599Z"
android:fillColor="#ffffff"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_ttoklip1_81.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="81dp"
android:height="69dp"
android:viewportWidth="81"
android:viewportHeight="69">
<path
android:pathData="M32.334,48.895C33.159,45.282 35.086,41.2 38.751,36.727C50.061,44.788 70.437,44.222 80.279,28.102C72.231,22.959 53.488,17.313 40.042,33.417H39.306C43.226,8.375 25.716,2.291 15.842,0C11,17.198 22.774,31.834 35.574,35.739C32.532,39 28.552,43.498 26.604,48.985C14.964,49.938 5.159,55.517 0.467,63.242C-0.921,65.527 0.973,68.12 3.647,68.12H56.667C59.341,68.12 61.235,65.527 59.847,63.242C54.972,55.214 44.574,49.504 32.334,48.895Z"
android:fillColor="#FFCC16"
android:fillType="evenOdd"/>
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_ttoklip2_64.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="64dp"
android:height="58dp"
android:viewportWidth="64"
android:viewportHeight="58">
<path
android:pathData="M20.24,15.24H23.52C26.2,15.24 28.64,15 30.72,14.44C31.08,14.4 31.04,13.96 31.04,13.96V9.76C31.04,9.4 30.68,9.48 30.68,9.48C28.56,10.04 25.64,10.2 23.52,10.2H22.88V5.08H30.12C30.4,5.08 30.48,4.92 30.48,4.68V0.4C30.48,0.08 30.36,0 30.12,0H17.24C16.88,0 16.8,0.28 16.8,0.44V13.56H16V9.88C16,9.52 15.64,9.6 15.64,9.6C13.52,10.08 10.84,10.2 8.92,10.2H8.52V5.08H14.8C15.08,5.08 15.16,4.92 15.16,4.68V0.4C15.16,0.08 15.04,0 14.8,0H2.88C2.52,0 2.44,0.28 2.44,0.44V14.64C2.44,15.08 2.56,15.24 2.96,15.24H8.8C10.04,15.24 11.76,15.16 13.44,14.96V18.16H0.44C0.12,18.16 0,18.4 0,18.6V22.68C0,22.96 0.12,23.2 0.44,23.2H33.32C33.552,23.2 33.646,23.063 33.672,22.88H44.52V25.96H32.6C32.28,25.96 32.2,26.24 32.2,26.4V38C32.2,38.76 32.56,38.84 33.04,38.84H42.88C47,38.84 51.08,38.04 53.4,37.56C53.76,37.52 53.72,37.08 53.72,37.08V32.92C53.72,32.56 53.36,32.64 53.36,32.64C51.24,33.28 46.4,34.04 42.84,34.04H38.68V30.76H50.48C50.8,30.76 50.88,30.6 50.88,30.32V18.44C50.88,18.12 50.68,18 50.36,18H32.6C32.41,18 32.298,18.067 32.234,18.16H20.24V15.24ZM24,39.12H29.76C30.04,39.12 30.12,38.92 30.12,38.68V26.24C30.12,25.88 29.96,25.72 29.64,25.72H3.92C3.64,25.72 3.48,25.88 3.48,26.2V30.44C3.48,30.8 3.76,30.88 3.92,30.88H23.64V38.68C23.64,38.92 23.68,39.12 24,39.12ZM57.04,39.6H62.72C63,39.6 63.16,39.44 63.16,39.08V18.32C63.16,17.96 63,17.8 62.72,17.8H57.04C56.76,17.8 56.64,17.96 56.64,18.28V39.08C56.64,39.44 56.76,39.6 57.04,39.6ZM36.8,42.16V57.12C36.8,57.56 36.96,57.64 37.32,57.64H54.8C56.56,57.64 59.84,56.92 62.28,54C62.84,52.84 62.96,51.68 62.96,50.32V42.08C62.96,41.76 62.8,41.6 62.44,41.6H57.12C56.8,41.6 56.64,41.68 56.64,42.16V45.28H43.16V42.08C43.16,41.76 43,41.6 42.68,41.6H37.28C36.96,41.6 36.8,41.76 36.8,42.16ZM55,52.76H43.16V49.96H56.64V50.96C56.64,52.04 56.2,52.76 55,52.76Z"
android:fillColor="#FFCC16"
android:fillType="evenOdd"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/oval_fill_strok_1.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@color/white"/>
<stroke
android:width="1dp"
android:color="@color/gray80"/>
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/rectangle_corner_100.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="100dp"/>
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="1dp"
android:color="@color/gray40"/>
<corners
android:radius="10dp"/>
</shape>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/rectangle_corner_30.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid
android:color="@color/white"/>
<corners
android:topLeftRadius="30dp"
android:topRightRadius="30dp"
android:bottomLeftRadius="30dp"
android:bottomRightRadius="30dp"/>
</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/rectangle_corner_30_0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners
android:topRightRadius="30dp"
android:topLeftRadius="30dp"/>
</shape>
54 changes: 54 additions & 0 deletions app/src/main/res/layout/activity_intro.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<data>

<variable
name="splash"
type="com.umc.ttoklip.presentation.intro.IntroActivity" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.viewpager2.widget.ViewPager2
android:id="@+id/intro_intro_vp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.tbuonomo.viewpagerdotsindicator.DotsIndicator
android:id="@+id/intro_indicator"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_marginBottom="5dp"
app:dotsColor="@color/gray40"
app:dotsSize="7dp"
app:dotsSpacing="4dp"
app:layout_constraintBottom_toTopOf="@id/intro_next_btn"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:selectedDotColor="@color/yellow" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/intro_next_btn"
android:layout_width="240dp"
android:layout_height="50dp"
android:layout_marginBottom="50dp"
android:background="@drawable/rectangle_corner_30"
android:backgroundTint="@color/yellow"
android:stateListAnimator="@null"
android:text="다음"
android:textAppearance="@style/TextAppearance.App.16sp_600"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />


</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
Loading

0 comments on commit 773b1fb

Please sign in to comment.