diff --git a/android/app/src/main/assets/fonts/RobotoSlab-Medium.ttf b/android/app/src/main/assets/fonts/RobotoSlab-Medium.ttf new file mode 100644 index 0000000..0d8e8df Binary files /dev/null and b/android/app/src/main/assets/fonts/RobotoSlab-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/RobotoSlab-Regular.ttf b/android/app/src/main/assets/fonts/RobotoSlab-Regular.ttf new file mode 100644 index 0000000..1066872 Binary files /dev/null and b/android/app/src/main/assets/fonts/RobotoSlab-Regular.ttf differ diff --git a/assets/fonts/RobotoSlab-Medium.ttf b/assets/fonts/RobotoSlab-Medium.ttf new file mode 100644 index 0000000..0d8e8df Binary files /dev/null and b/assets/fonts/RobotoSlab-Medium.ttf differ diff --git a/assets/fonts/RobotoSlab-Regular.ttf b/assets/fonts/RobotoSlab-Regular.ttf new file mode 100644 index 0000000..1066872 Binary files /dev/null and b/assets/fonts/RobotoSlab-Regular.ttf differ diff --git a/ios/gobarberapp.xcodeproj/project.pbxproj b/ios/gobarberapp.xcodeproj/project.pbxproj index 3a0349f..c62dde5 100644 --- a/ios/gobarberapp.xcodeproj/project.pbxproj +++ b/ios/gobarberapp.xcodeproj/project.pbxproj @@ -16,6 +16,8 @@ 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2DCD954D1E0B4F2C00145EB5 /* gobarberappTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* gobarberappTests.m */; }; + 2783AE7CEAC64B3784A728EB /* RobotoSlab-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1545ECDB697949909CE46A3A /* RobotoSlab-Medium.ttf */; }; + 0867F95160154D579332F0EA /* RobotoSlab-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 14DB562B038046C8A12EDE70 /* RobotoSlab-Regular.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -51,6 +53,8 @@ 2D02E4901E0B4A5D006451C7 /* gobarberapp-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "gobarberapp-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; + 1545ECDB697949909CE46A3A /* RobotoSlab-Medium.ttf */ = {isa = PBXFileReference; name = "RobotoSlab-Medium.ttf"; path = "../assets/fonts/RobotoSlab-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 14DB562B038046C8A12EDE70 /* RobotoSlab-Regular.ttf */ = {isa = PBXFileReference; name = "RobotoSlab-Regular.ttf"; path = "../assets/fonts/RobotoSlab-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -140,6 +144,7 @@ 00E356EF1AD99517003FC87E /* gobarberappTests */, 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, + 3DFBE0371EBA44DAA41F1ACB /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -157,6 +162,16 @@ name = Products; sourceTree = ""; }; + 3DFBE0371EBA44DAA41F1ACB /* Resources */ = { + isa = "PBXGroup"; + children = ( + 1545ECDB697949909CE46A3A /* RobotoSlab-Medium.ttf */, + 14DB562B038046C8A12EDE70 /* RobotoSlab-Regular.ttf */, + ); + name = Resources; + sourceTree = ""; + path = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -295,6 +310,8 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + 2783AE7CEAC64B3784A728EB /* RobotoSlab-Medium.ttf in Resources */, + 0867F95160154D579332F0EA /* RobotoSlab-Regular.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/gobarberapp/Info.plist b/ios/gobarberapp/Info.plist index 00e9c83..141c178 100644 --- a/ios/gobarberapp/Info.plist +++ b/ios/gobarberapp/Info.plist @@ -38,7 +38,7 @@ NSLocationWhenInUseUsageDescription - + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities @@ -53,5 +53,10 @@ UIViewControllerBasedStatusBarAppearance + UIAppFonts + + RobotoSlab-Medium.ttf + RobotoSlab-Regular.ttf + diff --git a/react-native.config.js b/react-native.config.js new file mode 100644 index 0000000..90b4a48 --- /dev/null +++ b/react-native.config.js @@ -0,0 +1,13 @@ +module.exports = { + project: { + ios: { + + }, + android: { + + }, + }, + assets: [ + './assets/fonts/' + ] +} diff --git a/src/@types/index.d.ts b/src/@types/index.d.ts new file mode 100644 index 0000000..eeea6c7 --- /dev/null +++ b/src/@types/index.d.ts @@ -0,0 +1,2 @@ +// Faz ele entender que esses arquivos podem ser importados dentro da aplicação +declare module '*.png'; diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 0000000..bbcd367 Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/assets/logo@2x.png b/src/assets/logo@2x.png new file mode 100644 index 0000000..93f6d18 Binary files /dev/null and b/src/assets/logo@2x.png differ diff --git a/src/assets/logo@3x.png b/src/assets/logo@3x.png new file mode 100644 index 0000000..9c2fb0a Binary files /dev/null and b/src/assets/logo@3x.png differ diff --git a/src/pages/SignIn/index.tsx b/src/pages/SignIn/index.tsx index bde7a00..b8bed1f 100644 --- a/src/pages/SignIn/index.tsx +++ b/src/pages/SignIn/index.tsx @@ -1,9 +1,17 @@ import React from 'react'; +import { Image } from 'react-native'; -import { Container } from './styles'; +import { Container, Title } from './styles'; + +import logoImg from '../../assets/logo.png'; const SignIn: React.FC = () => { - return ; + return ( + + + Faça seu Logon + + ); }; export default SignIn; diff --git a/src/pages/SignIn/styles.ts b/src/pages/SignIn/styles.ts index c9e58fb..bf8044f 100644 --- a/src/pages/SignIn/styles.ts +++ b/src/pages/SignIn/styles.ts @@ -1,3 +1,13 @@ import styled from 'styled-components/native'; -export const Container = styled.View``; +export const Container = styled.View` + flex: 1; + align-items: center; + justify-content: center; +`; +export const Title = styled.Text` + font-size: 24px; + color: #f4ede8; + font-family: 'RobotoSlab-Medium'; + margin: 64px 0 24px; +`;