Loading Animation #178
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "appdev_logo_white.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "Frame 1575.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "Frame 1575 (1).png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "intro_background.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "filename" : "Animation.png", | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "filename" : "Animation (1).png", | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
|
Contributor
There was a problem hiding this comment. This file is the same size as one above this looks sus 3x should have a file size bigger than the 2x |
.png){kind=link}
.png){kind=link}
%201.png){kind=link}
%202.png){kind=link}
.png){kind=link}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
|
Contributor
There was a problem hiding this comment. same here these are all the same size. in the figma there should be a way to export 2x, 3x of an asset |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // | ||
| // IntroAnimationViewModel.swift | ||
| // Uplift | ||
| // | ||
| // Created by Kaylee Ulep on 9/11/26. | ||
| // Copyright © 2026 Cornell AppDev. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| final class IntroAnimationViewModel: ObservableObject { | ||
|
|
||
| // MARK: - Properties | ||
|
|
||
| @Published var hasEntered = false | ||
| @Published var isFadingOut = false | ||
|
|
||
| // MARK: - Helpers | ||
|
|
||
| func appDevLogoYOffset(for height: CGFloat) -> CGFloat { | ||
| hasEntered ? 0 : height | ||
| } | ||
|
|
||
| // MARK: - Animation | ||
|
|
||
| @MainActor | ||
| func startAnimation( | ||
| for height: CGFloat, | ||
| onTransition: (() -> Void)?, | ||
| onFinished: (() -> Void)? | ||
| ) async { | ||
| guard height > 0 else { return } | ||
|
|
||
| hasEntered = true | ||
|
|
||
| try? await Task.sleep( | ||
| for: .seconds(Constants.IntroAnimation.introDuration) | ||
| ) | ||
|
|
||
| guard !Task.isCancelled else { return } | ||
|
|
||
| withAnimation( | ||
| .smooth(duration: Constants.IntroAnimation.transitionDuration) | ||
| ) { | ||
| isFadingOut = true | ||
| } | ||
|
|
||
| onTransition?() | ||
|
|
||
| try? await Task.sleep( | ||
| for: .seconds(Constants.IntroAnimation.transitionDuration) | ||
| ) | ||
|
|
||
| guard !Task.isCancelled else { return } | ||
|
|
||
| onFinished?() | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| // | ||
| // SignInViewModel.swift | ||
| // Uplift | ||
| // | ||
| // Created by Kaylee Ulep on 9/11/26. | ||
| // Copyright © 2026 Cornell AppDev. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| final class SignInAnimationViewModel: ObservableObject { | ||
|
|
||
| // MARK: - Phase | ||
|
|
||
| enum Phase { | ||
| case hidden | ||
| case entered | ||
| case transitioningToSignIn | ||
| case finished | ||
| } | ||
|
|
||
| @Published var phase: Phase | ||
|
|
||
| init(hasShownIntro: Bool) { | ||
| phase = hasShownIntro ? .finished : .hidden | ||
| } | ||
|
|
||
| // MARK: - Computed Properties | ||
|
|
||
| var showIntro: Bool { | ||
| phase != .finished | ||
| } | ||
|
|
||
| var introLogoEntered: Bool { | ||
| switch phase { | ||
| case .entered, .transitioningToSignIn, .finished: | ||
| return true | ||
| case .hidden: | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| var isTransitioningToSignIn: Bool { | ||
| switch phase { | ||
| case .transitioningToSignIn, .finished: | ||
| return true | ||
| case .hidden, .entered: | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| var mainLogoSize: CGSize { | ||
| isTransitioningToSignIn | ||
| ? CGSize(width: Constants.SignIn.transitionedLogoWidth, height: Constants.SignIn.transitionedLogoHeight) | ||
| : CGSize(width: Constants.SignIn.enteredLogoWidth, height: Constants.SignIn.enteredLogoHeight) | ||
| } | ||
|
|
||
| var mainLogoTopPadding: CGFloat { | ||
| isTransitioningToSignIn ? Constants.SignIn.transitionedLogoTopPadding : 0 | ||
| } | ||
|
|
||
| var mainLogoYOffset: CGFloat { | ||
| if isTransitioningToSignIn { | ||
| return Constants.SignIn.transitionedLogoYOffset | ||
| } | ||
|
|
||
| if introLogoEntered { | ||
| return Constants.SignIn.enteredLogoYOffset | ||
| } | ||
|
|
||
| return Constants.SignIn.hiddenLogoYOffset | ||
| } | ||
|
|
||
| // MARK: - Animation | ||
|
|
||
| @MainActor | ||
| func startIntroLogoAnimation() async { | ||
| guard phase == .hidden else { return } | ||
|
|
||
| await Task.yield() | ||
|
|
||
| phase = .entered | ||
| } | ||
|
|
||
| @MainActor | ||
| func transitionToSignIn() { | ||
| withAnimation( | ||
| .smooth(duration: Constants.IntroAnimation.transitionDuration) | ||
| ) { | ||
| phase = .transitioningToSignIn | ||
| } | ||
| } | ||
|
|
||
| @MainActor | ||
| func finish() { | ||
| phase = .finished | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we not have 2x 3x files for this? you need the 2x 3x file so that the photo does not get blurry. also do we use png for our assets or svgs can you check the other files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it looks like pngs inside of Assets.xcassets