Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions AppIcon.icon/icon.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,22 @@
"blur-material" : null,
"layers" : [
{
"glass" : true,
"blend-mode" : "normal",
"fill" : "automatic",
"glass" : false,
"image-name" : "3 - Layer.svg",
"name" : "3 - Layer"
"name" : "Cat"
},
{
"blend-mode" : "normal",
"fill" : "automatic",
"glass" : true,
"hidden" : false,
"image-name" : "2 - Layer.svg",
"name" : "2 - Layer"
"name" : "Background"
}
],
"name" : "Voctocat",
"shadow" : {
"kind" : "neutral",
"opacity" : 0.5
Expand Down
9 changes: 9 additions & 0 deletions HackerTube.xcodeproj/xcshareddata/xcodecloud/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"id" : "bd48d2f0-3a23-4f8c-a054-8bd874e12f26",
"targets" : [
{
"id" : "7A205BD4-A752-4B2A-9355-C4F764516E98",
"name" : "HackerTube"
}
]
}
2 changes: 1 addition & 1 deletion HackerTube/Configuration/HackerTube.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
// Build settings reference:
// https://developer.apple.com/documentation/xcode/build-settings-reference

MARKETING_VERSION = 1.5.1
MARKETING_VERSION = 1.6.0
2 changes: 2 additions & 0 deletions HackerTube/Features/Conferences/ConferenceCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ struct ConferenceCell: View {
VStack {
if #available(iOS 26.0, *) {
ConferenceThumbnail(conference: conference)
.background(.background.secondary)
.clipShape(ConcentricRectangle(
corners: .concentric,
isUniform: true
))
} else {
ConferenceThumbnail(conference: conference)
.background(.background.secondary)
}

Text(conference.title)
Expand Down
2 changes: 1 addition & 1 deletion HackerTube/Features/Conferences/ConferenceThumbnail.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ struct ConferenceThumbnail: View {

var body: some View {
thumbnail
.padding()
.frame(maxWidth: .infinity, maxHeight: .infinity)
.aspectRatio(16 / 9, contentMode: .fit)
.background(.regularMaterial)
.id(id)
}

Expand Down
17 changes: 8 additions & 9 deletions HackerTube/Features/Conferences/ConferencesGrid.swift
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,29 @@ private struct ConferencesGridRegular: View {
private struct ConferencesGridTV: View {
let conferences: [Conference]
let columns: [GridItem] = Array(
repeating: GridItem(.flexible(minimum: 300), spacing: 48),
repeating: GridItem(.flexible(minimum: 320), spacing: 48),
count: 4
)

var body: some View {
LazyVGrid(columns: columns, spacing: 64) {
ForEach(conferences) { conference in
VStack {
NavigationLink {
ConferenceView(conference: conference)
} label: {
ConferenceThumbnail(conference: conference)
}
NavigationLink {
ConferenceView(conference: conference)
} label: {
ConferenceThumbnail(conference: conference)
.background(.primary)
.hoverEffect(.highlight)

Text(conference.title)
.font(.headline)
.lineLimit(2, reservesSpace: true)
}
}
}
.padding()
.multilineTextAlignment(.center)
.focusSection()
.buttonStyle(.card)
.buttonStyle(.borderless)
.accessibilityIdentifier("ConferencesGrid")
.accessibilityElement(children: .contain)
}
Expand Down
17 changes: 7 additions & 10 deletions HackerTube/Features/Talk/TalksGrid.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ private struct TalksGridRegular: View {
.hoverEffect(.lift)
#endif
}
.buttonStyle(.plain)
}
}
.padding()
.buttonStyle(.plain)
.multilineTextAlignment(.center)
.accessibilityIdentifier("TalksGrid")
.accessibilityElement(children: .contain)
Expand All @@ -61,23 +61,20 @@ private struct TalksGridRegular: View {
var body: some View {
LazyVGrid(columns: columns, spacing: 64) {
ForEach(talks) { talk in
VStack(alignment: .leading) {
NavigationLink {
TalkView(talk: talk)
} label: {
TalkThumbnail(talk: talk)
}
NavigationLink {
TalkView(talk: talk)
} label: {
TalkThumbnail(talk: talk)

Text(talk.title)
.font(.headline)
.lineLimit(2, reservesSpace: true)
}
}
}
.padding()
.multilineTextAlignment(.leading)
.multilineTextAlignment(.center)
.focusSection()
.buttonStyle(.card)
.buttonStyle(.borderless)
.accessibilityIdentifier("TalksGrid")
.accessibilityElement(children: .contain)
}
Expand Down