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

Feature/#153 QA 대응 #156

Open
wants to merge 32 commits into
base: develop
Choose a base branch
from
Open

Feature/#153 QA 대응 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
450075b
[feat] #153 설정페이지 스크롤 기능, 여백 추가
Jan 11, 2025
6a9aeb9
[feat] #153 닉네임 초성 허용
Jan 11, 2025
db21903
[feat] #153 logo img to ic
Jan 11, 2025
617940d
[feat] #153 설정 간격 수정
Jan 11, 2025
7fdf651
[add] #153 ic_location
Jan 11, 2025
e6d34c7
[mod] #153 login logo img to icon
Jan 11, 2025
468a058
[mod] #153 장소 등록 텍스트 수정
Jan 11, 2025
73d0894
[mod] #153 login icon tint
Jan 11, 2025
94c45ca
[feat] #153 장소 검색 키보드 이슈 해결결
Jan 11, 2025
d271ba4
[mod] #153 신고사유 작성 문구 수정
Jan 12, 2025
aba92b7
[feat] #151 프로필 수정 중간단계 추가
cacaocoffee Jan 13, 2025
200ea80
[feat] #151 프로필 갤러리에서 선택 및 완료 로직 추가
cacaocoffee Jan 13, 2025
530f6b4
[feat] #153 홈화면 위치버튼 추가 , API 연결완료
android-MyeongSeog Jan 18, 2025
1780973
Merge remote-tracking branch 'origin/feature/#153-QA' into feature/#1…
android-MyeongSeog Jan 18, 2025
6a01d51
[feat] #153 이미지 업로드 다른 영상 고르기 창 추가
android-MyeongSeog Jan 19, 2025
b14a3ad
[feat] #153 바텀시트 드래그 핸들러 색상 변경
android-MyeongSeog Jan 19, 2025
b920cc4
[refactor]: qa
lsakee Jan 23, 2025
eb39895
[feat] #153 프로필 수정 버튼 권한
Jan 26, 2025
e2114c7
[feat] #153 프로필 수정 새로고침
Jan 26, 2025
1f4f545
[feat] #153 홈화면 위치 권한 로직 변경
Jan 26, 2025
288d85c
Merge remote-tracking branch 'refs/remotes/origin/refactor/qa' into f…
Jan 26, 2025
22ddd20
[chore] #153 ktlintformat
Jan 26, 2025
0003b51
[refactor] #157 unable to unfollow
seohee0925 Feb 13, 2025
582d106
[add] #157 add asset
seohee0925 Feb 13, 2025
5d57edd
[modify] #157 change asset
seohee0925 Feb 13, 2025
11a16f9
[refactor] #159 modify app icon
nagaeng Feb 14, 2025
9389339
[refactor] #159 delete previous ic
nagaeng Feb 14, 2025
3c09637
[refactor] #159 modify login screen padding
nagaeng Feb 14, 2025
9a0b3c1
[feat] #153 push location btn resetList
cacaocoffee Feb 17, 2025
2888e72
[feat] #153 신규 장소 등록 후 장소 선택화면으로 돌아옴
cacaocoffee Feb 17, 2025
62ac40d
Merge pull request #160 from Team-Recordy/Refactor/#159-qa-000-003
cacaocoffee Feb 17, 2025
b667189
Merge pull request #158 from Team-Recordy/refactor/#157-qa-following
cacaocoffee Feb 17, 2025
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
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_viskit_icon"
android:icon="@mipmap/ic_viskit"
android:label="@string/app_name"
android:largeHeap="true"
android:roundIcon="@mipmap/ic_viskit_icon_round"
android:roundIcon="@mipmap/ic_viskit_round"
android:supportsRtl="true"
android:theme="@style/Theme.Recordy"
android:usesCleartextTraffic="true"
Expand Down
Binary file added core/designsystem/src/main/ic_viskit-playstore.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed core/designsystem/src/main/ic_viskit_icon-playstore.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/designsystem/src/main/ic_yoo0-playstore.png
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...signsystem/src/main/java/com/record/designsystem/component/container/UserDataContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fun UserDataContainer(
)
Spacer(modifier = Modifier.weight(1f))

