mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-04-27 02:14:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bump version to 1.8.2

Browse source
This commit is contained in:
Thomas Ricouard 2023-09-20 08:20:01 +02:00
parent 46df3bb7f9
commit 90337bd3ea
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
IceCubesApp.xcodeproj/project.pbxproj
View file

@ -981,7 +981,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1011,7 +1011,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesNotifications";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1042,7 +1042,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1072,7 +1072,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesShareExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1244,7 +1244,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto; SDKROOT = auto;
@ -1297,7 +1297,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto; SDKROOT = auto;
@ -1331,7 +1331,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@ -1362,7 +1362,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@executable_path/../../Frameworks", "@executable_path/../../Frameworks",
); );
MARKETING_VERSION = 1.8.1; MARKETING_VERSION = 1.8.2;
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension"; PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_ID_PREFIX).IceCubesApp.IceCubesActionExtension";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos; SDKROOT = iphoneos;

3
IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift
View file

@ -232,8 +232,7 @@ struct DisplaySettingsView: View {
Section { Section {
Button { Button {
theme.followSystemColorScheme = true theme.followSystemColorScheme = true
theme.selectedSet = colorScheme == .dark ? .iceCubeDark : .iceCubeLight theme.applySet(set: colorScheme == .dark ? .iceCubeDark : .iceCubeLight)
theme.setColor(withName: theme.selectedSet)
theme.avatarShape = .rounded theme.avatarShape = .rounded
theme.avatarPosition = .top theme.avatarPosition = .top
theme.statusActionsDisplay = .full theme.statusActionsDisplay = .full

5
Packages/DesignSystem/Sources/DesignSystem/Theme.swift
View file

@ -287,6 +287,11 @@ import SwiftUI
ConstellationDark(), ConstellationDark(),
] ]
} }
public func applySet(set: ColorSetName) {
selectedSet = set
setColor(withName: set)
}
public func setColor(withName name: ColorSetName) { public func setColor(withName name: ColorSetName) {
let colorSet = Theme.allColorSet.filter { $0.name == name }.first ?? IceCubeDark() let colorSet = Theme.allColorSet.filter { $0.name == name }.first ?? IceCubeDark()

9
Packages/DesignSystem/Sources/DesignSystem/ThemeApplier.swift
View file

@ -30,15 +30,13 @@ struct ThemeApplier: ViewModifier {
.onAppear { .onAppear {
// If theme is never set before set the default store. This should only execute once after install. // If theme is never set before set the default store. This should only execute once after install.
if !theme.isThemePreviouslySet { if !theme.isThemePreviouslySet {
theme.selectedSet = colorScheme == .dark ? .iceCubeDark : .iceCubeLight theme.applySet(set: colorScheme == .dark ? .iceCubeDark : .iceCubeLight)
theme.setColor(withName: theme.selectedSet)
theme.isThemePreviouslySet = true theme.isThemePreviouslySet = true
} else if theme.followSystemColorScheme, theme.isThemePreviouslySet, } else if theme.followSystemColorScheme, theme.isThemePreviouslySet,
let sets = availableColorsSets let sets = availableColorsSets
.first(where: { $0.light.name == theme.selectedSet || $0.dark.name == theme.selectedSet }) .first(where: { $0.light.name == theme.selectedSet || $0.dark.name == theme.selectedSet })
{ {
theme.selectedSet = colorScheme == .dark ? sets.dark.name : sets.light.name theme.applySet(set: colorScheme == .dark ? sets.dark.name : sets.light.name)
theme.setColor(withName: theme.selectedSet)
} }
setWindowTint(theme.tintColor) setWindowTint(theme.tintColor)
setWindowUserInterfaceStyle(from: theme.selectedScheme) setWindowUserInterfaceStyle(from: theme.selectedScheme)
@ -58,8 +56,7 @@ struct ThemeApplier: ViewModifier {
let sets = availableColorsSets let sets = availableColorsSets
.first(where: { $0.light.name == theme.selectedSet || $0.dark.name == theme.selectedSet }) .first(where: { $0.light.name == theme.selectedSet || $0.dark.name == theme.selectedSet })
{ {
theme.selectedSet = newColorScheme == .dark ? sets.dark.name : sets.light.name theme.applySet(set: newColorScheme == .dark ? sets.dark.name : sets.light.name)
theme.setColor(withName: theme.selectedSet)
} }
} }
#endif #endif

3
Packages/DesignSystem/Sources/DesignSystem/Views/ThemePreviewView.swift
View file

@ -89,8 +89,7 @@ struct ThemeBoxView: View {
if color.scheme != currentScheme { if color.scheme != currentScheme {
theme.followSystemColorScheme = false theme.followSystemColorScheme = false
} }
theme.selectedSet = color.name theme.applySet(set: color.name)
theme.setColor(withName: theme.selectedSet)
} }
} }
} }