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.

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

feat: 하우스 관리 페이지 #72

Merged
merged 12 commits into from
Jun 19, 2022
Merged

Conversation

sujin-kk
Copy link
Member

  1. 하우스 관리 페이지 구현
  2. 하우스 이름 변경 화면 sign view type 넘겨 연결
  3. 초대 코드 화면 invite view type 넘겨 연결 -> 하우스 관리 통해 초대코드 화면 볼때는 건너뛰기 버튼 없도록 구현
  4. 각종 화면 string 처리 (SpannableString), 피그마랑 달라진 부분 수정

@sujin-kk sujin-kk requested a review from wjdwns June 18, 2022 17:42
@sujin-kk sujin-kk self-assigned this Jun 18, 2022
@sujin-kk
Copy link
Member Author

‼️ google_serivece.json 파일은 gitignore 적용되도록 했습니다.

@wjdwns
Copy link
Collaborator

wjdwns commented Jun 19, 2022

제가 CI가 계속 google_serivece.json파일로 인해 실패하여서 임의로 추가하였는데 gitignore해주셔서 감사합니다 ^^7

val toast = Toast.makeText(requireContext(), "코드를 클립보드에 복사했습니다.", Toast.LENGTH_SHORT)
toast.setGravity(Gravity.CENTER, Gravity.CENTER_HORIZONTAL, Gravity.CENTER_VERTICAL)
toast.show()
Toast.makeText(requireContext(), getString(R.string.invite_code_copy_toast_text), Toast.LENGTH_SHORT).show()
Copy link
Collaborator

Choose a reason for hiding this comment

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

제 코드에서는 초대코드 실험하기 위해서 수정해놓은 것이니 주석처리해놓고 작업해놓겠습니당

package com.depromeet.housekeeper.model.enums

enum class InviteViewType {
SIGN, SETTING
Copy link
Collaborator

Choose a reason for hiding this comment

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

분기처리 직접해주셔서 감사합니다 ㅎㅎ

@@ -67,7 +67,7 @@
android:id="@+id/join_group_make_space_info_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_info"
android:src="@drawable/ic_info_fill"
Copy link
Collaborator

Choose a reason for hiding this comment

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

ㅋㅋㅋㅋ네이밍이 겹쳤군요! 수정해주셔서 감사합니다

@@ -10,16 +10,17 @@
<Button
android:id="@+id/main_footer_button"
android:layout_width="match_parent"
android:layout_height="46dp"
android:layout_height="56dp"
Copy link
Collaborator

Choose a reason for hiding this comment

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

CTA버튼이 바뀐건가요?

@sujin-kk sujin-kk merged commit 1bb5adc into develop Jun 19, 2022
@sujin-kk sujin-kk deleted the feature/house-setting-page branch June 19, 2022 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants