-
Notifications
You must be signed in to change notification settings - Fork 2
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
[UI/#15] tendency test splash 구현 #20
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
b029129
[FEAT/#15] 온보딩 색상 변경 로직 수정
chattymin d9f361e
[REFACTOR/#15] 1차 리펙토링 - 코드 최적화
chattymin ab6d691
[REFACTOR/#15] 2차 리펙토링 - 코드 최적화
chattymin b1e697e
[UI/#15] UI 구현 및 관련 스트링 리소스 생성
chattymin babe7e5
[UI/#15] 버튼 테마에 폰트 적용
chattymin d148793
[UI/#15] Activity 생성 및 xml 연결
chattymin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
presentation/src/main/java/com/going/presentation/tendencytest/TendencyTestActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package com.going.presentation.tendencytest | ||
|
||
import android.os.Bundle | ||
import com.going.presentation.R | ||
import com.going.presentation.databinding.ActivityTendencyTestSplashBinding | ||
import com.going.ui.base.BaseActivity | ||
import com.going.ui.extension.setOnSingleClickListener | ||
|
||
class TendencyTestActivity : | ||
BaseActivity<ActivityTendencyTestSplashBinding>(R.layout.activity_tendency_test_splash) { | ||
override fun onCreate(savedInstanceState: Bundle?) { | ||
super.onCreate(savedInstanceState) | ||
|
||
initStartBtnSingleClickListener() | ||
} | ||
|
||
private fun initStartBtnSingleClickListener() { | ||
binding.btnTendencySplashStart.setOnSingleClickListener { | ||
// 페이지 이동~ | ||
} | ||
} | ||
} |
11 changes: 2 additions & 9 deletions
11
presentation/src/main/res/drawable/sel_rounded_corner_edit_text.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
presentation/src/main/res/drawable/sel_rounded_corner_edit_text_empty.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item> | ||
<shape> | ||
<stroke android:width="1dp"/> | ||
<stroke android:color="@color/gray_200"/> | ||
<corners android:radius="4dp" /> | ||
</shape> | ||
</item> | ||
</selector> |
4 changes: 2 additions & 2 deletions
4
presentation/src/main/res/drawable/sel_rounded_corner_edit_text_error.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,7 +46,7 @@ | |
android:layout_marginHorizontal="24dp" | ||
android:layout_marginTop="6dp" | ||
android:afterTextChanged="@{(text) -> viewModel.checkProfileAvailable()}" | ||
android:background="@{viewModel.isNameAvailable() == NameState.Blank ? @drawable/sel_rounded_corner_edit_text_error : @drawable/sel_rounded_corner_edit_text}" | ||
android:background="@drawable/sel_rounded_corner_edit_text_empty" | ||
android:hint="@string/onboarding_et_name_hint" | ||
android:imeOptions="actionNext" | ||
android:inputType="text" | ||
|
@@ -95,7 +95,7 @@ | |
android:layout_marginHorizontal="24dp" | ||
android:layout_marginTop="6dp" | ||
android:afterTextChanged="@{(text) -> viewModel.checkProfileAvailable()}" | ||
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. 저도 데바 사용할 때 이렇게 함수 이용해서 해봐야겠어요 |
||
android:background="@drawable/sel_rounded_corner_edit_text" | ||
android:background="@drawable/sel_rounded_corner_edit_text_empty" | ||
android:hint="@string/onboarding_one_line_et_info" | ||
android:imeOptions="actionDone" | ||
android:inputType="text" | ||
|
@@ -106,9 +106,11 @@ | |
app:layout_constraintTop_toBottomOf="@id/tv_onboarding_profile_setting_on_line_info_title" /> | ||
|
||
<TextView | ||
android:id="@+id/tv_info_counter" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:text="@{@string/text_count(viewModel.nowInfoLength, viewModel.MAX_INFO_LEN)}" | ||
android:textColor="@color/gray_200" | ||
app:layout_constraintEnd_toEndOf="@id/et_onboarding_profile_setting_info" | ||
app:layout_constraintTop_toBottomOf="@id/et_onboarding_profile_setting_info" /> | ||
|
||
|
54 changes: 54 additions & 0 deletions
54
presentation/src/main/res/layout/activity_tendency_test_splash.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
|
||
</data> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:background="@color/white_000"> | ||
|
||
<TextView | ||
android:id="@+id/tv_tendency_splash_title" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:text="@string/tendency_splash_title" | ||
android:gravity="center" | ||
android:textColor="@color/gray_700" | ||
android:layout_marginTop="236dp" | ||
style="@style/TextAppearance.Doorip.Head3" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
||
<!--더미 이미지의 크기가 너무 커서 임시로 크기를 지정했습니다. 추후 이미자가 나온다면 wrap_content 사용 예정--> | ||
<ImageView | ||
android:layout_width="200dp" | ||
android:layout_height="126dp" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintTop_toBottomOf="@id/tv_tendency_splash_title" | ||
android:layout_marginTop="10dp" | ||
android:src="@drawable/img_sign_in_main" /> | ||
|
||
<androidx.appcompat.widget.AppCompatButton | ||
android:id="@+id/btn_tendency_splash_start" | ||
style="@style/button_style" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_marginHorizontal="24dp" | ||
android:layout_marginBottom="22dp" | ||
android:background="@drawable/sel_rounded_corner_button" | ||
android:paddingVertical="10dp" | ||
android:text="@string/tendency_splash_start_btn" | ||
android:textColor="@color/white_000" | ||
android:textSize="16sp" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
</layout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,7 +25,7 @@ | |
|
||
<!-- Button Style --> | ||
<style name="button_style" parent="Widget.AppCompat.Button"> | ||
|
||
<item name="android:textAppearance">@style/TextAppearance.Doorip.Body2.Bold</item> | ||
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. 오호 버튼 사용할 때 여기서 유용하게 쓰겠습니다! |
||
<item name="android:buttonCornerRadius">46dp</item> | ||
<item name="cornerRadius">40dp</item> | ||
<item name="android:radius">40dp</item> | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
setOnFocusChangeListener
리스너도 있군요,,!