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.

Sign up for GitHub

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

DEP-373 마이페이지 습관 보관함 터치 영역 넓히기, 스플래시 시간 1초 추가 #179

Merged
merged 2 commits into from
Jan 8, 2023
Merged

DEP-373 마이페이지 습관 보관함 터치 영역 넓히기, 스플래시 시간 1초 추가 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7f5ca
bugfix: 습관보관함 버튼 터치 영역 넓히기
juhwankim-dev Jan 8, 2023
ee12fb2
bugfix: 스플래시 시간 1초 추가, 반복 삭제
juhwankim-dev Jan 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion presentation/mypage/src/main/java/com/depromeet/threedays/mypage/MyPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class MyPageFragment :
* 이벤트 관련 작업 초기화
*/
private fun initEvent() {
binding.ivHabitArchived.setOnClickListener {
binding.tvHabitArchived.setOnClickListener {
onHabitArchivedButtonClicked()
}
binding.ivEdit.setOnClickListener {
Expand Down
3 changes: 1 addition & 2 deletions presentation/splash/src/main/java/com/depromeet/threedays/splash/SplashActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
layoutParams.width = (width * 0.61).toInt() // 220/360 = 0.611
layoutParams.height = layoutParams.width
setAnimation(R.raw.lottie_splash)
repeatCount = 1
playAnimation()
}
}
Expand Down Expand Up @@ -112,6 +111,6 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
}

companion object {
private const val DELAYED_MILLIS = 1000L
private const val DELAYED_MILLIS = 2000L
}
}
7 changes: 4 additions & 3 deletions presentation/splash/src/main/res/layout/activity_splash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:lottie_autoPlay="false" />
Copy link
Member

Choose a reason for hiding this comment

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

와.. 이런 옵션이 있는줄 몰랐네요 ㅜ


<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text="@string/splash_text"
android:gravity="center"
android:textColor="@color/gray_500"
android:text="@string/splash_text"
android:textAppearance="@style/Typography.Body4"
android:textColor="@color/gray_500"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
Expand Down