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

Jump to bottom

[fix] 메인, 마이페이지 / QA 반영 및 탈퇴한 유저 처리 #161

Merged
merged 5 commits into from
Aug 27, 2023
Merged

[fix] 메인, 마이페이지 / QA 반영 및 탈퇴한 유저 처리 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3660966
[mod] #154 터치 영역 변경
Sangwook123 Aug 27, 2023
21879b9
[fix] #157 존재하지 않는 회원일 경우 토큰 초기화
Sangwook123 Aug 27, 2023
14eb27a
Merge branch 'develop' into feature/mod-mypage-toucharea
Sangwook123 Aug 27, 2023
9f22e60
[mod] #154 코드 수정
Sangwook123 Aug 27, 2023
de20143
Merge branch 'develop' into feature/mod-mypage-toucharea
Sangwook123 Aug 27, 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
5 changes: 5 additions & 0 deletions app/src/main/java/com/android/go/sopt/winey/data/interceptor/AuthInterceptor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ class AuthInterceptor @Inject constructor(
saveAccessToken("", "")
}
}

CODE_INVALID_USER -> {
saveAccessToken("", "")
Copy link
Member

Choose a reason for hiding this comment

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

오 이렇게 간단하게 처리할 수 있구나!! 구웃 👍👍

}
}
return response
}
Expand Down Expand Up @@ -95,6 +99,7 @@ class AuthInterceptor @Inject constructor(
companion object {
private const val HEADER_TOKEN = "accessToken"
private const val CODE_TOKEN_EXPIRED = 401
private const val CODE_INVALID_USER = 404
private const val REFRESH_TOKEN = "refreshToken"
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
}

private fun initBottomSheetClickListener(data: User?) {
binding.btnMypageTargetModify.setOnSingleClickListener {
binding.clMypageTargetmoney.setOnSingleClickListener {
when (data?.isOver) {
true -> {
val bottomSheet = TargetAmountBottomSheetFragment()
Expand Down
72 changes: 43 additions & 29 deletions app/src/main/res/layout/fragment_my_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,35 +153,49 @@
app:strokeColor="@color/gray_200"
app:strokeWidth="1dp">

<TextView
android:id="@+id/tv_mypage_target"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="11dp"
android:text="@string/mypage_target_amount"
android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
android:textColor="@color/gray_600" />

<TextView
android:id="@+id/tv_mypage_target_amount"
setAmount="@{targetMoney.targetMoney}"
setSuffix="@{@string/mypage_amount}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="21dp"
android:layout_marginBottom="11dp"
android:textAppearance="@style/TextAppearance.WINEY.body_b_16"
tools:text="10,000원" />

<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/btn_mypage_target_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:src="@drawable/ic_mypage_edit_btn" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mypage_targetmoney"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
android:id="@+id/tv_mypage_target"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="21dp"
android:layout_marginTop="11dp"
android:text="@string/mypage_target_amount"
android:textAppearance="@style/TextAppearance.WINEY.body_m_14"
android:textColor="@color/gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_mypage_target_amount"
setAmount="@{targetMoney.targetMoney}"
setSuffix="@{@string/mypage_amount}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="21dp"
android:layout_marginBottom="11dp"
android:textAppearance="@style/TextAppearance.WINEY.body_b_16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="10,000원" />

<ImageView
android:id="@+id/iv_mypage_target_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="@android:color/transparent"
android:src="@drawable/ic_mypage_edit_btn"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.card.MaterialCardView>

Expand Down