Compare commits
No commits in common. "c5c570392ba52a56dd35d77f13844c2acf9bce7f" and "43bc7f6f63f5034359eb0f4598386215889a35fe" have entirely different histories.
c5c570392b
...
43bc7f6f63
5 changed files with 41 additions and 83 deletions
15
CHANGELOG.md
15
CHANGELOG.md
|
|
@ -2,21 +2,6 @@
|
|||
|
||||
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
|
||||
|
||||
## [1.15.0](https://github.com/alerte-secours/as-app/compare/v1.13.13...v1.15.0) (2025-12-11)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **links:** add appui soutien ([43bc7f6](https://github.com/alerte-secours/as-app/commit/43bc7f6f63f5034359eb0f4598386215889a35fe))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **ios:** bundle export scipt ([457b9f3](https://github.com/alerte-secours/as-app/commit/457b9f3d5cb884551758df09bf69d09a179610db))
|
||||
* **ios:** expo 53 upgrade crash and black screen ([bf09f96](https://github.com/alerte-secours/as-app/commit/bf09f968a7937ccfd90171cb12b74cd66d482466))
|
||||
* **ios:** ok ([c228569](https://github.com/alerte-secours/as-app/commit/c2285691a75591bfa9e17bf20f710cab66c241ac))
|
||||
* **ios:** wip ([2da80b0](https://github.com/alerte-secours/as-app/commit/2da80b0ca963efdc6df3cc6f3d1c8c86fd4f5c50))
|
||||
|
||||
## [1.14.3](https://github.com/alerte-secours/as-app/compare/v1.14.2...v1.14.3) (2025-12-10)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ android {
|
|||
applicationId 'com.alertesecours'
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||
versionCode 230
|
||||
versionName "1.15.0"
|
||||
versionCode 229
|
||||
versionName "1.14.3"
|
||||
multiDexEnabled true
|
||||
testBuildType System.getProperty('testBuildType', 'debug')
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<key>CFBundlePackageType</key>
|
||||
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.15.0</string>
|
||||
<string>1.14.3</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleURLTypes</key>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>230</string>
|
||||
<string>229</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSApplicationQueriesSchemes</key>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "alerte-secours",
|
||||
"version": "1.15.0",
|
||||
"version": "1.14.3",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"start": "expo start --dev-client --private-key-path ./keys/private-key.pem",
|
||||
|
|
@ -50,8 +50,8 @@
|
|||
"screenshot:android": "scripts/screenshot-android.sh"
|
||||
},
|
||||
"customExpoVersioning": {
|
||||
"versionCode": 230,
|
||||
"buildNumber": 230
|
||||
"versionCode": 229,
|
||||
"buildNumber": 229
|
||||
},
|
||||
"commit-and-tag-version": {
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,9 @@
|
|||
import React from "react";
|
||||
import { View, ScrollView, StyleSheet, Platform, Modal } from "react-native";
|
||||
import { useSafeAreaInsets } from "react-native-safe-area-context";
|
||||
import { View, ScrollView, StyleSheet, Platform } from "react-native";
|
||||
import AsyncStorage from "~/storage/memoryAsyncStorage";
|
||||
import { STORAGE_KEYS } from "~/storage/storageKeys";
|
||||
import { useTheme } from "~/theme";
|
||||
|
||||
import CustomButton from "~/components/CustomButton";
|
||||
import Text from "~/components/Text";
|
||||
import Text from "../Text";
|
||||
|
||||
const EULA_TEXT = `Contrat de Licence Utilisateur Final (CLUF)
|
||||
|
||||
|
|
@ -69,9 +66,6 @@ Si vous avez des questions concernant ce Contrat, veuillez nous contacter à :
|
|||
Email : contact@alertesecours.fr`;
|
||||
|
||||
const EULA = ({ onAccept, visible = true }) => {
|
||||
const theme = useTheme();
|
||||
const insets = useSafeAreaInsets();
|
||||
|
||||
if (!visible || Platform.OS !== "ios") return null;
|
||||
|
||||
const handleAccept = async () => {
|
||||
|
|
@ -84,84 +78,63 @@ const EULA = ({ onAccept, visible = true }) => {
|
|||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
animationType="fade"
|
||||
transparent
|
||||
visible={visible}
|
||||
onRequestClose={() => {}}
|
||||
>
|
||||
<View
|
||||
style={[
|
||||
styles.container,
|
||||
{
|
||||
backgroundColor:
|
||||
theme.colors.backdrop || theme.colors.scrim || "rgba(0,0,0,0.5)",
|
||||
paddingTop: insets.top,
|
||||
paddingBottom: insets.bottom,
|
||||
},
|
||||
]}
|
||||
>
|
||||
<View
|
||||
style={[styles.content, { backgroundColor: theme.colors.surface }]}
|
||||
>
|
||||
<Text style={[styles.title, { color: theme.colors.onSurface }]}>
|
||||
Conditions Générales
|
||||
<View style={styles.container}>
|
||||
<View style={styles.content}>
|
||||
<Text style={styles.title}>Conditions Générales</Text>
|
||||
<ScrollView style={styles.scrollView}>
|
||||
<Text style={styles.text}>{EULA_TEXT}</Text>
|
||||
</ScrollView>
|
||||
<View style={styles.buttonContainer}>
|
||||
<Text onPress={handleAccept} style={styles.acceptButton}>
|
||||
Accepter
|
||||
</Text>
|
||||
<ScrollView
|
||||
style={styles.scrollView}
|
||||
contentContainerStyle={styles.scrollViewContent}
|
||||
showsVerticalScrollIndicator
|
||||
>
|
||||
<Text style={[styles.text, { color: theme.colors.onSurface }]}>
|
||||
{EULA_TEXT}
|
||||
</Text>
|
||||
</ScrollView>
|
||||
<View style={styles.buttonContainer}>
|
||||
<CustomButton mode="contained" onPress={handleAccept}>
|
||||
Accepter
|
||||
</CustomButton>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
</Modal>
|
||||
</View>
|
||||
);
|
||||
};
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1,
|
||||
position: "absolute",
|
||||
top: 0,
|
||||
left: 0,
|
||||
right: 0,
|
||||
bottom: 0,
|
||||
backgroundColor: "rgba(0,0,0,0.5)",
|
||||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
paddingHorizontal: 16,
|
||||
zIndex: 1000,
|
||||
},
|
||||
content: {
|
||||
borderRadius: 12,
|
||||
width: "100%",
|
||||
maxWidth: 520,
|
||||
maxHeight: "85%",
|
||||
paddingHorizontal: 16,
|
||||
paddingTop: 16,
|
||||
paddingBottom: 12,
|
||||
flexShrink: 1,
|
||||
backgroundColor: "white",
|
||||
borderRadius: 10,
|
||||
width: "90%",
|
||||
maxHeight: "80%",
|
||||
padding: 20,
|
||||
},
|
||||
title: {
|
||||
fontSize: 20,
|
||||
fontWeight: "600",
|
||||
fontWeight: "bold",
|
||||
marginBottom: 15,
|
||||
textAlign: "center",
|
||||
},
|
||||
scrollView: {
|
||||
flexGrow: 0,
|
||||
},
|
||||
scrollViewContent: {
|
||||
paddingBottom: 8,
|
||||
maxHeight: "80%",
|
||||
},
|
||||
text: {
|
||||
fontSize: 14,
|
||||
lineHeight: 20,
|
||||
},
|
||||
buttonContainer: {
|
||||
marginTop: 12,
|
||||
marginTop: 20,
|
||||
alignItems: "center",
|
||||
},
|
||||
acceptButton: {
|
||||
color: "#007AFF",
|
||||
fontSize: 18,
|
||||
fontWeight: "bold",
|
||||
padding: 10,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue