Skip to content

Commit

Permalink
➖ react-native-shimmer-placeholder
Browse files Browse the repository at this point in the history
➖ react-native-linear-gradient
💄 Mudança de cor nas linhas do menu
💄 💬 About
🔥 profilePicture
🔖 versão 1.04
  • Loading branch information
pitroldev committed Jul 17, 2020
1 parent 28a4eec commit 98ef3f8
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 69 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nextcommit.txt

yarn.lock
android/gradle.properties
android/app/cardapio-mobile-uerj-key.keystore
# OSX
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ android {
applicationId "com.cardapiomobileuerj"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 4
versionName "1.03"
versionCode 5
versionName "1.04"
project.ext.set("archivesBaseName", "cardapio-mobile-uerj-" + defaultConfig.versionName);
}
splits {
Expand Down
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cardapioMobileUerj",
"version": "1.03",
"version": "1.04",
"author": "Petro Cardoso",
"license": "Apache",
"private": true,
Expand All @@ -20,13 +20,11 @@
"react": "16.11.0",
"react-native": "0.62.2",
"react-native-cheerio": "^1.0.0-rc.4",
"react-native-linear-gradient": "^2.5.6",
"react-native-modal": "^11.5.6",
"react-native-shimmer-placeholder": "^1.0.36",
"react-native-snap-carousel": "^3.9.1",
"react-native-svg": "^12.1.0",
"react-native-svg-transformer": "^0.14.3",
"react-native-vector-icons": "^6.6.0",
"react-native-vector-icons": "6.6.0",
"react-native-webview": "^10.2.3",
"styled-components": "^5.1.1"
},
Expand Down
Binary file modified resources/Cardápio Mobile UERJ.xd
Binary file not shown.
26 changes: 20 additions & 6 deletions src/components/About.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from 'react';
import { Linking } from 'react-native';
import styled from 'styled-components/native';
import Modal from 'react-native-modal';

import ProfilePicture from './profilePicture';

import AppLogo from '../resources/App_Logo.svg';
import { version } from '../../package.json';
import Responsive from '../utils/responsive';
import { Icon, DarkText, Row, Button } from './styles';
import styled from 'styled-components/native';
import Modal from 'react-native-modal';

export const AboutModal = styled(Modal)`
flex: 1;
Expand All @@ -26,6 +26,17 @@ export const AboutView = styled.View`
elevation: 6;
`;

export const Logo = styled.View`
background-color: #0080c6;
width: ${props => props.size}px;
height: ${props => props.size}px;
border-radius: ${props => props.size * 2}px;
align-self: center;
padding: 4%;
margin: 2.5%;
elevation: 6;
`;

export const AboutTitle = styled.Text`
font-size: ${Responsive(18)}px;
margin-bottom: 3%;
Expand All @@ -45,12 +56,15 @@ const About = props => (
onBackdropPress={() => props.setState({ about: false })}
onBackButtonPress={() => props.setState({ about: false })}>
<AboutView>
<ProfilePicture size={90} />
<Logo size={100}>
<AppLogo />
</Logo>
<DarkText>Versão {version}</DarkText>
<AboutTitle>Desenvolvido por Petro Cardoso.</AboutTitle>
<Row>
<Button
onPress={() => {
const url = 'https://github.com/pitroldev';
const url = 'https://github.com/pitroldev/cardapio-mobile-uerj';
Linking.canOpenURL(url).then(supported => {
supported && Linking.openURL(url);
});
Expand Down
3 changes: 1 addition & 2 deletions src/components/carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useState } from 'react';
import { Animated } from 'react-native';
import Carousel from 'react-native-snap-carousel';
import {
Container,
Expand Down Expand Up @@ -37,7 +36,7 @@ const CarouselView = props => {
{info.map((item, key) => (
<ItemRow
key={key}
color={key % 2 === 0 ? '#0080c6' : '#00AFDF'}
color={key % 2 === 0 ? '#016BA5' : '#00AFDF'}
accessible={ActivePage === day.index ? true : false}
importantForAccessibility={
ActivePage === day.index ? 'yes' : 'no'
Expand Down
54 changes: 0 additions & 54 deletions src/components/profilePicture.js

This file was deleted.

1 change: 1 addition & 0 deletions src/resources/App_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/resources/profile_pic.jpg
Binary file not shown.

0 comments on commit 98ef3f8

Please sign in to comment.