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 20f8d8923..09948bfee 100644 Binary files a/Lock/Lock.xcassets/Social/ic_auth_google.imageset/ic_auth_google.pdf and b/Lock/Lock.xcassets/Social/ic_auth_google.imageset/ic_auth_google.pdf differ 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") {