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

Jump to bottom

πŸ”€ :: (#714) λ§ˆμ΄νŽ˜μ΄μ§€ μ•„μ΄μ½˜ λ³€κ²½ #720

Merged
merged 2 commits into from
Aug 12, 2024
Merged

πŸ”€ :: (#714) λ§ˆμ΄νŽ˜μ΄μ§€ μ•„μ΄μ½˜ λ³€κ²½ #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6602547
♻️ :: μ•„μ΄μ½˜ μΆ”κ°€
parkuiery Aug 12, 2024
33c71f6
♻️ :: μ•„μ΄μ½˜ λ³€κ²½
parkuiery Aug 12, 2024
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
2 changes: 1 addition & 1 deletion core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsIcon.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object DmsIcon {
val Logo = R.drawable.ic_logo
val Notification = R.drawable.ic_notification
val Lunch = R.drawable.ic_lunch
val MyPage = R.drawable.ic_person
val Person = R.drawable.ic_person
val Notice = R.drawable.ic_notice
val Palette = R.drawable.ic_palette
val PasswordInvisible = R.drawable.ic_password_invisible
Expand Down
12 changes: 8 additions & 4 deletions core/design-system/src/main/res/drawable/ic_person.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v1c0,0.55 0.45,1 1,1h14c0.55,0 1,-0.45 1,-1v-1c0,-2.66 -5.33,-4 -8,-4z"/>

<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="M12,11.869C13.823,11.869 15.299,10.257 15.299,8.283C15.299,6.34 13.823,4.795 12,4.795C10.184,4.795 8.692,6.362 8.7,8.298C8.707,10.265 10.177,11.869 12,11.869ZM12,10.551C10.96,10.551 10.078,9.564 10.078,8.298C10.071,7.063 10.952,6.114 12,6.114C13.054,6.114 13.921,7.048 13.921,8.283C13.921,9.549 13.047,10.551 12,10.551ZM7.299,18.875H16.693C17.996,18.875 18.622,18.461 18.622,17.572C18.622,15.5 16.038,12.743 12,12.743C7.962,12.743 5.37,15.5 5.37,17.572C5.37,18.461 5.995,18.875 7.299,18.875ZM7.065,17.557C6.884,17.557 6.817,17.497 6.817,17.361C6.817,16.209 8.677,14.062 12,14.062C15.314,14.062 17.175,16.209 17.175,17.361C17.175,17.497 17.107,17.557 16.927,17.557H7.065Z"
android:fillColor="#121212"/>
</vector>
12 changes: 6 additions & 6 deletions feature/src/main/java/team/aliens/dms/android/feature/main/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.annotation.RootNavGraph
import team.aliens.dms.android.core.designsystem.Scaffold
import team.aliens.dms.android.core.designsystem.DmsIcon
import team.aliens.dms.android.core.designsystem.DmsTheme
import team.aliens.dms.android.core.designsystem.R
import team.aliens.dms.android.core.designsystem.Scaffold
import team.aliens.dms.android.core.designsystem.slideInFromEnd
import team.aliens.dms.android.core.designsystem.slideInFromStart
import team.aliens.dms.android.core.designsystem.slideOutFromEnd
Expand Down Expand Up @@ -243,22 +243,22 @@ private enum class MainSections(
) {
HOME(
route = "home",
iconRes = R.drawable.ic_home,
iconRes = DmsIcon.Home,
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_home,
),
APPLICATION(
route = "application",
iconRes = R.drawable.ic_applicate,
iconRes = DmsIcon.Applicate,
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_application,
),
ANNOUNCEMENT_LIST(
route = "announcement_list",
iconRes = R.drawable.ic_notice,
iconRes = DmsIcon.Notice,
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_announcement_list,
),
MY_PAGE(
route = "my_page",
iconRes = R.drawable.ic_person,
iconRes = DmsIcon.Person,
labelRes = team.aliens.dms.android.feature.R.string.bottom_nav_my_page,
),
;
Expand Down
Loading