Skip to content

Commit

Permalink
Merge pull request #6 from fga-eps-mds/melhoria/config-apk
Browse files Browse the repository at this point in the history
Configurações corretas para gerar APK
  • Loading branch information
viniciused26 authored Jan 17, 2025
2 parents 4b66c12 + 6097d22 commit 4a7f7d8
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 178 deletions.
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXPO_PUBLIC_API_URL=http://192.168.1.19
EXPO_PUBLIC_API_URL=http://192.168.1.2
EXPO_PUBLIC_API_USUARIO_PORT=3001
EXPO_PUBLIC_API_FORUM_PORT=3002
EXPO_PUBLIC_API_SAUDE_PORT=3003
Expand Down
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXPO_PUBLIC_API_URL=http://18.231.115.8
EXPO_PUBLIC_API_URL=http://3.139.83.98
EXPO_PUBLIC_API_USUARIO_PORT=80
EXPO_PUBLIC_API_FORUM_PORT=80
EXPO_PUBLIC_API_SAUDE_PORT=80
Expand Down
16 changes: 13 additions & 3 deletions app.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
"supportsTablet": true
},
"android": {
"permissions": [],
"usesCleartextTraffic": true,
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
Expand All @@ -34,21 +36,29 @@
},
"plugins": [
"expo-router",
"expo-build-properties"
[
"expo-build-properties",
{
"android": {
"usesCleartextTraffic": true
}
}
]
],
"extra": {
"expoEnv": "process.env.EXPO_PUBLIC_API_URL",
"router": {
"origin": false
},
"eas": {
"projectId": "e30305f3-1909-4fb7-ad3d-41cd29eb1963"
"projectId": "53b640fc-f72d-4fb5-88b4-c80d4162aa8b"
}
},
"runtimeVersion": {
"policy": "appVersion"
},
"updates": {
"url": "https://u.expo.dev/e30305f3-1909-4fb7-ad3d-41cd29eb1963"
"url": "https://u.expo.dev/53b640fc-f72d-4fb5-88b4-c80d4162aa8b"
}
}
}
2 changes: 1 addition & 1 deletion eas.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"production": {
"android": {
"buildType": "app-bundle"
"buildType": "apk"
},
"channel": "production"
}
Expand Down
173 changes: 1 addition & 172 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions src/app/components/RecoverButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import React from "react";
import { ActivityIndicator, StyleSheet, Text } from "react-native";
import { router } from "expo-router";
import { View } from 'react-native';

interface Props {
title: string;
showLoading?: boolean;
}

export default function RecoverButton({
title,
showLoading,
}: Readonly<Props>) {

const handlePress = () => {
router.push("/private/pages/event");
};

return (
<View>
{showLoading ? (
<ActivityIndicator size="small" color="#0000ff" />
) : (
<Text
style={styles.linkText}
onPress={handlePress}
>
{title}
</Text>
)}
</View>
);
}

const styles = StyleSheet.create({
linkText: {
width: "40%",
color: "#2CCDB5",
maxWidth: 300,
textDecorationLine: "underline",
paddingVertical: 12,
paddingHorizontal: 18,
textAlign: "left",
borderRadius: 20,
},
});

0 comments on commit 4a7f7d8

Please sign in to comment.