Skip to content

Commit b883570

Browse files
Merge pull request #277 from Ebullioscopic/ui/fixes
Update ALPHA badge
2 parents bb9b611 + b125fb4 commit b883570

2 files changed

Lines changed: 22 additions & 27 deletions

File tree

DynamicIsland.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
387387
CODE_SIGN_STYLE = Manual;
388388
COMBINE_HIDPI_IMAGES = YES;
389-
CURRENT_PROJECT_VERSION = 3;
389+
CURRENT_PROJECT_VERSION = 4;
390390
DEVELOPMENT_ASSET_PATHS = "\"DynamicIsland/Preview Content\"";
391391
DEVELOPMENT_TEAM = "";
392392
ENABLE_APP_SANDBOX = NO;
@@ -427,7 +427,7 @@
427427
"@executable_path/../Frameworks",
428428
);
429429
MACOSX_DEPLOYMENT_TARGET = 14.6;
430-
MARKETING_VERSION = "1.2.2-beta";
430+
MARKETING_VERSION = "1.3-beta";
431431
PRODUCT_BUNDLE_IDENTIFIER = com.Ebullioscopic.Atoll.dev;
432432
PRODUCT_NAME = Atoll;
433433
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -457,7 +457,7 @@
457457
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
458458
CODE_SIGN_STYLE = Manual;
459459
COMBINE_HIDPI_IMAGES = YES;
460-
CURRENT_PROJECT_VERSION = 3;
460+
CURRENT_PROJECT_VERSION = 4;
461461
DEVELOPMENT_ASSET_PATHS = "\"DynamicIsland/Preview Content\"";
462462
DEVELOPMENT_TEAM = "";
463463
ENABLE_APP_SANDBOX = NO;
@@ -498,7 +498,7 @@
498498
"@executable_path/../Frameworks",
499499
);
500500
MACOSX_DEPLOYMENT_TARGET = 14.6;
501-
MARKETING_VERSION = "1.2.2-beta";
501+
MARKETING_VERSION = "1.3-beta";
502502
PRODUCT_BUNDLE_IDENTIFIER = com.Ebullioscopic.Atoll;
503503
PRODUCT_NAME = Atoll;
504504
PROVISIONING_PROFILE_SPECIFIER = "";

DynamicIsland/components/Settings/SettingsView.swift

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
1-
/*
2-
* Atoll (DynamicIsland)
3-
* Copyright (C) 2024-2026 Atoll Contributors
4-
*
5-
* Originally from boring.notch project
6-
* Modified and adapted for Atoll (DynamicIsland)
7-
* See NOTICE for details.
8-
*
9-
* This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
11-
* the Free Software Foundation, either version 3 of the License, or
12-
* (at your option) any later version.
13-
*
14-
* This program is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.
18-
*
19-
* You should have received a copy of the GNU General Public License
20-
* along with this program. If not, see <https://www.gnu.org/licenses/>.
21-
*/
22-
1+
//
2+
// SettingsView.swift
3+
// DynamicIsland
4+
//
5+
// Created by Richard Kunkli on 07/08/2024.
6+
//
237
import AppKit
248
import AVFoundation
259
import Combine
@@ -303,6 +287,17 @@ struct SettingsView: View {
303287
Capsule()
304288
.fill(Color.blue)
305289
)
290+
} else if tab == .extensions {
291+
Spacer()
292+
Text("ALPHA")
293+
.font(.system(size: 9, weight: .bold))
294+
.foregroundStyle(.white)
295+
.padding(.horizontal, 6)
296+
.padding(.vertical, 2)
297+
.background(
298+
Capsule()
299+
.fill(Color.orange)
300+
)
306301
}
307302
}
308303
.padding(.vertical, 4)
@@ -414,7 +409,6 @@ struct SettingsView: View {
414409
.lockScreen,
415410
.media,
416411
.devices,
417-
.extensions,
418412
.timer,
419413
.calendar,
420414
.hudAndOSD,
@@ -427,6 +421,7 @@ struct SettingsView: View {
427421
.downloads,
428422
.shelf,
429423
.shortcuts,
424+
.extensions,
430425
.about
431426
]
432427

0 commit comments

Comments
 (0)