if (user.nickname != "건우") {
if (user.nickname != "비스킷") {
FollowButton(
isFollowing = user.isFollowing,
onClick = { onClick(user) },
Expand Down
13 changes: 13 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_location.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<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="M0,0h24v24h-24z"/>
<path
android:pathData="M12,19.463C13.94,17.812 15.458,16.17 16.554,14.536C17.65,12.903 18.198,11.449 18.198,10.173C18.198,8.417 17.602,6.918 16.41,5.677C15.219,4.436 13.749,3.816 12,3.816C10.251,3.816 8.781,4.436 7.589,5.677C6.398,6.918 5.802,8.417 5.802,10.173C5.802,11.449 6.35,12.899 7.446,14.524C8.542,16.149 10.06,17.795 12,19.463ZM12,21.615C11.738,21.615 11.481,21.573 11.228,21.49C10.975,21.406 10.736,21.268 10.512,21.077C9.497,20.167 8.57,19.253 7.73,18.334C6.889,17.417 6.168,16.503 5.565,15.594C4.963,14.685 4.493,13.776 4.157,12.866C3.82,11.955 3.652,11.058 3.652,10.173C3.652,7.882 4.453,5.893 6.054,4.206C7.655,2.519 9.637,1.675 12,1.675C14.363,1.675 16.345,2.519 17.946,4.206C19.547,5.893 20.348,7.882 20.348,10.173C20.348,11.058 20.18,11.953 19.843,12.861C19.507,13.768 19.039,14.677 18.44,15.59C17.84,16.502 17.12,17.415 16.28,18.33C15.439,19.245 14.512,20.157 13.498,21.067C13.276,21.258 13.037,21.397 12.781,21.485C12.525,21.572 12.264,21.615 12,21.615ZM12.002,12.115C12.566,12.115 13.05,11.913 13.453,11.509C13.856,11.104 14.058,10.62 14.058,10.056C14.058,9.492 13.856,9.008 13.451,8.605C13.047,8.202 12.563,8 11.998,8C11.434,8 10.95,8.202 10.547,8.606C10.144,9.011 9.942,9.495 9.942,10.059C9.942,10.624 10.144,11.107 10.549,11.51C10.953,11.914 11.437,12.115 12.002,12.115Z"
android:fillColor="#ffffff"/>
</group>
</vector>
13 changes: 13 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_location_denied.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<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="M0,0h24v24h-24z"/>
<path
android:pathData="M12.7,9.429L13.523,10.277C13.62,10.374 13.734,10.396 13.863,10.343C13.993,10.289 14.058,10.194 14.058,10.058C14.058,9.772 13.998,9.507 13.88,9.264C13.761,9.02 13.612,8.809 13.431,8.63C13.233,8.437 13.014,8.284 12.772,8.17C12.531,8.057 12.273,8 12,8C11.868,8 11.779,8.07 11.734,8.21C11.688,8.349 11.727,8.48 11.851,8.6L12.7,9.429ZM12,1.675C14.363,1.675 16.345,2.519 17.946,4.206C19.547,5.893 20.348,7.881 20.348,10.17C20.348,10.761 20.27,11.369 20.114,11.993C19.957,12.617 19.714,13.257 19.385,13.913C19.267,14.184 19.065,14.357 18.779,14.432C18.493,14.507 18.221,14.469 17.962,14.318C17.704,14.167 17.538,13.946 17.465,13.655C17.392,13.363 17.415,13.083 17.533,12.814C17.742,12.33 17.906,11.871 18.022,11.438C18.139,11.003 18.198,10.582 18.198,10.173C18.198,8.417 17.602,6.918 16.41,5.677C15.219,4.436 13.749,3.816 12,3.816C11.486,3.816 11.003,3.876 10.551,3.996C10.099,4.117 9.668,4.291 9.259,4.519C8.99,4.654 8.709,4.693 8.416,4.635C8.123,4.578 7.883,4.43 7.694,4.189C7.506,3.949 7.438,3.689 7.492,3.41C7.546,3.13 7.702,2.915 7.962,2.763C8.576,2.411 9.221,2.141 9.896,1.955C10.572,1.768 11.273,1.675 12,1.675ZM14.454,17.077L6.044,8.667C5.953,8.907 5.89,9.15 5.855,9.396C5.82,9.642 5.802,9.901 5.802,10.173C5.802,11.449 6.35,12.899 7.446,14.524C8.542,16.149 10.06,17.795 12,19.463C12.462,19.072 12.894,18.677 13.297,18.277C13.7,17.877 14.086,17.477 14.454,17.077ZM11.994,21.615C11.736,21.615 11.481,21.573 11.228,21.49C10.975,21.406 10.736,21.268 10.512,21.077C9.498,20.167 8.57,19.253 7.73,18.334C6.889,17.417 6.168,16.503 5.565,15.594C4.963,14.685 4.493,13.776 4.157,12.866C3.82,11.955 3.652,11.059 3.652,10.177C3.652,9.609 3.705,9.052 3.81,8.507C3.915,7.961 4.079,7.434 4.302,6.925L1.448,4.071C1.233,3.862 1.125,3.613 1.125,3.326C1.125,3.038 1.232,2.783 1.445,2.562C1.658,2.34 1.911,2.229 2.204,2.229C2.498,2.229 2.755,2.34 2.977,2.562L20.685,20.269C20.9,20.482 21.007,20.73 21.005,21.014C21.003,21.298 20.893,21.551 20.674,21.773C20.456,21.995 20.203,22.106 19.915,22.106C19.627,22.106 19.372,21.995 19.15,21.773L15.973,18.596C15.673,18.926 15.34,19.275 14.974,19.643C14.608,20.012 14.116,20.486 13.498,21.067C13.276,21.258 13.035,21.397 12.774,21.485C12.514,21.572 12.254,21.615 11.994,21.615Z"
android:fillColor="#ffffff"/>
</group>
</vector>
74 changes: 74 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_viskit_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<vector
android:height="108dp"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z"/>
<path android:fillColor="#00000000" android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
<path android:fillColor="#00000000" android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
</vector>
39 changes: 39 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_viskit_caution_74.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="74dp"
android:height="74dp"
android:viewportWidth="74"
android:viewportHeight="74">
<path
android:strokeWidth="1"
android:pathData="M52.568,16.638C54.19,16.638 55.755,16.344 57.221,15.802C58.92,20.749 63.111,24.313 68.086,24.313C68.834,24.313 69.562,24.229 70.267,24.075C74.157,28.796 74.675,36.32 71.066,41.759L70.087,43.234L69.966,43.416L70.018,43.629L70.361,45.024L70.846,44.905L70.361,45.024C72.273,52.804 68.23,60.781 61.592,62.713L58.727,63.547L58.512,63.609L58.415,63.811C54.46,72.087 45.883,75.618 38.379,72.207L37.207,71.674L37,71.579L36.793,71.674L35.621,72.207C35.621,72.207 35.62,72.207 35.62,72.207C28.116,75.615 19.542,72.087 15.584,63.811L15.488,63.609L15.273,63.547L12.407,62.713C5.767,60.781 1.726,52.804 3.639,45.024L3.153,44.905L3.639,45.024L3.982,43.629L4.034,43.416L3.913,43.234L2.934,41.759L2.517,42.035L2.934,41.759C-1.275,35.418 0.136,26.267 5.915,22.001C5.915,22.001 5.915,22.001 5.915,22.001L7.836,20.584L8.014,20.453L8.036,20.232C8.955,11.235 15.751,4.762 23.398,5.313C23.398,5.313 23.398,5.313 23.398,5.313L25.329,5.454L25.555,5.47L25.716,5.311C29.079,2.001 33.237,0.405 37.36,0.504C38.004,9.475 44.508,16.638 52.568,16.638Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="37"
android:startY="-0"
android:endX="9.431"
android:endY="100.118"
android:type="linear">
<item android:offset="0" android:color="#FFF1E150"/>
<item android:offset="0.941" android:color="#FFFFD428"/>
</gradient>
</aapt:attr>
<aapt:attr name="android:strokeColor">
<gradient
android:startX="37"
android:startY="0"
android:endX="17.774"
android:endY="89.961"
android:type="linear">
<item android:offset="0" android:color="#FFFFF6AD"/>
<item android:offset="0.958" android:color="#FFE3B644"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M37,48C36.15,48 35.438,47.734 34.862,47.201C34.287,46.669 34,46.009 34,45.222V25.778C34,24.991 34.287,24.331 34.862,23.799C35.438,23.266 36.15,23 37,23C37.85,23 38.563,23.266 39.138,23.799C39.713,24.331 40,24.991 40,25.778V45.222C40,46.009 39.713,46.669 39.138,47.201C38.563,47.734 37.85,48 37,48Z"
android:fillColor="#FF690B"/>
<path
android:pathData="M37,55m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
android:fillColor="#FF690B"/>
</vector>
47 changes: 47 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_viskit_check_120.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="120dp"
android:height="120dp"
android:viewportWidth="120"
android:viewportHeight="120">
<group>
<clip-path
android:pathData="M93.3,24.55C90.79,25.6 88.07,26.17 85.24,26.17C72.49,26.17 62.07,14.61 61.35,0.04C54.19,-0.35 46.94,2.32 41.13,8.03L38,7.81C25.06,6.88 13.75,17.81 12.23,32.73L9.11,35.02C-0.64,42.22 -2.96,57.55 4.08,68.17L5.67,70.56L5.11,72.82C1.93,85.76 8.62,99.2 19.89,102.48L24.54,103.83C31.12,117.58 45.47,123.57 58.1,117.83L60,116.96L61.9,117.83C74.53,123.57 88.89,117.58 95.46,103.83L100.11,102.48C111.37,99.2 118.07,85.76 114.89,72.82L114.33,70.56L115.92,68.17C122.07,58.9 121.08,46.04 114.25,38.14C113.01,38.45 111.73,38.62 110.41,38.62C102.5,38.62 95.78,32.74 93.3,24.56L93.3,24.55Z"/>
<path
android:pathData="M93.3,24.55C90.79,25.6 88.07,26.17 85.24,26.17C72.49,26.17 62.07,14.61 61.35,0.04C54.19,-0.35 46.94,2.32 41.13,8.03L38,7.81C25.06,6.88 13.75,17.81 12.23,32.73L9.11,35.02C-0.64,42.22 -2.96,57.55 4.08,68.17L5.67,70.56L5.11,72.82C1.93,85.76 8.62,99.2 19.89,102.48L24.54,103.83C31.12,117.58 45.47,123.57 58.1,117.83L60,116.96L61.9,117.83C74.53,123.57 88.89,117.58 95.46,103.83L100.11,102.48C111.37,99.2 118.07,85.76 114.89,72.82L114.33,70.56L115.92,68.17C122.07,58.9 121.08,46.04 114.25,38.14C113.01,38.45 111.73,38.62 110.41,38.62C102.5,38.62 95.78,32.74 93.3,24.56L93.3,24.55Z"
android:strokeWidth="2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="60"
android:startY="-0"
android:endX="15.29"
android:endY="162.35"
android:type="linear">
<item android:offset="0" android:color="#FFF1E150"/>
<item android:offset="0.94" android:color="#FFFFD428"/>
</gradient>
</aapt:attr>
<aapt:attr name="android:strokeColor">
<gradient
android:startX="60"
android:startY="0"
android:endX="28.82"
android:endY="145.88"
android:type="linear">
<item android:offset="0.07" android:color="#FFFFFAD5"/>
<item android:offset="0.96" android:color="#FFE3B644"/>
</gradient>
</aapt:attr>
</path>
</group>
<path
android:strokeWidth="1"
android:pathData="M57.37,85.51C56.49,86.36 55.5,86.81 54.4,86.86C53.3,86.91 52.37,86.54 51.63,85.77L33.22,66.63C32.48,65.85 32.15,64.92 32.24,63.82C32.34,62.72 32.82,61.75 33.71,60.9C34.59,60.05 35.58,59.6 36.68,59.55C37.78,59.51 38.7,59.87 39.45,60.64L57.85,79.79C58.6,80.56 58.92,81.5 58.83,82.6C58.74,83.69 58.25,84.67 57.37,85.51Z"
android:fillColor="#FF690B"
android:strokeColor="#FF690B"/>
<path
android:strokeWidth="1"
android:pathData="M51.43,85.53C50.55,84.67 50.19,83.57 50.36,82.21C50.52,80.86 51.16,79.61 52.28,78.46L79.94,50.06C81.06,48.91 82.29,48.23 83.64,48.03C84.99,47.83 86.1,48.16 86.98,49.01C87.85,49.86 88.21,50.97 88.05,52.32C87.88,53.68 87.24,54.93 86.12,56.08L58.47,84.48C57.35,85.63 56.11,86.3 54.76,86.5C53.41,86.71 52.3,86.38 51.43,85.53Z"
android:fillColor="#FF690B"
android:strokeColor="#FF690B"/>
</vector>
47 changes: 47 additions & 0 deletions core/designsystem/src/main/res/drawable/ic_viskit_check_40.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="40dp"
android:height="40dp"
android:viewportWidth="40"
android:viewportHeight="40">
<group>
<clip-path
android:pathData="M31.101,8.185C30.262,8.533 29.357,8.723 28.415,8.723C24.163,8.723 20.689,4.869 20.45,0.012C18.063,-0.116 15.646,0.773 13.711,2.678L12.667,2.602C8.354,2.292 4.583,5.936 4.075,10.909L3.037,11.675C-0.212,14.073 -0.987,19.184 1.361,22.722L1.89,23.519L1.704,24.273C0.644,28.588 2.874,33.066 6.631,34.159L8.18,34.609C10.373,39.194 15.155,41.189 19.366,39.277L20,38.988L20.634,39.277C24.845,41.191 29.628,39.194 31.82,34.609L33.368,34.159C37.124,33.066 39.356,28.588 38.295,24.273L38.11,23.519L38.639,22.722C40.689,19.633 40.359,15.348 38.082,12.713C37.67,12.815 37.243,12.872 36.803,12.872C34.166,12.872 31.926,10.915 31.1,8.186L31.101,8.185Z"/>
<path
android:pathData="M31.101,8.185C30.262,8.533 29.357,8.723 28.415,8.723C24.163,8.723 20.689,4.869 20.45,0.012C18.063,-0.116 15.646,0.773 13.711,2.678L12.667,2.602C8.354,2.292 4.583,5.936 4.075,10.909L3.037,11.675C-0.212,14.073 -0.987,19.184 1.361,22.722L1.89,23.519L1.704,24.273C0.644,28.588 2.874,33.066 6.631,34.159L8.18,34.609C10.373,39.194 15.155,41.189 19.366,39.277L20,38.988L20.634,39.277C24.845,41.191 29.628,39.194 31.82,34.609L33.368,34.159C37.124,33.066 39.356,28.588 38.295,24.273L38.11,23.519L38.639,22.722C40.689,19.633 40.359,15.348 38.082,12.713C37.67,12.815 37.243,12.872 36.803,12.872C34.166,12.872 31.926,10.915 31.1,8.186L31.101,8.185Z"
android:strokeWidth="2">
<aapt:attr name="android:fillColor">
<gradient
android:startX="20"
android:startY="-0"
android:endX="5.098"
android:endY="54.118"
android:type="linear">
<item android:offset="0" android:color="#FFF1E150"/>
<item android:offset="0.941" android:color="#FFFFD428"/>
</gradient>
</aapt:attr>
<aapt:attr name="android:strokeColor">
<gradient
android:startX="20"
android:startY="0"
android:endX="9.608"
android:endY="48.627"
android:type="linear">
<item android:offset="0.069" android:color="#FFFFFAD5"/>
<item android:offset="0.958" android:color="#FFE3B644"/>
</gradient>
</aapt:attr>
</path>
</group>
<path
android:strokeWidth="1"
android:pathData="M19.123,28.504C18.83,28.787 18.499,28.936 18.132,28.953C17.766,28.969 17.458,28.848 17.21,28.59L11.074,22.209C10.826,21.951 10.717,21.638 10.748,21.273C10.779,20.907 10.941,20.583 11.235,20.3C11.529,20.017 11.859,19.868 12.226,19.852C12.593,19.835 12.9,19.956 13.149,20.215L19.284,26.596C19.532,26.854 19.641,27.166 19.61,27.532C19.58,27.897 19.417,28.222 19.123,28.504Z"
android:fillColor="#FF690B"
android:strokeColor="#FF690B"/>
<path
android:strokeWidth="1"
android:pathData="M17.142,28.509C16.85,28.224 16.731,27.856 16.786,27.405C16.841,26.953 17.055,26.536 17.428,26.153L26.645,16.686C27.018,16.303 27.43,16.077 27.88,16.011C28.33,15.944 28.701,16.053 28.993,16.337C29.285,16.621 29.404,16.989 29.349,17.441C29.294,17.892 29.08,18.31 28.707,18.693L19.49,28.16C19.116,28.543 18.705,28.768 18.255,28.835C17.805,28.902 17.434,28.793 17.142,28.509Z"
android:fillColor="#FF690B"
android:strokeColor="#FF690B"/>
</vector>
Binary file added core/designsystem/src/main/res/drawable/img_selection.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/designsystem/src/main/res/drawable/img_selection_check.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed core/designsystem/src/main/res/drawable/img_viskit_logo.png
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...n/res/mipmap-anydpi-v26/ic_yoo0_round.xml → .../main/res/mipmap-anydpi-v26/ic_viskit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_yoo0_background"/>
<foreground android:drawable="@drawable/ic_yoo0_foreground"/>
<background android:drawable="@drawable/ic_viskit_background"/>
<foreground android:drawable="@mipmap/ic_viskit_foreground"/>
</adaptive-icon>
6 changes: 3 additions & 3 deletions core/designsystem/src/main/res/mipmap-anydpi-v26/ic_viskit_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_viskit_icon_background"/>
<foreground android:drawable="@mipmap/ic_viskit_icon_foreground"/>
</adaptive-icon>
<background android:drawable="@drawable/ic_viskit_background"/>
<foreground android:drawable="@mipmap/ic_viskit_foreground"/>
</adaptive-icon>
Loading