bukovinafilip/Atoll
1
0
Fork 0
mirror of https://github.com/FBukovina/Atoll.git synced 2026-10-27 15:14:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'Ebullioscopic:main' into main

Browse source
This commit is contained in:
HerbJul 2025-12-28 03:21:55 +01:00 • committed by GitHub
commit 9d9618f932
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
DynamicIsland.xcodeproj/project.pbxproj
View file

@ -370,7 +370,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"DynamicIsland/Preview Content\"";
DEVELOPMENT_TEAM = "";
ENABLE_APP_SANDBOX = NO;
@ -441,7 +441,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_ASSET_PATHS = "\"DynamicIsland/Preview Content\"";
DEVELOPMENT_TEAM = "";
ENABLE_APP_SANDBOX = NO;

3
DynamicIsland/Localizable.xcstrings
View file

@ -2363,6 +2363,9 @@
}
}
}
},
"Adds the AirPlay/route picker button back to the customizable controls palette." : {
},
"Adjust settings above to see changes in real-time. The actual OSD appears at the bottom center of your screen." : {
"comment" : "A footer in the \"Preview\" section of the Custom OSD settings, explaining how to use the live preview feature.",

3
DynamicIsland/components/Settings/SettingsView.swift
View file

@ -1923,6 +1923,9 @@ struct Media: View {
}
}
if showShuffleAndRepeat {
Defaults.Toggle("Show \"Change Media Output\" control", key: .showMediaOutputControl)
.settingsHighlight(id: highlightID("Show Change Media Output control"))
.help("Adds the AirPlay/route picker button back to the customizable controls palette.")
MusicSlotConfigurationView()
} else {
Text("Turn on customizable controls to rearrange media buttons.")

2
DynamicIsland/models/Constants.swift
View file

@ -530,7 +530,7 @@ extension Defaults.Keys {
static let enableParallaxEffect = Key<Bool>("enableParallaxEffect", default: true)
static let waitInterval = Key<Double>("waitInterval", default: 3)
static let showShuffleAndRepeat = Key<Bool>("showShuffleAndRepeat", default: true)
static let showMediaOutputControl = Key<Bool>("showMediaOutputControl", default: false)
static let showMediaOutputControl = Key<Bool>("showMediaOutputControl", default: true)
static let musicAuxLeftControl = Key<MusicAuxiliaryControl>("musicAuxLeftControl", default: .shuffle)
static let musicAuxRightControl = Key<MusicAuxiliaryControl>("musicAuxRightControl", default: .repeatMode)
static let didMigrateMusicAuxControls = Key<Bool>("didMigrateMusicAuxControls", default: false)

2
DynamicIsland/models/MusicControlButton.swift
View file

@ -57,7 +57,7 @@ enum MusicControlButton: String, CaseIterable, Identifiable, Codable, Defaults.S
case .repeatMode:
return "Repeat"
case .mediaOutput:
return "Media Output"
return "Change Media Output"
case .lyrics:
return "Lyrics"
case .seekBackward: