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

[둘리] 뷰 챌린지 미션 1단계 제출합니다. #14

Merged
merged 24 commits into from
Oct 1, 2023
Merged

[둘리] 뷰 챌린지 미션 1단계 제출합니다. #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ed6898e
feat: 레이아웃 그리기
hyemdooly Sep 29, 2023
0e4dbd0
feat: 선을 그릴 수 있는 기능 추가
hyemdooly Sep 29, 2023
4b31375
feat: button listener 설정
hyemdooly Sep 29, 2023
970025b
feat: UI State 추가
hyemdooly Sep 29, 2023
56ddb01
feat: RecyclerView 어댑터 연결
hyemdooly Sep 29, 2023
14a1889
feat: PaintView 연결
hyemdooly Sep 29, 2023
cacf0fd
feat: Point 생성
hyemdooly Sep 29, 2023
2a97a99
refactor: 네이밍 수정 및 함수 리팩터링
hyemdooly Sep 29, 2023
37d0ad4
feat: Line 클래스 생성
hyemdooly Sep 29, 2023
7a8823e
refactor: 아이템 높이, 너비 변경
hyemdooly Sep 29, 2023
9b6da38
refactor: 패키지 이동
hyemdooly Sep 29, 2023
71214e0
feat: 각각 다른 paint에 대한 line 그리기 지원
hyemdooly Sep 29, 2023
100f930
feat: colors 뷰 margin 적용
hyemdooly Sep 29, 2023
93ab0a8
refactor: 필요없는 플러그인 삭제, 네이밍 변경
hyemdooly Oct 1, 2023
68e1f78
refactor: DataBindingUtil 대신 다른 코드로 변경
hyemdooly Oct 1, 2023
cc8c325
refactor: 변수 네이밍 변경
hyemdooly Oct 1, 2023
8783cab
refactor: 구성 변경 대응 및 CanvasView에서 CustomColor를 사용하도록 수정
hyemdooly Oct 1, 2023
ed6ecda
refactor: 코드 줄임
hyemdooly Oct 1, 2023
6852594
refactor: CustomColor 네이밍 수정
hyemdooly Oct 1, 2023
89deedc
refactor: 함수 네이밍 수정
hyemdooly Oct 1, 2023
2c91a84
refactor: 설정이 바뀌었을 때만 line을 추가하도록 수정
hyemdooly Oct 1, 2023
894e464
refactor: 네이밍 수정
hyemdooly Oct 1, 2023
e0fc87e
refactor: ktlint 재적용
hyemdooly Oct 1, 2023
345cc70
refactor: default 값 이동
hyemdooly Oct 1, 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
Prev Previous commit
Next Next commit
refactor: 아이템 높이, 너비 변경
  • Loading branch information
@hyemdooly
hyemdooly committed Sep 29, 2023
commit 7a8823e41a2d33dadaefda43c49a67c6659f1387
6 changes: 3 additions & 3 deletions app/src/main/res/layout/item_color_palette.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<data>
<variable
name="colorModel"
type="woowacourse.paint.ColorUiModel" />
type="woowacourse.paint.model.ColorUiModel" />
<variable
name="onItemClick"
type="kotlin.jvm.functions.Function1" />
Expand All @@ -16,8 +16,8 @@
android:onClick="@{() -> onItemClick.invoke(colorModel)}">

<RelativeLayout
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="@dimen/color_item_size"
android:layout_height="@dimen/color_item_size"
android:background="@{colorModel.color.colorCode}">

<ImageView
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="color_item_size">70dp</dimen>
</resources>