Skip to content

Centralize adjustment reset logic in the model #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yingwang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Centralize adjustment reset logic in the model #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 52 additions & 0 deletions Sources/Luma/PhotoAsset.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,58 @@ struct PhotoAdjustments: Codable, Equatable {
sharpness = 0
vignette = 0
}

mutating func resetRadialAdjustment() {
radialExposure = PhotoAdjustments.neutral.radialExposure
radialCenterX = PhotoAdjustments.neutral.radialCenterX
radialCenterY = PhotoAdjustments.neutral.radialCenterY
radialRadius = PhotoAdjustments.neutral.radialRadius
radialFeather = PhotoAdjustments.neutral.radialFeather
radialInvert = PhotoAdjustments.neutral.radialInvert
}

mutating func resetLinearAdjustment() {
linearExposure = PhotoAdjustments.neutral.linearExposure
linearStartY = PhotoAdjustments.neutral.linearStartY
linearEndY = PhotoAdjustments.neutral.linearEndY
linearInvert = PhotoAdjustments.neutral.linearInvert
}

mutating func resetSpotHeal() {
spotHealAmount = PhotoAdjustments.neutral.spotHealAmount
spotHealX = PhotoAdjustments.neutral.spotHealX
spotHealY = PhotoAdjustments.neutral.spotHealY
spotHealRadius = PhotoAdjustments.neutral.spotHealRadius
spotHealFeather = PhotoAdjustments.neutral.spotHealFeather
spotHealSourceOffsetX = PhotoAdjustments.neutral.spotHealSourceOffsetX
spotHealSourceOffsetY = PhotoAdjustments.neutral.spotHealSourceOffsetY
}

mutating func resetLocalAdjustments() {
resetRadialAdjustment()
resetLinearAdjustment()
resetSpotHeal()
}

mutating func resetBeautyAdjustments() {
beautySmooth = 0
beautyWrinkle = 0
beautyBlemish = 0
beautyBrighten = 0
beautyWhiten = 0
beautyRosy = 0
beautyGlow = 0
beautySoften = 0
beautyDetail = 0
beautyWarmth = 0
eyeEnlarge = 0
faceSlim = 0
bodySlim = 0
}

mutating func resetColorMixer() {
colorMixer = ColorMixerAdjustments()
}
}

