From 8c58150d76053b3ed4a7a88b51421b894751b87d Mon Sep 17 00:00:00 2001
From: Martin Walsh <martin.walsh@gmail.com>
Date: Wed, 1 May 2019 14:21:46 +0100
Subject: [PATCH] Changed OAuth Google logo inline with new compliance Removed
 Small icons support due to compliance

---
 Lock/AuthPresenter.swift                      |   7 +------
 .../ic_auth_google.imageset/Contents.json     |   3 ++-
 .../ic_auth_google.pdf                        | Bin 4154 -> 9003 bytes
 LockTests/Presenters/AuthPresenterSpec.swift  |   6 ------
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Lock/AuthPresenter.swift b/Lock/AuthPresenter.swift
index 5aed679f1..932561125 100644
--- a/Lock/AuthPresenter.swift
+++ b/Lock/AuthPresenter.swift
@@ -24,7 +24,6 @@ import Foundation
 
 class AuthPresenter: Presentable, Loggable {
 
-    let compactModeThreshold = 3
     let connections: [OAuth2Connection]
     let interactor: OAuth2Authenticatable
     let customStyle: [String: AuthStyle]
@@ -43,11 +42,7 @@ class AuthPresenter: Presentable, Loggable {
 
     func newViewToEmbed(withInsets insets: UIEdgeInsets, isLogin: Bool = true) -> AuthCollectionView {
         let mode: AuthCollectionView.Mode
-        if self.connections.count < compactModeThreshold {
-            mode = .expanded(isLogin: isLogin)
-        } else {
-            mode = .compact
-        }
+        mode = .expanded(isLogin: isLogin)
         return self.newView(withInsets: insets, mode: mode)
     }
 
diff --git a/Lock/Lock.xcassets/Social/ic_auth_google.imageset/Contents.json b/Lock/Lock.xcassets/Social/ic_auth_google.imageset/Contents.json
index d3cbd1401..b02aa8f21 100644
--- a/Lock/Lock.xcassets/Social/ic_auth_google.imageset/Contents.json
+++ b/Lock/Lock.xcassets/Social/ic_auth_google.imageset/Contents.json
@@ -10,6 +10,7 @@
     "author" : "xcode"
   },
   "properties" : {
-    "template-rendering-intent" : "template"
+    "template-rendering-intent" : "original",
+    "preserves-vector-representation" : true
   }
 }
\ No newline at end of file
diff --git a/Lock/Lock.xcassets/Social/ic_auth_google.imageset/ic_auth_google.pdf b/Lock/Lock.xcassets/Social/ic_auth_google.imageset/ic_auth_google.pdf
index 20f8d8923417ccdeb4f3a3fa4e10b6a34cc4bdf8..09948bfee69ae2e08a11c98c007d487154400d16 100644
GIT binary patch
delta 5523
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
J&u(FW_%APNAua#_

delta 1040
zcmZ4Owo73`Kz-^Y?=Bfbp0@9Ht=Ad@zf9YDjx)`aT|-Fig7Azle-(?$cf~4RS#)N3
zd;Q;Q>U$2U8zhEKa8R7OfvqOzSeJ+~m!3k8Pb%MkBhF_Bo1*;oO)~LTH%M-qI*;Sw
znGy>#qcb7tY<?n(nVf>>1}Bx+2Dap0Y3)l{Wa2*|pkuL%wMM<t<)zL1S9~L`)XJpK
z@JLG99o;=|%_Sqb>2@bKF4HyK+go;8N@m5w%?=!w*SbIITolH5NABCorJI!9OCr;Q
zv!aU`&E7oBS-3_^{<J6OdeizHn{!zGiyXFTx|C0U7uk01?xxw>o8L@Io-9{+H0sdg
z)a93->?l7~ca~2z^xbQ@2lW!(J9IVquVg7Nd$~%jboWdB*{0Wz`COd0;(2WJ6QS9$
z$7W7FBYC>{|F*YG?>~HFtvl$w-%<M3|DLBhDu!Lnp5i}${FS|D)ot)Vz2<LOs>Qks
z`Pc4$Z4h_ezO&3(#`aov-5TZ7w~nd5HvM<nEnMUKr?l0#uBQLuvw!fFf6mT%Cnq;B
zOEDW;7*C$d>?fx0o0^iD=#*cf5N)7fpkQPKM6q0xUo&e=KEN)hX{cZh6b(|avjZZo
z)V!4Zq%1BApb&_*u~E?XNzF?y$xyJI{EyFZv$%*0m!>6D*2v7z2&MyM2uMe?g1)D-
zvr}SmYKnrz<aRkzR<MPW56Y=d)?wqF{8>&q5@C;_Ayk`&Z(_27f3QM?f}w$)p`o6c
zLSSiPQAw3TfQy@ReqKpxMTsWNDnlcfCKoFs14A<d3j-rVOCwWbv&r4^s`g+rgB0|g
zi&7IyGV}9X5=&AQz<Pj!zWFK0e1uCXic-_K3=|BFC%>1M)-g6S16l$C3V8}#V1|K#
zi6t;tP{oW*fR>smsMed90|NzB&cF<)8%@mE!~p1HbaiH!<{DdIs53S-1O_syUSm@;
zu$Ta{LygUh3?}y}N!J@1E9eL1=a&G(6c}Pa-+Shz<tu=K9K?1}h*q$%NVZHdPfjsS
zHApf@GBr*~H8rwKGBr%JFg8v$G_*9e<07m?Ar_Q!ic5g;1r9}Hb7ONZRaIAJe>W}w
DthQgT

diff --git a/LockTests/Presenters/AuthPresenterSpec.swift b/LockTests/Presenters/AuthPresenterSpec.swift
index 7f272c9df..7d742e07e 100644
--- a/LockTests/Presenters/AuthPresenterSpec.swift
+++ b/LockTests/Presenters/AuthPresenterSpec.swift
@@ -78,12 +78,6 @@ class AuthPresenterSpec: QuickSpec {
                 expect(presenter.newViewToEmbed(withInsets: UIEdgeInsets.zero).mode).to(beExpandedMode())
             }
 
-            it("should return view with compact mode for more than three connecitons") {
-                let connections = OfflineConnections(databases: [], oauth2: mockConnections(count: Int(arc4random_uniform(10)) + 3), enterprise: [], passwordless: [])
-                presenter = AuthPresenter(connections: connections.oauth2, interactor: interactor, customStyle: [:])
-                expect(presenter.newViewToEmbed(withInsets: UIEdgeInsets.zero).mode).to(beCompactMode())
-            }
-
         }
 
         describe("action") {