mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
Unify session verification with Android (#5116)
* session verification now does not have a waiting screen, but the initial state instead presents a loading state. Everything is also handled with one single action * use progress view in place of the spinner icon * change progress view tint
This commit is contained in:
+26
-50
@@ -33,25 +33,15 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
|
|
||||||
var headerIcon: (keyPath: KeyPath<CompoundIcons, Image>, style: BigIcon.Style) {
|
var headerIcon: (keyPath: KeyPath<CompoundIcons, Image>, style: BigIcon.Style) {
|
||||||
switch verificationState {
|
switch verificationState {
|
||||||
case .initial:
|
case .initial, .acceptingVerificationRequest, .requestingVerification,
|
||||||
|
.verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted,
|
||||||
|
.cancelling:
|
||||||
switch flow {
|
switch flow {
|
||||||
case .deviceInitiator, .deviceResponder:
|
case .deviceInitiator, .deviceResponder:
|
||||||
return (\.devices, .defaultSolid)
|
return (\.devices, .defaultSolid)
|
||||||
case .userInitiator, .userResponder:
|
case .userInitiator, .userResponder:
|
||||||
return (\.userProfileSolid, .defaultSolid)
|
return (\.userProfileSolid, .defaultSolid)
|
||||||
}
|
}
|
||||||
case .acceptingVerificationRequest:
|
|
||||||
return (\.devices, .defaultSolid)
|
|
||||||
case .requestingVerification:
|
|
||||||
return (\.devices, .defaultSolid)
|
|
||||||
case .verificationRequestAccepted:
|
|
||||||
return (\.reaction, .defaultSolid)
|
|
||||||
case .startingSasVerification:
|
|
||||||
return (\.devices, .defaultSolid)
|
|
||||||
case .sasVerificationStarted:
|
|
||||||
return (\.devices, .defaultSolid)
|
|
||||||
case .cancelling:
|
|
||||||
return (\.lockSolid, .defaultSolid)
|
|
||||||
case .showingChallenge:
|
case .showingChallenge:
|
||||||
return (\.reaction, .defaultSolid)
|
return (\.reaction, .defaultSolid)
|
||||||
case .acceptingChallenge:
|
case .acceptingChallenge:
|
||||||
@@ -71,7 +61,9 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
|
|
||||||
var title: String? {
|
var title: String? {
|
||||||
switch verificationState {
|
switch verificationState {
|
||||||
case .initial:
|
case .initial, .acceptingVerificationRequest, .requestingVerification,
|
||||||
|
.verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted,
|
||||||
|
.cancelling:
|
||||||
switch flow {
|
switch flow {
|
||||||
case .deviceInitiator:
|
case .deviceInitiator:
|
||||||
return L10n.screenSessionVerificationUseAnotherDeviceTitle
|
return L10n.screenSessionVerificationUseAnotherDeviceTitle
|
||||||
@@ -80,16 +72,6 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
case .deviceResponder, .userResponder:
|
case .deviceResponder, .userResponder:
|
||||||
return L10n.screenSessionVerificationRequestTitle
|
return L10n.screenSessionVerificationRequestTitle
|
||||||
}
|
}
|
||||||
case .acceptingVerificationRequest:
|
|
||||||
return waitingTitle
|
|
||||||
case .requestingVerification:
|
|
||||||
return waitingTitle
|
|
||||||
case .verificationRequestAccepted:
|
|
||||||
return L10n.screenSessionVerificationCompareEmojisTitle
|
|
||||||
case .startingSasVerification:
|
|
||||||
return waitingTitle
|
|
||||||
case .sasVerificationStarted:
|
|
||||||
return waitingTitle
|
|
||||||
case .showingChallenge:
|
case .showingChallenge:
|
||||||
return L10n.screenSessionVerificationCompareEmojisTitle
|
return L10n.screenSessionVerificationCompareEmojisTitle
|
||||||
case .acceptingChallenge:
|
case .acceptingChallenge:
|
||||||
@@ -103,25 +85,16 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
case .userInitiator, .userResponder:
|
case .userInitiator, .userResponder:
|
||||||
return L10n.commonVerificationComplete
|
return L10n.commonVerificationComplete
|
||||||
}
|
}
|
||||||
case .cancelling:
|
|
||||||
return waitingTitle
|
|
||||||
case .cancelled:
|
case .cancelled:
|
||||||
return L10n.commonVerificationFailed
|
return L10n.commonVerificationFailed
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var waitingTitle: String {
|
|
||||||
switch flow {
|
|
||||||
case .deviceInitiator, .deviceResponder:
|
|
||||||
return L10n.screenSessionVerificationWaitingOtherDeviceTitle
|
|
||||||
case .userInitiator, .userResponder:
|
|
||||||
return L10n.screenSessionVerificationWaitingOtherUserTitle
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var message: String {
|
var message: String {
|
||||||
switch verificationState {
|
switch verificationState {
|
||||||
case .initial:
|
case .initial, .acceptingVerificationRequest, .requestingVerification,
|
||||||
|
.verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted,
|
||||||
|
.cancelling:
|
||||||
switch flow {
|
switch flow {
|
||||||
case .deviceInitiator:
|
case .deviceInitiator:
|
||||||
return L10n.screenSessionVerificationUseAnotherDeviceSubtitle
|
return L10n.screenSessionVerificationUseAnotherDeviceSubtitle
|
||||||
@@ -132,22 +105,10 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
case .userResponder:
|
case .userResponder:
|
||||||
return L10n.screenSessionVerificationUserResponderSubtitle
|
return L10n.screenSessionVerificationUserResponderSubtitle
|
||||||
}
|
}
|
||||||
case .acceptingVerificationRequest:
|
|
||||||
return waitingMessage
|
|
||||||
case .requestingVerification:
|
|
||||||
return waitingMessage
|
|
||||||
case .verificationRequestAccepted:
|
|
||||||
return L10n.screenSessionVerificationRequestAcceptedSubtitle
|
|
||||||
case .startingSasVerification:
|
|
||||||
return waitingMessage
|
|
||||||
case .sasVerificationStarted:
|
|
||||||
return waitingMessage
|
|
||||||
case .acceptingChallenge:
|
case .acceptingChallenge:
|
||||||
return L10n.screenSessionVerificationCompareEmojisSubtitle
|
return L10n.screenSessionVerificationCompareEmojisSubtitle
|
||||||
case .decliningChallenge:
|
case .decliningChallenge:
|
||||||
return L10n.screenSessionVerificationCompareEmojisSubtitle
|
return L10n.screenSessionVerificationCompareEmojisSubtitle
|
||||||
case .cancelling:
|
|
||||||
return waitingMessage
|
|
||||||
case .showingChallenge:
|
case .showingChallenge:
|
||||||
switch flow {
|
switch flow {
|
||||||
case .deviceInitiator, .deviceResponder:
|
case .deviceInitiator, .deviceResponder:
|
||||||
@@ -168,7 +129,22 @@ struct SessionVerificationScreenViewState: BindableState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private var waitingMessage: String {
|
var isWaiting: Bool {
|
||||||
L10n.screenSessionVerificationWaitingSubtitle
|
switch verificationState {
|
||||||
|
case .acceptingVerificationRequest, .requestingVerification, .verificationRequestAccepted,
|
||||||
|
.startingSasVerification, .sasVerificationStarted, .cancelling:
|
||||||
|
true
|
||||||
|
default:
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var showIgnoreButton: Bool {
|
||||||
|
switch flow {
|
||||||
|
case .deviceResponder, .userResponder:
|
||||||
|
true
|
||||||
|
default:
|
||||||
|
false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+62
-34
@@ -81,7 +81,7 @@ struct SessionVerificationScreen: View {
|
|||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var mainContent: some View {
|
private var mainContent: some View {
|
||||||
switch context.viewState.verificationState {
|
switch context.viewState.verificationState {
|
||||||
case .initial:
|
case .initial, .acceptingVerificationRequest, .requestingVerification, .verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted:
|
||||||
switch context.viewState.flow {
|
switch context.viewState.flow {
|
||||||
case .deviceResponder(let details):
|
case .deviceResponder(let details):
|
||||||
SessionVerificationRequestDetailsView(details: details,
|
SessionVerificationRequestDetailsView(details: details,
|
||||||
@@ -126,27 +126,18 @@ struct SessionVerificationScreen: View {
|
|||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private var actionButtons: some View {
|
private var actionButtons: some View {
|
||||||
switch context.viewState.verificationState {
|
switch context.viewState.verificationState {
|
||||||
case .initial:
|
case .initial, .acceptingVerificationRequest, .requestingVerification,
|
||||||
switch context.viewState.flow {
|
.verificationRequestAccepted, .startingSasVerification, .sasVerificationStarted, .cancelling:
|
||||||
case .deviceInitiator, .userInitiator:
|
|
||||||
Button(L10n.actionStartVerification) {
|
|
||||||
context.send(viewAction: .requestVerification)
|
|
||||||
}
|
|
||||||
.buttonStyle(.compound(.primary))
|
|
||||||
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.requestVerification)
|
|
||||||
case .deviceResponder, .userResponder:
|
|
||||||
VStack(spacing: 16) {
|
VStack(spacing: 16) {
|
||||||
Button(L10n.actionStartVerification) {
|
startVerificationButton
|
||||||
context.send(viewAction: .acceptVerificationRequest)
|
|
||||||
}
|
|
||||||
.buttonStyle(.compound(.primary))
|
|
||||||
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.acceptVerificationRequest)
|
|
||||||
|
|
||||||
|
if context.viewState.showIgnoreButton {
|
||||||
Button(L10n.actionIgnore) {
|
Button(L10n.actionIgnore) {
|
||||||
context.send(viewAction: .ignoreVerificationRequest)
|
context.send(viewAction: .ignoreVerificationRequest)
|
||||||
}
|
}
|
||||||
.buttonStyle(.compound(.tertiary))
|
.buttonStyle(.compound(.tertiary))
|
||||||
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.ignoreVerificationRequest)
|
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.ignoreVerificationRequest)
|
||||||
|
.disabled(context.viewState.isWaiting)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case .cancelled:
|
case .cancelled:
|
||||||
@@ -163,13 +154,6 @@ struct SessionVerificationScreen: View {
|
|||||||
.buttonStyle(.compound(.primary))
|
.buttonStyle(.compound(.primary))
|
||||||
}
|
}
|
||||||
|
|
||||||
case .verificationRequestAccepted:
|
|
||||||
Button(L10n.actionStart) {
|
|
||||||
context.send(viewAction: .startSasVerification)
|
|
||||||
}
|
|
||||||
.buttonStyle(.compound(.primary))
|
|
||||||
.accessibilityIdentifier(A11yIdentifiers.sessionVerificationScreen.startSasVerification)
|
|
||||||
|
|
||||||
case .showingChallenge:
|
case .showingChallenge:
|
||||||
VStack(spacing: 16) {
|
VStack(spacing: 16) {
|
||||||
Button(L10n.screenSessionVerificationTheyMatch) {
|
Button(L10n.screenSessionVerificationTheyMatch) {
|
||||||
@@ -190,6 +174,38 @@ struct SessionVerificationScreen: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var startVerificationButton: some View {
|
||||||
|
Button {
|
||||||
|
switch context.viewState.flow {
|
||||||
|
case .deviceInitiator, .userInitiator:
|
||||||
|
context.send(viewAction: .requestVerification)
|
||||||
|
case .deviceResponder, .userResponder:
|
||||||
|
context.send(viewAction: .acceptVerificationRequest)
|
||||||
|
}
|
||||||
|
} label: {
|
||||||
|
Label {
|
||||||
|
Text(L10n.actionStartVerification)
|
||||||
|
} icon: {
|
||||||
|
if context.viewState.isWaiting {
|
||||||
|
ProgressView()
|
||||||
|
.tint(.compound.iconOnSolidPrimary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.buttonStyle(.compound(.primary))
|
||||||
|
.disabled(context.viewState.isWaiting)
|
||||||
|
.accessibilityIdentifier(startVerificationButtonAccessibilityIdentifier)
|
||||||
|
}
|
||||||
|
|
||||||
|
private var startVerificationButtonAccessibilityIdentifier: String {
|
||||||
|
switch context.viewState.flow {
|
||||||
|
case .deviceInitiator, .userInitiator:
|
||||||
|
A11yIdentifiers.sessionVerificationScreen.requestVerification
|
||||||
|
case .deviceResponder, .userResponder:
|
||||||
|
A11yIdentifiers.sessionVerificationScreen.acceptVerificationRequest
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
struct EmojiView: View {
|
struct EmojiView: View {
|
||||||
let emoji: SessionVerificationEmoji
|
let emoji: SessionVerificationEmoji
|
||||||
|
|
||||||
@@ -224,24 +240,33 @@ struct SessionVerification_Previews: PreviewProvider, TestablePreview {
|
|||||||
deviceDisplayName: "Bob's Element X iOS",
|
deviceDisplayName: "Bob's Element X iOS",
|
||||||
firstSeenDate: .init(timeIntervalSince1970: 0))
|
firstSeenDate: .init(timeIntervalSince1970: 0))
|
||||||
|
|
||||||
sessionVerificationScreen(state: .initial, flow: .deviceResponder(requestDetails: details))
|
sessionVerificationScreen(state: .initial,
|
||||||
|
flow: .deviceResponder(requestDetails: details))
|
||||||
.previewDisplayName("Initial - Device Responder")
|
.previewDisplayName("Initial - Device Responder")
|
||||||
|
|
||||||
sessionVerificationScreen(state: .initial, flow: .userResponder(requestDetails: details))
|
sessionVerificationScreen(state: .initial,
|
||||||
|
flow: .userResponder(requestDetails: details))
|
||||||
.previewDisplayName("Initial - User Responder")
|
.previewDisplayName("Initial - User Responder")
|
||||||
|
|
||||||
sessionVerificationScreen(state: .acceptingVerificationRequest)
|
sessionVerificationScreen(state: .acceptingVerificationRequest,
|
||||||
.previewDisplayName("Accepting Verification Request")
|
flow: .deviceResponder(requestDetails: details))
|
||||||
|
.previewDisplayName("Accepting Verification Request - Device Responder")
|
||||||
|
|
||||||
sessionVerificationScreen(state: .requestingVerification)
|
sessionVerificationScreen(state: .requestingVerification,
|
||||||
.previewDisplayName("Requesting Verification")
|
flow: .deviceInitiator)
|
||||||
sessionVerificationScreen(state: .verificationRequestAccepted)
|
.previewDisplayName("Requesting Verification - Device Initiator")
|
||||||
.previewDisplayName("Request Accepted")
|
|
||||||
|
|
||||||
sessionVerificationScreen(state: .startingSasVerification)
|
sessionVerificationScreen(state: .verificationRequestAccepted,
|
||||||
.previewDisplayName("Starting SAS Verification")
|
flow: .userInitiator(userID: "@bob:matrix.org"))
|
||||||
sessionVerificationScreen(state: .sasVerificationStarted)
|
.previewDisplayName("Request Accepted - User Initiator")
|
||||||
.previewDisplayName("SAS Verification started")
|
|
||||||
|
sessionVerificationScreen(state: .startingSasVerification,
|
||||||
|
flow: .userResponder(requestDetails: details))
|
||||||
|
.previewDisplayName("Starting SAS Verification - User Responder")
|
||||||
|
|
||||||
|
sessionVerificationScreen(state: .sasVerificationStarted,
|
||||||
|
flow: .deviceResponder(requestDetails: details))
|
||||||
|
.previewDisplayName("SAS Verification started - Device Responder")
|
||||||
|
|
||||||
sessionVerificationScreen(state: .showingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
sessionVerificationScreen(state: .showingChallenge(emojis: SessionVerificationControllerProxyMock.emojis))
|
||||||
.previewDisplayName("Showing Challenge")
|
.previewDisplayName("Showing Challenge")
|
||||||
@@ -253,6 +278,9 @@ struct SessionVerification_Previews: PreviewProvider, TestablePreview {
|
|||||||
sessionVerificationScreen(state: .verified)
|
sessionVerificationScreen(state: .verified)
|
||||||
.previewDisplayName("Verified")
|
.previewDisplayName("Verified")
|
||||||
|
|
||||||
|
sessionVerificationScreen(state: .cancelling, flow: .deviceInitiator)
|
||||||
|
.previewDisplayName("Cancelling - Device Initiator")
|
||||||
|
|
||||||
sessionVerificationScreen(state: .cancelled)
|
sessionVerificationScreen(state: .cancelled)
|
||||||
.previewDisplayName("Cancelled")
|
.previewDisplayName("Cancelled")
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fadaa19ca5afa5ac3f165b9c7a0140b9a87370ebb9419de398cef9da18735482
|
||||||
|
size 127817
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2427eebcb8acb0582859bb77c633b1aed6dbf5cec9f93cf1ca8faaa4a98f6a1f
|
||||||
|
size 149860
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:803e2c17451b95dfa1c8fb34e16e3a17d1fb951b0f082faaf5025934e0b29b06
|
||||||
|
size 78783
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:75499d63b5ea67a0f93767ebf759973e82c2557dfc74ce088ecfbc244948ba05
|
||||||
|
size 106677
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b1a75d80201e1bf0a3e655f536a9a84ff4197f20b7757553e553db28474feb62
|
|
||||||
size 87719
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dd79efad451ec3d92ee607ed9e2bd124a2f05f7ab91a34f01974a276e63e71c3
|
|
||||||
size 103702
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:03b5af80e085e003c5e53f14666b51cdd4c46aee156e6480e454239765f28f0b
|
|
||||||
size 48092
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:77a3bf1e285d122422c8d9de9c7e2638c3db736f66fd991ef301b36c5d0b94e5
|
|
||||||
size 64407
|
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:42742fd4245cf07e78b0dad9ea8a056b3fc8b6cdb0333da45baaa7cc3fdaacfd
|
||||||
|
size 100907
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:86ecc041582db61c6b3856676484c384217be198f6f3706711492f6dda30a4e3
|
||||||
|
size 121768
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0cf242dd449a7129346863b15ea60ccf2702c007d695ab5ff93c13918dce9f56
|
||||||
|
size 57801
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1b1f8b31845c99692c2240e0d42e9a8f548ea06a65aa96a2cf0cdfc99d0cf3cf
|
||||||
|
size 81641
|
||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:be770707dbf4c71252945dcbb0f9a9268363ee7d06ac9230b51570e8dea724dc
|
oid sha256:8cd5a20854ab8d261490bd6e48f9dabe3af222447917bb75108825e9a1e48cd7
|
||||||
size 100863
|
size 100872
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:75ff292a32ea247985f7b4b53c96baa763a8f24cef0bed2fe937bb31d553d633
|
oid sha256:2fd414275be35f6c2380dbe35cca8058e3a90c59dad663561929e518cd90522f
|
||||||
size 121581
|
size 121720
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d251b8bffe582426828359e0703829a29a185858671beaf4d0f52f9cb8c1a688
|
oid sha256:074cf4274edf48c7ca983dd6b626b59aff4dde4eb111015e8c30b7ca36456283
|
||||||
size 58061
|
size 57837
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:5b897277ef26cb323d3dcfbbc72c686094d3e4b781e8520a4956c467f9b88ffa
|
oid sha256:a64b3a3953c4dc5388a770b29472931543ab481b78e81cc2dc43d9ce7dd0530d
|
||||||
size 82011
|
size 82004
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4ef7486b71f27e98b2a09a87dda976a6a699988788f5e392c48c899e0a9d8c07
|
oid sha256:6161a42c95f0e5be6ee0d72d4c7fb6f35b54792e80747786dfc1e3db00c84f84
|
||||||
size 127866
|
size 127877
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:f7fb6a05cfa29c5d55b669098792fc8dee6a01b7f55738d368fdd2834fe9388f
|
oid sha256:746fd9e8cca6294e369e9e020f6b79ae40c299e0bf0a7d97cc4649e9cd347c18
|
||||||
size 149856
|
size 149982
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:3399d4313a2bf007d9dea2b78d8be27bb178bb2a7fc79601b01370aa2b45e8b6
|
oid sha256:0fc46ce94a70c9c339571d6edeefe804dfa004ffa013a2906ff8eb86eba58d65
|
||||||
size 79033
|
size 78831
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:bee9235e2708138916f9dc354d9157defda564a90dcdb68e2210296c23cc11d1
|
oid sha256:5ddeb2b6b8bcad7b969ce488e11934c639ff551533f02461ca37ae6b377bee11
|
||||||
size 107142
|
size 107138
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:24319fecf776292a91584652b8c87763f1c6dcd6daef53aa097f0d07eac02126
|
oid sha256:c5245eacd0c6ddd7058a73b29691d88a6cc12d43f41b3aa4e29d0c661ceb1121
|
||||||
size 107307
|
size 107316
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:9907ccc9bd4283a29f3329819e4cff605e1e0aa60790ab2c40036b49c1d8036d
|
oid sha256:3482fc9dec655fe263a15319554d5eba1bf1dde9233a7cd6e0554f038d2baff5
|
||||||
size 128786
|
size 128925
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:31e9ccdf2d788e6b2add14ed120b42fbf6eb33e09e0b74689b612cf5a758f0df
|
oid sha256:61bd9c10f9eb7dac5dfce5845fcacec94fa51ab636baf832ae7a41f23417b5e3
|
||||||
size 65201
|
size 64977
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ba43b163989255e46102b7bcb19032ec89d2a87b1587b959412cc42f9bd472b8
|
oid sha256:de92e9c114f80b9cbd664d98f6f7b69e3459af490f6fcc39e9c522f37d54cb80
|
||||||
size 87607
|
size 87600
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:453f3e2e6f5b5854ec84c28b02719a47f0f70bce43358bba0bc14f56ba97aaa4
|
oid sha256:f8bb52ae4d2100f0caa8bef193f9d4d6ea0fea741fc1d5a92e87b44f8d14f559
|
||||||
size 145256
|
size 145270
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:fc8fc3665baf362eb39dc254015416c017fbf5c318c8dfaa90d80d20a2933538
|
oid sha256:55f04a46a64e94b396d7c1824a5da08f874a811e107596db5cbd14c2149eb9c9
|
||||||
size 162830
|
size 162960
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:f25b4fdbcb96928a7cc9a4b29f72ba7396d4c719d8725b84c115a6cf9e00f2ab
|
oid sha256:c2c35360b5cd5b80107dd1d47f55079d2a0e2f008e9288a690a989cc1cf1c2d5
|
||||||
size 95270
|
size 95059
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:d6a39f00da12a09f18cecceceb9e76f6566c338bf96780422495dcb3e05a55e0
|
oid sha256:7f79552e30a813e4478e21518cf1e1becd53b3376bd82b6ab793e815a1dd9409
|
||||||
size 118748
|
size 118750
|
||||||
|
|||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:afadc809a033e6146603cdaf7e2eccba586974b894c89cd466468db52ae20691
|
||||||
|
size 107351
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:69b143c9e84bd04939e29bda37568bd0f3660b0ed773d1a263eff46f5245d484
|
||||||
|
size 128973
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2fddac8821bbb5a30af63cbbbb38686ea301b71bccd69d36d4731a889a92a72d
|
||||||
|
size 64941
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d5912c829d0a8ebb5dbf63b8feab2313d59a06c873e8e7042a93129ab36ae7f2
|
||||||
|
size 87237
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d3b7985f6ba075bc66deb5c4521a518d0428bdfafafdf087dff67e16926c650e
|
|
||||||
size 91712
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7b26f0f5dfeea53c0b10359dc783213f3b67b6f333529e3ac3c3684ac00626fc
|
|
||||||
size 101795
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:d75ab79d69c227d709565355288fa58ca75777637d2413037c3a3fc8150da1db
|
|
||||||
size 49858
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a8cf26aca216a8a038b960638bb0be12b548dee487ae1103b40f3cf674bf6afb
|
|
||||||
size 60189
|
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:42742fd4245cf07e78b0dad9ea8a056b3fc8b6cdb0333da45baaa7cc3fdaacfd
|
||||||
|
size 100907
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:86ecc041582db61c6b3856676484c384217be198f6f3706711492f6dda30a4e3
|
||||||
|
size 121768
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:0cf242dd449a7129346863b15ea60ccf2702c007d695ab5ff93c13918dce9f56
|
||||||
|
size 57801
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:1b1f8b31845c99692c2240e0d42e9a8f548ea06a65aa96a2cf0cdfc99d0cf3cf
|
||||||
|
size 81641
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b1a75d80201e1bf0a3e655f536a9a84ff4197f20b7757553e553db28474feb62
|
|
||||||
size 87719
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dd79efad451ec3d92ee607ed9e2bd124a2f05f7ab91a34f01974a276e63e71c3
|
|
||||||
size 103702
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:03b5af80e085e003c5e53f14666b51cdd4c46aee156e6480e454239765f28f0b
|
|
||||||
size 48092
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:77a3bf1e285d122422c8d9de9c7e2638c3db736f66fd991ef301b36c5d0b94e5
|
|
||||||
size 64407
|
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fadaa19ca5afa5ac3f165b9c7a0140b9a87370ebb9419de398cef9da18735482
|
||||||
|
size 127817
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2427eebcb8acb0582859bb77c633b1aed6dbf5cec9f93cf1ca8faaa4a98f6a1f
|
||||||
|
size 149860
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:803e2c17451b95dfa1c8fb34e16e3a17d1fb951b0f082faaf5025934e0b29b06
|
||||||
|
size 78783
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:75499d63b5ea67a0f93767ebf759973e82c2557dfc74ce088ecfbc244948ba05
|
||||||
|
size 106677
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b1a75d80201e1bf0a3e655f536a9a84ff4197f20b7757553e553db28474feb62
|
|
||||||
size 87719
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dd79efad451ec3d92ee607ed9e2bd124a2f05f7ab91a34f01974a276e63e71c3
|
|
||||||
size 103702
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:03b5af80e085e003c5e53f14666b51cdd4c46aee156e6480e454239765f28f0b
|
|
||||||
size 48092
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:77a3bf1e285d122422c8d9de9c7e2638c3db736f66fd991ef301b36c5d0b94e5
|
|
||||||
size 64407
|
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:21061fa7ad12905b75e75cb320c67a92b7d55a37a01b177487d2d7187756039d
|
||||||
|
size 145208
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a04b8908d24795c61748aa8a11bc85c5a27225d03c38f29dbe8686ea2ea56b19
|
||||||
|
size 162926
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f79ed45b10641719f3eb3855a2f0a58ffd92b293e979b54f820e140e49e3d266
|
||||||
|
size 94927
|
||||||
+3
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:481e722ad8832dead8eb93c40d245d7f0332ef74b99053772b96424fe92ff781
|
||||||
|
size 118261
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b1a75d80201e1bf0a3e655f536a9a84ff4197f20b7757553e553db28474feb62
|
|
||||||
size 87719
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:dd79efad451ec3d92ee607ed9e2bd124a2f05f7ab91a34f01974a276e63e71c3
|
|
||||||
size 103702
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:03b5af80e085e003c5e53f14666b51cdd4c46aee156e6480e454239765f28f0b
|
|
||||||
size 48092
|
|
||||||
-3
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:77a3bf1e285d122422c8d9de9c7e2638c3db736f66fd991ef301b36c5d0b94e5
|
|
||||||
size 64407
|
|
||||||
Reference in New Issue
Block a user