diff --git a/ios/Launch Screen.storyboard b/ios/Launch Screen.storyboard new file mode 100644 index 000000000..f695818bd --- /dev/null +++ b/ios/Launch Screen.storyboard @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/Contents.json b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/Contents.json new file mode 100644 index 000000000..ed1e0d0bd --- /dev/null +++ b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/Contents.json @@ -0,0 +1,33 @@ +{ + "images" : [ + { + "filename" : "splash-1.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "splash-2.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "splash-3.jpg", + "idiom" : "universal", + "scale" : "3x" + }, + { + "filename" : "splash-3 1.jpg", + "idiom" : "ipad", + "scale" : "1x" + }, + { + "filename" : "splash-4.jpg", + "idiom" : "ipad", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-1.jpg b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-1.jpg new file mode 100644 index 000000000..99ea3caab Binary files /dev/null and b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-1.jpg differ diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-2.jpg b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-2.jpg new file mode 100644 index 000000000..3945e922c Binary files /dev/null and b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-2.jpg differ diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3 1.jpg b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3 1.jpg new file mode 100644 index 000000000..362ffa07c Binary files /dev/null and b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3 1.jpg differ diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3.jpg b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3.jpg new file mode 100644 index 000000000..362ffa07c Binary files /dev/null and b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-3.jpg differ diff --git a/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-4.jpg b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-4.jpg new file mode 100644 index 000000000..8d89c7da8 Binary files /dev/null and b/ios/iNaturalistReactNative/Images.xcassets/splash.imageset/splash-4.jpg differ diff --git a/ios/iNaturalistReactNative/LaunchScreen.storyboard b/ios/iNaturalistReactNative/LaunchScreen.storyboard index b77163aea..1294927bb 100644 --- a/ios/iNaturalistReactNative/LaunchScreen.storyboard +++ b/ios/iNaturalistReactNative/LaunchScreen.storyboard @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/src/components/Camera/CameraWithDevice.tsx b/src/components/Camera/CameraWithDevice.tsx index 46feebe04..a232ab765 100644 --- a/src/components/Camera/CameraWithDevice.tsx +++ b/src/components/Camera/CameraWithDevice.tsx @@ -172,7 +172,7 @@ const CameraWithDevice = ( { body={t( "iNaturalist-can-save-photos-you-take-in-the-app-to-your-devices-gallery" )} buttonText={t( "SAVE-PHOTOS" )} icon="gallery" - image={require( "images/birger-strahl-ksiGE4hMiso-unsplash.jpg" )} + image={require( "images/background/birger-strahl-ksiGE4hMiso-unsplash.jpg" )} onModalHide={( ) => setAddPhotoPermissionGateWasClosed( true )} onPermissionGranted={onPhotoPermissionGranted} onPermissionDenied={onPhotoPermissionDenied} diff --git a/src/components/LoginSignUp/ForgotPassword.js b/src/components/LoginSignUp/ForgotPassword.js index 38f142357..4c58fd528 100644 --- a/src/components/LoginSignUp/ForgotPassword.js +++ b/src/components/LoginSignUp/ForgotPassword.js @@ -31,7 +31,7 @@ const ForgotPassword = ( ): Node => { return ( - + {showSheet && ( setShowSheet( false )} diff --git a/src/components/LoginSignUp/Header.js b/src/components/LoginSignUp/Header.js index 78c034dd2..55b72f06b 100644 --- a/src/components/LoginSignUp/Header.js +++ b/src/components/LoginSignUp/Header.js @@ -1,9 +1,8 @@ // @flow import { Body1 } from "components/SharedComponents"; -import { - Image, View -} from "components/styledComponents"; +import { View } from "components/styledComponents"; +import INaturalistLogo from "images/svg/inaturalist-white.svg"; import type { Node } from "react"; import React from "react"; @@ -14,14 +13,14 @@ type Props = { const Header = ( { headerText, hideHeader }: Props ): Node => { if ( hideHeader ) { return null; } + + const renderLogo = ( ) => ( + // $FlowIgnore[not-a-component] + + ); return ( - + {renderLogo()} {headerText && ( {headerText} diff --git a/src/components/LoginSignUp/LicensePhotos.js b/src/components/LoginSignUp/LicensePhotos.js index e50c1542b..8575bfa88 100644 --- a/src/components/LoginSignUp/LicensePhotos.js +++ b/src/components/LoginSignUp/LicensePhotos.js @@ -10,7 +10,7 @@ import LicensePhotosForm from "./LicensePhotosForm"; import LoginSignUpWrapper from "./LoginSignUpWrapper"; const LicensePhotos = ( ): Node => ( - + diff --git a/src/components/LoginSignUp/Login.tsx b/src/components/LoginSignUp/Login.tsx index 9711f6165..3d3fccf49 100644 --- a/src/components/LoginSignUp/Login.tsx +++ b/src/components/LoginSignUp/Login.tsx @@ -34,7 +34,7 @@ const Login = ( ) => { return ( {renderLoginForm( )} diff --git a/src/components/LoginSignUp/SignUp.js b/src/components/LoginSignUp/SignUp.js index 471e19f8b..9d63f9ed1 100644 --- a/src/components/LoginSignUp/SignUp.js +++ b/src/components/LoginSignUp/SignUp.js @@ -24,7 +24,7 @@ const SignUp = ( ): Node => { return (
{ const navigation = useNavigation( ); return ( - +
diff --git a/src/components/SharedComponents/LocationPermissionGate.tsx b/src/components/SharedComponents/LocationPermissionGate.tsx index 36ac3e52a..1f5ed6c00 100644 --- a/src/components/SharedComponents/LocationPermissionGate.tsx +++ b/src/components/SharedComponents/LocationPermissionGate.tsx @@ -31,7 +31,7 @@ const LocationPermissionGate = ( { blockedPrompt={t( "Youve-previously-denied-location-permissions" )} buttonText={t( "USE-LOCATION" )} icon="map-marker-outline" - image={require( "images/landon-parenteau-EEuDMqRYbx0-unsplash.jpg" )} + image={require( "images/background/landon-parenteau-EEuDMqRYbx0-unsplash.jpg" )} permissionNeeded={permissionNeeded} onModalHide={onModalHide} onPermissionGranted={onPermissionGranted} diff --git a/src/components/SharedComponents/PermissionGate.tsx b/src/components/SharedComponents/PermissionGate.tsx index 95587468e..32cd2ce11 100644 --- a/src/components/SharedComponents/PermissionGate.tsx +++ b/src/components/SharedComponents/PermissionGate.tsx @@ -53,7 +53,7 @@ const PermissionGate = ( { body2, blockedPrompt = t( "Youve-denied-permission-prompt" ), buttonText = t( "GRANT-PERMISSION" ), - image = require( "images/bart-zimny-W5XTTLpk1-I-unsplash.jpg" ), + image = require( "images/background/bart-zimny-W5XTTLpk1-I-unsplash.jpg" ), onClose, testID }: Props ) => ( diff --git a/src/images/azmaan-baluch-_ra6NcejHVs-unsplash.jpg b/src/images/background/azmaan-baluch-_ra6NcejHVs-unsplash.jpg similarity index 100% rename from src/images/azmaan-baluch-_ra6NcejHVs-unsplash.jpg rename to src/images/background/azmaan-baluch-_ra6NcejHVs-unsplash.jpg diff --git a/src/images/bart-zimny-W5XTTLpk1-I-unsplash.jpg b/src/images/background/bart-zimny-W5XTTLpk1-I-unsplash.jpg similarity index 100% rename from src/images/bart-zimny-W5XTTLpk1-I-unsplash.jpg rename to src/images/background/bart-zimny-W5XTTLpk1-I-unsplash.jpg diff --git a/src/images/birger-strahl-ksiGE4hMiso-unsplash.jpg b/src/images/background/birger-strahl-ksiGE4hMiso-unsplash.jpg similarity index 100% rename from src/images/birger-strahl-ksiGE4hMiso-unsplash.jpg rename to src/images/background/birger-strahl-ksiGE4hMiso-unsplash.jpg diff --git a/src/images/background/butterfly.jpg b/src/images/background/butterfly.jpg new file mode 100644 index 000000000..06b074fa4 Binary files /dev/null and b/src/images/background/butterfly.jpg differ diff --git a/src/images/background/daniel-olah-YNUFtf4qyh0-unsplash.jpg b/src/images/background/daniel-olah-YNUFtf4qyh0-unsplash.jpg new file mode 100644 index 000000000..a66d97bfc Binary files /dev/null and b/src/images/background/daniel-olah-YNUFtf4qyh0-unsplash.jpg differ diff --git a/src/images/landon-parenteau-EEuDMqRYbx0-unsplash.jpg b/src/images/background/landon-parenteau-EEuDMqRYbx0-unsplash.jpg similarity index 100% rename from src/images/landon-parenteau-EEuDMqRYbx0-unsplash.jpg rename to src/images/background/landon-parenteau-EEuDMqRYbx0-unsplash.jpg diff --git a/src/images/background/pink_flower.jpg b/src/images/background/pink_flower.jpg new file mode 100644 index 000000000..04f49fb13 Binary files /dev/null and b/src/images/background/pink_flower.jpg differ diff --git a/src/images/background/plants.jpg b/src/images/background/plants.jpg new file mode 100644 index 000000000..ff6d32649 Binary files /dev/null and b/src/images/background/plants.jpg differ diff --git a/src/images/background/toucan.jpg b/src/images/background/toucan.jpg new file mode 100644 index 000000000..54167e751 Binary files /dev/null and b/src/images/background/toucan.jpg differ diff --git a/src/images/viviana-rishe-j2330n6bg3I-unsplash.jpg b/src/images/background/viviana-rishe-j2330n6bg3I-unsplash.jpg similarity index 100% rename from src/images/viviana-rishe-j2330n6bg3I-unsplash.jpg rename to src/images/background/viviana-rishe-j2330n6bg3I-unsplash.jpg diff --git a/src/images/butterfly.png b/src/images/butterfly.png deleted file mode 100644 index fbeb744fd..000000000 Binary files a/src/images/butterfly.png and /dev/null differ diff --git a/src/images/frog.png b/src/images/frog.png deleted file mode 100644 index faf510e5d..000000000 Binary files a/src/images/frog.png and /dev/null differ diff --git a/src/images/inaturalist.png b/src/images/inaturalist.png deleted file mode 100644 index 43012f3d7..000000000 Binary files a/src/images/inaturalist.png and /dev/null differ diff --git a/src/images/pink_flower.png b/src/images/pink_flower.png deleted file mode 100644 index b987630a5..000000000 Binary files a/src/images/pink_flower.png and /dev/null differ diff --git a/src/images/plants.png b/src/images/plants.png deleted file mode 100644 index 247aaa7d1..000000000 Binary files a/src/images/plants.png and /dev/null differ diff --git a/src/images/svg/inaturalist-white.svg b/src/images/svg/inaturalist-white.svg new file mode 100644 index 000000000..40bb62146 --- /dev/null +++ b/src/images/svg/inaturalist-white.svg @@ -0,0 +1,15 @@ + + + + iNaturalist-Identity-white + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/src/images/toucan.png b/src/images/toucan.png deleted file mode 100644 index b44f5e4ef..000000000 Binary files a/src/images/toucan.png and /dev/null differ diff --git a/src/navigation/StackNavigators/NoBottomTabStackNavigator.js b/src/navigation/StackNavigators/NoBottomTabStackNavigator.js index b3e4ee772..279df432e 100644 --- a/src/navigation/StackNavigators/NoBottomTabStackNavigator.js +++ b/src/navigation/StackNavigators/NoBottomTabStackNavigator.js @@ -79,7 +79,7 @@ const GalleryContainerWithPermission = ( ) => ( blockedPrompt={t( "Youve-previously-denied-gallery-permissions" )} buttonText={t( "CHOOSE-PHOTOS" )} icon="gallery" - image={require( "images/viviana-rishe-j2330n6bg3I-unsplash.jpg" )} + image={require( "images/background/viviana-rishe-j2330n6bg3I-unsplash.jpg" )} > @@ -95,7 +95,7 @@ const SoundRecorderWithPermission = ( ) => ( blockedPrompt={t( "Youve-previously-denied-microphone-permissions" )} buttonText={t( "RECORD-SOUND" )} icon="microphone" - image={require( "images/azmaan-baluch-_ra6NcejHVs-unsplash.jpg" )} + image={require( "images/background/azmaan-baluch-_ra6NcejHVs-unsplash.jpg" )} >