diff --git a/Vernissage.xcodeproj/project.pbxproj b/Vernissage.xcodeproj/project.pbxproj index efe85b4..9e68fd8 100644 --- a/Vernissage.xcodeproj/project.pbxproj +++ b/Vernissage.xcodeproj/project.pbxproj @@ -69,6 +69,7 @@ F897978829681B9C00B22335 /* UserAvatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897978729681B9C00B22335 /* UserAvatar.swift */; }; F897978A2968314A00B22335 /* LoadingIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F89797892968314A00B22335 /* LoadingIndicator.swift */; }; F897978D2968369600B22335 /* HapticService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897978C2968369600B22335 /* HapticService.swift */; }; + F897978F29684BCB00B22335 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F897978E29684BCB00B22335 /* LoadingView.swift */; }; F8A93D7E2965FD89001D8331 /* UserProfileView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A93D7D2965FD89001D8331 /* UserProfileView.swift */; }; F8A93D802965FED4001D8331 /* AccountService.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A93D7F2965FED4001D8331 /* AccountService.swift */; }; F8A93D822965FF5D001D8331 /* MastodonClientAuthenticated+Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A93D812965FF5D001D8331 /* MastodonClientAuthenticated+Account.swift */; }; @@ -135,6 +136,7 @@ F897978729681B9C00B22335 /* UserAvatar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAvatar.swift; sourceTree = ""; }; F89797892968314A00B22335 /* LoadingIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingIndicator.swift; sourceTree = ""; }; F897978C2968369600B22335 /* HapticService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HapticService.swift; sourceTree = ""; }; + F897978E29684BCB00B22335 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = ""; }; F8A93D7D2965FD89001D8331 /* UserProfileView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserProfileView.swift; sourceTree = ""; }; F8A93D7F2965FED4001D8331 /* AccountService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountService.swift; sourceTree = ""; }; F8A93D812965FF5D001D8331 /* MastodonClientAuthenticated+Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MastodonClientAuthenticated+Account.swift"; sourceTree = ""; }; @@ -176,6 +178,7 @@ F8A93D7D2965FD89001D8331 /* UserProfileView.swift */, F85DBF8E296732E20069BF89 /* FollowersView.swift */, F85DBF902967385F0069BF89 /* FollowingView.swift */, + F897978E29684BCB00B22335 /* LoadingView.swift */, ); path = Views; sourceTree = ""; @@ -453,6 +456,7 @@ F88FAD25295F3FF7009B20C9 /* FederatedFeedView.swift in Sources */, F88FAD32295F5029009B20C9 /* RemoteFileService.swift in Sources */, F88FAD27295F400E009B20C9 /* NotificationsView.swift in Sources */, + F897978F29684BCB00B22335 /* LoadingView.swift in Sources */, F88FAD2D295F4AD7009B20C9 /* ApplicationState.swift in Sources */, F866F6A1296040A8002E8F88 /* ApplicationSettings+CoreDataProperties.swift in Sources */, F866F6AE29606367002E8F88 /* ApplicationViewMode.swift in Sources */, diff --git a/Vernissage/Assets.xcassets/AppIcon.appiconset/icon.png b/Vernissage/Assets.xcassets/AppIcon.appiconset/icon.png index 5155859..2e4cd96 100644 Binary files a/Vernissage/Assets.xcassets/AppIcon.appiconset/icon.png and b/Vernissage/Assets.xcassets/AppIcon.appiconset/icon.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/Contents.json b/Vernissage/Assets.xcassets/Pixelfed.imageset/Contents.json new file mode 100644 index 0000000..5d40392 --- /dev/null +++ b/Vernissage/Assets.xcassets/Pixelfed.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "PixelfedBlack.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "PixelfedWhite.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "PixelfedBlack@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "PixelfedWhite@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "PixelfedBlack@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "PixelfedWhite@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack.png new file mode 100644 index 0000000..7df72ad Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@2x.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@2x.png new file mode 100644 index 0000000..9bf1736 Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@2x.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@3x.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@3x.png new file mode 100644 index 0000000..e0886c5 Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedBlack@3x.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite.png new file mode 100644 index 0000000..40efd4e Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@2x.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@2x.png new file mode 100644 index 0000000..94223b8 Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@2x.png differ diff --git a/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@3x.png b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@3x.png new file mode 100644 index 0000000..2920d60 Binary files /dev/null and b/Vernissage/Assets.xcassets/Pixelfed.imageset/PixelfedWhite@3x.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/Contents.json b/Vernissage/Assets.xcassets/SplashText.imageset/Contents.json new file mode 100644 index 0000000..897064c --- /dev/null +++ b/Vernissage/Assets.xcassets/SplashText.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "SplashTextBlack.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashTextWhite.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "SplashTextBlack@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashTextWhite@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "SplashTextBlack@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "SplashTextWhite@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack.png new file mode 100644 index 0000000..d25d5da Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@2x.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@2x.png new file mode 100644 index 0000000..100491a Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@2x.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@3x.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@3x.png new file mode 100644 index 0000000..78be9a6 Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextBlack@3x.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite.png new file mode 100644 index 0000000..ffee908 Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@2x.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@2x.png new file mode 100644 index 0000000..c03ce34 Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@2x.png differ diff --git a/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@3x.png b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@3x.png new file mode 100644 index 0000000..d5e75b1 Binary files /dev/null and b/Vernissage/Assets.xcassets/SplashText.imageset/SplashTextWhite@3x.png differ diff --git a/Vernissage/VernissageApp.swift b/Vernissage/VernissageApp.swift index f444eac..4767677 100644 --- a/Vernissage/VernissageApp.swift +++ b/Vernissage/VernissageApp.swift @@ -20,8 +20,7 @@ struct VernissageApp: App { NavigationStack { switch applicationViewMode { case .loading: - // TODO: Loading splashscreen. - Text("Loading") + LoadingView() case .signIn: SignInView { viewMode in applicationViewMode = viewMode diff --git a/Vernissage/Views/LoadingView.swift b/Vernissage/Views/LoadingView.swift new file mode 100644 index 0000000..2ae9374 --- /dev/null +++ b/Vernissage/Views/LoadingView.swift @@ -0,0 +1,25 @@ +// +// https://mczachurski.dev +// Copyright © 2023 Marcin Czachurski and the repository contributors. +// Licensed under the MIT License. +// + + +import SwiftUI + +struct LoadingView: View { + var body: some View { + VStack(alignment: .center) { + Spacer() + Image("SplashText") + Image("Pixelfed") + Spacer() + } + } +} + +struct LoadingView_Previews: PreviewProvider { + static var previews: some View { + LoadingView() + } +} diff --git a/icon.afdesign b/icon.afdesign index 826ea2d..0c00809 100644 Binary files a/icon.afdesign and b/icon.afdesign differ