Merge pull request #165 from yourssu/develop

.github/config.yml

@@ -0,0 +1,35 @@
+name-template: "Release $RESOLVED_VERSION"
+tag-template: "$RESOLVED_VERSION"
+
+# 해당 라벨이 붙은 pr은 변경내용에 추가 안함.
+exclude-labels:
+  - 'skip'
+
+# 각 pr의 라벨에 따라서 카테고리가 나뉨.
+categories:
+  - title: '🚀 Features'
+    label: 'features'
+  - title: '🛠 Modify'
+    label: 'modify'
+  - title: '🔥 Hotfix'
+    label: 'hotfix'
+
+#  각 pr의 내용 설명 뒤에 추가될 정보. 아래와 같은 형태로 알맞은 카테고리에 문장이 추가됨.
+#  - pr제목 @pr올린사람ID (#pr번호)
+change-template: '- $TITLE @$AUTHOR (#$NUMBER) '
+
+# 카테고리 분류가 안되는 pr은 Uncategorized 타이틀로 분류.
+# 여기서 $CHANGES는 해당 PR의 제목임.
+template: |
+  ## Uncategorized
+  $CHANGES
+
+# 각 pr의 라벨에 따라서 버전 업 기준이 달라짐.
+version-resolver:
+  major:
+    labels:
+      - "features"
+  minor:
+    labels:
+      - "modify"
+  default: patch

.github/workflows/deployLibraryYDS.yml

@@ -24,6 +24,23 @@ jobs:
         with:
           java-version: 11
 
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+
+      - name: Install Bundle
+        run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+
+      - name: Generate Credential File for Fastlane
+        run: |
+          echo "$PLAY_STORE_CREDENTIALS" > fastlane/play-store-credentials.json.b64
+          base64 -d -i fastlane/play-store-credentials.json.b64 > fastlane/play-store-credentials.json
+        env:
+          PLAY_STORE_CREDENTIALS: ${{ secrets.PLAY_STORE_CREDENTIALS }}
+
       - name: Setting env
         run: |
           echo "BUILD_NUMBER=$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
@@ -46,4 +63,10 @@ jobs:
           release_name: Release ${{ steps.release_version.outputs.value }}
 
       - name: Upload to Slack
-        run: curl -F file=@"app/storybook/build/outputs/bundle/productionRelease/YDS-StoryBook-${{ steps.release_version.outputs.value }}($BUILD_NUMBER)-production-release.aab" -F "initial_comment=YDS ${{ steps.release_version.outputs.value }} 라이브러리가 등록되었슈~ https://jitpack.io/#yourssu/YDS-Android    aab 파일은 스토어에 업로드 해유~" -F "channels=${{ secrets.SLACK_CHANNEL_ID }}" -H "Authorization:Bearer ${{ secrets.SLACK_WORKSPACE_TOKEN }}" https://slack.com/api/files.upload
+        run: curl -F file=@"app/storybook/build/outputs/bundle/productionRelease/YDS-StoryBook-${{ steps.release_version.outputs.value }}($BUILD_NUMBER)-production-release.aab" -F "initial_comment=YDS ${{ steps.release_version.outputs.value }} 라이브러리가 등록되었슈~ https://jitpack.io/#yourssu/YDS-Android    aab 파일은 스토어에 업로드 했슈~" -F "channels=${{ secrets.SLACK_CHANNEL_ID }}" -H "Authorization:Bearer ${{ secrets.SLACK_WORKSPACE_TOKEN }}" https://slack.com/api/files.upload
+
+      - name: Rename aab
+        run: mv app/storybook/build/outputs/bundle/productionRelease/YDS-StoryBook-${{ steps.release_version.outputs.value }}\($BUILD_NUMBER\)-production-release.aab app/storybook/build/outputs/bundle/productionRelease/app-production-release.aab
+
+      - name: Submit a new Internal Build to Play Store
+        run: bundle exec fastlane internal_release

.github/workflows/release-drafter.yml

