Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-05 02:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve favorite button

Browse Source
This commit is contained in:
Arkadiusz Fal
2021-12-02 21:35:25 +01:00
parent 19b146c6ad
commit bd59b8e2c3
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Shared/Search/SearchView.swift
View File

@@ -23,6 +23,7 @@ struct SearchView: View {
@EnvironmentObject<AccountsModel> private var accounts
@EnvironmentObject<RecentsModel> private var recents
@EnvironmentObject<SearchModel> private var state
private var favorites = FavoritesModel.shared
@Default(.saveRecents) private var saveRecents
@@ -70,10 +71,8 @@ struct SearchView: View {
#if !os(tvOS)
ToolbarItemGroup(placement: toolbarPlacement) {
#if os(macOS)
if let favoriteItem = favoriteItem {
FavoriteButton(item: favoriteItem)
.id(favoriteItem.id)
}
FavoriteButton(item: favoriteItem)
.id(favoriteItem?.id)
#endif
if accounts.app.supportsSearchFilters {
@@ -97,10 +96,8 @@ struct SearchView: View {
#if os(iOS)
Spacer()
if let favoriteItem = favoriteItem {
FavoriteButton(item: favoriteItem)
.id(favoriteItem.id)
}
FavoriteButton(item: favoriteItem)
.id(favoriteItem?.id)
Spacer()
#endif
@@ -188,6 +185,7 @@ struct SearchView: View {
#endif
#if os(iOS)
.navigationBarHidden(!Defaults[.visibleSections].isEmpty || navigationStyle == .sidebar)
.navigationBarTitleDisplayMode(.inline)
#endif
}
@@ -203,12 +201,10 @@ struct SearchView: View {
filtersHorizontalStack
}
if let favoriteItem = favoriteItem {
FavoriteButton(item: favoriteItem)
.id(favoriteItem.id)
.labelStyle(.iconOnly)
.font(.system(size: 25))
}
FavoriteButton(item: favoriteItem)
.id(favoriteItem?.id)
.labelStyle(.iconOnly)
.font(.system(size: 25))
}
HorizontalCells(items: items)
@@ -233,9 +229,9 @@ struct SearchView: View {
private var toolbarPlacement: ToolbarItemPlacement {
#if os(iOS)
.bottomBar
accounts.app.supportsSearchFilters || favorites.isEnabled ? .bottomBar : .automatic
#else
.automatic
.automatic
#endif
}