Skip to content

Commit be3e89b

Browse files
jkurijkuri
committed
style(app): restyle the whole app using shadcn monochrome colours
1 parent 4bad85f commit be3e89b

File tree

61 files changed

+961
-860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+961
-860
lines changed

‎Reframed.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
A20000000000000000000016 /* EditorTopBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20000000000000000000016 /* EditorTopBar.swift */; };
8080
A20000000000000000000017 /* ExportSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20000000000000000000017 /* ExportSheet.swift */; };
8181
A20000000000000000000018 /* PropertiesPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20000000000000000000018 /* PropertiesPanel.swift */; };
82-
A20000000000000000000019 /* EditorBottomBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20000000000000000000019 /* EditorBottomBar.swift */; };
8382
A2000000000000000000001A /* CompositionInstruction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000001A /* CompositionInstruction.swift */; };
8483
A2000000000000000000000C /* EditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000000C /* EditorView.swift */; };
8584
A2000000000000000000000D /* EditorWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000000D /* EditorWindow.swift */; };
@@ -148,6 +147,8 @@
148147
A1000000000000000000004A /* InlineEditableText.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1000000000000000000004A /* InlineEditableText.swift */; };
149148
A1000000000000000000004B /* SettingsAboutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1000000000000000000004B /* SettingsAboutTab.swift */; };
150149
A1000000000000000000004C /* UpdateChecker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1000000000000000000004C /* UpdateChecker.swift */; };
150+
A1000000000000000000004D /* PrimaryButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1000000000000000000004D /* PrimaryButton.swift */; };
151+
A1000000000000000000004E /* SelectButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1000000000000000000004E /* SelectButton.swift */; };
151152
A2000000000000000000002A /* EditorView+TransportBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000002A /* EditorView+TransportBar.swift */; };
152153
A2000000000000000000002B /* ResizePopover.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000002B /* ResizePopover.swift */; };
153154
A2000000000000000000002C /* ExportResultSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2000000000000000000002C /* ExportResultSheet.swift */; };
@@ -233,7 +234,6 @@
233234
B20000000000000000000016 /* EditorTopBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorTopBar.swift; sourceTree = "<group>"; };
234235
B20000000000000000000017 /* ExportSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportSheet.swift; sourceTree = "<group>"; };
235236
B20000000000000000000018 /* PropertiesPanel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PropertiesPanel.swift; sourceTree = "<group>"; };
236-
B20000000000000000000019 /* EditorBottomBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorBottomBar.swift; sourceTree = "<group>"; };
237237
B2000000000000000000001A /* CompositionInstruction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompositionInstruction.swift; sourceTree = "<group>"; };
238238
B2000000000000000000000C /* EditorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorView.swift; sourceTree = "<group>"; };
239239
B2000000000000000000000D /* EditorWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorWindow.swift; sourceTree = "<group>"; };
@@ -301,6 +301,8 @@
301301
B1000000000000000000004A /* InlineEditableText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InlineEditableText.swift; sourceTree = "<group>"; };
302302
B1000000000000000000004B /* SettingsAboutTab.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsAboutTab.swift; sourceTree = "<group>"; };
303303
B1000000000000000000004C /* UpdateChecker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateChecker.swift; sourceTree = "<group>"; };
304+
B1000000000000000000004D /* PrimaryButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryButton.swift; sourceTree = "<group>"; };
305+
B1000000000000000000004E /* SelectButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectButton.swift; sourceTree = "<group>"; };
304306
B2000000000000000000002A /* EditorView+TransportBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorView+TransportBar.swift"; sourceTree = "<group>"; };
305307
B2000000000000000000002B /* ResizePopover.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResizePopover.swift; sourceTree = "<group>"; };
306308
B2000000000000000000002C /* ExportResultSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExportResultSheet.swift; sourceTree = "<group>"; };
@@ -491,6 +493,8 @@
491493
B10000000000000000000049 /* IconButton.swift */,
492494
B1000000000000000000004A /* InlineEditableText.swift */,
493495
B1000000000000000000004B /* SettingsAboutTab.swift */,
496+
B1000000000000000000004D /* PrimaryButton.swift */,
497+
B1000000000000000000004E /* SelectButton.swift */,
494498
);
495499
path = UI;
496500
sourceTree = "<group>";
@@ -560,7 +564,6 @@
560564
isa = PBXGroup;
561565
children = (
562566
B2000000000000000000000B /* AudioWaveformGenerator.swift */,
563-
B20000000000000000000019 /* EditorBottomBar.swift */,
564567
B20000000000000000000006 /* EditorState.swift */,
565568
B20000000000000000000016 /* EditorTopBar.swift */,
566569
B20000000000000000000022 /* History.swift */,
@@ -757,7 +760,6 @@
757760
A20000000000000000000016 /* EditorTopBar.swift in Sources */,
758761
A20000000000000000000017 /* ExportSheet.swift in Sources */,
759762
A20000000000000000000018 /* PropertiesPanel.swift in Sources */,
760-
A20000000000000000000019 /* EditorBottomBar.swift in Sources */,
761763
A2000000000000000000001A /* CompositionInstruction.swift in Sources */,
762764
A2000000000000000000000C /* EditorView.swift in Sources */,
763765
A2000000000000000000000D /* EditorWindow.swift in Sources */,
@@ -829,6 +831,8 @@
829831
A1000000000000000000004A /* InlineEditableText.swift in Sources */,
830832
A1000000000000000000004B /* SettingsAboutTab.swift in Sources */,
831833
A1000000000000000000004C /* UpdateChecker.swift in Sources */,
834+
A1000000000000000000004D /* PrimaryButton.swift in Sources */,
835+
A1000000000000000000004E /* SelectButton.swift in Sources */,
832836
A2000000000000000000002A /* EditorView+TransportBar.swift in Sources */,
833837
A2000000000000000000002B /* ResizePopover.swift in Sources */,
834838
A2000000000000000000002C /* ExportResultSheet.swift in Sources */,

‎Reframed/App/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
4545
window.isReleasedWhenClosed = false
4646
window.titlebarAppearsTransparent = true
4747
window.isMovableByWindowBackground = true
48-
window.backgroundColor = ReframedColors.panelBackgroundNS
48+
window.backgroundColor = ReframedColors.backgroundNS
4949
window.center()
5050

5151
window.collectionBehavior.insert(.moveToActiveSpace)

‎Reframed/CaptureModes/CaptureArea/CaptureAreaView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ struct CaptureAreaView: View {
5454
}
5555
.padding(.horizontal, 30)
5656
.padding(.vertical, 30)
57-
.background(ReframedColors.panelBackground)
58-
.clipShape(RoundedRectangle(cornerRadius: 6))
57+
.background(ReframedColors.background)
58+
.clipShape(RoundedRectangle(cornerRadius: Radius.md))
5959

6060
StartRecordingButton(
6161
delay: session.options.timerDelay.rawValue,

‎Reframed/CaptureModes/CaptureScreen/StartRecordingOverlay.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ struct StartRecordingOverlayView: View {
1313
VStack(spacing: 12) {
1414
Text(displayName)
1515
.font(.system(size: 14, weight: .medium))
16-
.foregroundStyle(ReframedColors.primaryText)
16+
.foregroundStyle(Color.black)
1717

1818
Text(resolution)
1919
.font(.system(size: 12))
20-
.foregroundStyle(ReframedColors.secondaryText)
20+
.foregroundStyle(Color.black.opacity(0.6))
2121

2222
StartRecordingButton(
2323
delay: delay,
@@ -27,11 +27,11 @@ struct StartRecordingOverlayView: View {
2727
)
2828
}
2929
.padding(24)
30-
.background(ReframedColors.panelBackground)
30+
.background(ReframedColors.overlayCardBackground)
3131
.clipShape(RoundedRectangle(cornerRadius: 16))
3232
.shadow(radius: 20)
3333
.frame(maxWidth: .infinity, maxHeight: .infinity)
34-
.background(.black.opacity(0.4))
34+
.background(ReframedColors.overlayDimBackground)
3535
.overlay {
3636
Button("") { onCancel() }
3737
.keyboardShortcut(.escape, modifiers: [])

‎Reframed/CaptureModes/CaptureWindow/ResizePopover.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private struct ResizeRow: View {
8989
}
9090
.buttonStyle(.plain)
9191
.background(
92-
RoundedRectangle(cornerRadius: 4)
92+
RoundedRectangle(cornerRadius: Radius.sm)
9393
.fill(isHovered ? ReframedColors.hoverBackground : Color.clear)
9494
.padding(.horizontal, 4)
9595
)

‎Reframed/CaptureModes/CaptureWindow/WindowSelectionView.swift‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ struct WindowSelectionView: View {
3636
context.fill(targetPath, with: .color(.black))
3737
context.blendMode = .normal
3838

39-
context.fill(targetPath, with: .color(Color(nsColor: .controlAccentColor).opacity(0.3)))
40-
context.stroke(targetPath, with: .color(Color(nsColor: .controlAccentColor)), lineWidth: 2)
39+
context.fill(targetPath, with: .color(.white.opacity(0.8)))
40+
context.stroke(targetPath, with: .color(.white), lineWidth: 2)
4141
}
4242
.edgesIgnoringSafeArea(.all)
4343

@@ -57,31 +57,21 @@ struct WindowSelectionView: View {
5757

5858
Text(current.appName)
5959
.font(.title2.bold())
60-
.foregroundStyle(.white)
61-
.shadow(color: .black.opacity(0.3), radius: 4)
60+
.foregroundStyle(Color.black)
61+
.shadow(color: .white.opacity(0.3), radius: 4)
6262

6363
HStack(spacing: 8) {
6464
Text("\(Int(current.frame.width)) \u{00d7} \(Int(current.frame.height))")
6565
.font(.system(size: 15))
66-
.foregroundStyle(.white)
67-
.shadow(color: .black.opacity(0.3), radius: 4)
68-
69-
Button {
70-
showingResize.toggle()
71-
} label: {
72-
Text("Resize")
73-
.font(.system(size: 13))
74-
.foregroundStyle(.white)
75-
.padding(.horizontal, 12)
76-
.padding(.vertical, 5)
77-
.background(Color(nsColor: .controlAccentColor))
78-
.clipShape(RoundedRectangle(cornerRadius: 5))
79-
}
80-
.buttonStyle(.plain)
81-
.popover(isPresented: $showingResize, arrowEdge: .bottom) {
82-
ResizePopover(windowController: windowController, window: current)
83-
.background(ReframedColors.panelBackground)
84-
}
66+
.foregroundStyle(Color.black)
67+
.shadow(color: .white.opacity(0.3), radius: 4)
68+
69+
Button("Resize") { showingResize.toggle() }
70+
.buttonStyle(PrimaryButtonStyle(size: .small, forceLightMode: true))
71+
.popover(isPresented: $showingResize, arrowEdge: .bottom) {
72+
ResizePopover(windowController: windowController, window: current)
73+
.background(ReframedColors.background)
74+
}
8575
}
8676

8777
StartRecordingButton(

‎Reframed/CaptureModes/Common/RecordingBorderWindow.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private final class RecordingBorderLayerView: NSView {
9494
}
9595

9696
borderLayer.fillColor = nil
97-
borderLayer.strokeColor = NSColor.controlAccentColor.cgColor
97+
borderLayer.strokeColor = ReframedColors.primaryNS.cgColor
9898
borderLayer.lineWidth = 2
9999
layer?.addSublayer(borderLayer)
100100

‎Reframed/Compositor/ExportSettings.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ struct ExportSettings: Sendable {
77
var resolution: ExportResolution = .original
88
var codec: ExportCodec = .h265
99
var audioBitrate: ExportAudioBitrate = .kbps320
10-
var mode: ExportMode = .normal
10+
var mode: ExportMode = .parallel
1111
var gifQuality: GIFQuality = .high
1212
}
1313

@@ -48,8 +48,8 @@ enum GIFQuality: Sendable, CaseIterable, Identifiable {
4848
}
4949

5050
enum ExportMode: Sendable, CaseIterable, Identifiable {
51-
case normal
5251
case parallel
52+
case normal
5353

5454
var id: Self { self }
5555

0 commit comments

Comments
 (0)