feat: 메인 홈
- 캔 충전 아이콘 변경 - 검색, 구매목록 아이콘 추가
This commit is contained in:
21
SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/Contents.json
vendored
Normal file
21
SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "ic_can_circle.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/ic_can_circle.png
vendored
Normal file
BIN
SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/ic_can_circle.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
21
SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/Contents.json
vendored
Normal file
21
SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "ic_search_white.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/ic_search_white.png
vendored
Normal file
BIN
SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/ic_search_white.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 432 B |
21
SodaLive/Resources/Assets.xcassets/ic_storage.imageset/Contents.json
vendored
Normal file
21
SodaLive/Resources/Assets.xcassets/ic_storage.imageset/Contents.json
vendored
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "ic_storage.png",
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
SodaLive/Resources/Assets.xcassets/ic_storage.imageset/ic_storage.png
vendored
Normal file
BIN
SodaLive/Resources/Assets.xcassets/ic_storage.imageset/ic_storage.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 375 B |
@@ -18,18 +18,32 @@ struct HomeTabView: View {
|
|||||||
BaseView(isLoading: $viewModel.isLoading) {
|
BaseView(isLoading: $viewModel.isLoading) {
|
||||||
ZStack(alignment: .bottomTrailing) {
|
ZStack(alignment: .bottomTrailing) {
|
||||||
VStack(alignment: .leading, spacing: 0) {
|
VStack(alignment: .leading, spacing: 0) {
|
||||||
HStack(spacing: 0) {
|
HStack(spacing: 24) {
|
||||||
Image("img_text_logo")
|
Image("img_text_logo")
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
if !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
if !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
|
||||||
Image("ic_can")
|
Image("ic_search_white")
|
||||||
|
.onTapGesture {
|
||||||
|
AppState
|
||||||
|
.shared
|
||||||
|
.setAppStep(step: .search)
|
||||||
|
}
|
||||||
|
|
||||||
|
Image("ic_can_circle")
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
AppState
|
AppState
|
||||||
.shared
|
.shared
|
||||||
.setAppStep(step: .canCharge(refresh: {}))
|
.setAppStep(step: .canCharge(refresh: {}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Image("ic_storage")
|
||||||
|
.onTapGesture {
|
||||||
|
AppState
|
||||||
|
.shared
|
||||||
|
.setAppStep(step: .myBox(currentTab: .orderlist))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding(.horizontal, 24)
|
.padding(.horizontal, 24)
|
||||||
|
|||||||
Reference in New Issue
Block a user