struct ColorMixerAdjustments: Codable, Equatable {
Expand Down
54 changes: 6 additions & 48 deletions Sources/Luma/PhotoLibraryStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,26 +596,14 @@ final class PhotoLibraryStore: ObservableObject {

func resetSelectedBeautyAdjustments() {
updateSelectedAdjustments { adjustments in
adjustments.beautySmooth = 0
adjustments.beautyWrinkle = 0
adjustments.beautyBlemish = 0
adjustments.beautyBrighten = 0
adjustments.beautyWhiten = 0
adjustments.beautyRosy = 0
adjustments.beautyGlow = 0
adjustments.beautySoften = 0
adjustments.beautyDetail = 0
adjustments.beautyWarmth = 0
adjustments.eyeEnlarge = 0
adjustments.faceSlim = 0
adjustments.bodySlim = 0
adjustments.resetBeautyAdjustments()
}
statusMessage = "Reset beauty adjustments."
}

func resetSelectedColorMixer() {
updateSelectedAdjustments { adjustments in
adjustments.colorMixer = ColorMixerAdjustments()
adjustments.resetColorMixer()
}
statusMessage = "Reset color mixer."
}
Expand Down Expand Up @@ -676,45 +664,21 @@ final class PhotoLibraryStore: ObservableObject {

func resetSelectedLocalAdjustments() {
updateSelectedAdjustments { adjustments in
adjustments.radialExposure = 0
adjustments.radialCenterX = 0.5
adjustments.radialCenterY = 0.5
adjustments.radialRadius = 0.35
adjustments.radialFeather = 0.25
adjustments.radialInvert = false
adjustments.linearExposure = 0
adjustments.linearStartY = 1
adjustments.linearEndY = 0.65
adjustments.linearInvert = false
adjustments.spotHealAmount = 0
adjustments.spotHealX = 0.5
adjustments.spotHealY = 0.5
adjustments.spotHealRadius = 0.06
adjustments.spotHealFeather = 0.04
adjustments.spotHealSourceOffsetX = 0.08
adjustments.spotHealSourceOffsetY = 0
adjustments.resetLocalAdjustments()
}
statusMessage = "Reset local adjustments."
}

func resetSelectedRadialAdjustment() {
updateSelectedAdjustments { adjustments in
adjustments.radialExposure = 0
adjustments.radialCenterX = 0.5
adjustments.radialCenterY = 0.5
adjustments.radialRadius = 0.35
adjustments.radialFeather = 0.25
adjustments.radialInvert = false
adjustments.resetRadialAdjustment()
}
statusMessage = "Reset radial adjustment."
}

func resetSelectedLinearAdjustment() {
updateSelectedAdjustments { adjustments in
adjustments.linearExposure = 0
adjustments.linearStartY = 1
adjustments.linearEndY = 0.65
adjustments.linearInvert = false
adjustments.resetLinearAdjustment()
}
statusMessage = "Reset linear adjustment."
}
Expand All @@ -728,13 +692,7 @@ final class PhotoLibraryStore: ObservableObject {

func resetSelectedSpotHeal() {
updateSelectedAdjustments { adjustments in
adjustments.spotHealAmount = 0
adjustments.spotHealX = 0.5
adjustments.spotHealY = 0.5
adjustments.spotHealRadius = 0.06
adjustments.spotHealFeather = 0.04
adjustments.spotHealSourceOffsetX = 0.08
adjustments.spotHealSourceOffsetY = 0
adjustments.resetSpotHeal()
}
statusMessage = "Reset spot heal."
}
Expand Down
139 changes: 139 additions & 0 deletions Tests/LumaTests/LumaModelTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,145 @@ final class LumaModelTests: XCTestCase {
XCTAssertTrue(adjustments.flipHorizontal)
}

func testResetRadialAdjustmentRestoresDefaultsWithoutChangingOtherEdits() {
var adjustments = PhotoAdjustments(
exposure: 0.5,
radialExposure: -0.8,
radialCenterX: 0.2,
radialCenterY: 0.3,
radialRadius: 0.6,
radialFeather: 0.5,
radialInvert: true,
linearExposure: 0.4,
spotHealAmount: 0.7
)

adjustments.resetRadialAdjustment()

XCTAssertEqual(adjustments.radialExposure, 0)
XCTAssertEqual(adjustments.radialCenterX, 0.5)
XCTAssertEqual(adjustments.radialCenterY, 0.5)
XCTAssertEqual(adjustments.radialRadius, 0.35)
XCTAssertEqual(adjustments.radialFeather, 0.25)
XCTAssertFalse(adjustments.radialInvert)
XCTAssertEqual(adjustments.exposure, 0.5)
XCTAssertEqual(adjustments.linearExposure, 0.4)
XCTAssertEqual(adjustments.spotHealAmount, 0.7)
}

func testResetLinearAdjustmentRestoresDefaultsWithoutChangingOtherEdits() {
var adjustments = PhotoAdjustments(
linearExposure: 0.9,
linearStartY: 0.2,
linearEndY: 0.1,
linearInvert: true,
radialExposure: -0.3
)

adjustments.resetLinearAdjustment()

XCTAssertEqual(adjustments.linearExposure, 0)
XCTAssertEqual(adjustments.linearStartY, 1)
XCTAssertEqual(adjustments.linearEndY, 0.65)
XCTAssertFalse(adjustments.linearInvert)
XCTAssertEqual(adjustments.radialExposure, -0.3)
}

func testResetSpotHealRestoresDefaultsWithoutChangingOtherEdits() {
var adjustments = PhotoAdjustments(
spotHealAmount: 0.8,
spotHealX: 0.1,
spotHealY: 0.9,
spotHealRadius: 0.3,
spotHealFeather: 0.2,
spotHealSourceOffsetX: 0.4,
spotHealSourceOffsetY: -0.4,
radialExposure: 0.5
)

adjustments.resetSpotHeal()

XCTAssertEqual(adjustments.spotHealAmount, 0)
XCTAssertEqual(adjustments.spotHealX, 0.5)
XCTAssertEqual(adjustments.spotHealY, 0.5)
XCTAssertEqual(adjustments.spotHealRadius, 0.06)
XCTAssertEqual(adjustments.spotHealFeather, 0.04)
XCTAssertEqual(adjustments.spotHealSourceOffsetX, 0.08)
XCTAssertEqual(adjustments.spotHealSourceOffsetY, 0)
XCTAssertEqual(adjustments.radialExposure, 0.5)
}

func testResetLocalAdjustmentsClearsAllLocalEditsButKeepsToneEdits() {
var adjustments = PhotoAdjustments(
exposure: 0.6,
contrast: 1.3,
radialExposure: -0.7,
radialInvert: true,
linearExposure: 0.5,
linearInvert: true,
spotHealAmount: 0.9
)

adjustments.resetLocalAdjustments()

XCTAssertEqual(adjustments.radialExposure, 0)
XCTAssertFalse(adjustments.radialInvert)
XCTAssertEqual(adjustments.linearExposure, 0)
XCTAssertFalse(adjustments.linearInvert)
XCTAssertEqual(adjustments.spotHealAmount, 0)
XCTAssertEqual(adjustments.exposure, 0.6)
XCTAssertEqual(adjustments.contrast, 1.3)
}

func testResetBeautyAdjustmentsClearsBeautyEditsButKeepsToneEdits() {
var adjustments = PhotoAdjustments(
exposure: 0.4,
beautySmooth: 0.5,
beautyWrinkle: 0.4,
beautyBlemish: 0.3,
beautyBrighten: 0.2,
beautyWhiten: 0.3,
beautyRosy: 0.2,
beautyGlow: 0.4,
beautySoften: 0.3,
beautyDetail: 0.2,
beautyWarmth: 0.5,
eyeEnlarge: 0.3,
faceSlim: 0.2,
bodySlim: 0.4
)

adjustments.resetBeautyAdjustments()

XCTAssertEqual(adjustments.beautySmooth, 0)
XCTAssertEqual(adjustments.beautyWrinkle, 0)
XCTAssertEqual(adjustments.beautyBlemish, 0)
XCTAssertEqual(adjustments.beautyBrighten, 0)
XCTAssertEqual(adjustments.beautyWhiten, 0)
XCTAssertEqual(adjustments.beautyRosy, 0)
XCTAssertEqual(adjustments.beautyGlow, 0)
XCTAssertEqual(adjustments.beautySoften, 0)
XCTAssertEqual(adjustments.beautyDetail, 0)
XCTAssertEqual(adjustments.beautyWarmth, 0)
XCTAssertEqual(adjustments.eyeEnlarge, 0)
XCTAssertEqual(adjustments.faceSlim, 0)
XCTAssertEqual(adjustments.bodySlim, 0)
XCTAssertEqual(adjustments.exposure, 0.4)
}

func testResetColorMixerClearsMixerButKeepsToneEdits() {
var mixer = ColorMixerAdjustments()
mixer.blue = -0.5
mixer.orange = 0.3
var adjustments = PhotoAdjustments(saturation: 1.2, colorMixer: mixer)

adjustments.resetColorMixer()

XCTAssertFalse(adjustments.colorMixer.hasAdjustments)
XCTAssertEqual(adjustments.colorMixer, ColorMixerAdjustments())
XCTAssertEqual(adjustments.saturation, 1.2)
}

func testLibrarySortMetadata() {
XCTAssertEqual(LibrarySort.allCases.map(\.rawValue), ["File Name", "Capture Date", "Rating", "Flag", "Color Label", "Import Date"])
}
Expand Down