#40: Self review for PR

element-hq · Jun 14, 2022 · 66f4955 · 66f4955
1 parent f3ac347
commit 66f4955
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 113 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/...ns/Onboarding/Common/String-Tinting.swift → ElementX/Sources/Other/String.swift b/...ns/Onboarding/Common/String-Tinting.swift → ElementX/Sources/Other/String.swift
@@ -17,6 +17,11 @@
 import SwiftUI
 
 extension String {
+    /// Returns the string as an `AttributedString` with the specified character tinted in a different color.
+    /// - Parameters:
+    ///   - character: The character to be tinted.
+    ///   - color: The color to tint the character. Defaults to the accent color.
+    /// - Returns: An `AttributedString`.
     func tinting(_ character: Character, color: Color = .accentColor) -> AttributedString {
         var string = AttributedString(self)
         let characterView = string.characters

diff --git a/...Onboarding/Common/OnboardingMetrics.swift → ...uthentication/AuthenticationMetrics.swift b/...Onboarding/Common/OnboardingMetrics.swift → ...uthentication/AuthenticationMetrics.swift
@@ -17,23 +17,12 @@
 import SwiftUI
 
 /// Metrics used across the entire onboarding flow.
-struct OnboardingMetrics {
+struct AuthenticationMetrics {
     static let maxContentWidth: CGFloat = 600
     static let maxContentHeight: CGFloat = 750
 
     /// The padding used between the top of the main content and the navigation bar.
     static let topPaddingToNavigationBar: CGFloat = 16
-    /// The padding used between the footer and the bottom of the view.
-    static let actionButtonBottomPadding: CGFloat = 24
     /// The width/height used for the main icon shown in most of the screens.
     static let iconSize: CGFloat = 90
-
-    /// The padding used to the top of the view for breaker screens that don't have a navigation bar.
-    static let breakerScreenTopPadding: CGFloat = 80
-    static let breakerScreenIconBottomPadding: CGFloat = 42
-
-    /// The height to use for top/bottom spacers to pad the views to fit the `maxContentHeight`.
-    static func spacerHeight(in geometry: GeometryProxy) -> CGFloat {
-        max(0, (geometry.size.height - maxContentHeight) / 2)
-    }
 }
diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift
@@ -90,7 +90,7 @@ struct SplashScreen: View {
 
                 buttons
                     .padding(.horizontal, 16)
-                    .frame(maxWidth: OnboardingMetrics.maxContentWidth)
+                    .frame(maxWidth: AuthenticationMetrics.maxContentWidth)
                 Spacer()
             }
             .background(ViewFrameReader(frame: $overlayFrame))

diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPage.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPage.swift
@@ -68,8 +68,8 @@ struct SplashScreenPage: View {
                 Spacer().frame(maxHeight: overlayHeight)
             }
             .padding(.horizontal, 16)
-            .frame(maxWidth: OnboardingMetrics.maxContentWidth,
-                   maxHeight: OnboardingMetrics.maxContentHeight)
+            .frame(maxWidth: AuthenticationMetrics.maxContentWidth,
+                   maxHeight: AuthenticationMetrics.maxContentHeight)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .background(backgroundGradient.ignoresSafeArea())

diff --git a/...urces/OnboardingSplashScreenUITests.swift → UITests/Sources/SplashScreenUITests.swift b/...urces/OnboardingSplashScreenUITests.swift → UITests/Sources/SplashScreenUITests.swift
diff --git a/...nboardingSplashScreenViewModelTests.swift → .../Sources/SplashScreenViewModelTests.swift b/...nboardingSplashScreenViewModelTests.swift → .../Sources/SplashScreenViewModelTests.swift
@@ -15,10 +15,9 @@
 //
 
 import XCTest
-import Combine
 
 @testable import ElementX
 
 class SplashScreenViewModelTests: XCTestCase {
-
+    // Nothing to test, the view model has no mutable state.
 }
diff --git a/changelog.d/40.change b/changelog.d/40.change
@@ -0,0 +1 @@
+Add a UserSessionStore and the splash screen from Element iOS.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add a UserSessionStore and the splash screen from Element iOS.