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

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions core-design-system/src/main/res/drawable/bg_rect_main_r30.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/main" />
Copy link
Contributor

Choose a reason for hiding this comment

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

color main이 변경되고 gray800으로 바껴서 (근데 아직 몇몇 디자인에는 main이 남아있더라구요) gray800으로 바꿔주시면 감사하겠습니다!

Copy link
Member Author

Choose a reason for hiding this comment

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

후,,, 뭔가가,,, 색상이 또 바뀌었나보군여,, 알려주셔서 감사합니다 🥲

<corners android:radius="30dp" />

</shape>
48 changes: 47 additions & 1 deletion 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 @@ -96,7 +96,7 @@
<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:visibility="gone"
app:constraint_referenced_ids="cl_this_month_clap, cl_this_month_achieve_days, cl_most_achieve, tv_ongoing_habit, rv_habit" />

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -271,5 +271,51 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_ongoing_habit"
tools:listitem="@layout/item_habit"/>

<androidx.constraintlayout.widget.Group
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:constraint_referenced_ids="tv_illustration, tv_no_habit_guide, btn_create_habit" />

<TextView
android:id="@+id/tv_illustration"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_marginTop="185dp"
android:background="@color/gray_300"
android:gravity="center"
android:text="일러스트로 대체될 영역"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/tv_no_habit_guide"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/no_habit_guide"
android:textAppearance="@style/Typography.Paragraph3.13dp"
android:gravity="center"
android:textColor="@color/gray_500"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_illustration" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_create_habit"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:layout_marginTop="30dp"
android:background="@drawable/bg_rect_main_r30"
android:gravity="center"
android:paddingHorizontal="44dp"
android:text="@string/create_habit"
android:textAppearance="@style/Typography.Button1"
android:textColor="@color/white"
app:layout_constraintTop_toBottomOf="@+id/tv_no_habit_guide"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
2 changes: 2 additions & 0 deletions presentation/history/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<string name="this_month_most_achieve_habit_title">점심먹은 직후\n종합 비타민 호다닥</string>
<string name="ongoing_habit">진행중인 습관</string>
<string name="history_tooltip_guide">히스토리에 저장되지 않고 삭제된 습관은\n나의 기록에서 확인할 수 없어요. 🥲</string>
<string name="no_habit_guide">아직 습관이 없어요.\n새로운 습관을 만들어볼까요?</string>
<string name="create_habit">습관 만들기</string>

<!-- emoji -->
<string name="clap">👏🏻</string>
Expand Down