Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/#15 첫화면로그인 구현 #19

Merged
merged 74 commits into from
Jan 23, 2024
Merged

Conversation

40food
Copy link
Collaborator

@40food 40food commented Jan 23, 2024

#️⃣연관된 이슈

#15

📝작업 내용

첫화면로그인 레이아웃 작업

kyujin0911 and others added 30 commits January 9, 2024 17:54
Feat/ 다자인 시스템 & BaseActivity, BaseFragment
hangunhee39 and others added 23 commits January 22, 2024 14:55
intro, login, signup, location layout 추가
naver map api 추가(적용은 아직)
…at/#4_honey_tips_fragment

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/umc/ttoklip/presentation/MainActivity.kt
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/values/style.xml
@40food 40food self-assigned this Jan 23, 2024
@40food 40food linked an issue Jan 23, 2024 that may be closed by this pull request
10 tasks
Copy link
Collaborator

@kyujin0911 kyujin0911 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@40food 40food merged commit a86b51a into main Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

첫 화면, 로그인, 회원가입 구현
4 participants