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-148 ui: history UI 구현 #46

Merged
merged 14 commits into from
Nov 28, 2022
Merged

DEP-148 ui: history UI 구현 #46

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c494d69
fix: 습관 명칭 단어 변경
juhwankim-dev Nov 26, 2022
ac199e6
fix: 변경된 아이콘으로 적용
juhwankim-dev Nov 26, 2022
3e8e27e
feat: 툴팁 기능 구현
juhwankim-dev Nov 26, 2022
e2fba36
ui: 문자열을 strings.xml에 선언하여 사용하도록 변경
juhwankim-dev Nov 26, 2022
3fbb951
ui: hide / show가 편하도록 group으로 설정
juhwankim-dev Nov 26, 2022
9baea9e
ui: 습관이 없을 때 ui 구현
juhwankim-dev Nov 26, 2022
1f2aacc
ui: 221125 디자인 시스템(폰트) 변경사항 적용
juhwankim-dev Nov 26, 2022
cf5fe1d
Merge branch 'develop' of https://github.com/depromeet12th/three-days…
juhwankim-dev Nov 28, 2022
594325f
chore: 주석 변경
juhwankim-dev Nov 28, 2022
2fbe1c1
chore: 문자열 하드코딩대신 strings.xml 사용
juhwankim-dev Nov 28, 2022
b923380
ui: main color -> gray 800으로 수정
juhwankim-dev Nov 28, 2022
a66934b
feat: switch 확장함수 제거
juhwankim-dev Nov 28, 2022
7b96e14
ui: cardView 대신 background 사용하는 방향으로 변경
juhwankim-dev Nov 28, 2022
286cc43
chore: merge로 문자열이 사라져 에러뜨는 부분 임시 주석처리
juhwankim-dev Nov 28, 2022
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
12 changes: 10 additions & 2 deletions presentation/history/src/main/res/layout/fragment_history.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@
android:layout_height="35dp"
app:layout_constraintTop_toBottomOf="@+id/tv_this_month"/>

<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="cl_this_month_clap, cl_this_month_achieve_days, cl_most_achieve, tv_ongoing_habit, rv_habit" />

Copy link
Contributor

Choose a reason for hiding this comment

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

신기하네요 !! 덕분에 좋은것? 알아갑니다!! 적용해서 제 코드도 수정해봐야겠어요👍

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_this_month_clap"
android:layout_width="0dp"
Expand Down Expand Up @@ -200,6 +206,7 @@
app:layout_constraintEnd_toEndOf="parent" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_most_achieve"
android:layout_width="0dp"
android:layout_height="212dp"
android:background="@drawable/bg_rect_green_sub_color_r10"
Expand Down Expand Up @@ -244,7 +251,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_in_progress_object"
android:id="@+id/tv_ongoing_habit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
Expand All @@ -255,13 +262,14 @@
app:layout_constraintTop_toBottomOf="@+id/cl_this_month_achieve_days" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_habit"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="12dp"
app:layout_constraintStart_toStartOf="@id/gl_begin"
app:layout_constraintEnd_toEndOf="@id/gl_end"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_in_progress_object"
app:layout_constraintTop_toBottomOf="@+id/tv_ongoing_habit"
tools:listitem="@layout/item_habit"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>