Skip to content

[Ui/#100] 마이페이지, 설정 화면 리디자인 변경 사항 반영 #101

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

Merged
merged 6 commits into from
Aug 13, 2025
Merged

[Ui/#100] 마이페이지, 설정 화면 리디자인 변경 사항 반영 #101

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9bdb65
Refactor: 마이페이지 화면 리디자인 반영
wjdrjs00 Aug 12, 2025
ec3c8ba
Refactor: 설정 화면 리디자인 반영
wjdrjs00 Aug 12, 2025
0083464
Refactor: 로그아웃, 회원탈퇴 다이얼로그 기능 분리
wjdrjs00 Aug 13, 2025
b61c73b
Refactor: 로그아웃 중복 클릭 방지 로직 구현
wjdrjs00 Aug 13, 2025
7c7cbc5
Refactor: 로딩 호출 위치 수정
wjdrjs00 Aug 13, 2025
932081f
Chore: 네이밍 수정
wjdrjs00 Aug 13, 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
50 changes: 29 additions & 21 deletions app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -30,27 +31,34 @@ fun HomeBottomNavigationBar(
) {
val navBackStackEntry by navController.currentBackStackEntryAsState()

Row(
modifier = Modifier
.fillMaxWidth()
.background(color = BitnagilTheme.colors.white)
.height(62.dp)
.padding(horizontal = 16.dp, vertical = 7.dp),
horizontalArrangement = Arrangement.spacedBy(10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
HomeRoute.entries.map { homeRoute ->
HomeBottomNavigationItem(
modifier = Modifier.weight(1f),
icon = homeRoute.icon,
title = homeRoute.title,
onClick = {
navController.navigate(homeRoute.route) {
popUpTo(0) { inclusive = true }
}
},
selected = navBackStackEntry?.destination?.route == homeRoute.route,
)
Column {
HorizontalDivider(
modifier = Modifier.fillMaxWidth(),
thickness = 1.dp,
color = BitnagilTheme.colors.coolGray98,
)
Row(
modifier = Modifier
.fillMaxWidth()
.background(color = BitnagilTheme.colors.white)
.height(62.dp)
.padding(horizontal = 16.dp, vertical = 7.dp),
horizontalArrangement = Arrangement.spacedBy(10.dp),
verticalAlignment = Alignment.CenterVertically,
) {
HomeRoute.entries.map { homeRoute ->
HomeBottomNavigationItem(
modifier = Modifier.weight(1f),
icon = homeRoute.icon,
title = homeRoute.title,
onClick = {
navController.navigate(homeRoute.route) {
popUpTo(0) { inclusive = true }
}
},
selected = navBackStackEntry?.destination?.route == homeRoute.route,
)
}
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions .../src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilOptionButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ fun BitnagilOptionButton(
) {
Text(
text = title,
color = BitnagilTheme.colors.black,
style = BitnagilTheme.typography.body1Regular,
color = BitnagilTheme.colors.coolGray10,
style = BitnagilTheme.typography.body1Medium,
modifier = Modifier.weight(1f),
)

BitnagilIcon(
id = R.drawable.ic_right_arrow_20,
tint = BitnagilTheme.colors.black,
id = R.drawable.ic_chevron_right_md,
tint = BitnagilTheme.colors.coolGray10,
modifier = Modifier.padding(10.dp),
)
}
Expand Down
14 changes: 10 additions & 4 deletions core/designsystem/src/main/res/drawable/ic_setting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#878A93"
android:pathData="M20.36,8.977C20.18,8.877 20.16,8.907 19.98,8.807C19.92,8.777 19.95,8.657 19.92,8.647C19.65,8.487 19.44,8.267 19.27,7.997C19.25,7.967 18.95,8.107 18.91,8.057C18.88,7.997 19.15,7.807 19.14,7.777C18.99,7.497 18.79,7.217 18.78,6.897C18.78,6.867 18.76,6.827 18.76,6.767C18.76,6.557 18.67,6.557 18.68,6.337C18.68,6.067 18.8,5.857 18.8,5.667C18.8,5.387 18.97,5.147 18.92,4.967C18.84,4.697 18.73,4.327 18.54,4.117C18.41,3.967 18.08,4.007 17.84,3.857C17.68,3.757 17.4,3.827 17.16,3.687C16.91,3.547 17.1,3.217 16.86,3.067C16.62,2.927 16.29,3.097 16.12,3.007C15.87,2.877 15.8,2.437 15.61,2.397C15.33,2.337 14.94,2.397 14.67,2.457C14.48,2.497 14.26,2.637 14.02,2.767C13.86,2.857 13.65,2.927 13.41,3.067C13.41,3.067 13.6,3.387 13.6,3.397C13.42,3.507 13.25,3.217 13.08,3.327C13.02,3.357 13.11,3.577 13.08,3.597C12.8,3.747 12.47,4.047 12.15,4.057C12.12,4.057 12.08,3.757 12.01,3.757C11.94,3.757 11.91,3.757 11.88,3.757C11.56,3.747 11.28,3.637 11,3.477C10.97,3.457 10.99,3.377 10.93,3.337C10.75,3.227 10.65,3.407 10.47,3.297C10.24,3.157 10.13,2.907 9.97,2.817C9.73,2.677 9.45,2.867 9.26,2.817C8.98,2.757 8.69,2.397 8.42,2.457C8.23,2.497 8.1,2.797 7.86,2.927C7.7,3.017 7.41,2.957 7.18,3.097L7.26,3.247C7.02,3.387 6.94,3.267 6.7,3.407C6.7,3.407 6.85,3.667 6.85,3.677C6.62,3.817 6.45,3.937 6.29,4.037C6.06,4.187 5.74,4.087 5.61,4.227C5.42,4.437 5.26,4.717 5.18,4.987C5.12,5.177 5.28,5.397 5.28,5.667C5.28,5.847 5.23,6.067 5.23,6.337C5.23,6.547 5.05,6.557 5.05,6.767C5.05,6.827 5.45,6.867 5.45,6.897C5.45,7.217 5.3,7.637 5.15,7.927C5.14,7.957 4.8,7.807 4.77,7.867C4.74,7.927 4.85,8.027 4.83,8.047C4.66,8.317 4.29,8.337 4.02,8.497C3.99,8.517 4.05,8.667 3.99,8.697C3.81,8.797 3.95,9.047 3.77,9.147C3.53,9.277 3.28,9.267 3.12,9.367C2.88,9.507 2.69,9.567 2.56,9.717C2.37,9.927 2.29,10.187 2.2,10.457C2.14,10.647 1.92,10.807 1.91,11.087C1.91,11.267 1.84,11.497 1.84,11.767C1.84,12.047 1.82,12.047 1.82,12.327C1.82,12.597 1.82,12.827 1.82,13.007C1.83,13.287 2.3,13.387 2.36,13.577C2.45,13.847 2.42,14.107 2.61,14.317C2.74,14.457 2.91,14.517 3.14,14.657C3.3,14.747 3.48,14.857 3.72,14.987C3.9,15.087 3.73,15.387 3.91,15.487C3.97,15.517 3.98,15.567 4.01,15.577C4.28,15.737 4.5,15.857 4.67,16.127C4.69,16.157 4.77,16.147 4.8,16.207C4.83,16.267 4.8,16.317 4.82,16.347C4.97,16.627 4.93,16.887 4.93,17.197C4.93,17.227 5.35,17.267 5.34,17.337C5.34,17.537 5.37,17.537 5.37,17.747C5.37,18.017 5.07,18.237 5.07,18.417C5.07,18.697 4.98,18.947 5.04,19.137C5.12,19.407 5.58,19.487 5.77,19.697C5.9,19.847 5.82,20.247 6.06,20.397C6.22,20.497 6.5,20.447 6.74,20.577C6.99,20.717 6.92,20.847 7.16,20.987C7.4,21.127 7.71,21.007 7.87,21.097C8.12,21.227 8.26,21.367 8.45,21.407C8.73,21.467 9.05,21.677 9.33,21.617C9.52,21.577 9.58,21.167 9.83,21.037C9.99,20.947 10.12,20.757 10.35,20.617C10.53,20.507 10.69,20.787 10.87,20.677C10.93,20.647 10.91,20.547 10.94,20.527C11.22,20.377 11.54,20.097 11.86,20.087C11.89,20.087 11.93,20.027 12,20.027C12.07,20.027 12.09,20.447 12.13,20.447C12.45,20.457 12.76,20.417 13.04,20.567C13.06,20.577 13.07,20.627 13.11,20.657C13.3,20.767 13.36,20.677 13.54,20.787C13.77,20.927 14.07,20.847 14.23,20.937C14.47,21.077 14.56,21.227 14.75,21.277C15.03,21.337 15.27,21.487 15.55,21.427C15.74,21.387 15.81,21.117 16.06,20.977C16.22,20.887 16.44,20.847 16.67,20.707C16.92,20.567 16.94,20.597 17.19,20.457C17.42,20.317 17.75,20.457 17.91,20.357C18.14,20.207 18.18,19.937 18.31,19.787C18.5,19.577 18.86,19.417 18.94,19.147C19,18.967 18.98,18.717 18.99,18.447C18.99,18.267 18.84,18.047 18.83,17.777C18.83,17.557 18.93,17.557 18.92,17.337C18.92,17.277 18.72,17.237 18.72,17.207C18.72,16.887 19.11,16.677 19.26,16.397C19.27,16.367 19.32,16.367 19.35,16.307C19.38,16.247 19.31,16.177 19.33,16.157C19.5,15.887 19.46,15.347 19.74,15.187C19.77,15.167 19.83,15.197 19.88,15.167L20.02,15.417C20.2,15.317 20.12,15.177 20.3,15.077C20.54,14.947 20.77,14.917 20.93,14.817C21.17,14.677 21.37,14.597 21.5,14.447C21.69,14.237 21.56,13.877 21.65,13.607C21.71,13.427 22.05,13.307 22.06,13.027C22.06,12.847 21.9,12.627 21.9,12.357C21.9,12.067 22.18,12.067 22.18,11.787C22.18,11.517 22.11,11.297 22.1,11.117C22.09,10.837 21.99,10.637 21.93,10.447C21.84,10.177 21.59,9.997 21.4,9.787C21.27,9.647 21.12,9.557 20.88,9.407C20.72,9.317 20.57,9.147 20.34,9.017L20.36,8.977Z" />
<path
android:fillColor="#00000000"
android:pathData="M20.35,8.923L19.984,8.719C19.927,8.688 19.899,8.672 19.871,8.655C19.598,8.492 19.368,8.266 19.2,7.995C19.183,7.968 19.167,7.939 19.135,7.883C19.102,7.827 19.086,7.798 19.071,7.77C18.92,7.489 18.838,7.175 18.834,6.856C18.833,6.824 18.833,6.791 18.834,6.726L18.841,6.301C18.853,5.62 18.859,5.279 18.763,4.973C18.678,4.701 18.536,4.45 18.346,4.237C18.132,3.997 17.835,3.825 17.24,3.483L16.746,3.198C16.154,2.857 15.857,2.686 15.542,2.621C15.264,2.563 14.976,2.566 14.699,2.628C14.386,2.698 14.093,2.874 13.508,3.224L13.505,3.226L13.151,3.437C13.095,3.471 13.066,3.488 13.038,3.503C12.76,3.658 12.45,3.744 12.131,3.754C12.099,3.755 12.066,3.755 12.001,3.755C11.936,3.755 11.902,3.755 11.87,3.754C11.552,3.744 11.24,3.658 10.962,3.502C10.933,3.487 10.906,3.47 10.85,3.436L10.493,3.222C9.904,2.868 9.609,2.691 9.294,2.621C9.016,2.558 8.727,2.556 8.448,2.615C8.132,2.681 7.836,2.853 7.243,3.197L7.24,3.198L6.752,3.481L6.747,3.485C6.159,3.826 5.864,3.997 5.652,4.236C5.463,4.449 5.322,4.699 5.237,4.97C5.142,5.277 5.147,5.619 5.159,6.303L5.166,6.727C5.167,6.792 5.169,6.824 5.168,6.855C5.163,7.175 5.081,7.489 4.93,7.771C4.915,7.799 4.899,7.827 4.867,7.882C4.834,7.938 4.819,7.966 4.802,7.993C4.633,8.265 4.402,8.492 4.127,8.656C4.1,8.672 4.071,8.688 4.015,8.719L3.654,8.919C3.052,9.252 2.751,9.419 2.533,9.657C2.339,9.867 2.193,10.116 2.103,10.387C2.003,10.694 2.003,11.038 2.004,11.726L2.006,12.288C2.007,12.971 2.009,13.312 2.11,13.617C2.2,13.886 2.345,14.134 2.537,14.343C2.755,14.579 3.053,14.745 3.65,15.077L4.008,15.276C4.069,15.31 4.1,15.327 4.129,15.344C4.401,15.508 4.631,15.735 4.798,16.005C4.816,16.035 4.834,16.065 4.868,16.125C4.903,16.185 4.92,16.215 4.936,16.245C5.083,16.523 5.161,16.831 5.166,17.146C5.167,17.179 5.167,17.214 5.165,17.283L5.159,17.69C5.147,18.376 5.142,18.72 5.238,19.027C5.323,19.299 5.465,19.55 5.655,19.763C5.869,20.003 6.167,20.174 6.761,20.517L7.255,20.802C7.848,21.143 8.144,21.314 8.459,21.379C8.737,21.437 9.025,21.434 9.302,21.372C9.616,21.302 9.909,21.126 10.496,20.774L10.85,20.563C10.906,20.529 10.935,20.512 10.963,20.497C11.241,20.342 11.551,20.256 11.87,20.246C11.901,20.245 11.934,20.245 11.999,20.245C12.065,20.245 12.097,20.245 12.13,20.246C12.448,20.256 12.761,20.342 13.039,20.497C13.064,20.511 13.089,20.526 13.132,20.552L13.508,20.778C14.097,21.132 14.392,21.308 14.707,21.379C14.985,21.441 15.274,21.444 15.553,21.385C15.868,21.32 16.166,21.147 16.759,20.803L17.254,20.516C17.842,20.174 18.137,20.003 18.35,19.764C18.538,19.551 18.68,19.301 18.764,19.03C18.859,18.725 18.853,18.386 18.842,17.712L18.834,17.272C18.833,17.208 18.833,17.176 18.834,17.145C18.838,16.825 18.92,16.51 19.071,16.229C19.086,16.201 19.102,16.173 19.134,16.117C19.166,16.062 19.183,16.034 19.199,16.007C19.368,15.735 19.6,15.507 19.874,15.344C19.901,15.328 19.929,15.312 19.984,15.282L19.986,15.281L20.347,15.08C20.949,14.747 21.25,14.58 21.469,14.343C21.663,14.133 21.809,13.884 21.898,13.613C21.998,13.308 21.997,12.966 21.996,12.286L21.994,11.712C21.993,11.029 21.992,10.687 21.891,10.383C21.802,10.113 21.656,9.866 21.463,9.657C21.246,9.421 20.948,9.255 20.352,8.924L20.35,8.923Z"
android:pathData="M20.36,8.977C20.18,8.877 20.16,8.907 19.98,8.807C19.92,8.777 19.95,8.657 19.92,8.647C19.65,8.487 19.44,8.267 19.27,7.997C19.25,7.967 18.95,8.107 18.91,8.057C18.88,7.997 19.15,7.807 19.14,7.777C18.99,7.497 18.79,7.217 18.78,6.897C18.78,6.867 18.76,6.827 18.76,6.767C18.76,6.557 18.67,6.557 18.68,6.337C18.68,6.067 18.8,5.857 18.8,5.667C18.8,5.387 18.97,5.147 18.92,4.967C18.84,4.697 18.73,4.327 18.54,4.117C18.41,3.967 18.08,4.007 17.84,3.857C17.68,3.757 17.4,3.827 17.16,3.687C16.91,3.547 17.1,3.217 16.86,3.067C16.62,2.927 16.29,3.097 16.12,3.007C15.87,2.877 15.8,2.437 15.61,2.397C15.33,2.337 14.94,2.397 14.67,2.457C14.48,2.497 14.26,2.637 14.02,2.767C13.86,2.857 13.65,2.927 13.41,3.067C13.41,3.067 13.6,3.387 13.6,3.397C13.42,3.507 13.25,3.217 13.08,3.327C13.02,3.357 13.11,3.577 13.08,3.597C12.8,3.747 12.47,4.047 12.15,4.057C12.12,4.057 12.08,3.757 12.01,3.757C11.94,3.757 11.91,3.757 11.88,3.757C11.56,3.747 11.28,3.637 11,3.477C10.97,3.457 10.99,3.377 10.93,3.337C10.75,3.227 10.65,3.407 10.47,3.297C10.24,3.157 10.13,2.907 9.97,2.817C9.73,2.677 9.45,2.867 9.26,2.817C8.98,2.757 8.69,2.397 8.42,2.457C8.23,2.497 8.1,2.797 7.86,2.927C7.7,3.017 7.41,2.957 7.18,3.097L7.26,3.247C7.02,3.387 6.94,3.267 6.7,3.407C6.7,3.407 6.85,3.667 6.85,3.677C6.62,3.817 6.45,3.937 6.29,4.037C6.06,4.187 5.74,4.087 5.61,4.227C5.42,4.437 5.26,4.717 5.18,4.987C5.12,5.177 5.28,5.397 5.28,5.667C5.28,5.847 5.23,6.067 5.23,6.337C5.23,6.547 5.05,6.557 5.05,6.767C5.05,6.827 5.45,6.867 5.45,6.897C5.45,7.217 5.3,7.637 5.15,7.927C5.14,7.957 4.8,7.807 4.77,7.867C4.74,7.927 4.85,8.027 4.83,8.047C4.66,8.317 4.29,8.337 4.02,8.497C3.99,8.517 4.05,8.667 3.99,8.697C3.81,8.797 3.95,9.047 3.77,9.147C3.53,9.277 3.28,9.267 3.12,9.367C2.88,9.507 2.69,9.567 2.56,9.717C2.37,9.927 2.29,10.187 2.2,10.457C2.14,10.647 1.92,10.807 1.91,11.087C1.91,11.267 1.84,11.497 1.84,11.767C1.84,12.047 1.82,12.047 1.82,12.327C1.82,12.597 1.82,12.827 1.82,13.007C1.83,13.287 2.3,13.387 2.36,13.577C2.45,13.847 2.42,14.107 2.61,14.317C2.74,14.457 2.91,14.517 3.14,14.657C3.3,14.747 3.48,14.857 3.72,14.987C3.9,15.087 3.73,15.387 3.91,15.487C3.97,15.517 3.98,15.567 4.01,15.577C4.28,15.737 4.5,15.857 4.67,16.127C4.69,16.157 4.77,16.147 4.8,16.207C4.83,16.267 4.8,16.317 4.82,16.347C4.97,16.627 4.93,16.887 4.93,17.197C4.93,17.227 5.35,17.267 5.34,17.337C5.34,17.537 5.37,17.537 5.37,17.747C5.37,18.017 5.07,18.237 5.07,18.417C5.07,18.697 4.98,18.947 5.04,19.137C5.12,19.407 5.58,19.487 5.77,19.697C5.9,19.847 5.82,20.247 6.06,20.397C6.22,20.497 6.5,20.447 6.74,20.577C6.99,20.717 6.92,20.847 7.16,20.987C7.4,21.127 7.71,21.007 7.87,21.097C8.12,21.227 8.26,21.367 8.45,21.407C8.73,21.467 9.05,21.677 9.33,21.617C9.52,21.577 9.58,21.167 9.83,21.037C9.99,20.947 10.12,20.757 10.35,20.617C10.53,20.507 10.69,20.787 10.87,20.677C10.93,20.647 10.91,20.547 10.94,20.527C11.22,20.377 11.54,20.097 11.86,20.087C11.89,20.087 11.93,20.027 12,20.027C12.07,20.027 12.09,20.447 12.13,20.447C12.45,20.457 12.76,20.417 13.04,20.567C13.06,20.577 13.07,20.627 13.11,20.657C13.3,20.767 13.36,20.677 13.54,20.787C13.77,20.927 14.07,20.847 14.23,20.937C14.47,21.077 14.56,21.227 14.75,21.277C15.03,21.337 15.27,21.487 15.55,21.427C15.74,21.387 15.81,21.117 16.06,20.977C16.22,20.887 16.44,20.847 16.67,20.707C16.92,20.567 16.94,20.597 17.19,20.457C17.42,20.317 17.75,20.457 17.91,20.357C18.14,20.207 18.18,19.937 18.31,19.787C18.5,19.577 18.86,19.417 18.94,19.147C19,18.967 18.98,18.717 18.99,18.447C18.99,18.267 18.84,18.047 18.83,17.777C18.83,17.557 18.93,17.557 18.92,17.337C18.92,17.277 18.72,17.237 18.72,17.207C18.72,16.887 19.11,16.677 19.26,16.397C19.27,16.367 19.32,16.367 19.35,16.307C19.38,16.247 19.31,16.177 19.33,16.157C19.5,15.887 19.46,15.347 19.74,15.187C19.77,15.167 19.83,15.197 19.88,15.167L20.02,15.417C20.2,15.317 20.12,15.177 20.3,15.077C20.54,14.947 20.77,14.917 20.93,14.817C21.17,14.677 21.37,14.597 21.5,14.447C21.69,14.237 21.56,13.877 21.65,13.607C21.71,13.427 22.05,13.307 22.06,13.027C22.06,12.847 21.9,12.627 21.9,12.357C21.9,12.067 22.18,12.067 22.18,11.787C22.18,11.517 22.11,11.297 22.1,11.117C22.09,10.837 21.99,10.637 21.93,10.447C21.84,10.177 21.59,9.997 21.4,9.787C21.27,9.647 21.12,9.557 20.88,9.407C20.72,9.317 20.57,9.147 20.34,9.017L20.36,8.977Z"
android:strokeWidth="2"
android:strokeColor="#000000"
android:strokeColor="#878A93"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:fillColor="#ffffff"
android:pathData="M7.86,12.026C7.86,12.296 8.12,12.536 8.17,12.796C8.22,13.056 8.44,13.236 8.54,13.476C8.64,13.716 8.64,13.986 8.78,14.196C8.92,14.406 8.82,14.866 9.01,15.046C9.2,15.226 9.64,15.136 9.85,15.286C10.06,15.436 10.33,15.446 10.57,15.546C10.81,15.646 11.01,15.756 11.27,15.806C11.53,15.856 11.75,16.156 12.02,16.156C12.29,16.156 12.59,16.216 12.84,16.166C13.09,16.116 13.41,16.066 13.65,15.966C13.89,15.866 13.91,15.326 14.12,15.176C14.33,15.026 14.55,14.926 14.73,14.746C14.91,14.566 15.14,14.436 15.29,14.216C15.44,13.996 15.58,13.786 15.68,13.546C15.78,13.306 15.99,13.086 16.04,12.826C16.09,12.566 15.94,12.296 15.94,12.026C15.94,11.756 16.03,11.486 15.98,11.236C15.93,10.986 15.78,10.746 15.68,10.506C15.58,10.266 15.37,10.096 15.22,9.886C15.07,9.676 14.89,9.526 14.71,9.336C14.53,9.146 14.57,8.686 14.35,8.536C14.13,8.386 13.78,8.466 13.53,8.366C13.28,8.266 13,8.426 12.74,8.366C12.48,8.306 12.28,8.186 12.01,8.186C11.74,8.186 11.45,7.906 11.2,7.956C10.95,8.006 10.73,8.256 10.49,8.356C10.25,8.456 10.01,8.566 9.8,8.706C9.59,8.846 9.28,8.906 9.09,9.096C8.9,9.286 8.69,9.486 8.55,9.706C8.41,9.926 8.38,10.226 8.28,10.466C8.18,10.706 7.96,10.936 7.91,11.196C7.86,11.456 7.85,11.746 7.85,12.016L7.86,12.026Z" />
<path
android:fillColor="#00000000"
android:pathData="M8,12C8,14.209 9.791,16 12,16C14.21,16 16,14.209 16,12C16,9.791 14.21,8 12,8C9.791,8 8,9.791 8,12Z"
android:pathData="M7.86,12.026C7.86,12.296 8.12,12.536 8.17,12.796C8.22,13.056 8.44,13.236 8.54,13.476C8.64,13.716 8.64,13.986 8.78,14.196C8.92,14.406 8.82,14.866 9.01,15.046C9.2,15.226 9.64,15.136 9.85,15.286C10.06,15.436 10.33,15.446 10.57,15.546C10.81,15.646 11.01,15.756 11.27,15.806C11.53,15.856 11.75,16.156 12.02,16.156C12.29,16.156 12.59,16.216 12.84,16.166C13.09,16.116 13.41,16.066 13.65,15.966C13.89,15.866 13.91,15.326 14.12,15.176C14.33,15.026 14.55,14.926 14.73,14.746C14.91,14.566 15.14,14.436 15.29,14.216C15.44,13.996 15.58,13.786 15.68,13.546C15.78,13.306 15.99,13.086 16.04,12.826C16.09,12.566 15.94,12.296 15.94,12.026C15.94,11.756 16.03,11.486 15.98,11.236C15.93,10.986 15.78,10.746 15.68,10.506C15.58,10.266 15.37,10.096 15.22,9.886C15.07,9.676 14.89,9.526 14.71,9.336C14.53,9.146 14.57,8.686 14.35,8.536C14.13,8.386 13.78,8.466 13.53,8.366C13.28,8.266 13,8.426 12.74,8.366C12.48,8.306 12.28,8.186 12.01,8.186C11.74,8.186 11.45,7.906 11.2,7.956C10.95,8.006 10.73,8.256 10.49,8.356C10.25,8.456 10.01,8.566 9.8,8.706C9.59,8.846 9.28,8.906 9.09,9.096C8.9,9.286 8.69,9.486 8.55,9.706C8.41,9.926 8.38,10.226 8.28,10.466C8.18,10.706 7.96,10.936 7.91,11.196C7.86,11.456 7.85,11.746 7.85,12.016L7.86,12.026Z"
android:strokeWidth="2"
android:strokeColor="#000000"
android:strokeColor="#878A93"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
12 changes: 6 additions & 6 deletions presentation/src/main/java/com/threegap/bitnagil/presentation/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.threegap.bitnagil.presentation.mypage
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
Expand All @@ -25,10 +26,9 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.threegap.bitnagil.designsystem.BitnagilTheme
import com.threegap.bitnagil.designsystem.R
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
import com.threegap.bitnagil.designsystem.component.block.BitnagilOptionButton
import com.threegap.bitnagil.designsystem.component.block.BitnagilTopBar
import com.threegap.bitnagil.designsystem.modifier.clickableWithoutRipple
import com.threegap.bitnagil.presentation.mypage.model.MyPageState

@Composable
Expand Down Expand Up @@ -68,11 +68,11 @@ private fun MyPageScreen(
BitnagilTopBar(
title = "마이페이지",
actions = {
BitnagilIcon(
BitnagilIconButton(
id = R.drawable.ic_setting,
modifier = Modifier
.clickableWithoutRipple(onClick = onClickSetting)
.padding(6.dp),
onClick = onClickSetting,
tint = null,
paddingValues = PaddingValues(6.dp),
)
},
)
Expand Down
Loading