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

[FIX/#156] 로티 추가 및 카카오 버튼 수정 #159

Merged
merged 4 commits into from
Jan 17, 2024
Merged

[FIX/#156] 로티 추가 및 카카오 버튼 수정 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c80936f
[FIX/#156] 카카오 로그인 버튼 수정
chattymin Jan 17, 2024
fc48adb
[ADD/#156] splash lottie 추가
chattymin Jan 17, 2024
c6907a6
Merge branch 'develop' into fix/#156-list-scroll
chattymin Jan 17, 2024
71d52b5
Merge branch 'develop' into fix/#156-list-scroll
chattymin Jan 17, 2024
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/src/main/java/com/going/presentation/onboarding/splash/SplashActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(R.layout.activity_spl
} else {
navigateToSignInScreen()
}
}, 3000)
}, 2200)
}

private fun observeUserState() {
Expand Down
2 changes: 1 addition & 1 deletion presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,4 +293,4 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
const val debounceTime = 300L
}

}
}
2 changes: 1 addition & 1 deletion ...ion/src/main/java/com/going/presentation/todo/ourtodo/todolist/OurTodoCompleteFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,4 @@ class OurTodoCompleteFragment() :
_adapter = null
}

}
}
25 changes: 14 additions & 11 deletions presentation/src/main/res/layout/activity_signin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/btn_sign_in"
android:layout_width="0dp"
style="@style/TextAppearance.Doorip.Body2.Bold"
android:layout_width="0dp"
android:layout_height="45dp"
android:layout_marginHorizontal="37dp"
android:layout_marginBottom="12dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="30dp"
android:background="@drawable/shape_kakao_yellow_fill_8_rect"
app:layout_constraintBottom_toTopOf="@id/btn_terms"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/btn_terms">
app:layout_constraintStart_toStartOf="parent">

<ImageView
android:id="@+id/iv_sign_in_kakao"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="18dp"
android:padding="8dp"
android:layout_marginStart="10dp"
android:src="@drawable/ic_kakao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1"
Expand All @@ -60,6 +61,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="16dp"
android:textSize="15dp"
style="@style/TextAppearance.Doorip.Body2.Bold"
android:text="@string/sign_in_tv_btn"
android:textColor="#D9000000"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -73,9 +76,9 @@
android:id="@+id/btn_terms"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintStart_toStartOf="parent">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_sign_in_terms_icon"
Expand All @@ -102,10 +105,10 @@
<View
android:layout_width="0dp"
android:layout_height="1dp"
app:layout_constraintStart_toStartOf="@id/tv_sign_in_terms_icon"
app:layout_constraintTop_toBottomOf="@id/tv_sign_in_terms_text"
android:background="@color/gray_300"
app:layout_constraintEnd_toEndOf="@id/tv_sign_in_terms_text"
android:background="@color/gray_300" />
app:layout_constraintStart_toStartOf="@id/tv_sign_in_terms_icon"
app:layout_constraintTop_toBottomOf="@id/tv_sign_in_terms_text" />
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
15 changes: 8 additions & 7 deletions presentation/src/main/res/layout/activity_splash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
android:layout_height="match_parent"
android:background="@color/red_500">

<ImageView
android:src="@drawable/text_logo_doorip_white000"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
<com.airbnb.lottie.LottieAnimationView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />

app:lottie_autoPlay="true"
app:lottie_loop="false"
app:lottie_rawRes="@raw/doorip_splash" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
Loading