diff --git a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift index 4b32de72f..a51e29f24 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Profile/ProfileView.swift @@ -70,7 +70,7 @@ struct ProfileView: View { innerBody } .navigationTitle(LocalText.genericProfile) - .navigationBarTitleDisplayMode(.large) + .navigationBarTitleDisplayMode(.inline) #elseif os(macOS) List { innerBody diff --git a/apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift b/apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift index 28c39586e..43d8dbe6c 100644 --- a/apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift +++ b/apple/OmnivoreKit/Sources/App/Views/TabBar/CustomTabBar.swift @@ -3,12 +3,11 @@ import SwiftUI struct CustomTabBar: View { @Binding var selectedTab: String - @Namespace var animation var body: some View { HStack(spacing: 0) { - TabBarButton(key: "following", image: Image.tabFollowing, selectedTab: $selectedTab, animation: animation) - TabBarButton(key: "inbox", image: Image.tabLibrary, selectedTab: $selectedTab, animation: animation) - TabBarButton(key: "profile", image: Image.tabHighlights, selectedTab: $selectedTab, animation: animation) + TabBarButton(key: "following", image: Image.tabFollowing, selectedTab: $selectedTab) + TabBarButton(key: "inbox", image: Image.tabLibrary, selectedTab: $selectedTab) + TabBarButton(key: "profile", image: Image.tabProfile, selectedTab: $selectedTab) } .padding(.top, 10) .padding(.bottom, 40) @@ -20,13 +19,10 @@ struct TabBarButton: View { let key: String let image: Image @Binding var selectedTab: String - var animation: Namespace.ID var body: some View { Button(action: { - withAnimation(.spring()) { - selectedTab = key - } + selectedTab = key }, label: { image .resizable() diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.swift b/apple/OmnivoreKit/Sources/Views/Images/Images.swift index 1c771fd56..d66deb6f1 100644 --- a/apple/OmnivoreKit/Sources/Views/Images/Images.swift +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.swift @@ -11,6 +11,7 @@ public extension Image { static var tabLibrary: Image { Image("_tab_library", bundle: .module).renderingMode(.template) } static var tabSearch: Image { Image("_tab_search", bundle: .module).renderingMode(.template) } static var tabHighlights: Image { Image("_tab_highlights", bundle: .module).renderingMode(.template) } + static var tabProfile: Image { Image("_tab_profile", bundle: .module).renderingMode(.template) } static var pinRotated: Image { Image("pin-rotated", bundle: .module) } diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Contents.json b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Contents.json new file mode 100644 index 000000000..960bd3e1c --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Contents.json @@ -0,0 +1,24 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame.svg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Frame.svg b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Frame.svg new file mode 100644 index 000000000..d48db9f42 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Images/Images.xcassets/_tab_profile.imageset/Frame.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +