mirror of
https://github.com/yattee/yattee.git
synced 2025-08-06 10:44:06 +00:00
UI improvements, player state refactor
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "1.000",
|
||||
"green" : "0.343",
|
||||
"red" : "0.000"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
},
|
||||
{
|
||||
"appearances" : [
|
||||
{
|
||||
"appearance" : "luminosity",
|
||||
"value" : "dark"
|
||||
}
|
||||
],
|
||||
"color" : {
|
||||
"color-space" : "srgb",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "1.000",
|
||||
"green" : "0.343",
|
||||
"red" : "0.000"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"colors" : [
|
||||
{
|
||||
"color" : {
|
||||
"color-space" : "display-p3",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "0.197",
|
||||
"green" : "0.168",
|
||||
"red" : "0.691"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
},
|
||||
{
|
||||
"appearances" : [
|
||||
{
|
||||
"appearance" : "luminosity",
|
||||
"value" : "dark"
|
||||
}
|
||||
],
|
||||
"color" : {
|
||||
"color-space" : "display-p3",
|
||||
"components" : {
|
||||
"alpha" : "1.000",
|
||||
"blue" : "0.197",
|
||||
"green" : "0.168",
|
||||
"red" : "0.543"
|
||||
}
|
||||
},
|
||||
"idiom" : "universal"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
@@ -1,14 +1,31 @@
|
||||
import Defaults
|
||||
|
||||
enum ListingLayout: String, CaseIterable, Identifiable, Defaults.Serializable {
|
||||
case list, cells
|
||||
|
||||
var id: String {
|
||||
rawValue
|
||||
}
|
||||
|
||||
var name: String {
|
||||
switch self {
|
||||
case .list:
|
||||
return "List"
|
||||
case .cells:
|
||||
return "Cells"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension Defaults.Keys {
|
||||
#if os(tvOS)
|
||||
static let layout = Key<ListingLayout>("listingLayout", default: .cells)
|
||||
#endif
|
||||
static let searchQuery = Key<String>("searchQuery", default: "")
|
||||
|
||||
static let searchSortOrder = Key<SearchSortOrder>("searchSortOrder", default: .relevance)
|
||||
static let searchDate = Key<SearchDate?>("searchDate")
|
||||
static let searchDuration = Key<SearchDuration?>("searchDuration")
|
||||
static let searchSortOrder = Key<SearchQuery.SortOrder>("searchSortOrder", default: .relevance)
|
||||
static let searchDate = Key<SearchQuery.Date?>("searchDate")
|
||||
static let searchDuration = Key<SearchQuery.Duration?>("searchDuration")
|
||||
|
||||
static let selectedPlaylistID = Key<String?>("selectedPlaylistID")
|
||||
static let showingAddToPlaylist = Key<Bool>("showingAddToPlaylist", default: false)
|
||||
|
96
Shared/DetailBadge.swift
Normal file
96
Shared/DetailBadge.swift
Normal file
@@ -0,0 +1,96 @@
|
||||
import SwiftUI
|
||||
|
||||
struct DetailBadge: View {
|
||||
enum Style {
|
||||
case `default`, prominent, outstanding, informational
|
||||
}
|
||||
|
||||
struct StyleModifier: ViewModifier {
|
||||
let style: Style
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
Group {
|
||||
switch style {
|
||||
case .prominent:
|
||||
content.modifier(ProminentStyleModifier())
|
||||
case .outstanding:
|
||||
content.modifier(OutstandingStyleModifier())
|
||||
case .informational:
|
||||
content.modifier(InformationalStyleModifier())
|
||||
default:
|
||||
content.modifier(DefaultStyleModifier())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct DefaultStyleModifier: ViewModifier {
|
||||
func body(content: Content) -> some View {
|
||||
content
|
||||
.background(.thinMaterial)
|
||||
}
|
||||
}
|
||||
|
||||
struct ProminentStyleModifier: ViewModifier {
|
||||
var font: Font {
|
||||
Font.system(.body).weight(.semibold)
|
||||
}
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
content
|
||||
.font(font)
|
||||
.modifier(DefaultStyleModifier())
|
||||
}
|
||||
}
|
||||
|
||||
struct OutstandingStyleModifier: ViewModifier {
|
||||
var backgroundColor: Color {
|
||||
Color("DetailBadgeOutstandingStyleBackgroundColor")
|
||||
}
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
content
|
||||
.textCase(.uppercase)
|
||||
.background(backgroundColor)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
}
|
||||
|
||||
struct InformationalStyleModifier: ViewModifier {
|
||||
var backgroundColor: Color {
|
||||
Color("DetailBadgeInformationalStyleBackgroundColor")
|
||||
}
|
||||
|
||||
func body(content: Content) -> some View {
|
||||
content
|
||||
.background(backgroundColor)
|
||||
.foregroundColor(.white)
|
||||
}
|
||||
}
|
||||
|
||||
var text: String
|
||||
var style: Style = .default
|
||||
|
||||
var body: some View {
|
||||
Text(text)
|
||||
.lineLimit(1)
|
||||
.truncationMode(.middle)
|
||||
.padding(10)
|
||||
.modifier(StyleModifier(style: style))
|
||||
.mask(RoundedRectangle(cornerRadius: 12))
|
||||
}
|
||||
}
|
||||
|
||||
struct DetailBadge_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
VStack {
|
||||
DetailBadge(text: "Live", style: .outstanding)
|
||||
DetailBadge(text: "Premieres", style: .informational)
|
||||
DetailBadge(text: "Booyah", style: .prominent)
|
||||
DetailBadge(
|
||||
text: "Donec in neque mi. Phasellus quis sapien metus. Ut felis ante, posuere."
|
||||
)
|
||||
}
|
||||
.frame(maxWidth: 500)
|
||||
}
|
||||
}
|
@@ -1,18 +0,0 @@
|
||||
import Defaults
|
||||
|
||||
enum ListingLayout: String, CaseIterable, Identifiable, Defaults.Serializable {
|
||||
case list, cells
|
||||
|
||||
var id: String {
|
||||
rawValue
|
||||
}
|
||||
|
||||
var name: String {
|
||||
switch self {
|
||||
case .list:
|
||||
return "List"
|
||||
case .cells:
|
||||
return "Cells"
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user