Skip to content

Commit

Permalink
Merge pull request #154 from yourssu/develop
Browse files Browse the repository at this point in the history 
[YDS] 2.1.8 배포
  • Loading branch information
@Hanna922
Hanna922 authored Sep 16, 2022
2 parents 324fce5 + ac9556c commit 0c6f613
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 75 deletions.
1 change: 1 addition & 0 deletions DesignSystem/src/main/java/com/yourssu/design/system/atom/BoxButton.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class BoxButton : LinearLayout {

var isDisabled: Boolean = false
set(isDisabled) {
isEnabled = !isDisabled
field = isDisabled
setBoxButtonInfo()
}
Expand Down
154 changes: 80 additions & 74 deletions DesignSystem/src/main/java/com/yourssu/design/system/foundation/Iconography.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ object Icon {
ic_bell_filled,
ic_bell_line,
ic_bellmute_line,
ic_blockuser_line,
ic_board_filled,
ic_board_line,
ic_book_filled,
Expand Down Expand Up @@ -102,80 +103,81 @@ object Icon {
const val ic_bell_filled = 6
const val ic_bell_line = 7
const val ic_bellmute_line = 8
const val ic_board_filled = 9
const val ic_board_line = 10
const val ic_book_filled = 11
const val ic_book_line = 12
const val ic_calendar_filled = 13
const val ic_calendar_line = 14
const val ic_camera_filled = 15
const val ic_camera_line = 16
const val ic_cameracircle_line = 17
const val ic_check_line = 18
const val ic_checkcircle_filled = 19
const val ic_checkcircle_line = 20
const val ic_clip_line = 21
const val ic_comment_filled = 22
const val ic_comment_line = 23
const val ic_dotbadge_line = 24
const val ic_dots_horizontal_line = 25
const val ic_dots_vertical_line = 26
const val ic_download_line = 27
const val ic_emojiadd_line = 28
const val ic_eyeclosed_line = 29
const val ic_eyeopen_line = 30
const val ic_food_filled = 31
const val ic_food_line = 32
const val ic_foodcalendar_filled = 33
const val ic_foodcalendar_line = 34
const val ic_ground_filled = 35
const val ic_ground_line = 36
const val ic_home_filled = 37
const val ic_home_line = 38
const val ic_list_line = 39
const val ic_lock_filled = 40
const val ic_lock_line = 41
const val ic_new_filled = 42
const val ic_new_line = 43
const val ic_notice_filled = 44
const val ic_notice_line = 45
const val ic_pen_filled = 46
const val ic_pen_line = 47
const val ic_person_filled = 48
const val ic_person_line = 49
const val ic_personcircle_line = 50
const val ic_picture_filled = 51
const val ic_picture_line = 52
const val ic_pin_filled = 53
const val ic_pin_line = 54
const val ic_playcircle_filled = 55
const val ic_playcircle_line = 56
const val ic_plus_line = 57
const val ic_rank_filled = 58
const val ic_rank_line = 59
const val ic_recomment_line = 60
const val ic_refresh_line = 61
const val ic_savecircle_filled = 62
const val ic_savecircle_line = 63
const val ic_schoolcalendar_filled = 64
const val ic_schoolcalendar_line = 65
const val ic_search_line = 66
const val ic_sharecircle_filled = 67
const val ic_sharecircle_line = 68
const val ic_star_filled = 69
const val ic_star_line = 70
const val ic_thumb_down_filled = 71
const val ic_thumb_down_line = 72
const val ic_thumb_up_filled = 73
const val ic_thumb_up_line = 74
const val ic_timecalendar_filled = 75
const val ic_timecalendar_line = 76
const val ic_trashcan_filled = 77
const val ic_trashcan_line = 78
const val ic_warningcircle_filled = 79
const val ic_warningcircle_line = 80
const val ic_x_line = 81
const val ic_xcircle_filled= 82
const val ic_blockuser_line = 9
const val ic_board_filled = 10
const val ic_board_line = 11
const val ic_book_filled = 12
const val ic_book_line = 13
const val ic_calendar_filled = 14
const val ic_calendar_line = 15
const val ic_camera_filled = 16
const val ic_camera_line = 17
const val ic_cameracircle_line = 18
const val ic_check_line = 19
const val ic_checkcircle_filled = 20
const val ic_checkcircle_line = 21
const val ic_clip_line = 22
const val ic_comment_filled = 23
const val ic_comment_line = 24
const val ic_dotbadge_line = 25
const val ic_dots_horizontal_line = 26
const val ic_dots_vertical_line = 27
const val ic_download_line = 28
const val ic_emojiadd_line = 29
const val ic_eyeclosed_line = 30
const val ic_eyeopen_line = 31
const val ic_food_filled = 32
const val ic_food_line = 33
const val ic_foodcalendar_filled = 34
const val ic_foodcalendar_line = 35
const val ic_ground_filled = 36
const val ic_ground_line = 37
const val ic_home_filled = 38
const val ic_home_line = 39
const val ic_list_line = 40
const val ic_lock_filled = 41
const val ic_lock_line = 42
const val ic_new_filled = 43
const val ic_new_line = 44
const val ic_notice_filled = 45
const val ic_notice_line = 46
const val ic_pen_filled = 47
const val ic_pen_line = 48
const val ic_person_filled = 49
const val ic_person_line = 50
const val ic_personcircle_line = 51
const val ic_picture_filled = 52
const val ic_picture_line = 53
const val ic_pin_filled = 54
const val ic_pin_line = 55
const val ic_playcircle_filled = 56
const val ic_playcircle_line = 57
const val ic_plus_line = 58
const val ic_rank_filled = 59
const val ic_rank_line = 60
const val ic_recomment_line = 61
const val ic_refresh_line = 62
const val ic_savecircle_filled = 63
const val ic_savecircle_line = 64
const val ic_schoolcalendar_filled = 65
const val ic_schoolcalendar_line = 66
const val ic_search_line = 67
const val ic_sharecircle_filled = 68
const val ic_sharecircle_line = 69
const val ic_star_filled = 70
const val ic_star_line = 71
const val ic_thumb_down_filled = 72
const val ic_thumb_down_line = 73
const val ic_thumb_up_filled = 74
const val ic_thumb_up_line = 75
const val ic_timecalendar_filled = 76
const val ic_timecalendar_line = 77
const val ic_trashcan_filled = 78
const val ic_trashcan_line = 79
const val ic_warningcircle_filled = 80
const val ic_warningcircle_line = 81
const val ic_x_line = 82
const val ic_xcircle_filled= 83

@DrawableRes
fun getIconDrawable(@Iconography icon: Int): Int {
Expand All @@ -189,6 +191,7 @@ object Icon {
ic_bell_filled -> R.drawable.ic_bell_filled
ic_bell_line -> R.drawable.ic_bell_line
ic_bellmute_line -> R.drawable.ic_bellmute_line
ic_blockuser_line -> R.drawable.ic_blockuser_line
ic_board_filled -> R.drawable.ic_board_filled
ic_board_line -> R.drawable.ic_board_line
ic_book_filled -> R.drawable.ic_book_filled
Expand Down Expand Up @@ -278,6 +281,7 @@ object Icon {
ic_bell_filled -> "ic_bell_filled"
ic_bell_line -> "ic_bell_line"
ic_bellmute_line -> "ic_bellmute_line"
ic_blockuser_line -> "ic_blockuser_line"
ic_board_filled -> "ic_board_filled"
ic_board_line -> "ic_board_line"
ic_book_filled -> "ic_book_filled"
Expand Down Expand Up @@ -367,6 +371,7 @@ object Icon {
"ic_bell_filled" -> ic_bell_filled
"ic_bell_line" -> ic_bell_line
"ic_bellmute_line" -> ic_bellmute_line
"ic_blockuser_line" -> ic_blockuser_line
"ic_board_filled" -> ic_board_filled
"ic_board_line" -> ic_board_line
"ic_book_filled" -> ic_book_filled
Expand Down Expand Up @@ -456,6 +461,7 @@ object Icon {
ic_bell_filled,
ic_bell_line,
ic_bellmute_line,
ic_blockuser_line,
ic_board_filled,
ic_board_line,
ic_book_filled,
Expand Down
30 changes: 30 additions & 0 deletions DesignSystem/src/main/res/drawable/ic_blockuser_line.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M3,3h18v18h-18z"/>
<path
android:pathData="M12.07,4.5C10.965,4.5 10.07,5.395 10.07,6.5C10.07,7.605 10.965,8.5 12.07,8.5C13.175,8.5 14.07,7.605 14.07,6.5C14.07,5.395 13.175,4.5 12.07,4.5ZM8.57,6.5C8.57,4.567 10.137,3 12.07,3C14.003,3 15.57,4.567 15.57,6.5C15.57,8.433 14.003,10 12.07,10C10.137,10 8.57,8.433 8.57,6.5Z"
android:fillColor="@color/buttonNormal"
android:fillType="evenOdd"/>
<path
android:pathData="M11.995,11.25L12.001,11.25C13.322,11.251 14.626,11.55 15.816,12.125C16.189,12.305 16.346,12.753 16.166,13.126C15.985,13.499 15.537,13.656 15.164,13.476C14.178,13 13.097,12.752 12.002,12.75C10.016,12.763 8.115,13.557 6.711,14.961C5.485,16.187 4.724,17.791 4.542,19.5H13.13C13.544,19.5 13.88,19.836 13.88,20.25C13.88,20.664 13.544,21 13.13,21H3.75C3.55,21 3.359,20.92 3.218,20.779C3.077,20.637 2.999,20.445 3,20.246C3.014,17.864 3.967,15.584 5.651,13.901C7.334,12.217 9.614,11.264 11.995,11.25Z"
android:fillColor="@color/buttonNormal"
android:fillType="evenOdd"/>
<path
android:pathData="M17.5,15.5C16.395,15.5 15.5,16.395 15.5,17.5C15.5,18.605 16.395,19.5 17.5,19.5C18.605,19.5 19.5,18.605 19.5,17.5C19.5,16.395 18.605,15.5 17.5,15.5ZM14,17.5C14,15.567 15.567,14 17.5,14C19.433,14 21,15.567 21,17.5C21,19.433 19.433,21 17.5,21C15.567,21 14,19.433 14,17.5Z"
android:fillColor="@color/buttonNormal"
android:fillType="evenOdd"/>
<path
android:pathData="M15.03,18.91L16.97,16.97L18.03,18.03L16.09,19.97L15.03,18.91Z"
android:fillColor="@color/buttonNormal"
android:fillType="evenOdd"/>
<path
android:pathData="M19.979,16.092L18.029,18.032L16.971,16.968L18.921,15.028L19.979,16.092Z"
android:fillColor="@color/buttonNormal"
android:fillType="evenOdd"/>
</group>
</vector>
2 changes: 1 addition & 1 deletion version.properties
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
versionName=2.1.7
versionName=2.1.8
#자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다

0 comments on commit 0c6f613

Please sign in to comment.