Skip to content

Commit

Permalink
Foi adicionado a imagem da logo, onde adicionando a imagem PNG em 1x,…
Browse files Browse the repository at this point in the history
… 2x e 3x por conta da densidade de pixel. Tambem foi importado fontes externas para a aplicação. Alem de começar a codificar a estilização da pagina signIn.
  • Loading branch information
NecroKills committed May 20, 2020
1 parent 719231b commit 5f5173c
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 4 deletions.
Binary file not shown.
Binary file not shown.
Binary file added assets/fonts/RobotoSlab-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/RobotoSlab-Regular.ttf
Binary file not shown.
17 changes: 17 additions & 0 deletions ios/gobarberapp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 = "<group>"; 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 = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -140,6 +144,7 @@
00E356EF1AD99517003FC87E /* gobarberappTests */,
83CBBA001A601CBA00E9B192 /* Products */,
2D16E6871FA4F8E400B85C8A /* Frameworks */,
3DFBE0371EBA44DAA41F1ACB /* Resources */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand All @@ -157,6 +162,16 @@
name = Products;
sourceTree = "<group>";
};
3DFBE0371EBA44DAA41F1ACB /* Resources */ = {
isa = "PBXGroup";
children = (
1545ECDB697949909CE46A3A /* RobotoSlab-Medium.ttf */,
14DB562B038046C8A12EDE70 /* RobotoSlab-Regular.ttf */,
);
name = Resources;
sourceTree = "<group>";
path = "";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -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;
};
Expand Down
7 changes: 6 additions & 1 deletion ios/gobarberapp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
Expand All @@ -53,5 +53,10 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIAppFonts</key>
<array>
<string>RobotoSlab-Medium.ttf</string>
<string>RobotoSlab-Regular.ttf</string>
</array>
</dict>
</plist>
13 changes: 13 additions & 0 deletions react-native.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
project: {
ios: {

},
android: {

},
},
assets: [
'./assets/fonts/'
]
}
2 changes: 2 additions & 0 deletions src/@types/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// Faz ele entender que esses arquivos podem ser importados dentro da aplicação
declare module '*.png';
Binary file added src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions src/pages/SignIn/index.tsx
Original file line number Diff line number Diff line change
@@ -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 <Container />;
return (
<Container>
<Image source={logoImg} />
<Title>Faça seu Logon</Title>
</Container>
);
};

export default SignIn;
12 changes: 11 additions & 1 deletion src/pages/SignIn/styles.ts
Original file line number Diff line number Diff line change
@@ -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;
`;

0 comments on commit 5f5173c

Please sign in to comment.