diff --git a/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/Contents.json new file mode 100644 index 0000000..8f4be45 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/Contents.json @@ -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 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/ic_can_circle.png b/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/ic_can_circle.png new file mode 100644 index 0000000..0609dca Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_can_circle.imageset/ic_can_circle.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/Contents.json new file mode 100644 index 0000000..17c9c0b --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/Contents.json @@ -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 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/ic_search_white.png b/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/ic_search_white.png new file mode 100644 index 0000000..ac53822 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_search_white.imageset/ic_search_white.png differ diff --git a/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/Contents.json new file mode 100644 index 0000000..7babeae --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/Contents.json @@ -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 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/ic_storage.png b/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/ic_storage.png new file mode 100644 index 0000000..6ee52aa Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_storage.imageset/ic_storage.png differ diff --git a/SodaLive/Sources/Home/HomeTabView.swift b/SodaLive/Sources/Home/HomeTabView.swift index 41ab0e0..706963e 100644 --- a/SodaLive/Sources/Home/HomeTabView.swift +++ b/SodaLive/Sources/Home/HomeTabView.swift @@ -18,18 +18,32 @@ struct HomeTabView: View { BaseView(isLoading: $viewModel.isLoading) { ZStack(alignment: .bottomTrailing) { VStack(alignment: .leading, spacing: 0) { - HStack(spacing: 0) { + HStack(spacing: 24) { Image("img_text_logo") Spacer() if !token.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty { - Image("ic_can") + Image("ic_search_white") + .onTapGesture { + AppState + .shared + .setAppStep(step: .search) + } + + Image("ic_can_circle") .onTapGesture { AppState .shared .setAppStep(step: .canCharge(refresh: {})) } + + Image("ic_storage") + .onTapGesture { + AppState + .shared + .setAppStep(step: .myBox(currentTab: .orderlist)) + } } } .padding(.horizontal, 24)