-
Notifications
You must be signed in to change notification settings - Fork 1
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
로그인 화면 구성 #91
로그인 화면 구성 #91
Changes from 3 commits
16c0e2c
817c5b2
78ada72
291c1da
85323ea
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<background android:drawable="@color/black" /> | ||
<foreground android:drawable="@drawable/ic_launcher_foreground" /> | ||
<foreground android:drawable="@drawable/ic_launcher_icon" /> | ||
</adaptive-icon> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<background android:drawable="@color/black" /> | ||
<foreground android:drawable="@drawable/ic_launcher_foreground" /> | ||
<foreground android:drawable="@drawable/ic_launcher_icon" /> | ||
</adaptive-icon> |
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"> | ||
<solid android:color="@color/light_gray" /> | ||
<corners android:radius="@dimen/login_radius" /> | ||
|
||
</shape> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="18dp" | ||
android:height="18dp" | ||
android:viewportWidth="18" | ||
android:viewportHeight="18"> | ||
<path | ||
android:pathData="M17.64,9.205C17.64,8.566 17.583,7.953 17.476,7.364H9V10.845H13.844C13.635,11.97 13.001,12.923 12.048,13.561V15.82H14.956C16.658,14.253 17.64,11.946 17.64,9.205Z" | ||
android:fillColor="#4285F4" | ||
android:fillType="evenOdd"/> | ||
<path | ||
android:pathData="M9,18C11.43,18 13.467,17.194 14.956,15.82L12.048,13.561C11.242,14.101 10.211,14.42 9,14.42C6.656,14.42 4.672,12.837 3.964,10.71H0.957V13.042C2.438,15.983 5.482,18 9,18Z" | ||
android:fillColor="#34A853" | ||
android:fillType="evenOdd"/> | ||
<path | ||
android:pathData="M3.964,10.71C3.784,10.17 3.682,9.593 3.682,9C3.682,8.407 3.784,7.83 3.964,7.29V4.958H0.957C0.348,6.173 0,7.548 0,9C0,10.452 0.348,11.827 0.957,13.042L3.964,10.71Z" | ||
android:fillColor="#FBBC05" | ||
android:fillType="evenOdd"/> | ||
<path | ||
android:pathData="M9,3.58C10.321,3.58 11.508,4.034 12.441,4.925L15.022,2.344C13.463,0.892 11.426,0 9,0C5.482,0 2.438,2.017 0.957,4.958L3.964,7.29C4.672,5.163 6.656,3.58 9,3.58Z" | ||
android:fillColor="#EA4335" | ||
android:fillType="evenOdd"/> | ||
</vector> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="108dp" | ||
android:height="108dp" | ||
android:viewportWidth="600" | ||
android:viewportHeight="600"> | ||
<group android:scaleX="1" | ||
android:scaleY="1" | ||
android:translateX="0" | ||
android:translateY="0"> | ||
<path | ||
android:pathData="M80,150L520,150A30,30 0,0 1,550 180L550,420A30,30 0,0 1,520 450L80,450A30,30 0,0 1,50 420L50,180A30,30 0,0 1,80 150z" | ||
android:fillColor="#BB2649"/> | ||
<path | ||
android:pathData="M100,204h400v193h-400z" | ||
android:fillColor="#000000"/> | ||
<path | ||
android:pathData="M405,300m-35,0a35,35 0,1 1,70 0a35,35 0,1 1,-70 0" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:pathData="M195,300m-35,0a35,35 0,1 1,70 0a35,35 0,1 1,-70 0" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:pathData="M265,347C290.2,367 321.83,355.33 334.5,347" | ||
android:strokeWidth="10" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff"/> | ||
<path | ||
android:pathData="M405.5,314.5m-20.5,0a20.5,20.5 0,1 1,41 0a20.5,20.5 0,1 1,-41 0" | ||
android:fillColor="#000000"/> | ||
<path | ||
android:pathData="M195.5,314.5m-20.5,0a20.5,20.5 0,1 1,41 0a20.5,20.5 0,1 1,-41 0" | ||
android:fillColor="#000000"/> | ||
</group> | ||
</vector> |
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,4 +9,11 @@ | |
<dimen name="extra_large">32dp</dimen> | ||
|
||
<dimen name="music_horizontal_img">120dp</dimen> | ||
|
||
<dimen name="login_icon_size">201dp</dimen> | ||
<dimen name="login_icon_margin_vertical">168dp</dimen> | ||
|
||
<dimen name="login_width">300dp</dimen> | ||
<dimen name="login_height">50dp</dimen> | ||
<dimen name="login_radius">10dp</dimen> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 로그인 아이콘이 아마 우리 앱 아이콘인 거 같은데, login보다는 앱 아이콘과 관련된 이름으로 짓는 게 좋을 거 같아! 201 말고 200으로 해도 될 듯? width는 parent 기준으로 사이징해서 없어도 될 거 같구 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 저도 위에 말씀에 동의합니다요 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. login radius 도 btn radius로 바꾸면 좋을듯! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 반영 완료😀 |
||
</resources> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package com.ohdodok.catchytape.feature.login | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import androidx.fragment.app.viewModels | ||
import com.ohdodok.catchytape.core.ui.BaseFragment | ||
import com.ohdodok.catchytape.feature.login.databinding.FragmentLoginBinding | ||
import dagger.hilt.android.AndroidEntryPoint | ||
|
||
|
||
@AndroidEntryPoint | ||
class LoginFragment : BaseFragment<FragmentLoginBinding>(R.layout.fragment_login) { | ||
private val viewModel: LoginViewModel by viewModels() | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
binding.viewModel = viewModel | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package com.ohdodok.catchytape.feature.login | ||
|
||
import androidx.lifecycle.ViewModel | ||
|
||
class LoginViewModel : ViewModel() { | ||
|
||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. HiltViewModel 어노테이션이 필요할 거 같아 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. HiltViewModel 어노테이션은 나중에 할때 해도 될듯! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 반영 완료😀 |
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?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> | ||
|
||
<variable | ||
name="viewModel" | ||
type="com.ohdodok.catchytape.feature.login.LoginViewModel" /> | ||
</data> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
|
||
<ImageView | ||
android:id="@+id/iv_icon" | ||
android:layout_width="@dimen/login_icon_size" | ||
android:layout_height="@dimen/login_icon_size" | ||
android:layout_marginTop="@dimen/login_icon_margin_vertical" | ||
android:src="@drawable/ic_login_icon" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
||
|
||
<ImageView | ||
android:id="@+id/iv_logo" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:src="@drawable/ic_logo" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@+id/iv_icon" /> | ||
|
||
|
||
<Button | ||
android:id="@+id/btn_google_login" | ||
style="@style/TitleSmall" | ||
android:layout_width="@dimen/login_width" | ||
android:layout_height="@dimen/login_height" | ||
android:layout_marginHorizontal="@dimen/margin_horizontal" | ||
android:layout_marginBottom="@dimen/extra_large" | ||
android:background="@drawable/btn_login" | ||
android:drawableStart="@drawable/ic_google" | ||
android:paddingHorizontal="@dimen/margin_horizontal" | ||
android:text="@string/google_account_login" | ||
android:textColor="@color/black" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
|
||
</layout> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<navigation 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" | ||
android:id="@+id/login_nav_graph" | ||
app:startDestination="@id/login_fragment"> | ||
|
||
<fragment | ||
android:id="@+id/login_fragment" | ||
android:name="com.ohdodok.catchytape.feature.login.LoginFragment" | ||
android:label="login" | ||
tools:layout="@layout/fragment_login"/> | ||
|
||
</navigation> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이거 래핑 안 된 아이콘으로 받은 거 같은데 래핑된 아이콘으로 받아야 할 거 같아. 나중에 정렬에 문제가 생겨서
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
반영 완료😀