mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-06 12:28:29 +00:00
Update and enable the new bloom style on the home screen. (#4291)
* Update Compound * Adopt the new accent colour (and gradient) tokens.
This commit is contained in:
@@ -8895,7 +8895,7 @@
|
|||||||
repositoryURL = "https://github.com/element-hq/compound-ios";
|
repositoryURL = "https://github.com/element-hq/compound-ios";
|
||||||
requirement = {
|
requirement = {
|
||||||
kind = revision;
|
kind = revision;
|
||||||
revision = 4aa89193ba5bfa0d83f9bbc584900e518fdb3a26;
|
revision = 4cadcbcf1d4102e9a8114842c4def62cd8989de3;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
|
F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/element-hq/compound-design-tokens",
|
"location" : "https://github.com/element-hq/compound-design-tokens",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "45818d8a7183a6838414791de50fbcea6a49100c",
|
"revision" : "00a392cf3e907fb2ebc49a9590f7a0a97c175c0f",
|
||||||
"version" : "4.0.1"
|
"version" : "5.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
"kind" : "remoteSourceControl",
|
"kind" : "remoteSourceControl",
|
||||||
"location" : "https://github.com/element-hq/compound-ios",
|
"location" : "https://github.com/element-hq/compound-ios",
|
||||||
"state" : {
|
"state" : {
|
||||||
"revision" : "4aa89193ba5bfa0d83f9bbc584900e518fdb3a26"
|
"revision" : "4cadcbcf1d4102e9a8114842c4def62cd8989de3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ final class AppSettings {
|
|||||||
case optimizeMediaUploads
|
case optimizeMediaUploads
|
||||||
case appAppearance
|
case appAppearance
|
||||||
case sharePresence
|
case sharePresence
|
||||||
case isNewBloomEnabled
|
|
||||||
|
|
||||||
case elementCallBaseURLOverride
|
case elementCallBaseURLOverride
|
||||||
|
|
||||||
@@ -347,9 +346,6 @@ final class AppSettings {
|
|||||||
@UserPreference(key: UserDefaultsKeys.threadsEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store))
|
@UserPreference(key: UserDefaultsKeys.threadsEnabled, defaultValue: isDevelopmentBuild, storageType: .userDefaults(store))
|
||||||
var developerOptionsEnabled
|
var developerOptionsEnabled
|
||||||
|
|
||||||
@UserPreference(key: UserDefaultsKeys.isNewBloomEnabled, defaultValue: false, storageType: .userDefaults(store))
|
|
||||||
var isNewBloomEnabled
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// MARK: - Shared
|
// MARK: - Shared
|
||||||
|
|||||||
@@ -15,11 +15,11 @@ struct PillView: View {
|
|||||||
let didChangeText: () -> Void
|
let didChangeText: () -> Void
|
||||||
|
|
||||||
var textColor: Color {
|
var textColor: Color {
|
||||||
context.viewState.isOwnMention ? .compound._textOwnPill : .compound.textPrimary
|
context.viewState.isOwnMention ? .compound.textBadgeAccent : .compound.textPrimary
|
||||||
}
|
}
|
||||||
|
|
||||||
var backgroundColor: Color {
|
var backgroundColor: Color {
|
||||||
context.viewState.isOwnMention ? .compound._bgOwnPill : .compound._bgPill
|
context.viewState.isOwnMention ? .compound.bgBadgeAccent : .compound.bgBadgeDefault
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
|
|||||||
@@ -134,19 +134,19 @@ struct AvatarHeaderView<Footer: View>: View {
|
|||||||
case .encrypted(true):
|
case .encrypted(true):
|
||||||
BadgeLabel(title: L10n.screenRoomDetailsBadgeEncrypted,
|
BadgeLabel(title: L10n.screenRoomDetailsBadgeEncrypted,
|
||||||
icon: \.lockSolid,
|
icon: \.lockSolid,
|
||||||
isHighlighted: true)
|
style: .accent)
|
||||||
case .encrypted(false):
|
case .encrypted(false):
|
||||||
BadgeLabel(title: L10n.screenRoomDetailsBadgeNotEncrypted,
|
BadgeLabel(title: L10n.screenRoomDetailsBadgeNotEncrypted,
|
||||||
icon: \.lockOff,
|
icon: \.lockOff,
|
||||||
isHighlighted: false)
|
style: .info)
|
||||||
case .public:
|
case .public:
|
||||||
BadgeLabel(title: L10n.screenRoomDetailsBadgePublic,
|
BadgeLabel(title: L10n.screenRoomDetailsBadgePublic,
|
||||||
icon: \.public,
|
icon: \.public,
|
||||||
isHighlighted: false)
|
style: .info)
|
||||||
case .verified:
|
case .verified:
|
||||||
BadgeLabel(title: L10n.commonVerified,
|
BadgeLabel(title: L10n.commonVerified,
|
||||||
icon: \.verified,
|
icon: \.verified,
|
||||||
isHighlighted: true)
|
style: .accent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,46 +9,64 @@ import Compound
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct BadgeLabel: View {
|
struct BadgeLabel: View {
|
||||||
|
enum Style {
|
||||||
|
case accent
|
||||||
|
case info
|
||||||
|
case `default`
|
||||||
|
}
|
||||||
|
|
||||||
let title: String
|
let title: String
|
||||||
let icon: KeyPath<CompoundIcons, Image>
|
let icon: KeyPath<CompoundIcons, Image>
|
||||||
let isHighlighted: Bool
|
let style: Style
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Label(title,
|
Label(title,
|
||||||
icon: icon,
|
icon: icon,
|
||||||
iconSize: .xSmall,
|
iconSize: .xSmall,
|
||||||
relativeTo: .compound.bodySM)
|
relativeTo: .compound.bodySM)
|
||||||
.labelStyle(BadgeLabelStyle(isHighlighted: isHighlighted))
|
.labelStyle(LabelStyle(style: style))
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private struct BadgeLabelStyle: LabelStyle {
|
|
||||||
let isHighlighted: Bool
|
|
||||||
|
|
||||||
var titleColor: Color {
|
|
||||||
isHighlighted ? .compound.textBadgeAccent : .compound.textBadgeInfo
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var iconColor: Color {
|
private struct LabelStyle: SwiftUI.LabelStyle {
|
||||||
isHighlighted ? .compound.iconSuccessPrimary : .compound.iconInfoPrimary
|
let style: Style
|
||||||
}
|
|
||||||
|
|
||||||
var backgroundColor: Color {
|
var titleColor: Color {
|
||||||
isHighlighted ? .compound.bgBadgeAccent : .compound.bgBadgeInfo
|
switch style {
|
||||||
}
|
case .accent: .compound.textBadgeAccent
|
||||||
|
case .info: .compound.textBadgeInfo
|
||||||
func makeBody(configuration: Configuration) -> some View {
|
case .default: .compound.textPrimary
|
||||||
HStack(spacing: 4) {
|
}
|
||||||
configuration.icon
|
}
|
||||||
.foregroundStyle(iconColor)
|
|
||||||
configuration.title
|
var iconColor: Color {
|
||||||
.foregroundStyle(titleColor)
|
switch style {
|
||||||
|
case .accent: .compound.iconAccentPrimary
|
||||||
|
case .info: .compound.iconInfoPrimary
|
||||||
|
case .default: .compound.iconPrimary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var backgroundColor: Color {
|
||||||
|
switch style {
|
||||||
|
case .accent: .compound.bgBadgeAccent
|
||||||
|
case .info: .compound.bgBadgeInfo
|
||||||
|
case .default: .compound.bgBadgeDefault
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeBody(configuration: Configuration) -> some View {
|
||||||
|
HStack(spacing: 4) {
|
||||||
|
configuration.icon
|
||||||
|
.foregroundStyle(iconColor)
|
||||||
|
configuration.title
|
||||||
|
.foregroundStyle(titleColor)
|
||||||
|
}
|
||||||
|
.font(.compound.bodySM)
|
||||||
|
.padding(.leading, 8)
|
||||||
|
.padding(.trailing, 12)
|
||||||
|
.padding(.vertical, 4)
|
||||||
|
.background(Capsule().fill(backgroundColor))
|
||||||
}
|
}
|
||||||
.font(.compound.bodySM)
|
|
||||||
.padding(.leading, 8)
|
|
||||||
.padding(.trailing, 12)
|
|
||||||
.padding(.vertical, 4)
|
|
||||||
.background(Capsule().fill(backgroundColor))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,10 +75,13 @@ struct BadgeLabel_Previews: PreviewProvider, TestablePreview {
|
|||||||
VStack(spacing: 10) {
|
VStack(spacing: 10) {
|
||||||
BadgeLabel(title: "Encrypted",
|
BadgeLabel(title: "Encrypted",
|
||||||
icon: \.lockSolid,
|
icon: \.lockSolid,
|
||||||
isHighlighted: true)
|
style: .accent)
|
||||||
BadgeLabel(title: "Not encrypted",
|
BadgeLabel(title: "Not encrypted",
|
||||||
icon: \.lockSolid,
|
icon: \.lockSolid,
|
||||||
isHighlighted: false)
|
style: .info)
|
||||||
|
BadgeLabel(title: "1234",
|
||||||
|
icon: \.userProfile,
|
||||||
|
style: .default)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,28 +8,29 @@
|
|||||||
import Compound
|
import Compound
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
|
extension View {
|
||||||
|
func highlight(gradient: Gradient, borderColor: Color, backgroundColor: Color = .clear) -> some View {
|
||||||
|
modifier(HorizontalHighlightGradient(gradient: gradient, borderColor: borderColor, backgroundColor: backgroundColor))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct HorizontalHighlightGradient: ViewModifier {
|
struct HorizontalHighlightGradient: ViewModifier {
|
||||||
|
let gradient: Gradient
|
||||||
let borderColor: Color
|
let borderColor: Color
|
||||||
let primaryColor: Color
|
let backgroundColor: Color
|
||||||
let secondaryColor: Color
|
|
||||||
|
|
||||||
func body(content: Content) -> some View {
|
func body(content: Content) -> some View {
|
||||||
ZStack(alignment: .top) {
|
ZStack(alignment: .top) {
|
||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
borderColor
|
borderColor
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
LinearGradient(colors: [primaryColor, secondaryColor],
|
LinearGradient(gradient: gradient,
|
||||||
startPoint: .top,
|
startPoint: .top,
|
||||||
endPoint: .bottom)
|
endPoint: .bottom)
|
||||||
|
.background(backgroundColor)
|
||||||
}
|
}
|
||||||
content
|
content
|
||||||
.layoutPriority(1)
|
.layoutPriority(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension View {
|
|
||||||
func highlight(borderColor: Color, primaryColor: Color, secondaryColor: Color) -> some View {
|
|
||||||
modifier(HorizontalHighlightGradient(borderColor: borderColor, primaryColor: primaryColor, secondaryColor: secondaryColor))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -105,10 +105,6 @@ struct HomeScreenViewState: BindableState {
|
|||||||
|
|
||||||
var reportRoomEnabled = false
|
var reportRoomEnabled = false
|
||||||
|
|
||||||
// Intentionally not mutable so that we don't have to reset the navigation bar's
|
|
||||||
// appearance whenever the feature flag is toggled (requires a restart).
|
|
||||||
let isNewBloomEnabled: Bool
|
|
||||||
|
|
||||||
var visibleRooms: [HomeScreenRoom] {
|
var visibleRooms: [HomeScreenRoom] {
|
||||||
if roomListMode == .skeletons {
|
if roomListMode == .skeletons {
|
||||||
return placeholderRooms
|
return placeholderRooms
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class HomeScreenViewModel: HomeScreenViewModelType, HomeScreenViewModelProtocol
|
|||||||
|
|
||||||
roomSummaryProvider = userSession.clientProxy.roomSummaryProvider
|
roomSummaryProvider = userSession.clientProxy.roomSummaryProvider
|
||||||
|
|
||||||
super.init(initialViewState: .init(userID: userSession.clientProxy.userID, isNewBloomEnabled: appSettings.isNewBloomEnabled),
|
super.init(initialViewState: .init(userID: userSession.clientProxy.userID),
|
||||||
mediaProvider: userSession.mediaProvider)
|
mediaProvider: userSession.mediaProvider)
|
||||||
|
|
||||||
userSession.clientProxy.userAvatarURLPublisher
|
userSession.clientProxy.userAvatarURLPublisher
|
||||||
|
|||||||
@@ -10,18 +10,13 @@ import SwiftUI
|
|||||||
import SwiftUIIntrospect
|
import SwiftUIIntrospect
|
||||||
|
|
||||||
extension View {
|
extension View {
|
||||||
// Note: The dependency on HomeScreenViewModel.Context will be removed in the next iteration.
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
func bloom(context: HomeScreenViewModel.Context, scrollViewAdapter: ScrollViewAdapter, isNewBloomEnabled: Bool) -> some View {
|
func bloom() -> some View {
|
||||||
if isNewBloomEnabled {
|
modifier(BloomModifier())
|
||||||
modifier(NewBloomModifier())
|
|
||||||
} else {
|
|
||||||
modifier(BloomModifier(context: context, scrollViewAdapter: scrollViewAdapter))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct NewBloomModifier: ViewModifier {
|
private struct BloomModifier: ViewModifier {
|
||||||
@State private var standardAppearance = UINavigationBarAppearance()
|
@State private var standardAppearance = UINavigationBarAppearance()
|
||||||
@State private var scrollEdgeAppearance = UINavigationBarAppearance()
|
@State private var scrollEdgeAppearance = UINavigationBarAppearance()
|
||||||
|
|
||||||
@@ -63,149 +58,10 @@ struct NewBloomModifier: ViewModifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private var bloomGradient: some View {
|
private var bloomGradient: some View {
|
||||||
LinearGradient(colors: [.compound._bgOwnPill, .clear], // This isn't the final gradient.
|
LinearGradient(gradient: .compound.subtle,
|
||||||
startPoint: .top,
|
startPoint: .top,
|
||||||
endPoint: .init(x: 0.5, y: 0.7))
|
endPoint: .init(x: 0.5, y: 0.7))
|
||||||
.ignoresSafeArea(edges: .all)
|
.ignoresSafeArea(edges: .all)
|
||||||
.frame(width: 256, height: 256)
|
.frame(width: 256, height: 256)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct BloomModifier: ViewModifier {
|
|
||||||
@ObservedObject var context: HomeScreenViewModel.Context
|
|
||||||
|
|
||||||
let scrollViewAdapter: ScrollViewAdapter
|
|
||||||
|
|
||||||
// Bloom components
|
|
||||||
@State private var bloomView: UIView?
|
|
||||||
@State private var leftBarButtonView: UIView?
|
|
||||||
@State private var gradientView: UIView?
|
|
||||||
@State private var navigationBarContainer: UIView?
|
|
||||||
@State private var hairlineView: UIView?
|
|
||||||
|
|
||||||
func body(content: Content) -> some View {
|
|
||||||
content
|
|
||||||
.introspect(.viewController, on: .supportedVersions) { controller in
|
|
||||||
Task {
|
|
||||||
if bloomView == nil {
|
|
||||||
makeBloomView(controller: controller)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let isTopController = controller.navigationController?.topViewController != controller
|
|
||||||
let isHidden = isTopController || context.isSearchFieldFocused
|
|
||||||
if let bloomView {
|
|
||||||
bloomView.isHidden = isHidden
|
|
||||||
UIView.transition(with: bloomView, duration: 1.75, options: .curveEaseInOut) {
|
|
||||||
bloomView.alpha = isTopController ? 0 : 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
gradientView?.isHidden = isHidden
|
|
||||||
navigationBarContainer?.clipsToBounds = !isHidden
|
|
||||||
hairlineView?.isHidden = isHidden || !scrollViewAdapter.isAtTopEdge.value
|
|
||||||
if !isHidden {
|
|
||||||
updateBloomCenter()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.onReceive(scrollViewAdapter.isAtTopEdge.removeDuplicates()) { value in
|
|
||||||
hairlineView?.isHidden = !value
|
|
||||||
guard let gradientView else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if value {
|
|
||||||
UIView.transition(with: gradientView, duration: 0.3, options: .curveEaseIn) {
|
|
||||||
gradientView.alpha = 0
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
gradientView.alpha = 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private var bloomGradient: some View {
|
|
||||||
LinearGradient(colors: [.clear, .compound.bgCanvasDefault], startPoint: .top, endPoint: .bottom)
|
|
||||||
.mask {
|
|
||||||
LinearGradient(stops: [.init(color: .white, location: 0.75), .init(color: .clear, location: 1.0)],
|
|
||||||
startPoint: .leading,
|
|
||||||
endPoint: .trailing)
|
|
||||||
}
|
|
||||||
.ignoresSafeArea(edges: .all)
|
|
||||||
}
|
|
||||||
|
|
||||||
private func makeBloomView(controller: UIViewController) {
|
|
||||||
guard let navigationBarContainer = controller.navigationController?.navigationBar.subviews.first,
|
|
||||||
let leftBarButtonView = controller.navigationItem.leadingItemGroups.first?.barButtonItems.first?.customView else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let bloomController = UIHostingController(rootView: bloom)
|
|
||||||
bloomController.view.translatesAutoresizingMaskIntoConstraints = true
|
|
||||||
bloomController.view.backgroundColor = .clear
|
|
||||||
navigationBarContainer.insertSubview(bloomController.view, at: 0)
|
|
||||||
self.leftBarButtonView = leftBarButtonView
|
|
||||||
bloomView = bloomController.view
|
|
||||||
self.navigationBarContainer = navigationBarContainer
|
|
||||||
updateBloomCenter()
|
|
||||||
|
|
||||||
let gradientController = UIHostingController(rootView: bloomGradient)
|
|
||||||
gradientController.view.backgroundColor = .clear
|
|
||||||
gradientController.view.translatesAutoresizingMaskIntoConstraints = false
|
|
||||||
navigationBarContainer.insertSubview(gradientController.view, aboveSubview: bloomController.view)
|
|
||||||
|
|
||||||
let constraints = [gradientController.view.bottomAnchor.constraint(equalTo: navigationBarContainer.bottomAnchor),
|
|
||||||
gradientController.view.trailingAnchor.constraint(equalTo: navigationBarContainer.trailingAnchor),
|
|
||||||
gradientController.view.leadingAnchor.constraint(equalTo: navigationBarContainer.leadingAnchor),
|
|
||||||
gradientController.view.heightAnchor.constraint(equalToConstant: 40)]
|
|
||||||
constraints.forEach { $0.isActive = true }
|
|
||||||
gradientView = gradientController.view
|
|
||||||
|
|
||||||
let dividerController = UIHostingController(rootView: Divider().ignoresSafeArea())
|
|
||||||
dividerController.view.translatesAutoresizingMaskIntoConstraints = false
|
|
||||||
navigationBarContainer.addSubview(dividerController.view)
|
|
||||||
let dividerConstraints = [dividerController.view.bottomAnchor.constraint(equalTo: gradientController.view.bottomAnchor),
|
|
||||||
dividerController.view.widthAnchor.constraint(equalTo: gradientController.view.widthAnchor),
|
|
||||||
dividerController.view.leadingAnchor.constraint(equalTo: gradientController.view.leadingAnchor)]
|
|
||||||
dividerConstraints.forEach { $0.isActive = true }
|
|
||||||
hairlineView = dividerController.view
|
|
||||||
}
|
|
||||||
|
|
||||||
private func updateBloomCenter() {
|
|
||||||
guard let leftBarButtonView,
|
|
||||||
let bloomView,
|
|
||||||
let navigationBarContainer = bloomView.superview else {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let center = leftBarButtonView.convert(leftBarButtonView.center, to: navigationBarContainer.coordinateSpace)
|
|
||||||
bloomView.center = center
|
|
||||||
}
|
|
||||||
|
|
||||||
private var bloom: some View {
|
|
||||||
BloomView(context: context)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private struct BloomView: View {
|
|
||||||
@ObservedObject var context: HomeScreenViewModel.Context
|
|
||||||
@Environment(\.colorScheme) private var colorScheme
|
|
||||||
|
|
||||||
var body: some View {
|
|
||||||
ZStack {
|
|
||||||
avatar
|
|
||||||
.blur(radius: 64)
|
|
||||||
.blendMode(colorScheme == .dark ? .exclusion : .hardLight)
|
|
||||||
.opacity(colorScheme == .dark ? 0.50 : 0.20)
|
|
||||||
avatar
|
|
||||||
.blur(radius: 64)
|
|
||||||
.blendMode(.color)
|
|
||||||
.opacity(colorScheme == .dark ? 0.20 : 0.80)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private var avatar: some View {
|
|
||||||
LoadableAvatarImage(url: context.viewState.userAvatarURL,
|
|
||||||
name: context.viewState.userDisplayName,
|
|
||||||
contentID: context.viewState.userID,
|
|
||||||
avatarSize: .custom(256),
|
|
||||||
mediaProvider: context.mediaProvider)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -25,9 +25,7 @@ struct HomeScreen: View {
|
|||||||
.toolbar { toolbar }
|
.toolbar { toolbar }
|
||||||
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
|
.background(Color.compound.bgCanvasDefault.ignoresSafeArea())
|
||||||
.track(screen: .Home)
|
.track(screen: .Home)
|
||||||
.bloom(context: context,
|
.bloom()
|
||||||
scrollViewAdapter: scrollViewAdapter,
|
|
||||||
isNewBloomEnabled: context.viewState.isNewBloomEnabled)
|
|
||||||
.sentryTrace("\(Self.self)")
|
.sentryTrace("\(Self.self)")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ struct JoinRoomScreen: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !context.viewState.isDMInvite, let memberCount = context.viewState.roomDetails?.memberCount {
|
if !context.viewState.isDMInvite, let memberCount = context.viewState.roomDetails?.memberCount {
|
||||||
BadgeLabel(title: "\(memberCount)", icon: \.userProfile, isHighlighted: false)
|
BadgeLabel(title: "\(memberCount)", icon: \.userProfile, style: .default)
|
||||||
}
|
}
|
||||||
|
|
||||||
if let topic = context.viewState.roomDetails?.topic {
|
if let topic = context.viewState.roomDetails?.topic {
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ private extension FormatItem {
|
|||||||
var foregroundColor: Color {
|
var foregroundColor: Color {
|
||||||
switch state {
|
switch state {
|
||||||
case .reversed:
|
case .reversed:
|
||||||
return .compound.iconSuccessPrimary
|
return .compound.iconAccentPrimary
|
||||||
case .enabled:
|
case .enabled:
|
||||||
return .compound.iconSecondary
|
return .compound.iconSecondary
|
||||||
case .disabled:
|
case .disabled:
|
||||||
@@ -52,7 +52,7 @@ private extension FormatItem {
|
|||||||
var backgroundColor: Color {
|
var backgroundColor: Color {
|
||||||
switch state {
|
switch state {
|
||||||
case .reversed:
|
case .reversed:
|
||||||
return .compound._bgAccentSelected
|
return .compound.bgAccentSelected
|
||||||
case .enabled, .disabled:
|
case .enabled, .disabled:
|
||||||
return .compound.bgCanvasDefault
|
return .compound.bgCanvasDefault
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,9 +137,9 @@ struct RoomScreen: View {
|
|||||||
.padding(.top, 16)
|
.padding(.top, 16)
|
||||||
.padding(.horizontal, 16)
|
.padding(.horizontal, 16)
|
||||||
.padding(.bottom, 12)
|
.padding(.bottom, 12)
|
||||||
.highlight(borderColor: .compound.borderInfoSubtle,
|
.highlight(gradient: .compound.info,
|
||||||
primaryColor: .compound.bgInfoSubtle,
|
borderColor: .compound.borderInfoSubtle,
|
||||||
secondaryColor: .compound.bgCanvasDefault)
|
backgroundColor: .compound.bgCanvasDefault)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Compound
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct RoomScreenFooterView: View {
|
struct RoomScreenFooterView: View {
|
||||||
@@ -23,21 +24,23 @@ struct RoomScreenFooterView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var gradientColor: Color {
|
private var gradient: Gradient {
|
||||||
switch details {
|
switch details {
|
||||||
case .pinViolation:
|
case .pinViolation:
|
||||||
.compound.bgInfoSubtle
|
.compound.info
|
||||||
case .verificationViolation:
|
case .verificationViolation:
|
||||||
.compound.bgCriticalSubtle
|
Gradient(colors: [.compound.bgCriticalSubtle, .clear])
|
||||||
case .none:
|
case .none:
|
||||||
Color.compound.bgCanvasDefault
|
Gradient(colors: [.clear])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
if let details {
|
if let details {
|
||||||
detailsView(details)
|
detailsView(details)
|
||||||
.highlight(borderColor: borderColor, primaryColor: gradientColor, secondaryColor: .compound.bgCanvasDefault)
|
.highlight(gradient: gradient,
|
||||||
|
borderColor: borderColor,
|
||||||
|
backgroundColor: .compound.bgCanvasDefault)
|
||||||
.padding(.top, 8)
|
.padding(.top, 8)
|
||||||
.fixedSize(horizontal: false, vertical: true)
|
.fixedSize(horizontal: false, vertical: true)
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -46,7 +46,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
|
|||||||
var elementCallBaseURLOverride: URL? { get set }
|
var elementCallBaseURLOverride: URL? { get set }
|
||||||
var knockingEnabled: Bool { get set }
|
var knockingEnabled: Bool { get set }
|
||||||
var threadsEnabled: Bool { get set }
|
var threadsEnabled: Bool { get set }
|
||||||
var isNewBloomEnabled: Bool { get set }
|
|
||||||
var hideQuietNotificationAlerts: Bool { get set }
|
var hideQuietNotificationAlerts: Bool { get set }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-5
@@ -50,11 +50,6 @@ struct DeveloperOptionsScreen: View {
|
|||||||
Toggle(isOn: $context.fuzzyRoomListSearchEnabled) {
|
Toggle(isOn: $context.fuzzyRoomListSearchEnabled) {
|
||||||
Text("Fuzzy searching")
|
Text("Fuzzy searching")
|
||||||
}
|
}
|
||||||
|
|
||||||
Toggle(isOn: $context.isNewBloomEnabled) {
|
|
||||||
Text("New bloom appearance")
|
|
||||||
Text("Requires app reboot")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Section("Join rules") {
|
Section("Join rules") {
|
||||||
|
|||||||
+3
-3
@@ -23,15 +23,15 @@ private struct HighlightedTimelineItemModifier: ViewModifier {
|
|||||||
.background {
|
.background {
|
||||||
if isHighlighted {
|
if isHighlighted {
|
||||||
VStack(spacing: 0) {
|
VStack(spacing: 0) {
|
||||||
Color.compound._bgBubbleHighlighted
|
Color.compound.gradientSubtleStop1
|
||||||
LinearGradient(colors: [.compound._bgBubbleHighlighted, .clear],
|
LinearGradient(gradient: .compound.subtle,
|
||||||
startPoint: .top,
|
startPoint: .top,
|
||||||
endPoint: .bottom)
|
endPoint: .bottom)
|
||||||
.frame(maxHeight: 200)
|
.frame(maxHeight: 200)
|
||||||
.layoutPriority(1)
|
.layoutPriority(1)
|
||||||
}
|
}
|
||||||
.overlay(alignment: .top) {
|
.overlay(alignment: .top) {
|
||||||
Color.compound.bgAccentRest
|
Color.compound.borderAccentSubtle
|
||||||
.frame(height: 1)
|
.frame(height: 1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ struct TimelineStartRoomTimelineView: View {
|
|||||||
.padding(.top, 16)
|
.padding(.top, 16)
|
||||||
.padding(.bottom, 8)
|
.padding(.bottom, 8)
|
||||||
.padding(.horizontal, 16)
|
.padding(.horizontal, 16)
|
||||||
.highlight(borderColor: .compound.borderInfoSubtle, primaryColor: .compound.bgInfoSubtle, secondaryColor: Color.clear)
|
.highlight(gradient: .compound.info, borderColor: .compound.borderInfoSubtle)
|
||||||
}
|
}
|
||||||
|
|
||||||
private var title: String {
|
private var title: String {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:2d7c3c922a7f7dcc3603262eb901acab8800d32dfa1966e7da944c8ce2153b8a
|
oid sha256:d8043f5fba6f552fd761eaf5f37b69159da2f34cc87a61056fa33892c9751fbd
|
||||||
size 75689
|
size 78985
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:2d7c3c922a7f7dcc3603262eb901acab8800d32dfa1966e7da944c8ce2153b8a
|
oid sha256:d8043f5fba6f552fd761eaf5f37b69159da2f34cc87a61056fa33892c9751fbd
|
||||||
size 75689
|
size 78985
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:970fd6a95b0ae9893db5f863950bdd6cbe2e12f648307d6990ae9e0881b95754
|
oid sha256:6f5a4c4582ef62565cf2386ab0b71c0817becdd092894d08c84a8eca63411984
|
||||||
size 34260
|
size 37235
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:970fd6a95b0ae9893db5f863950bdd6cbe2e12f648307d6990ae9e0881b95754
|
oid sha256:6f5a4c4582ef62565cf2386ab0b71c0817becdd092894d08c84a8eca63411984
|
||||||
size 34260
|
size 37235
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:95b63f112a7b3afea22dcb5e15b78d9a1f1eb450d3a577360b9efc5e2e77c2c9
|
oid sha256:6b1899c746fbdda24884e1767cdde32f440d90e2d5c72ae8a4deaf29518d123f
|
||||||
size 99035
|
size 98935
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:24c29efa36f9caab05536b1422988a7203661ef72b6d7d75f7f2729d965f5ab8
|
oid sha256:c2a09d457aa811bbc77555de5fc66fb027bb387c4059b3c8f0b7d8c8e0b1ab39
|
||||||
size 99849
|
size 99749
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:7a624dd19ae7d8976591004d1142647a5e69b83c8f8fd87a0bede6c7ed95aa12
|
oid sha256:f750f6783076ef9f0de9b12bb9e27e19831ed74264b198228c75bdf863fac2ca
|
||||||
size 56169
|
size 56084
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:c92cdab0be98bb1de37d888ac9adcd3f29c0473f1b2220f6d52fc293465c0dd5
|
oid sha256:beed583ef35e23e1d950e0ae79a358ba90e617ea1733ae44b23831bf7bcbdf38
|
||||||
size 57003
|
size 56918
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:3137ef502a6372a6da696f5b0d304267936bc10a708812e09e2791f9965369df
|
oid sha256:6da015fc8dfdee8f727ae417d2858b163a460d0011bea0a3cd2a45f93f4a829b
|
||||||
size 277163
|
size 269709
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:3137ef502a6372a6da696f5b0d304267936bc10a708812e09e2791f9965369df
|
oid sha256:6da015fc8dfdee8f727ae417d2858b163a460d0011bea0a3cd2a45f93f4a829b
|
||||||
size 277163
|
size 269709
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:03acd358adcbe1b8186305336e16c036ed12ca313e6374996e5fdefd3be80ca4
|
oid sha256:680cb8763815fce6bf01c3b70e6c05577e42bd9ce7f500262d5053bf3788c4fe
|
||||||
size 243464
|
size 243251
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:03acd358adcbe1b8186305336e16c036ed12ca313e6374996e5fdefd3be80ca4
|
oid sha256:680cb8763815fce6bf01c3b70e6c05577e42bd9ce7f500262d5053bf3788c4fe
|
||||||
size 243464
|
size 243251
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:498e426cdafbcef01c8e431bc5fab9150b5cd795915f914244fada9c1d28c54e
|
oid sha256:03fe18082110028b6a833b5a7ddefe87acc8d148bfd277deba361b30945011b2
|
||||||
size 94117
|
size 111861
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4daf902f81c2f4a23c9544685f42bf6e8ea26d68dfcac72244c7811ee537a8eb
|
oid sha256:e9d19c4496bdefd144a70b97d7597285c04b48a4c52a6cc7e67c3b5eb4eb280c
|
||||||
size 98432
|
size 116135
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:875afd204492380b88399d7c0ce93cb605f949a22f582218f6de929473ca2235
|
oid sha256:6e2f3272221c65b074fec4533035a91cd70edbd5a4633a82a3c24c4822b5223f
|
||||||
size 53420
|
size 67716
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:da13548671e4afb3e371d2edef1b1097f23cdbff2dcfbc66ed3cfc3efdde1299
|
oid sha256:be8e95fcbe4f70a985de7e2eef2850f52d5bb764767cb11f04bb451cfb2ed157
|
||||||
size 63632
|
size 78100
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d8857f34fc49bd98435b4e5595c10b1a463987f83084edc7682591993f69137e
|
oid sha256:747fcacfe0124acbca2edbacc54fd124608216136082d46e82265a7eb3fac8a4
|
||||||
size 260979
|
size 298835
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:93bec421deab287621f9491cb3c8f1f6c5a2032f035b33c0e694eab5e73e40ae
|
oid sha256:cb758b28f1235738d0139a66b15d871add2f421e15280e227c147a8f31c0d211
|
||||||
size 269355
|
size 307275
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5c17c1409da49b67f48bbc12856a7411368741c1e987933d1304fef98aa1a81f
|
oid sha256:bd0f4c884dd0af89feea1df28182f5aba33a64e38eb9b5f0090ee777697bc025
|
||||||
size 195209
|
size 219728
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bdc4b92d1659096dc1bc61acfeab73799d520a990b34621ff398fa1563cbbf83
|
oid sha256:70ee649ce5bd7babfbf22b71af1d23139668a5bd30148a75385b74fb1c54f7fe
|
||||||
size 202572
|
size 227094
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:fbb929cb7177e45396a10b14ff1fddc351cfb6b5a5754fb1f52ef44666ebb3ab
|
oid sha256:bd987d59e92afefd5410c8a7ab81396c0b1d92d7f7ff4f1cd418b51342e91395
|
||||||
size 92017
|
size 110390
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:686e08e7fb182eb86468c8fbc0905e52f26d2319c98e3be022a39181d8b511a9
|
oid sha256:5b69d704994106be2aabe2d6dcf15ae22b43becc34054175f2a5bf0e2ab540ca
|
||||||
size 92729
|
size 111025
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d0af4162fc19aa519aa0f2182cd3eab3d9e73d645cb550e545227d6f5617a38e
|
oid sha256:9a9cf69e89d2636a1e941b3a3e660eeb12546b8f4222f631f783f0e168f0ab99
|
||||||
size 50109
|
size 65679
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ccae5111908061e0a138ae2fc48b1aedc6bd889ed5380f352206bb2940f291a8
|
oid sha256:462ecea74d80a94351f28bf401f07b772b82c992186d9db4dbb79c83963b1dda
|
||||||
size 50986
|
size 66401
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bb95cfaa18cb26f9cc6c82a8c11d3f032b2af0c7c3eb5faad7003928196ad65f
|
oid sha256:48a3788ffed24280bbeeba840d4f75f5e6dba037b4d6c525f7456129b8dbe27f
|
||||||
size 207556
|
size 207636
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9f7d9eb659c324454b102746c9e583ce1276e68a1d262366bdc686dd7976c7ba
|
oid sha256:a4913673c2bce79a0f9b0f0b45a9a5dc6a0742160b392975fbca2d3424bb3d78
|
||||||
size 218268
|
size 218348
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:15a858e153b470913d8a6c6604f21332a69779a157608619e559f52da84aa337
|
oid sha256:ba468042056e6c2d2531f3e20aa3410ecea5a81ad58d09b118042bf453f485f1
|
||||||
size 163128
|
size 163094
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a787a4a8bf924e33d934921e8799457187b3783d8bb2f2b3495f8a1710f07c70
|
oid sha256:b084f87281f1a031086f2c79d9da812305e383da388bd1ce96ef9b88fc02be7a
|
||||||
size 177515
|
size 177481
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:3aacd30824f4fc78e2f92476cef0698c5144b2fc2241b7c5d4973baa272cb346
|
oid sha256:0a99f6e4bb47e5ff5a8c911f6ae9707a83d5183e4dd11c8b42bf0bd726ec6dfa
|
||||||
size 207527
|
size 207607
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:e7b793509581cbb362e946f030541822973c0fa4720be0b5a9b87d379267c2c2
|
oid sha256:b0624c9f63c8ce9ad6706005cee922d4850fa3da5bc11be20f7ee477d0526043
|
||||||
size 220412
|
size 220492
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:2f59228951bf88dda39158ff20298daf6a950a0ed5d4dafeaaa4ba1712113119
|
oid sha256:be7916e0e1f379faeeb3e903d13866d054b737b2afc2216b5419a8cf7cb6b9b0
|
||||||
size 163017
|
size 162983
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ca7f92d79e4fb2f96e34ead07f04e354a28758edcd1b12a188f8d3a2c12e72d0
|
oid sha256:83b531f84251a1260bea5ad02a6581ebcbebcfee26887be6ac17f08f9ea0f394
|
||||||
size 181475
|
size 181441
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:292fde6fdecbfff146e8b85540651c54d2dab2f073d3cd3a388f63de1121c750
|
oid sha256:f5be91ebfd4f1052105d5299fc22be843ab9922064a03ef14bf8c1a4c99645cb
|
||||||
size 191418
|
size 191498
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1877453f28cb92ba4c915a8af3d3d6395aa9bd7c63876737c90b2b800669ca0b
|
oid sha256:448768a9a85d15a8d43dc05d41421b9eba5be9d0dc5f5e8e8afc2864aaaf952f
|
||||||
size 197487
|
size 197567
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6e23a9ff351f0a7510cdea1c516862eed4faafea0a38369b5684bc048ea7ec94
|
oid sha256:7c368e208b2f69b557667fc2f84ea5886c1c0d40b649d684d54503e595ff5088
|
||||||
size 149096
|
size 149062
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:598a583a6be90107aae1173c736e923e896cb8520167ee9fbba136fb549541d4
|
oid sha256:0591d609c4ff490710d553412f926186bb45657e11e0079a8ed2eed74c78b92e
|
||||||
size 157671
|
size 157637
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ccdf6b4198c2a855df924758482362596b4ca9f2a034f5229228e50aa0c0f2b8
|
oid sha256:c093e65173aea12af2a0f0a51293903169b774fbc8f451c034843a020059f7b6
|
||||||
size 204243
|
size 204307
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:350adbbc77f245dfe7f822da44c69c4050a8c6f2c63800b57cf79b954acf5ad5
|
oid sha256:017480bae1b1829d44f6bee8a0dcb852c951583d035a47a329911c3e1ea9b521
|
||||||
size 211926
|
size 212007
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:34e5d01ed3109e359aad855a408bf9885924d83e39b830bc45f8ef49d4a3040f
|
oid sha256:7fbe87c7fbfb9e627a1497c6ad98af84986ea5a6f73135e60e05c046cd3e61ab
|
||||||
size 160117
|
size 160097
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:973ba4d3e33d59cbb786ceeea793485557e2002fdecb72100bcdb9f34bedd774
|
oid sha256:b41badc51eec49a01cb579970486fc4b3415bf6f44e52b8cd617857cac058c95
|
||||||
size 169551
|
size 169541
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ef49d0ec8085575cdc32e94502b2962032cfb84deecc21b9c3bb83e1f53ad3ef
|
oid sha256:08b81fdf382e749aff5d840c30e4121f33e55f7b091eb6bf906dd0b0e3f04353
|
||||||
size 138739
|
size 138801
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:32675b577632f1c4730fd4f931446e3976a3fdd934cacf26cd04838bed7b309e
|
oid sha256:41fc5f52bce46b4ee6c4632c89ca304229f21d19cf6db4ea94cbbd83cf3b4269
|
||||||
size 146259
|
size 146322
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bc0382013ac8c27e59b77dd669ccf636141a60e467c91f94828063f3d1b5e88c
|
oid sha256:eddba8dfc99dedebbdd4d6a387f4d99a0926dd91b68319583e18b7c9b50c69ab
|
||||||
size 91168
|
size 91138
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:696d87e51df167b17aa1c4a9ebc7c1f232f3f38800b8f13420003c1875184f0c
|
oid sha256:39758cdbad10ae48f79bb6dc969e12b18d4f3c0c607f250b8c814a8f3b347901
|
||||||
size 100543
|
size 100507
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:614b7fbb6d4659ee341a447658b7a7009a2b1c8eb9bd410c52a643470ecc29a0
|
oid sha256:2d473ea1bf6accb5ec30ed758a500277bfa5870edf2c23315c6f732ac21cf67c
|
||||||
size 197528
|
size 190962
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:38e5137d1e07ed48a1305266804b78cda7fb27b704558813d223e6f506b8ced9
|
oid sha256:5602aaf0cd4a0ba002a6eabc99d8e05a56a21bc527f31fc3b802dd1df831efd0
|
||||||
size 199277
|
size 192516
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6caafd717b97f0ca6d3490ffa8b2869cd8c0bc518d38917d6957c5188496d16a
|
oid sha256:70140c2f6735e991cdf87eea162f673907ba8a5faf03d683f19ffd4e3bb20bce
|
||||||
size 150737
|
size 146351
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4fbc48c046e9204f081fa8b1949d6fa7688e1fa26ceea354521e7b26f733e917
|
oid sha256:a5a26d8872ae7bfc5a35755b6862d60aed98228f6cb4b5af5d627714f1b072e2
|
||||||
size 152774
|
size 147840
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:898d87b40e4d9c2590023436e19ce48586bbefd898fd60968865754f01f6bec1
|
oid sha256:cc03fc0c41dacc64b5a0d8eae4cbd69617ecef524f501c4eedab9a906651c3dd
|
||||||
size 209881
|
size 203278
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:0639a103ce9ccba5ef1857d286be86f05050a9d4326e2d145dc9af6f769f407c
|
oid sha256:a2ef29357551f17170570ab5b5fa1744594beb3b65659303de6898ba9f00a1b1
|
||||||
size 216117
|
size 205530
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:c6bfbe0ea330c7a7fa5153a332128c71851ed357b4132a368f3695543b61ea20
|
oid sha256:9e69cbf0e0a49b53c5a3124c3feb24e7b18bb11be3edc15c6ad81cc78489bc0e
|
||||||
size 160658
|
size 156444
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:40be41a04bfa6281b46dfa01aa3ac372c0ec526f28fd5d0b80b4e8c9ca3817ce
|
oid sha256:27f27c4ec3d0fff0e777954a164f42ab1fc373bbea9f19ef0e8aaeb4f1f3bca3
|
||||||
size 169867
|
size 162752
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:843c9bca5aaf1d8ab46b56bc2fa87f661306235d1fa89067afeb99906c4aace6
|
oid sha256:83bd0716172b4b6ef0972e61676f68e571c445b0ef471a9993741ff2f65c32f1
|
||||||
size 212826
|
size 206000
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4f1a333d9d693aec8b7e2e352d469b356a4475c124105ec927babf1e7f484119
|
oid sha256:91c247cbe0da99711fdfa405014f37605c7c6132c95dfcd9fd4556aef24a6ee6
|
||||||
size 225682
|
size 219094
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:98a5dba7e68a0e3b735354a509d73ebaf6c4cf24fafc6033f05a98c392f3fcb0
|
oid sha256:d09cab4944f82df22214c5ced124ffa732123dc4946fa5db351fb92740f63b15
|
||||||
size 167418
|
size 163140
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a9102a18181ca8506db52eea10ee8f6b3db66f56ff0e45aa22d9f18998c9432f
|
oid sha256:5a47703587c197f61a8de494a61c562b579e8f3f4f77dd592dc3838f977ff1c5
|
||||||
size 182789
|
size 178101
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1790aeffe51cdb48d16beca802aa7ad55c38a91639a5c140158367b6dede0c47
|
oid sha256:e7377923e95f6e052ffba73cfeee5d1e9567656d8d017be1f7cac571f95217ed
|
||||||
size 106679
|
size 99773
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:54e8363df0eb18c7917f7a744a04eb12f3d0f9d029f1db54a61cacbdcd79e9fd
|
oid sha256:fd68b89f449b4c6823e109c57bf7fa8a9cfd6bd53575754a74e2b9a8ea053b39
|
||||||
size 121729
|
size 115061
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:6ed33503f049b8b9d00b1107806c72e963517ef9af8bd05978f8e00a0029890c
|
oid sha256:841f21c6026c6ad270269f08d663fd1eaa577e819094bf3d9ae45a134a678ac7
|
||||||
size 63100
|
size 58856
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ffaa33792427b91784773f513c3bffc2fbbbe4b32c04f4adb0c3826ec07e95a0
|
oid sha256:a532bfe35f244be30367c3e2aaf3ce330d3ced13290a9002dd813fc7bee11184
|
||||||
size 82426
|
size 77772
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:27c1163f7415e7ae06bd78fb6ae0f78d0cca150ea2bdcb68fdc6e1457181b05e
|
oid sha256:3339bf93cd5c4a6adc4648f758f16e458186ed79e4f795766dfab6de1c601285
|
||||||
size 89578
|
size 89495
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:85b0734b01882f8aa19f8f6ffdf81d1c6824c5340114bbf9d7d53bfd448fc1de
|
oid sha256:0b1cd2fa30211d98c0f8e4abcc798d5980c94d892af93c91a87b547568133008
|
||||||
size 90613
|
size 90526
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:efd4b0bcedea3389b10ebe55f2dc536fa4d263342e97f452a044a8ef667a1bad
|
oid sha256:d765faa6bb1075b91aae3e851e10d1f354c94892e792870e766e4166c0d07c48
|
||||||
size 48459
|
size 48357
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d2e3125c47e6f4bd81a49e8ae7f9c23ab787431dec3671e8ff9da85d41c6f638
|
oid sha256:d3be31d8e7bb3d41e64c78bc315de3750683e21d2f6cf52c8d4a0ad8a3727523
|
||||||
size 49322
|
size 49223
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9a69dc4da7c7cfa9a9e02276b9d3ae3086b80dae50bd734aa15286c24031acf4
|
oid sha256:fbf8671e2db31fe762eb1b1974496e4ee51e90502177b29d85957e8ec451fb8b
|
||||||
size 73475
|
size 73156
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9a69dc4da7c7cfa9a9e02276b9d3ae3086b80dae50bd734aa15286c24031acf4
|
oid sha256:fbf8671e2db31fe762eb1b1974496e4ee51e90502177b29d85957e8ec451fb8b
|
||||||
size 73475
|
size 73156
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1917fe439a153d7de4e8a24d9367b9dc68be902c87ee157bd6ec0ec9aee7d8cf
|
oid sha256:fc35986ef873445c22c25e541fc9ab7dda74b7ffc8646379cc357935bac7da44
|
||||||
size 32599
|
size 32508
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:1917fe439a153d7de4e8a24d9367b9dc68be902c87ee157bd6ec0ec9aee7d8cf
|
oid sha256:fc35986ef873445c22c25e541fc9ab7dda74b7ffc8646379cc357935bac7da44
|
||||||
size 32599
|
size 32508
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:42458395202c8c27d51f04d04fea568b3bd4810cfb591f960fe2cef0faa3b3d2
|
oid sha256:20db9a00d07e7c17a7555e08e31b430474b8006d3bdbcd6e0bdd54ac7bf12ccc
|
||||||
size 75236
|
size 75443
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:42458395202c8c27d51f04d04fea568b3bd4810cfb591f960fe2cef0faa3b3d2
|
oid sha256:20db9a00d07e7c17a7555e08e31b430474b8006d3bdbcd6e0bdd54ac7bf12ccc
|
||||||
size 75236
|
size 75443
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:de9203b51ed448c790df06d658a09ca7e582bd87b8beb6138b9ab427ee4b4bc4
|
oid sha256:ab42fa76c69e75ce1a265840dff244d92dcf73353c1a49ce24e46be9388c5ffe
|
||||||
size 34921
|
size 34824
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:de9203b51ed448c790df06d658a09ca7e582bd87b8beb6138b9ab427ee4b4bc4
|
oid sha256:ab42fa76c69e75ce1a265840dff244d92dcf73353c1a49ce24e46be9388c5ffe
|
||||||
size 34921
|
size 34824
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:8a3ce3dbcb983f608d38f510dc4ee16e9bc65c9e246aebb3aee8fc46bcaf476e
|
oid sha256:50141db2c7b5dd7b6ce07969a675047c0b8eeacfccb10fea526979b0c5dcfcc4
|
||||||
size 69720
|
size 69632
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:8a3ce3dbcb983f608d38f510dc4ee16e9bc65c9e246aebb3aee8fc46bcaf476e
|
oid sha256:50141db2c7b5dd7b6ce07969a675047c0b8eeacfccb10fea526979b0c5dcfcc4
|
||||||
size 69720
|
size 69632
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:79b26613033be55f6d5bac6ea368aa8dcaf346f7799af773bf1599984ffd6bb3
|
oid sha256:ec4d0cc27fc0fa149da0a307a02d5a3f9bc96b7a019f83323774edb9b83bf262
|
||||||
size 30224
|
size 30200
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:79b26613033be55f6d5bac6ea368aa8dcaf346f7799af773bf1599984ffd6bb3
|
oid sha256:ec4d0cc27fc0fa149da0a307a02d5a3f9bc96b7a019f83323774edb9b83bf262
|
||||||
size 30224
|
size 30200
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5e8cfd15d81ecfd4966947582f869c4357cef4e54bd8646fc078e2a79b5fe0d3
|
oid sha256:458b7ab530c9403bd3feaa272ffd7abb5a7be6d36204ac842127f4588df55651
|
||||||
size 69712
|
size 69609
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5e8cfd15d81ecfd4966947582f869c4357cef4e54bd8646fc078e2a79b5fe0d3
|
oid sha256:458b7ab530c9403bd3feaa272ffd7abb5a7be6d36204ac842127f4588df55651
|
||||||
size 69712
|
size 69609
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d2199497caedf0c974a93d04445feb6fc11ca35d9f895d6257fd9c3cebc79a5d
|
oid sha256:e8fd29f129bcf2b28b2b597665a6f69123a49bdd8d07eeb6b81253c66ce0d21b
|
||||||
size 29379
|
size 29257
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d2199497caedf0c974a93d04445feb6fc11ca35d9f895d6257fd9c3cebc79a5d
|
oid sha256:e8fd29f129bcf2b28b2b597665a6f69123a49bdd8d07eeb6b81253c66ce0d21b
|
||||||
size 29379
|
size 29257
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:eadb984285c3bb9a815f0fd7839d69b7af7968702f747b3a2ccc32f3a7091a52
|
oid sha256:c87107a1a736c3f7af026f9085c5a681dfe178aa29da6d355c85326072d83f3f
|
||||||
size 72100
|
size 71969
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user