diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f59082..65dd9de3 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b523998..00000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd6..2d4ed551 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c76..00000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd80..9248ec7d 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca609..00000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe0..7c8290e4 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b410..00000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebdd..f1658a93 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13c..00000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/ios/app/LaunchScreen.storyboard b/ios/LaunchScreen.storyboard similarity index 61% rename from ios/app/LaunchScreen.storyboard rename to ios/LaunchScreen.storyboard index e5542188..700f1cfc 100644 --- a/ios/app/LaunchScreen.storyboard +++ b/ios/LaunchScreen.storyboard @@ -1,6 +1,6 @@ - - + + @@ -9,33 +9,33 @@ - + - - - + + + - - + + - - - - + + + + - + - + - + diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 20e1657a..c82cf898 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 5698CA584FD738B2091BD18F /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C0C7BDE7769B84011D3747DC /* libPods-app-appTests.a */; }; 67BF1AE6AABFC881715B2D6A /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8789F612EDA2C48C6064ADD6 /* libPods-app.a */; }; - 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + E46FE2C12981C0DB007C107C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E46FE2C02981C0DB007C107C /* LaunchScreen.storyboard */; }; E4BBD590292C1F5200296224 /* app.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = E4437C9E28581FA7006DA9E7 /* app.entitlements */; }; /* End PBXBuildFile section */ @@ -38,13 +38,13 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; 53DBA218C184B95B107AC33E /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; 8789F612EDA2C48C6064ADD6 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 8BB4EDB104E125B8A1913E74 /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; A8E093A0B5DA947150924A68 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; C01FB6762BC17DADC0319338 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; C0C7BDE7769B84011D3747DC /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E4437C9E28581FA7006DA9E7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = app.entitlements; path = app/app.entitlements; sourceTree = ""; }; + E46FE2C02981C0DB007C107C /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -93,8 +93,8 @@ 13B07FB01A68108700A75B9A /* AppDelegate.mm */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, - 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */, 13B07FB71A68108700A75B9A /* main.m */, + E46FE2C02981C0DB007C107C /* LaunchScreen.storyboard */, ); name = app; sourceTree = ""; @@ -245,8 +245,8 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E46FE2C12981C0DB007C107C /* LaunchScreen.storyboard in Resources */, E4BBD590292C1F5200296224 /* app.entitlements in Resources */, - 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/100.png b/ios/app/Images.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 00000000..2ab2cc19 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/100.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/1024.png b/ios/app/Images.xcassets/AppIcon.appiconset/1024.png index a1bf0bcb..1dda9a34 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/1024.png and b/ios/app/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/114.png b/ios/app/Images.xcassets/AppIcon.appiconset/114.png index 008659b5..37ce4787 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/114.png and b/ios/app/Images.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/120 1.png b/ios/app/Images.xcassets/AppIcon.appiconset/120 1.png deleted file mode 100644 index c9fd3014..00000000 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/120 1.png and /dev/null differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/120.png b/ios/app/Images.xcassets/AppIcon.appiconset/120.png index c9fd3014..5288bd5b 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/120.png and b/ios/app/Images.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/128.png b/ios/app/Images.xcassets/AppIcon.appiconset/128.png new file mode 100644 index 00000000..ba401db8 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/128.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/144.png b/ios/app/Images.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 00000000..ae573d2e Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/144.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/152.png b/ios/app/Images.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 00000000..255663d5 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/152.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/16.png b/ios/app/Images.xcassets/AppIcon.appiconset/16.png new file mode 100644 index 00000000..be4e2b0b Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/16.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/167.png b/ios/app/Images.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 00000000..84f4bfa2 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/167.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/172.png b/ios/app/Images.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 00000000..3532bb96 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/172.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/180.png b/ios/app/Images.xcassets/AppIcon.appiconset/180.png index 7d58a9ed..114c2a4d 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/180.png and b/ios/app/Images.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/196.png b/ios/app/Images.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 00000000..a71f3d29 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/196.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/20.png b/ios/app/Images.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 00000000..c6df8f01 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/216.png b/ios/app/Images.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 00000000..e2839dcc Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/216.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/256.png b/ios/app/Images.xcassets/AppIcon.appiconset/256.png new file mode 100644 index 00000000..16d647a9 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/256.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/29.png b/ios/app/Images.xcassets/AppIcon.appiconset/29.png index 332cf9bc..eb2ffd25 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/29.png and b/ios/app/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/32.png b/ios/app/Images.xcassets/AppIcon.appiconset/32.png new file mode 100644 index 00000000..ec90d9f2 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/32.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/40.png b/ios/app/Images.xcassets/AppIcon.appiconset/40.png index b14a56a9..b9565b37 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/40.png and b/ios/app/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/48.png b/ios/app/Images.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 00000000..d33d0b1f Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/48.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/50.png b/ios/app/Images.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 00000000..f6bb3099 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/50.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/512.png b/ios/app/Images.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 00000000..d732c6d7 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/512.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/55.png b/ios/app/Images.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 00000000..f81097bd Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/55.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/57.png b/ios/app/Images.xcassets/AppIcon.appiconset/57.png index 7a2680b7..ec857480 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/57.png and b/ios/app/Images.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/58.png b/ios/app/Images.xcassets/AppIcon.appiconset/58.png index ceb9533e..38bf21bf 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/58.png and b/ios/app/Images.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/60.png b/ios/app/Images.xcassets/AppIcon.appiconset/60.png index 46c004d3..51c0afaf 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/60.png and b/ios/app/Images.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/64.png b/ios/app/Images.xcassets/AppIcon.appiconset/64.png new file mode 100644 index 00000000..4aa33f78 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/64.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/66.png b/ios/app/Images.xcassets/AppIcon.appiconset/66.png new file mode 100644 index 00000000..e2a77b36 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/66.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/72.png b/ios/app/Images.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 00000000..ec793ba8 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/72.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/76.png b/ios/app/Images.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 00000000..1f275d14 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/80.png b/ios/app/Images.xcassets/AppIcon.appiconset/80.png index 162fac8d..9efd70e5 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/80.png and b/ios/app/Images.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/87.png b/ios/app/Images.xcassets/AppIcon.appiconset/87.png index 8159b3fe..4527df1d 100644 Binary files a/ios/app/Images.xcassets/AppIcon.appiconset/87.png and b/ios/app/Images.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/88.png b/ios/app/Images.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 00000000..5223e3fa Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/88.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/92.png b/ios/app/Images.xcassets/AppIcon.appiconset/92.png new file mode 100644 index 00000000..c9d526d7 Binary files /dev/null and b/ios/app/Images.xcassets/AppIcon.appiconset/92.png differ diff --git a/ios/app/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/app/Images.xcassets/AppIcon.appiconset/Contents.json index 66800458..8e70699a 100644 --- a/ios/app/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/app/Images.xcassets/AppIcon.appiconset/Contents.json @@ -55,7 +55,7 @@ "size" : "57x57" }, { - "filename" : "120 1.png", + "filename" : "120.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" @@ -66,11 +66,277 @@ "scale" : "3x", "size" : "60x60" }, + { + "filename" : "20.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "29.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "58.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "40.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "80.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "50.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "50x50" + }, + { + "filename" : "100.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "50x50" + }, + { + "filename" : "72.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "72x72" + }, + { + "filename" : "144.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "72x72" + }, + { + "filename" : "76.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "152.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "167.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, { "filename" : "1024.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" + }, + { + "filename" : "16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "64.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "1024.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + }, + { + "filename" : "48.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "24x24", + "subtype" : "38mm" + }, + { + "filename" : "55.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "27.5x27.5", + "subtype" : "42mm" + }, + { + "filename" : "58.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "87.png", + "idiom" : "watch", + "role" : "companionSettings", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "66.png", + "idiom" : "watch", + "role" : "notificationCenter", + "scale" : "2x", + "size" : "33x33", + "subtype" : "45mm" + }, + { + "filename" : "80.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "40x40", + "subtype" : "38mm" + }, + { + "filename" : "88.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "44x44", + "subtype" : "40mm" + }, + { + "filename" : "92.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "46x46", + "subtype" : "41mm" + }, + { + "filename" : "100.png", + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "50x50", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "51x51", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "appLauncher", + "scale" : "2x", + "size" : "54x54", + "subtype" : "49mm" + }, + { + "filename" : "172.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "86x86", + "subtype" : "38mm" + }, + { + "filename" : "196.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "98x98", + "subtype" : "42mm" + }, + { + "filename" : "216.png", + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "108x108", + "subtype" : "44mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "117x117", + "subtype" : "45mm" + }, + { + "idiom" : "watch", + "role" : "quickLook", + "scale" : "2x", + "size" : "129x129", + "subtype" : "49mm" + }, + { + "filename" : "1024.png", + "idiom" : "watch-marketing", + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/Contents.json b/ios/app/Images.xcassets/LaunchScreen.imageset/Contents.json index f57e4f49..6ed6bc6f 100644 --- a/ios/app/Images.xcassets/LaunchScreen.imageset/Contents.json +++ b/ios/app/Images.xcassets/LaunchScreen.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "splash.jpg", + "filename" : "bsky-app-splash.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "splash@2x.jpg", + "filename" : "bsky-app-splash@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "splash@3x.jpg", + "filename" : "bsky-app-splash@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash.png b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash.png new file mode 100644 index 00000000..18862533 Binary files /dev/null and b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash.png differ diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@2x.png b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@2x.png new file mode 100644 index 00000000..02e12c9a Binary files /dev/null and b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@2x.png differ diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@3x.png b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@3x.png new file mode 100644 index 00000000..12be9bc0 Binary files /dev/null and b/ios/app/Images.xcassets/LaunchScreen.imageset/bsky-app-splash@3x.png differ diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/splash.jpg b/ios/app/Images.xcassets/LaunchScreen.imageset/splash.jpg deleted file mode 100644 index 9925cd70..00000000 Binary files a/ios/app/Images.xcassets/LaunchScreen.imageset/splash.jpg and /dev/null differ diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/splash@2x.jpg b/ios/app/Images.xcassets/LaunchScreen.imageset/splash@2x.jpg deleted file mode 100644 index a42cd2ee..00000000 Binary files a/ios/app/Images.xcassets/LaunchScreen.imageset/splash@2x.jpg and /dev/null differ diff --git a/ios/app/Images.xcassets/LaunchScreen.imageset/splash@3x.jpg b/ios/app/Images.xcassets/LaunchScreen.imageset/splash@3x.jpg deleted file mode 100644 index 6382a9e6..00000000 Binary files a/ios/app/Images.xcassets/LaunchScreen.imageset/splash@3x.jpg and /dev/null differ diff --git a/public/img/cloud-splash.png b/public/img/cloud-splash.png new file mode 100644 index 00000000..18862533 Binary files /dev/null and b/public/img/cloud-splash.png differ diff --git a/src/view/com/login/Logo.tsx b/src/view/com/login/Logo.tsx index 7045e415..ec53549b 100644 --- a/src/view/com/login/Logo.tsx +++ b/src/view/com/login/Logo.tsx @@ -1,42 +1,9 @@ import React from 'react' -import {StyleSheet, View} from 'react-native' +import {StyleSheet} from 'react-native' import LinearGradient from 'react-native-linear-gradient' -import Svg, {Circle, Line, Text as SvgText} from 'react-native-svg' import {s, gradients} from '../../lib/styles' import {Text} from '../util/text/Text' -export const Logo = ({color, size = 100}: {color: string; size?: number}) => { - return ( - - - - - - - - - B - - - - ) -} - export const LogoTextHero = () => { return ( { start={{x: 0, y: 0}} end={{x: 1, y: 1}} style={[styles.textHero]}> - - + Bluesky diff --git a/src/view/lib/assets.native.ts b/src/view/lib/assets.native.ts index 609f8e01..a2db553e 100644 --- a/src/view/lib/assets.native.ts +++ b/src/view/lib/assets.native.ts @@ -2,3 +2,4 @@ import {ImageSourcePropType} from 'react-native' export const DEF_AVATAR: ImageSourcePropType = require('../../../public/img/default-avatar.jpg') export const TABS_EXPLAINER: ImageSourcePropType = require('../../../public/img/tabs-explainer.jpg') +export const CLOUD_SPLASH: ImageSourcePropType = require('../../../public/img/cloud-splash.png') diff --git a/src/view/lib/assets.ts b/src/view/lib/assets.ts index 9e937d4d..948f3a22 100644 --- a/src/view/lib/assets.ts +++ b/src/view/lib/assets.ts @@ -4,3 +4,4 @@ export const DEF_AVATAR: ImageSourcePropType = {uri: '/img/default-avatar.jpg'} export const TABS_EXPLAINER: ImageSourcePropType = { uri: '/img/tabs-explainer.jpg', } +export const CLOUD_SPLASH: ImageSourcePropType = {uri: '/img/cloud-splash.png'} diff --git a/src/view/screens/Login.tsx b/src/view/screens/Login.tsx index accd0f42..81a2c9e6 100644 --- a/src/view/screens/Login.tsx +++ b/src/view/screens/Login.tsx @@ -1,21 +1,19 @@ import React, {useState} from 'react' import { + Image, SafeAreaView, StyleSheet, TouchableOpacity, View, - useWindowDimensions, } from 'react-native' -import Svg, {Line} from 'react-native-svg' -import LinearGradient from 'react-native-linear-gradient' import {observer} from 'mobx-react-lite' import {Signin} from '../com/login/Signin' -import {Logo} from '../com/login/Logo' import {CreateAccount} from '../com/login/CreateAccount' import {Text} from '../com/util/text/Text' import {ErrorBoundary} from '../com/util/ErrorBoundary' -import {s, colors} from '../lib/styles' +import {colors} from '../lib/styles' import {usePalette} from '../lib/hooks/usePalette' +import {CLOUD_SPLASH} from '../lib/assets' enum ScreenState { S_SigninOrCreateAccount, @@ -30,48 +28,27 @@ const SigninOrCreateAccount = ({ onPressSignin: () => void onPressCreateAccount: () => void }) => { - const winDim = useWindowDimensions() - const halfWidth = winDim.width / 2 + const pal = usePalette('default') return ( <> - - Bluesky - [ private beta ] + + Bluesky + [ private beta ] + - + - Create a new account + Create a new account - - - - - - or - - Sign in + Sign in @@ -86,11 +63,8 @@ export const Login = observer(() => { if (screenState === ScreenState.S_SigninOrCreateAccount) { return ( - + + { /> - + ) } @@ -140,21 +114,34 @@ const styles = StyleSheet.create({ flex: 2, justifyContent: 'center', }, + bgImg: { + position: 'absolute', + top: 0, + left: 0, + width: '100%', + height: '100%', + }, + heroText: { + backgroundColor: colors.white, + paddingTop: 10, + paddingBottom: 20, + }, + btns: { + paddingBottom: 40, + }, title: { textAlign: 'center', - color: colors.white, + color: colors.blue3, fontSize: 68, fontWeight: 'bold', }, subtitle: { textAlign: 'center', - color: colors.white, + color: colors.blue3, fontSize: 18, }, btn: { - borderWidth: 1, - borderColor: colors.white, - borderRadius: 10, + borderRadius: 4, paddingVertical: 16, marginBottom: 20, marginHorizontal: 20, @@ -162,20 +149,8 @@ const styles = StyleSheet.create({ }, btnLabel: { textAlign: 'center', + fontSize: 21, + // fontWeight: '500', color: colors.white, - fontSize: 18, - fontWeight: 'bold', - }, - or: { - marginBottom: 20, - }, - orLine: { - position: 'absolute', - top: 10, - }, - orLabel: { - textAlign: 'center', - color: colors.white, - fontSize: 16, }, })