Skip to content

Commit

Permalink
Merge pull request #8 from Team-Umbba/design/#7
Browse files Browse the repository at this point in the history 
[Design/#7] 로그인, 시작하기 화면 UI 구현
  • Loading branch information
@yeoncheong
yeoncheong authored Jul 5, 2023
2 parents 4e2740d + c6fae79 commit cf6daa5
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 3 deletions.
8 changes: 8 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
android:supportsRtl="true"
android:theme="@style/Theme.Umbbaandroid"
tools:targetApi="31">
<activity
android:name=".presentation.onboarding.InviteActivity"
android:exported="false"
android:screenOrientation="portrait"/>
<activity
android:name=".presentation.onboarding.LoginActivity"
android:exported="false"
android:screenOrientation="portrait"/>
<activity
android:name=".presentation.onboarding.InputInfoActivity"
android:exported="false"
Expand Down
13 changes: 13 additions & 0 deletions app/src/main/java/com/sopt/umbba_android/presentation/onboarding/InviteActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.sopt.umbba_android.presentation.onboarding

import android.os.Bundle
import com.sopt.umbba_android.R
import com.sopt.umbba_android.databinding.ActivityInviteBinding
import com.sopt.umbba_android.util.binding.BindingActivity

class InviteActivity : BindingActivity<ActivityInviteBinding>(R.layout.activity_invite) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

}
}
12 changes: 12 additions & 0 deletions app/src/main/java/com/sopt/umbba_android/presentation/onboarding/LoginActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.sopt.umbba_android.presentation.onboarding

import android.os.Bundle
import com.sopt.umbba_android.R
import com.sopt.umbba_android.databinding.ActivityLoginBinding
import com.sopt.umbba_android.util.binding.BindingActivity

class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_login) {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
}
}
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="50dp" />
<solid android:color="@color/grey_code_btn" />
</shape>
84 changes: 84 additions & 0 deletions app/src/main/res/layout/activity_invite.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?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"
xmlns:tools="http://schemas.android.com/tools">

<data>

</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="21dp"
tools:context=".presentation.onboarding.InviteActivity">

<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="52dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_app_description"
style="@style/AndroidHead2Regular24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="16dp"
android:text="@string/app_description"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_logo" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_start"
style="@style/AndroidBody3Bold16"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginBottom="12dp"
android:background="@drawable/sel_invite_code_btn_next"
android:enabled="true"
android:text="@string/btn_start"
android:textColor="@color/white"
app:layout_constraintBottom_toTopOf="@id/tv_or" />

<TextView
android:id="@+id/tv_or"
style="@style/AndroidBody2_2Regular16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:text="@string/or"
android:textColor="@color/grey_or"
app:layout_constraintBottom_toTopOf="@id/tv_receive_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<TextView
android:id="@+id/tv_receive_code"
style="@style/AndroidBody2_2Regular16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:text="@string/did_you_receive_code"
app:layout_constraintBottom_toTopOf="@id/btn_input_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_input_code"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginVertical="24dp"
android:background="@drawable/shape_grey_btn_r50_rectangle"
android:enabled="false"
android:text="@string/btn_input_code"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
49 changes: 49 additions & 0 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?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"
xmlns:tools="http://schemas.android.com/tools">

<data>

</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="21dp"
tools:context=".presentation.onboarding.LoginActivity">

<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="52dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_app_description"
style="@style/AndroidHead2Regular24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_marginTop="16dp"
android:text="@string/app_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_logo" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_kakao_login"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginVertical="24dp"
android:background="@drawable/shape_grey_btn_r50_rectangle"
android:enabled="false"
android:text="@string/kakao_login"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
2 changes: 2 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<color name="primary_500">#E99F74</color>
<color name="primary_600">#C87759</color>

<color name="grey_or">#BABABA</color>
<color name="grey_code_btn">#808080</color>
<color name="grey_stroke">#D4D4D4</color>
<color name="grey_btn_stroke">#DBDBDB</color>
<color name="grey_btn_solid">#EAEAEA</color>
Expand Down
29 changes: 26 additions & 3 deletions app/src/main/res/values/fonts.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<item name="android:textSize">24sp</item>
</style>


<style name="AndroidSubHead1SemiBold20">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
Expand All @@ -38,12 +37,36 @@
<item name="android:textSize">16sp</item>
</style>

<style name="AndroidBody2Regular16">
<style name="AndroidBody2_1SemiBold16">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
</style>

<style name="AndroidBody2_2Regular16">
<item name="android:fontFamily">@font/pretendard_regular</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
</style>

<style name="AndroidBody3Bold16">
<item name="android:fontFamily">@font/pretendard_bold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
</style>

<style name="AndroidBody2_1SemiBold12">
<item name="android:fontFamily">@font/pretendard_semibold</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">12sp</item>
</style>

<style name="AndroidBody2_2Regular12">
<item name="android:fontFamily">@font/pretendard_regular</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">12sp</item>
</style>

<style name="AndroidCaptionRegular12">
<item name="android:fontFamily">@font/pretendard_regular</item>
<item name="android:fontStyle">normal</item>
Expand All @@ -55,8 +78,8 @@
<item name="android:fontStyle">normal</item>
<item name="android:fontWeight">400</item>
<item name="android:textSize">20sp</item>

</style>

<style name="BrandTypeSmallSemiBold16">
<item name="android:fontFamily">@font/cafe24_classic_type</item>
<item name="android:fontStyle">normal</item>
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
<string name="invite_code_hint">초대 코드를 입력해주세요.</string>
<string name="invite_code_title">초대코드를\n입력해주세요.</string>

<!--login activity-->
<string name="app_description">부모와 떠나는 시간 여행</string>
<string name="kakao_login">카카오로 로그인</string>

<!--invite activity-->
<string name="btn_start">시작하기</string>
<string name="or">----------------- or ----------------</string>
<string name="did_you_receive_code">초대 코드를 받으셨나요?</string>
<string name="btn_input_code">초대코드 입력하기</string>

<!--input info activity-->
<string name="please_introduce_user">환영해!\n너에 대해 알려줘!</string>
<string name="what_is_your_name">너의 이름이 뭐야?</string>
Expand Down

0 comments on commit cf6daa5

Please sign in to comment.