@@ -0,0 +1,18 @@
+# 해당 워크플로우의 이름.
+name: Release Drafter
+#조건. 마스터 브랜치에 푸쉬될때,
+on:
+  push:
+    branches:
+      - master
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        with:
+          # 해당 confing파일에 정의한 대로 릴리즈 노트가 작성됨.
+          config-name: config.yml
+        env:
+          # 자동생성되는 환경변수.
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

DesignSystem/src/main/java/com/yourssu/design/system/foundation/Iconography.kt

@@ -45,6 +45,8 @@ object Icon {
         ic_foodcalendar_line,
         ic_ground_filled,
         ic_ground_line,
+        ic_heart_filled,
+        ic_heart_line,
         ic_home_filled,
         ic_home_line,
         ic_list_line,
@@ -75,6 +77,8 @@ object Icon {
         ic_schoolcalendar_filled,
         ic_schoolcalendar_line,
         ic_search_line,
+        ic_setting_line,
+        ic_share_line,
         ic_sharecircle_filled,
         ic_sharecircle_line,
         ic_star_filled,
@@ -132,52 +136,56 @@ object Icon {
     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
+    const val ic_heart_filled = 38
+    const val ic_heart_line = 39
+    const val ic_home_filled = 40
+    const val ic_home_line = 41
+    const val ic_list_line = 42
+    const val ic_lock_filled = 43
+    const val ic_lock_line = 44
+    const val ic_new_filled = 45
+    const val ic_new_line = 46
+    const val ic_notice_filled = 47
+    const val ic_notice_line = 48
+    const val ic_pen_filled = 49
+    const val ic_pen_line = 50
+    const val ic_person_filled = 51
+    const val ic_person_line = 52
+    const val ic_personcircle_line = 53
+    const val ic_picture_filled = 54
+    const val ic_picture_line = 55
+    const val ic_pin_filled = 56
+    const val ic_pin_line = 57
+    const val ic_playcircle_filled = 58
+    const val ic_playcircle_line = 59
+    const val ic_plus_line = 60
+    const val ic_rank_filled = 61
+    const val ic_rank_line = 62
+    const val ic_recomment_line = 63
+    const val ic_refresh_line = 64
+    const val ic_savecircle_filled = 65
+    const val ic_savecircle_line = 66
+    const val ic_schoolcalendar_filled = 67
+    const val ic_schoolcalendar_line = 68
+    const val ic_search_line = 69
+    const val ic_setting_line = 70
+    const val ic_share_line = 71
+    const val ic_sharecircle_filled = 72
+    const val ic_sharecircle_line = 73
+    const val ic_star_filled = 74
+    const val ic_star_line = 75
+    const val ic_thumb_down_filled = 76
+    const val ic_thumb_down_line = 77
+    const val ic_thumb_up_filled = 78
+    const val ic_thumb_up_line = 79
+    const val ic_timecalendar_filled = 80
+    const val ic_timecalendar_line = 81
+    const val ic_trashcan_filled = 82
+    const val ic_trashcan_line = 83
+    const val ic_warningcircle_filled = 84
+    const val ic_warningcircle_line = 85
+    const val ic_x_line = 86
+    const val ic_xcircle_filled= 87
 
     @DrawableRes
     fun getIconDrawable(@Iconography icon: Int): Int {
@@ -220,6 +228,8 @@ object Icon {
             ic_foodcalendar_line -> R.drawable.ic_foodcalendar_line
             ic_ground_filled -> R.drawable.ic_ground_filled
             ic_ground_line -> R.drawable.ic_ground_line
+            ic_heart_filled -> R.drawable.ic_heart_filled
+            ic_heart_line -> R.drawable.ic_heart_line
             ic_home_filled -> R.drawable.ic_home_filled
             ic_home_line -> R.drawable.ic_home_line
             ic_list_line -> R.drawable.ic_list_line
@@ -250,6 +260,8 @@ object Icon {
             ic_schoolcalendar_filled -> R.drawable.ic_schoolcalendar_filled
             ic_schoolcalendar_line -> R.drawable.ic_schoolcalendar_line
             ic_search_line -> R.drawable.ic_search_line
+            ic_setting_line -> R.drawable.ic_setting_line
+            ic_share_line -> R.drawable.ic_share_line
             ic_sharecircle_filled -> R.drawable.ic_sharecircle_filled
             ic_sharecircle_line -> R.drawable.ic_sharecircle_line
             ic_star_filled -> R.drawable.ic_star_filled
@@ -310,6 +322,8 @@ object Icon {
             ic_foodcalendar_line -> "ic_foodcalendar_line"
             ic_ground_filled -> "ic_ground_filled"
             ic_ground_line -> "ic_ground_line"
+            ic_heart_filled -> "ic_heart_filled"
+            ic_heart_line -> "ic_heart_line"
             ic_home_filled -> "ic_home_filled"
             ic_home_line -> "ic_home_line"
             ic_list_line -> "ic_list_line"
@@ -340,6 +354,8 @@ object Icon {
             ic_schoolcalendar_filled -> "ic_schoolcalendar_filled"
             ic_schoolcalendar_line -> "ic_schoolcalendar_line"
             ic_search_line -> "ic_search_line"
+            ic_setting_line -> "ic_setting_line"
+            ic_share_line -> "ic_share_line"
             ic_sharecircle_filled -> "ic_sharecircle_filled"
             ic_sharecircle_line -> "ic_sharecircle_line"
             ic_star_filled -> "ic_star_filled"
@@ -400,6 +416,8 @@ object Icon {
             "ic_foodcalendar_line" -> ic_foodcalendar_line
             "ic_ground_filled" -> ic_ground_filled
             "ic_ground_line" -> ic_ground_line
+            "ic_heart_filled" -> ic_heart_filled
+            "ic_heart_line" -> ic_heart_line
             "ic_home_filled" -> ic_home_filled
             "ic_home_line" -> ic_home_line
             "ic_list_line" -> ic_list_line
@@ -430,6 +448,8 @@ object Icon {
             "ic_schoolcalendar_filled" -> ic_schoolcalendar_filled
             "ic_schoolcalendar_line" -> ic_schoolcalendar_line
             "ic_search_line" -> ic_search_line
+            "ic_setting_line" -> ic_setting_line
+            "ic_share_line" -> ic_share_line
             "ic_sharecircle_filled" -> ic_sharecircle_filled
             "ic_sharecircle_line" -> ic_sharecircle_line
             "ic_star_filled" -> ic_star_filled
@@ -490,6 +510,8 @@ object Icon {
             ic_foodcalendar_line,
             ic_ground_filled,
             ic_ground_line,
+            ic_heart_filled,
+            ic_heart_line,
             ic_home_filled,
             ic_home_line,
             ic_list_line,
@@ -520,6 +542,8 @@ object Icon {
             ic_schoolcalendar_filled,
             ic_schoolcalendar_line,
             ic_search_line,
+            ic_setting_line,
+            ic_share_line,
             ic_sharecircle_filled,
             ic_sharecircle_line,
             ic_star_filled,

DesignSystem/src/main/res/drawable/ic_heart_filled.xml

@@ -0,0 +1,20 @@
+<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,20.25C12,20.25 3.74,13.93 3.74,8.25C3.74,8.16 3.74,8.09 3.74,8C3.706,7.454 3.784,6.907 3.97,6.392C4.155,5.878 4.444,5.407 4.819,5.009C5.194,4.61 5.647,4.293 6.149,4.077C6.652,3.86 7.193,3.749 7.74,3.75C10.34,3.84 11.4,6.07 11.98,7.75C12.56,6.09 13.62,3.86 16.22,3.75C16.767,3.749 17.308,3.86 17.811,4.077C18.313,4.293 18.766,4.61 19.141,5.009C19.515,5.407 19.805,5.878 19.99,6.392C20.176,6.907 20.254,7.454 20.22,8C20.22,8.09 20.22,8.16 20.22,8.25C20.22,13.93 11.96,20.25 11.96,20.25"
+        android:fillColor="@color/buttonNormal"/>
+    <path
+        android:pathData="M12,20.25C12,20.25 3.74,13.93 3.74,8.25C3.74,8.16 3.74,8.09 3.74,8C3.706,7.454 3.784,6.907 3.97,6.392C4.155,5.878 4.444,5.407 4.819,5.009C5.194,4.61 5.647,4.293 6.149,4.077C6.652,3.86 7.193,3.749 7.74,3.75C10.34,3.84 11.4,6.07 11.98,7.75C12.56,6.09 13.62,3.86 16.22,3.75C16.767,3.749 17.308,3.86 17.811,4.077C18.313,4.293 18.766,4.61 19.141,5.009C19.515,5.407 19.805,5.878 19.99,6.392C20.176,6.907 20.254,7.454 20.22,8C20.22,8.09 20.22,8.16 20.22,8.25C20.22,13.93 11.96,20.25 11.96,20.25"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/buttonNormal"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>

DesignSystem/src/main/res/drawable/ic_heart_line.xml

@@ -0,0 +1,17 @@
+<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,20.25C12,20.25 3.74,13.93 3.74,8.25C3.74,8.16 3.74,8.09 3.74,8C3.706,7.454 3.784,6.907 3.97,6.392C4.155,5.878 4.444,5.407 4.819,5.009C5.194,4.61 5.647,4.293 6.149,4.077C6.652,3.86 7.193,3.749 7.74,3.75C10.34,3.84 11.4,6.07 11.98,7.75C12.56,6.09 13.62,3.86 16.22,3.75C16.767,3.749 17.308,3.86 17.811,4.077C18.313,4.293 18.766,4.61 19.141,5.009C19.515,5.407 19.805,5.878 19.99,6.392C20.176,6.907 20.254,7.454 20.22,8C20.22,8.09 20.22,8.16 20.22,8.25C20.22,13.93 11.96,20.25 11.96,20.25"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:strokeColor="@color/buttonNormal"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>

DesignSystem/src/main/res/drawable/ic_setting_line.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.25,3.75C9.25,2.783 10.033,2 11,2H13C13.967,2 14.75,2.783 14.75,3.75V5.29C15.358,5.539 15.924,5.868 16.435,6.264L17.77,5.493C18.607,5.01 19.677,5.297 20.16,6.134L21.16,7.866C21.643,8.703 21.357,9.773 20.52,10.257L19.185,11.027C19.228,11.346 19.25,11.67 19.25,12C19.25,12.33 19.228,12.654 19.185,12.973L20.52,13.743C21.357,14.227 21.643,15.297 21.16,16.134L20.16,17.866C19.677,18.703 18.607,18.99 17.77,18.507L16.435,17.736C15.924,18.132 15.358,18.461 14.75,18.71V20.25C14.75,21.216 13.967,22 13,22H11C10.033,22 9.25,21.216 9.25,20.25V18.71C8.642,18.461 8.077,18.132 7.565,17.736L6.23,18.507C5.393,18.99 4.323,18.703 3.84,17.866L2.84,16.134C2.357,15.297 2.643,14.227 3.48,13.743L4.815,12.973C4.772,12.654 4.75,12.33 4.75,12C4.75,11.67 4.772,11.346 4.815,11.027L3.48,10.257C2.643,9.773 2.357,8.703 2.84,7.866L3.84,6.134C4.323,5.297 5.393,5.01 6.23,5.493L7.565,6.264C8.077,5.868 8.642,5.539 9.25,5.29V3.75ZM11,3.5C10.862,3.5 10.75,3.612 10.75,3.75V6.359L10.231,6.527C9.45,6.779 8.742,7.194 8.147,7.732L7.742,8.098L5.48,6.792C5.361,6.723 5.208,6.764 5.139,6.884L4.139,8.616C4.07,8.736 4.111,8.889 4.23,8.958L6.49,10.262L6.376,10.795C6.294,11.183 6.25,11.586 6.25,12C6.25,12.414 6.294,12.817 6.376,13.205L6.49,13.738L4.23,15.042C4.111,15.111 4.07,15.264 4.139,15.384L5.139,17.116C5.208,17.236 5.361,17.277 5.48,17.208L7.742,15.902L8.147,16.268C8.742,16.806 9.45,17.221 10.231,17.473L10.75,17.641V20.25C10.75,20.388 10.862,20.5 11,20.5H13C13.138,20.5 13.25,20.388 13.25,20.25V17.641L13.769,17.473C14.55,17.221 15.258,16.806 15.853,16.268L16.258,15.902L18.52,17.208C18.639,17.277 18.792,17.236 18.861,17.116L19.861,15.384C19.93,15.264 19.889,15.111 19.77,15.042L17.51,13.738L17.624,13.205C17.706,12.817 17.75,12.414 17.75,12C17.75,11.586 17.706,11.183 17.624,10.795L17.51,10.262L19.77,8.958C19.889,8.889 19.93,8.736 19.861,8.616L18.861,6.884C18.792,6.764 18.639,6.723 18.52,6.792L16.258,8.098L15.853,7.732C15.258,7.194 14.55,6.779 13.769,6.527L13.25,6.359V3.75C13.25,3.612 13.138,3.5 13,3.5H11ZM12,11C11.448,11 11,11.448 11,12C11,12.552 11.448,13 12,13C12.552,13 13,12.552 13,12C13,11.448 12.552,11 12,11ZM9.5,12C9.5,10.619 10.619,9.5 12,9.5C13.381,9.5 14.5,10.619 14.5,12C14.5,13.381 13.381,14.5 12,14.5C10.619,14.5 9.5,13.381 9.5,12Z"
+      android:fillColor="@color/buttonNormal"
+      android:fillType="evenOdd"/>
+</vector>

DesignSystem/src/main/res/drawable/ic_share_line.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,5C20,6.657 18.657,8 17,8C15.343,8 14,6.657 14,5C14,3.343 15.343,2 17,2C18.657,2 20,3.343 20,5ZM10,12C10,13.657 8.657,15 7,15C5.343,15 4,13.657 4,12C4,10.343 5.343,9 7,9C8.657,9 10,10.343 10,12ZM17,22C18.657,22 20,20.657 20,19C20,17.343 18.657,16 17,16C15.343,16 14,17.343 14,19C14,20.657 15.343,22 17,22Z"
+      android:fillColor="@color/buttonNormal"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,5L7,12L17,19"
+      android:strokeWidth="1.5"
+      android:fillColor="#00000000"
+      android:strokeColor="@color/buttonNormal"/>
+</vector>

Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"

fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("fastlane/play-store-credentials.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("com.yourssu.storybook") # e.g. com.krausefx.app

fastlane/Fastfile

@@ -0,0 +1,23 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+  desc "Submit a new Internal Build to Play Store"
+  lane :internal_release do
+    upload_to_play_store(track: 'internal', aab: 'app/storybook/build/outputs/bundle/productionRelease/app-production-release.aab')
+  end
+end

fastlane/metadata/android/ko-KR/changelogs/17.txt

@@ -0,0 +1 @@
+일부 컴포넌트의 버그 수정

fastlane/metadata/android/ko-KR/full_description.txt

@@ -0,0 +1,3 @@
+YDS는 숭실대학교 동아리 유어슈에서 사용하는 디자인 시스템입니다. 뷰 컴포넌트 재사용성을 높여 코드 작성에 걸리는 시간을 단축함과 동시에 일관된 디자인 퀄리티를 보장하기 위해 고안됐습니다.
+YDS StoryBook 은 디자이너가 스스로 설계한 YDS 컴포넌트가 잘 구현 되었는지 확인하기 위해서, 실제 코드를 기반으로 만들어진 컴포넌트를 상황에 따라 제어할 수 있게 도와주는 역할을 합니다. 
+이를 통해 보다 다양한 환경에서 동일하게 품질 높은 디자인 시스템을 유지보수 할 수 있도록 도와줍니다.

fastlane/metadata/android/ko-KR/short_description.txt

@@ -0,0 +1 @@
+숭실대 동아리 유어슈에서 사용하는 디자인 시스템, YDS를 보다 쉽게 파악할 수 있도록 도와주는 StoryBook Application 입니다

fastlane/metadata/android/ko-KR/title.txt

@@ -0,0 +1 @@
+YDS StoryBook