Skip to content

Commit 0c089a8

Browse files
sohyun127sohyun127
authored
Merge pull request #182 from Team-Wable/feature/match-ui-fix
[Feature/#181] : 경기 일정 UI 수정
2 parents 24102ab + 0cc5a9f commit 0c089a8

16 files changed

+139
-7
lines changed

‎core/common/src/main/res/drawable/ic_news_team_profile_100t.png‎

6.93 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_al.xml‎

Lines changed: 34 additions & 0 deletions
Large diffs are not rendered by default.

‎core/common/src/main/res/drawable/ic_news_team_profile_blg.png‎

2.41 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_cfo.png‎

17.5 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_fly.png‎

4.33 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_fnc.png‎

3.07 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_g2.png‎

6.13 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_ig.png‎

6.45 KB
Loading

‎core/common/src/main/res/drawable/ic_news_team_profile_mkoi.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="44dp"
3+
android:height="44dp"
4+
android:viewportWidth="44"
5+
android:viewportHeight="44">
6+
<path
7+
android:pathData="M0,0h44v44h-44z"
8+
android:fillColor="#ffffff"/>
9+
<group>
10+
<clip-path
11+
android:pathData="M11,4h23v36h-23z"/>
12+
<path
13+
android:pathData="M29.827,32.118V35.989H15.172V32.118C15.172,32.118 15.783,33.013 16.537,33.077H28.463C29.217,33.013 29.828,32.118 29.828,32.118H29.827ZM22.499,22.02L29.827,24.75V29.463L22.499,32.194L15.172,29.463V24.75L22.499,22.02ZM27.912,26.95L22.499,24.933L17.088,26.949V27.265L22.499,29.281L27.912,27.265V26.95V26.95ZM29.827,17.556V13.685C29.827,13.685 29.217,14.58 28.462,14.643H23.914V13.685H21.083V14.643H16.537C15.783,14.58 15.172,13.685 15.172,13.685V17.556H21.083V17.871L15.172,20.073V22.986L22.499,20.256L29.827,22.986V20.074L23.914,17.871V17.556H29.827L29.827,17.556ZM26.403,9.576C26.424,9.853 26.549,10.13 26.873,10.174C26.9,10.177 26.927,10.179 26.953,10.179C27.261,10.179 27.505,9.931 27.607,9.635C27.65,9.508 27.688,9.314 27.708,9.177C27.809,8.484 27.836,8.018 27.79,7.308C27.736,6.478 27.567,5.721 27.273,5.066C26.991,4.439 26.538,4.038 25.958,4.002C25.93,4.001 25.902,4 25.873,4C25.251,4 24.559,4.408 24.189,5.17C23.833,5.903 23.547,6.656 23.374,7.04C23.198,7.43 22.94,7.67 22.543,7.71C22.511,7.713 22.481,7.715 22.45,7.715C22.004,7.715 21.62,7.389 21.333,6.938C21.066,6.517 20.537,5.716 20.254,5.447C19.993,5.197 19.694,4.887 19.08,4.887H19.052C18.552,4.895 17.63,5.131 17.208,6.786C17.025,7.506 16.954,8.258 17.111,9.152C17.256,9.977 17.513,10.689 17.686,11.081C17.745,11.217 17.838,11.358 17.91,11.445C18.038,11.601 18.222,11.653 18.376,11.653C18.466,11.653 18.547,11.635 18.6,11.61C18.757,11.536 18.937,11.357 18.871,10.948C18.84,10.751 18.749,10.462 18.698,10.302C18.541,9.81 18.332,9.215 18.314,8.792C18.29,8.226 18.522,8.152 18.676,8.119C18.699,8.114 18.721,8.112 18.743,8.112C18.974,8.112 19.171,8.367 19.36,8.681C19.607,9.09 20.029,9.816 20.374,10.37C20.674,10.854 21.222,11.371 22.091,11.371C22.121,11.371 22.15,11.37 22.181,11.369C23.121,11.332 23.814,10.987 24.171,9.901C24.438,9.089 24.62,8.482 24.913,7.861C25.21,7.232 25.594,6.86 25.94,6.86C25.986,6.86 26.033,6.867 26.078,6.881C26.429,6.989 26.517,7.319 26.521,7.805C26.525,8.234 26.474,8.707 26.433,9.054C26.418,9.18 26.392,9.434 26.403,9.575L26.403,9.576Z"
14+
android:fillColor="#4B9BEC"/>
15+
<path
16+
android:pathData="M28.822,7.521C28.837,7.868 28.833,8.174 28.809,8.5H32.982V39.021H12.018V8.5H16.015C15.998,8.173 16.008,7.849 16.043,7.521H11V40H34V7.521H28.822Z"
17+
android:fillColor="#4B9BEC"/>
18+
</group>
19+
</vector>

‎core/common/src/main/res/drawable/ic_news_team_profile_psg.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="44dp"
3+
android:height="44dp"
4+
android:viewportWidth="44"
5+
android:viewportHeight="44">
6+
<path
7+
android:pathData="M0,0h44v44h-44z"
8+
android:fillColor="#ffffff"/>
9+
<group>
10+
<clip-path
11+
android:pathData="M6,9h34v26h-34z"/>
12+
<path
13+
android:pathData="M39.796,9H40V9.104C38.492,10.759 36.871,12.285 35.138,13.681C34.968,13.705 34.798,13.705 34.628,13.681C29.776,13.184 24.925,12.667 20.076,12.132C20.281,11.87 20.519,11.656 20.79,11.489C27.127,10.67 33.462,9.84 39.796,9Z"
14+
android:strokeAlpha="0.99"
15+
android:fillColor="#EB1846"
16+
android:fillType="evenOdd"
17+
android:fillAlpha="0.99"/>
18+
<path
19+
android:pathData="M6,17.98V17.562C6.143,16.766 6.262,15.965 6.357,15.161C6.375,15.065 6.403,14.971 6.442,14.882C7.941,13.901 9.437,12.915 10.93,11.924C10.993,12.208 10.953,12.474 10.811,12.724C10.682,12.914 10.54,13.095 10.386,13.264C9.562,13.953 8.699,14.592 7.802,15.178C8.167,15.262 8.399,15.488 8.499,15.857C8.522,16.089 8.522,16.321 8.499,16.553C8.375,16.877 8.166,17.126 7.87,17.301C7.631,17.428 7.393,17.555 7.156,17.684C6.768,17.932 6.598,18.286 6.646,18.746C6.43,18.49 6.215,18.235 6,17.98ZM19.736,12.411C24.282,13.263 28.827,14.122 33.37,14.987C32.349,15.791 31.275,16.524 30.157,17.18C27.669,14.864 24.739,13.918 21.368,14.343C20.598,13.902 19.827,13.461 19.056,13.02C19.277,12.811 19.504,12.608 19.736,12.411Z"
20+
android:strokeAlpha="0.98"
21+
android:fillColor="#EB1846"
22+
android:fillType="evenOdd"
23+
android:fillAlpha="0.98"/>
24+
<path
25+
android:pathData="M18.58,13.351C18.615,13.345 18.65,13.351 18.682,13.368L20.212,14.604L20.195,14.638C19.784,14.759 19.381,14.904 18.988,15.073C18.939,15.101 18.893,15.095 18.852,15.056C18.544,14.648 18.249,14.23 17.968,13.803C18.184,13.67 18.389,13.519 18.58,13.351Z"
26+
android:strokeAlpha="0.96"
27+
android:fillColor="#EB1846"
28+
android:fillType="evenOdd"
29+
android:fillAlpha="0.96"/>
30+
<path
31+
android:pathData="M7.904,35H7.836C8,33.818 8.164,32.635 8.329,31.45C9.021,29.696 9.69,27.932 10.335,26.16C10.826,24.493 11.03,22.787 10.947,21.043C10.871,19.837 10.508,18.735 9.859,17.737C9.543,17.332 9.19,16.959 8.805,16.623C8.69,16.094 8.712,15.572 8.873,15.057C9.09,14.55 9.458,14.225 9.978,14.082C11.665,14.824 13.433,15.23 15.282,15.3C15.315,16.078 15.361,16.856 15.418,17.632C13.219,20.191 12.352,23.172 12.817,26.577C12.92,27.093 13.044,27.604 13.191,28.109C13.214,28.178 13.214,28.248 13.191,28.318C11.358,30.486 9.595,32.714 7.904,35Z"
32+
android:strokeAlpha="0.99"
33+
android:fillColor="#EB1846"
34+
android:fillType="evenOdd"
35+
android:fillAlpha="0.99"/>
36+
<path
37+
android:pathData="M17.458,14.151H17.56C17.762,14.582 17.977,15.006 18.206,15.422C17.944,15.625 17.658,15.794 17.356,15.927C17.22,15.46 17.061,15.001 16.88,14.552C17.061,14.402 17.254,14.268 17.458,14.151Z"
38+
android:strokeAlpha="0.96"
39+
android:fillColor="#EB1846"
40+
android:fillType="evenOdd"
41+
android:fillAlpha="0.96"/>
42+
<path
43+
android:pathData="M16.234,14.813H16.404C16.534,15.319 16.67,15.824 16.812,16.327C16.578,16.573 16.315,16.789 16.03,16.971C15.951,16.321 15.871,15.671 15.792,15.021C15.958,14.988 16.106,14.918 16.234,14.813Z"
44+
android:strokeAlpha="0.96"
45+
android:fillColor="#EB1845"
46+
android:fillType="evenOdd"
47+
android:fillAlpha="0.96"/>
48+
<path
49+
android:pathData="M22.997,14.743C17.587,14.743 13.183,19.248 13.183,24.79C13.183,30.332 17.587,34.837 22.997,34.837C28.407,34.837 32.812,30.328 32.812,24.79C32.812,19.252 28.411,14.743 22.997,14.743Z"
50+
android:fillColor="#004071"/>
51+
<path
52+
android:pathData="M22.989,26.458C21.819,26.458 20.869,27.382 20.869,28.52C20.869,28.922 20.987,29.295 21.191,29.613C21.749,29.834 22.357,29.954 22.989,29.954C23.621,29.954 24.23,29.834 24.787,29.613C24.991,29.295 25.109,28.922 25.109,28.52C25.113,27.382 24.163,26.458 22.989,26.458Z"
53+
android:fillColor="#004071"/>
54+
<path
55+
android:pathData="M24.841,24.927C25.458,25.972 26.251,26.872 27.181,27.64C26.781,28.263 26.251,28.793 25.631,29.187C25.654,29.05 25.666,28.914 25.666,28.773C25.666,27.358 24.469,26.213 22.993,26.213C21.517,26.213 20.319,27.358 20.319,28.773C20.319,28.914 20.331,29.054 20.354,29.187C19.734,28.793 19.204,28.262 18.804,27.64C19.73,26.872 20.523,25.972 21.139,24.927H24.841ZM24.728,24.726C23.943,23.32 23.479,21.656 23.444,19.711C23.295,19.698 23.142,19.69 22.989,19.69C22.836,19.69 22.682,19.698 22.529,19.714C22.494,21.656 22.031,23.319 21.246,24.726H24.728"
56+
android:fillColor="#EC1C24"/>
57+
<path
58+
android:pathData="M23.17,29.131L23.178,29.151C23.142,29.223 23.083,29.312 23.009,29.372L22.993,29.38L22.978,29.372C22.903,29.312 22.844,29.223 22.809,29.151L22.817,29.131C22.876,29.094 22.919,29.034 22.935,28.966L22.993,28.918L23.052,28.966C23.068,29.038 23.111,29.094 23.17,29.131ZM23.338,27.981C23.338,27.772 23.072,27.117 22.989,27.117L22.969,27.125C22.871,27.206 22.639,27.784 22.639,27.981C22.639,28.138 22.946,28.548 22.946,28.773L22.989,28.813L23.028,28.773C23.032,28.548 23.338,28.138 23.338,27.981M22.817,28.753C22.671,28.363 22.42,28.15 22.161,28.15C21.965,28.15 21.804,28.311 21.804,28.516C21.804,28.721 21.965,28.877 22.161,28.877C22.22,28.877 22.283,28.849 22.31,28.813C22.361,28.753 22.349,28.692 22.346,28.684L22.322,28.672H22.302C22.236,28.672 22.185,28.616 22.185,28.552C22.185,28.484 22.24,28.431 22.302,28.431C22.42,28.431 22.625,28.548 22.738,28.793L22.778,28.817L22.821,28.773L22.817,28.753ZM23.806,28.15C23.547,28.15 23.295,28.363 23.15,28.753L23.146,28.773L23.189,28.817L23.228,28.793C23.338,28.548 23.546,28.431 23.66,28.431C23.727,28.431 23.778,28.488 23.778,28.552C23.778,28.62 23.723,28.672 23.66,28.672H23.64L23.617,28.684C23.613,28.697 23.601,28.757 23.652,28.813C23.684,28.845 23.743,28.877 23.802,28.877C23.998,28.877 24.159,28.716 24.159,28.516C24.163,28.311 24.002,28.15 23.806,28.15Z"
59+
android:fillColor="#C4A361"/>
60+
<path
61+
android:pathData="M22.985,15.463C20.551,15.463 18.263,16.431 16.543,18.195C14.824,19.956 13.874,22.299 13.874,24.79C13.874,27.282 14.824,29.625 16.543,31.385C18.263,33.145 20.552,34.118 22.985,34.118C25.419,34.118 27.708,33.149 29.427,31.385C31.147,29.621 32.097,27.282 32.097,24.79C32.097,22.299 31.15,19.956 29.427,18.195C27.708,16.431 25.419,15.463 22.985,15.463ZM22.985,15.833C27.818,15.833 31.736,19.843 31.736,24.791C31.736,29.738 27.818,33.749 22.985,33.749C18.153,33.749 14.231,29.738 14.231,24.791C14.231,19.843 18.149,15.833 22.985,15.833ZM25.451,19.301C25.309,19.232 25.164,19.172 25.019,19.116L25.882,16.986C26.028,17.042 26.173,17.102 26.314,17.167L25.451,19.301ZM22.954,16.869V17.633H23.79C23.994,17.633 24.163,17.46 24.163,17.251C24.163,17.042 23.994,16.869 23.79,16.869H22.954ZM22.954,18.734C22.801,18.734 22.648,18.742 22.499,18.754V16.459H23.794C24.218,16.459 24.622,16.813 24.622,17.247C24.622,17.609 24.344,17.914 24.006,18.007L24.595,18.971C24.406,18.915 24.214,18.87 24.022,18.834L23.527,18.038H22.958V18.734M17.525,19.128L18.074,19.642L18.686,18.951C18.824,18.795 18.812,18.553 18.663,18.413C18.51,18.272 18.274,18.284 18.137,18.437L17.525,19.128ZM18.879,20.394C18.769,20.502 18.659,20.611 18.557,20.727L16.92,19.2L17.858,18.143C18.145,17.821 18.655,17.781 18.97,18.075C19.284,18.368 19.284,18.886 18.997,19.208L18.365,19.923L18.879,20.393M27.421,18.457C27.759,18.376 28.379,19.007 28.497,19.434C28.595,19.357 28.815,19.192 28.815,19.192C28.552,18.429 27.508,17.665 27.013,18.143C26.719,18.429 26.888,18.867 27.142,19.14L27.39,19.409C27.645,19.682 27.865,19.956 27.661,20.129C27.445,20.313 26.836,19.851 26.467,19.06L26.142,19.313C26.22,19.522 26.397,19.823 26.632,20.08C26.903,20.369 27.194,20.559 27.457,20.611C27.661,20.651 27.869,20.619 28.002,20.49C28.34,20.169 28.218,19.703 27.684,19.128L27.465,18.891C27.229,18.629 27.327,18.481 27.421,18.457ZM20.359,18.336C20.579,18.243 20.803,18.163 21.03,18.095L20.395,17.351L20.359,18.336ZM20.497,16.841L22.224,18.782C22.047,18.806 21.871,18.834 21.698,18.875L21.305,18.413C20.975,18.501 20.653,18.618 20.343,18.754L20.32,19.365C20.159,19.445 20.006,19.534 19.853,19.63L20.021,17.014C20.178,16.954 20.335,16.893 20.496,16.841M23.7,19.743C26.134,20.096 28.006,22.234 28.006,24.823C28.006,25.651 27.814,26.434 27.472,27.129C25.262,25.43 23.92,23.042 23.7,19.743M25.631,29.187C25.655,29.05 25.667,28.914 25.667,28.769C25.667,27.354 24.469,26.209 22.993,26.209C21.517,26.209 20.32,27.354 20.32,28.769C20.32,28.91 20.332,29.05 20.355,29.187C19.735,28.793 19.205,28.262 18.804,27.636C19.731,26.868 20.524,25.968 21.14,24.923H24.85C25.466,25.968 26.259,26.868 27.19,27.636C26.784,28.26 26.252,28.789 25.631,29.187ZM24.791,29.613C24.233,29.834 23.625,29.954 22.993,29.954C22.361,29.954 21.753,29.834 21.195,29.613C20.991,29.295 20.873,28.922 20.873,28.52C20.873,27.382 21.823,26.458 22.993,26.458C24.163,26.458 25.113,27.382 25.113,28.52C25.113,28.922 24.995,29.295 24.791,29.613ZM17.976,24.823C17.976,22.234 19.849,20.092 22.283,19.743C22.063,23.042 20.72,25.433 18.51,27.129C18.172,26.434 17.976,25.65 17.976,24.822M22.989,19.69C23.142,19.69 23.296,19.698 23.445,19.714C23.48,21.659 23.943,23.319 24.729,24.726H21.25C22.035,23.319 22.499,21.656 22.534,19.714C22.683,19.698 22.836,19.69 22.989,19.69ZM22.989,19.321C20.026,19.321 17.615,21.788 17.615,24.823C17.615,27.857 20.025,30.324 22.989,30.324C25.954,30.324 28.364,27.857 28.364,24.823C28.364,21.788 25.954,19.321 22.989,19.321ZM18.62,30.099L18.33,30.24L18.53,30.417L18.62,30.099M18.514,30.939L18.404,30.855L18.495,30.549L18.208,30.3L17.926,30.441L17.831,30.348L18.671,29.942L18.773,30.031L18.514,30.939M18.773,31.128L19.244,30.397L19.346,30.465L18.875,31.196L18.773,31.128ZM19.711,30.702L19.856,31.518L20.155,30.939L20.261,30.995L19.872,31.759L19.766,31.715L19.621,30.891L19.315,31.474L19.209,31.413L19.601,30.646L19.711,30.702M21.164,31.341L21.125,31.458L20.846,31.357L20.607,32.06L20.493,32.02L20.732,31.317L20.453,31.221L20.493,31.104L21.164,31.341M23.013,31.984L23.398,31.992L23.394,32.221C23.39,32.377 23.225,32.474 23.013,32.47C22.789,32.466 22.558,32.306 22.561,32.012C22.565,31.767 22.762,31.57 23.028,31.574C23.229,31.578 23.335,31.686 23.382,31.735L23.295,31.823C23.256,31.783 23.189,31.703 23.04,31.698C22.816,31.694 22.687,31.843 22.683,32.02C22.679,32.189 22.808,32.342 23.02,32.346C23.166,32.35 23.272,32.281 23.272,32.209V32.112L23.008,32.108L23.013,31.983M24.324,31.461L24.34,31.586L23.778,31.67L23.809,31.895L24.092,31.855L24.108,31.98L23.825,32.02L23.861,32.281L24.442,32.197L24.457,32.322L23.754,32.426L23.637,31.574L24.324,31.462M24.764,31.474L24.835,31.719L25.192,31.606C25.278,31.578 25.314,31.518 25.29,31.437C25.263,31.345 25.188,31.345 25.122,31.365L24.764,31.474M25.086,31.245C25.215,31.205 25.357,31.232 25.407,31.401C25.458,31.582 25.36,31.671 25.294,31.698L25.557,31.988L25.431,32.036L25.172,31.743L24.87,31.835L24.972,32.181L24.854,32.213L24.611,31.389L25.086,31.244M26.935,30.441L26.998,30.763L27.214,30.606L26.935,30.441M27.692,30.75L27.586,30.835L27.327,30.674L27.021,30.895L27.08,31.208L26.97,31.277L26.793,30.352L26.903,30.272L27.692,30.75M27.429,29.846L28.002,30.477L27.912,30.558L27.343,29.931L27.429,29.846M27.763,29.508L28.572,29.565L28.097,29.127L28.179,29.034L28.803,29.609L28.733,29.701L27.916,29.645L28.395,30.087L28.309,30.175L27.681,29.597L27.763,29.508M26.338,30.662L26.735,31.421L26.628,31.482L26.342,30.947L26.322,31.55L25.835,31.212L26.091,31.763L25.981,31.811L25.616,31.036L25.725,30.979L26.22,31.321L26.236,30.71L26.338,30.662M18.196,29.553V29.557L18.11,29.609L18.106,29.613V29.609C18.051,29.42 17.847,29.175 17.705,29.175H17.69L17.623,29.227C17.607,29.259 17.607,29.316 17.67,29.404L17.749,29.513C17.866,29.673 17.921,29.81 17.906,29.91L17.819,30.047L17.705,30.079L17.611,30.063C17.513,30.031 17.403,29.943 17.313,29.814C17.222,29.69 17.171,29.565 17.152,29.484H17.156L17.247,29.4V29.404C17.348,29.722 17.553,29.943 17.674,29.943L17.73,29.927L17.781,29.851C17.796,29.774 17.73,29.674 17.659,29.577L17.569,29.453C17.506,29.368 17.474,29.272 17.486,29.196L17.557,29.075L17.674,29.035C17.867,29.035 18.13,29.292 18.197,29.553M21.592,31.952L21.619,31.827L21.918,31.895L21.89,32.02L21.592,31.952Z"
62+
android:fillColor="#ffffff"/>
63+
</group>
64+
</vector>

0 commit comments

Comments
 (0)