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

[스터디 상세보기] 버그 리포팅 기반 개선 #251

Merged
merged 11 commits into from
Aug 9, 2023
Merged

[스터디 상세보기] 버그 리포팅 기반 개선 #251

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c690046
feat: 툴바 뒤로가기 버튼 설명 추가
no1msh Aug 7, 2023
afa411e
refactor: 너무 길었던 버튼 텍스트 수정
no1msh Aug 8, 2023
483b45a
refactor: 프로퍼티 명을 좀 더 자연스럽게 변경
no1msh Aug 8, 2023
1629af9
feat: 메인 버튼 버그 수정
no1msh Aug 8, 2023
854d5fb
Merge remote-tracking branch 'origin/develop' into AN/feature/242-stu…
no1msh Aug 8, 2023
2f71e13
refactor: 불필요한 지역변수 제거
no1msh Aug 8, 2023
1b3e6e3
refactor: 어울리지 않는 변수명 수정
no1msh Aug 8, 2023
c1fa511
refactor: NonNullLiveData 사용 및 기타 더미데이터 처리
no1msh Aug 9, 2023
8383a0f
Merge remote-tracking branch 'origin/develop' into AN/feature/242-stu…
no1msh Aug 9, 2023
d19e20b
refactor: member를 찾을 수 없다면 해당 함수를 종료하게 변경
no1msh Aug 9, 2023
264ea9b
Merge remote-tracking branch 'origin/develop' into AN/feature/242-stu…
no1msh Aug 9, 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 android/app/src/main/res/layout/activity_study_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_weight="4"
app:layout_constraintStart_toEndOf="@+id/btn_study_detail_sub"
tools:text="참여하기(3/6)" />
tools:text="@string/study_detail_study_accept_waiting" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
4 changes: 2 additions & 2 deletions android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<string name="study_detail_study_capacity">참여하기(%d/%d)</string>
<string name="study_detail_button_start_study">시작하기(%d/%d)</string>
<string name="study_detail_dm_button_content_description">스터디장에게 문의하기</string>
<string name="study_detail_study_accept_waiting">스터디장의 수락을 기다리고있어요.</string>
<string name="study_detail_study_start_waiting">스터디 시작을 기다리고있어요.</string>
<string name="study_detail_study_accept_waiting">수락을 기다리고 있어요</string>
<string name="study_detail_study_start_waiting">시작을 기다리고 있어요</string>
Comment on lines -75 to +76
Copy link
Collaborator

Choose a reason for hiding this comment

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

image

<string name="study_detail_do_not_accept_member_anymore">더이상 스터디 멤버를 받을 수 없습니다.</string>
<string name="study_detail_period_of_count_day">%d일</string>
<string name="study_detail_period_of_count_week">%d주</string>
Expand Down