Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actualizar identidad 2023 #55

Merged
merged 6 commits into from
Sep 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,25 @@ Como ejecutar la aplicación el el móvil
Hace falta descargar la aplicación "Expo" para Android o iOS: https://expo.io/tools#client
Una vez descargada, hay que escanear el código QR que se muestra despues de correr la app en el terminal.

Como subir la app a AppleStore y PlayStore
=======================================

Android
-----
- In `app.json` define a new version number in `android.versionCode` and add the googleMaps key in `android.config.googleMaps.apiKey` (get the key from Google console https://console.cloud.google.com/apis/credentials?project=active-cove-284317)
- Create the bundle by runnning `eas build --platform android`
- When the build finished, download from https://expo.dev/accounts/diegov/projects/confusionapp/builds the bundle
- Go to Google Play Console and log in with possibility. In "Produción" tab click on "Crear una nueva versión". Upload the bundle, save changes and get to submit them. In the Tab "Resumen de versiones" there will then appear the new version in status "Under revision".

IOS
----
MAC IS NEEDED

- In `app.json` define a new version number in `ios.buildNumber` (must be a string) and add the googleMaps key in `ios.config.googleMapsApiKey` (get the key from Google console https://console.cloud.google.com/apis/credentials?project=active-cove-284317)
- Create the bundle by runnning `eas build --platform ios`. You will be asked to log in with the possibility apple credential. 2 factor authentication with code by phone is needed as well as being enrolled (paid 99€) to the apple developer program.
- When the build finished, download from https://expo.dev/accounts/diegov/projects/confusionapp/builds the bundle
- Go to Apple Developer Console....

Contacto
=========
[email protected]
Expand Down
27 changes: 0 additions & 27 deletions app.config.source.js

This file was deleted.

24 changes: 15 additions & 9 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
],
"version": "0.1.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"splash": {
"image": "./assets/splash.png",
"icon": "./assets/icon.png", // showed by default as icon of the app -> 1024x1024
"splash": {
"image": "./assets/splash.png", // displayed while loading the app on full screen (transparent background) -> 1024x1024
"resizeMode": "contain",
"adaptiveIcon": true,
"backgroundColor": "#ffffff"
"backgroundColor": "#000000"
},
"updates": {
"fallbackToCacheTimeout": 0
Expand All @@ -29,20 +29,26 @@
"infoPlist": {
"NSLocationWhenInUseUsageDescription": "Mostraremos tu localización en los mapas para que ubiques los espacios más fácilmente"
},
"buildNumber": 19
"buildNumber": "19"
},
"android": {
"package": "es.beniconfusionfest.confusion",
"package": "es.beniconfusionfest.confusion",
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive_icon_foreground.png",
"backgroundColor": "#FFF4E2"
"foregroundImage": "./assets/adaptive_icon_foreground.png", // overwrite default icon of the app for android -> 1024x1024
"backgroundColor": "#000000"
},
"permissions": [
"INTERNET",
"WRITE_SETTINGS",
"ACCESS_FINE_LOCATION"
],
"versionCode": 19
"versionCode": 20,
"config": {
"googleMaps": {
"apiKey": "<API_KEY>"
}
}

},
"extra": {
"eas": {
Expand Down
Binary file modified assets/adaptive_icon_foreground.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 removed assets/adaptive_icon_foreground_2.png
Binary file not shown.
Binary file modified assets/icon.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 removed assets/icon_2.png
Binary file not shown.
Binary file modified assets/splash.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 removed assets/splash_2.png
Binary file not shown.
12 changes: 7 additions & 5 deletions src/components/announcement.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ const Announcement = ({ navigationRef }) => {

return (
<Center>
<Modal isOpen={showAnnouncement} onClose={() => setShowAnnouncement(false)} size='lg'>
<Modal.Content>
<Modal isOpen={showAnnouncement} onClose={() => setShowAnnouncement(false)}>
<Modal.Content width="90%">
<Modal.CloseButton />
<Modal.Header><Text style={styles.headerText}>¡Tenemos crowdfunding!</Text></Modal.Header>
<Modal.Body>
Expand Down Expand Up @@ -86,9 +86,11 @@ const styles = StyleSheet.create({
},
linkContainer: {
flexDirection: 'row',
paddingVertical: 4,
marginVertical: 4,
alignItems: 'center'
paddingTop: 6,
paddingBottom: 2,
marginVertical: 10,
alignItems: 'center',
maxWidth: '98%'
},
link: {
fontWeight: 'bold',
Expand Down
38 changes: 24 additions & 14 deletions src/containers/info-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ const InfoContainer = ({ navigation }) => {
</Text>
</View>
<View style={styles.linksContainer}>
{crowdfundintActive &&
<TouchableHighlight
activeOpacity={0.9}
underlayColor={TOUCHABLE_UNDERLAY_COLOR}
onPress={() => Linking.openURL(CROWDFUNDING_URL)}
style={styles.crowdFunding}
>
<View style={styles.linkContainer}>
<DrawAttentionView duration='1000'>
<Text>
{iconsMap.get('crowdfunding', { color: LINK_COLOR, size: 28 })}
</Text>
</DrawAttentionView>
<Text style={styles.linkImportant}> ¡Apóyanos participando en el crowdfunding! </Text>
</View>
</TouchableHighlight>}
<TouchableHighlight
activeOpacity={0.9}
underlayColor={TOUCHABLE_UNDERLAY_COLOR}
Expand All @@ -57,7 +73,7 @@ const InfoContainer = ({ navigation }) => {
onPress={() => Linking.openURL(INSTAGRAM_URL)}
>
<View style={styles.linkContainer}>
<Text>{iconsMap.get('instagram', { color: LINK_COLOR })}</Text>
<Text> {iconsMap.get('instagram', { color: LINK_COLOR })}</Text>
<Text style={styles.link}> @benimacletconfusion </Text>
</View>
</TouchableHighlight>
Expand All @@ -71,17 +87,6 @@ const InfoContainer = ({ navigation }) => {
<Text style={styles.link}> Benimaclet conFusión </Text>
</View>
</TouchableHighlight>
{crowdfundintActive &&
<TouchableHighlight
activeOpacity={0.9}
underlayColor={TOUCHABLE_UNDERLAY_COLOR}
onPress={() => Linking.openURL(CROWDFUNDING_URL)}
>
<View style={styles.linkContainer}>
<DrawAttentionView duration='1000'><Text> {iconsMap.get('crowdfunding', { color: LINK_COLOR, size: 28 })} </Text></DrawAttentionView>
<Text style={styles.linkImportant}> ¡Apóyanos participando en el crowdfunding! </Text>
</View>
</TouchableHighlight>}
</View>
<View style={styles.textContainer}>
<Text style={styles.normalText}>
Expand Down Expand Up @@ -143,13 +148,18 @@ const styles = StyleSheet.create({
},
linksContainer: {
paddingHorizontal: 12,
marginBottom: 12
marginBottom: 12,
maxWidth: '90%'
},
linkContainer: {
flexDirection: 'row',
paddingVertical: 4,
paddingVertical: 6,
alignItems: 'center'
},
crowdFunding: {
paddingBottom: 10,
paddingTop: 5
},
subtitle: {
fontSize: 18
},
Expand Down
6 changes: 3 additions & 3 deletions src/containers/map-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import {

import PageLayout from './page-layout';

const MAP_VIEW_DELTA = 0.0092;
const MAP_CENTER_LATITUDE = 39.487282;
const MAP_CENTER_LONGITUDE = -0.358120;
const MAP_VIEW_DELTA = 0.0105;
const MAP_CENTER_LATITUDE = 39.488882;
const MAP_CENTER_LONGITUDE = -0.359420;

const MapContainer = ({ navigation }) => {
const { allShows } = useContext(ProgramContext);
Expand Down
2 changes: 1 addition & 1 deletion src/styles/colors.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const PRIMARY_COLOR = '#EB148B';
export const SECONDARY_COLOR = '#00008B';
export const SECONDARY_COLOR = 'black';

export const CREAM_COLOR = '#FFF4E2';
export const LIGHT_GREY = '#DDDDDD';
Expand Down
Loading