diff --git a/.gitignore b/.gitignore index 098bd78..4e638b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ nextcommit.txt - +yarn.lock android/gradle.properties android/app/cardapio-mobile-uerj-key.keystore # OSX diff --git a/android/app/build.gradle b/android/app/build.gradle index 94e4766..c33411f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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 { diff --git a/package.json b/package.json index 65fd0d1..2e1223f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cardapioMobileUerj", - "version": "1.03", + "version": "1.04", "author": "Petro Cardoso", "license": "Apache", "private": true, @@ -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" }, diff --git "a/resources/Card\303\241pio Mobile UERJ.xd" "b/resources/Card\303\241pio Mobile UERJ.xd" index ab32021..3eac989 100644 Binary files "a/resources/Card\303\241pio Mobile UERJ.xd" and "b/resources/Card\303\241pio Mobile UERJ.xd" differ diff --git a/src/components/About.js b/src/components/About.js index b714086..cbb8d46 100644 --- a/src/components/About.js +++ b/src/components/About.js @@ -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; @@ -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%; @@ -45,12 +56,15 @@ const About = props => ( onBackdropPress={() => props.setState({ about: false })} onBackButtonPress={() => props.setState({ about: false })}> - + + + + Versão {version} Desenvolvido por Petro Cardoso.