Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix avatar shape and position settings not being saved

This commit is contained in:
Thomas Ricouard 2023-09-20 21:19:45 +02:00
parent 7589ab75f8
commit 4adbff1342
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Packages/DesignSystem/Sources/DesignSystem/Theme.swift
View File

@ -5,7 +5,7 @@ import SwiftUI
class ThemeStorage { class ThemeStorage {
enum ThemeKey: String { enum ThemeKey: String {
case colorScheme, tint, label, primaryBackground, secondaryBackground case colorScheme, tint, label, primaryBackground, secondaryBackground
case avatarPosition, avatarShape, statusActionsDisplay, statusDisplayStyle case avatarPosition2, avatarShape2, statusActionsDisplay, statusDisplayStyle
case selectedSet, selectedScheme case selectedSet, selectedScheme
case followSystemColorSchme case followSystemColorSchme
case displayFullUsernameTimeline case displayFullUsernameTimeline
@ -18,8 +18,8 @@ import SwiftUI
@AppStorage(ThemeKey.primaryBackground.rawValue) public var primaryBackgroundColor: Color = .white @AppStorage(ThemeKey.primaryBackground.rawValue) public var primaryBackgroundColor: Color = .white
@AppStorage(ThemeKey.secondaryBackground.rawValue) public var secondaryBackgroundColor: Color = .gray @AppStorage(ThemeKey.secondaryBackground.rawValue) public var secondaryBackgroundColor: Color = .gray
@AppStorage(ThemeKey.label.rawValue) public var labelColor: Color = .black @AppStorage(ThemeKey.label.rawValue) public var labelColor: Color = .black
@AppStorage(ThemeKey.avatarPosition.rawValue) var rawAvatarPosition: String = AvatarPosition.top.rawValue @AppStorage(ThemeKey.avatarPosition2.rawValue) var avatarPosition: AvatarPosition = AvatarPosition.top
@AppStorage(ThemeKey.avatarShape.rawValue) var rawAvatarShape: String = AvatarShape.rounded.rawValue @AppStorage(ThemeKey.avatarShape2.rawValue) var avatarShape: AvatarShape = AvatarShape.rounded
@AppStorage(ThemeKey.selectedSet.rawValue) var storedSet: ColorSetName = .iceCubeDark @AppStorage(ThemeKey.selectedSet.rawValue) var storedSet: ColorSetName = .iceCubeDark
@AppStorage(ThemeKey.statusActionsDisplay.rawValue) public var statusActionsDisplay: StatusActionsDisplay = .full @AppStorage(ThemeKey.statusActionsDisplay.rawValue) public var statusActionsDisplay: StatusActionsDisplay = .full
@AppStorage(ThemeKey.statusDisplayStyle.rawValue) public var statusDisplayStyle: StatusDisplayStyle = .large @AppStorage(ThemeKey.statusDisplayStyle.rawValue) public var statusDisplayStyle: StatusDisplayStyle = .large
@ -173,15 +173,15 @@ import SwiftUI
} }
} }
private var rawAvatarPosition: String { public var avatarPosition: AvatarPosition {
didSet { didSet {
themeStorage.rawAvatarPosition = rawAvatarPosition themeStorage.avatarPosition = avatarPosition
} }
} }
private var rawAvatarShape: String { public var avatarShape: AvatarShape {
didSet { didSet {
themeStorage.rawAvatarShape = rawAvatarShape themeStorage.avatarShape = avatarShape
} }
} }
@ -233,18 +233,6 @@ import SwiftUI
} }
} }
public var avatarPosition: AvatarPosition = .top {
didSet {
rawAvatarPosition = avatarShape.rawValue
}
}
public var avatarShape: AvatarShape = .rounded {
didSet {
rawAvatarShape = avatarShape.rawValue
}
}
public var selectedSet: ColorSetName = .iceCubeDark public var selectedSet: ColorSetName = .iceCubeDark
public static let shared = Theme() public static let shared = Theme()
@ -256,8 +244,8 @@ import SwiftUI
primaryBackgroundColor = themeStorage.primaryBackgroundColor primaryBackgroundColor = themeStorage.primaryBackgroundColor
secondaryBackgroundColor = themeStorage.secondaryBackgroundColor secondaryBackgroundColor = themeStorage.secondaryBackgroundColor
labelColor = themeStorage.labelColor labelColor = themeStorage.labelColor
rawAvatarPosition = themeStorage.rawAvatarPosition avatarPosition = themeStorage.avatarPosition
rawAvatarShape = themeStorage.rawAvatarShape avatarShape = themeStorage.avatarShape
storedSet = themeStorage.storedSet storedSet = themeStorage.storedSet
statusActionsDisplay = themeStorage.statusActionsDisplay statusActionsDisplay = themeStorage.statusActionsDisplay
statusDisplayStyle = themeStorage.statusDisplayStyle statusDisplayStyle = themeStorage.statusDisplayStyle
@ -267,8 +255,6 @@ import SwiftUI
fontSizeScale = themeStorage.fontSizeScale fontSizeScale = themeStorage.fontSizeScale
chosenFontData = themeStorage.chosenFontData chosenFontData = themeStorage.chosenFontData
selectedSet = storedSet selectedSet = storedSet
avatarPosition = AvatarPosition(rawValue: rawAvatarPosition) ?? .top
avatarShape = AvatarShape(rawValue: rawAvatarShape) ?? .rounded
} }
public static var allColorSet: [ColorSet] { public static var allColorSet: [ColorSet] {