felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-29 12:46:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Replace DesignKit with package from ElementX."

Browse Source 
This reverts the following commits:
4858d72afb
6827d2a854
92c5874359
0a9bd1fbe6
This commit is contained in:
Doug
2022-08-18 11:50:08 +01:00
committed by Doug
parent 4dde22c6b7
commit 2b1bd6f772
55 changed files with 1051 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Common/Theme/ThemeSwiftUI.swift
+1 -24
View File
@@ -14,33 +14,10 @@
// limitations under the License.
//
import SwiftUI
import Foundation
import DesignKit
import DesignTokens
protocol ThemeSwiftUI: ThemeSwiftUIType {
var identifier: ThemeIdentifier { get }
var isDark: Bool { get }
}
/// Theme v2 for SwiftUI.
@available(iOS 14.0, *)
public protocol ThemeSwiftUIType {
/// Colors object
var colors: ElementColors { get }
/// Fonts object
var fonts: ElementFonts { get }
/// may contain more design components in future, like icons, audio files etc.
}
// MARK: - Legacy Colors
public extension ElementColors {
var legacyTile: Color {
let dynamicColor = UIColor { $0.userInterfaceStyle == .light ? .elementLight.tile : .elementDark.tile }
return Color(dynamicColor)
}
}
RiotSwiftUI/Modules/Common/Theme/ThemeUsersColorsExtension.swift
+2 -2
View File
@@ -23,7 +23,7 @@ extension ThemeSwiftUI {
/// - Parameter userId: The user id used to hash.
/// - Returns: The SwiftUI color for the associated userId.
func userColor(for userId: String) -> Color {
let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.contentAndAvatars.count))
return colors.contentAndAvatars[senderNameColorIndex]
let senderNameColorIndex = Int(userId.vc_hashCode % Int32(colors.namesAndAvatars.count))
return colors.namesAndAvatars[senderNameColorIndex]
}
}
RiotSwiftUI/Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift
+3 -3
View File
@@ -14,12 +14,12 @@
// limitations under the License.
//
import SwiftUI
import Foundation
import DesignKit
struct DarkThemeSwiftUI: ThemeSwiftUI {
var identifier: ThemeIdentifier = .dark
let isDark: Bool = true
var colors = Color.element
var fonts = Font.element
var colors: ColorSwiftUI = DarkColors.swiftUI
var fonts: FontSwiftUI = FontSwiftUI(values: ElementFonts())
}
RiotSwiftUI/Modules/Common/Theme/Themes/DefaultThemeSwiftUI.swift
+3 -3
View File
@@ -14,12 +14,12 @@
// limitations under the License.
//
import SwiftUI
import Foundation
import DesignKit
struct DefaultThemeSwiftUI: ThemeSwiftUI {
var identifier: ThemeIdentifier = .light
let isDark: Bool = false
var colors = Color.element
var fonts = Font.element
var colors: ColorSwiftUI = LightColors.swiftUI
var fonts: FontSwiftUI = FontSwiftUI(values: ElementFonts())
}