From b00c71c69e629d08113a52efb9e1e846eb9b2339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9=20Coniel?= <timothe@coniel.com>
Date: Mon, 26 Feb 2024 15:38:43 +0800
Subject: [PATCH] Develop (#38)

* Fix: env variables in github

* Fix: Env variables in release

* Feat: Update page check (#37)
---
 .github/workflows/main.yml        |  1 +
 App.tsx                           | 44 ++++++++++++++++++++++++++++---
 android/app/build.gradle          |  6 -----
 package-lock.json                 |  8 +++---
 package.json                      |  6 ++---
 src/services/updateApp.service.ts | 18 +++++++++++++
 6 files changed, 66 insertions(+), 17 deletions(-)
 create mode 100644 src/services/updateApp.service.ts

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4933552..2b04912 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -90,3 +90,4 @@ jobs:
           body: |
             Release version ${{steps.version.outputs.prop}}
             Fetures:
+              - Alert users that an update is available
diff --git a/App.tsx b/App.tsx
index 5fb7e22..2ab3cf9 100644
--- a/App.tsx
+++ b/App.tsx
@@ -1,13 +1,49 @@
-import React from 'react';
+import React, {useEffect, useState} from 'react';
 import {NavigationContainer} from '@react-navigation/native';
 import RootStackNavigation from './src/Navigation/RootStackNavigator';
+import updateApp from './src/services/updateApp.service';
+import {Button, Linking, StyleSheet, Text, View} from 'react-native';
 
 const App = (): JSX.Element => {
+  const [version, setVersion] = useState(false);
+  useEffect(() => {
+    updateApp(setVersion);
+  }, []);
   return (
-    <NavigationContainer>
-      <RootStackNavigation />
-    </NavigationContainer>
+    <>
+      {version ? (
+        <View style={styles.updateContainer}>
+          <Text style={styles.text}>
+            Il semblerait que votre application ne soit pas à jour !
+          </Text>
+          <Button
+            title="Mettre à jour"
+            onPress={() => {
+              Linking.openURL('market://details?id=com.opticarbu');
+            }}
+          />
+        </View>
+      ) : (
+        <NavigationContainer>
+          <RootStackNavigation />
+        </NavigationContainer>
+      )}
+    </>
   );
 };
 
+const styles = StyleSheet.create({
+  updateContainer: {
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  text: {
+    width: '80%',
+    textAlign: 'center',
+    marginBottom: 10,
+    fontSize: 18,
+  },
+});
+
 export default App;
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f4fd24b..f4e5eb2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -95,20 +95,16 @@ def myAppUploadKeyPassword = System.getenv("MYAPP_UPLOAD_KEY_PASSWORD")
 
 
 def getVersionFromPackageJson() {
-    //  Read and parse package.json file from project root
     def inputFile = new File("$rootDir/../package.json")
     def packageJson = new JsonSlurper().parseText(inputFile.text)
 
-    // Return the version, you can get any value this way
     return packageJson["version"]
 }
 
 def getVersionCodeFromPackageJson() {
-    //  Read and parse package.json file from project root
     def inputFile = new File("$rootDir/../package.json")
     def packageJson = new JsonSlurper().parseText(inputFile.text)
 
-    // Return the version, you can get any value this way
     return packageJson["versionCode"]
 }
 
@@ -161,8 +157,6 @@ android {
                 debugSymbolLevel 'FULL'
             }
 
-            // Caution! In production, you need to generate your own keystore file.
-            // see https://reactnative.dev/docs/signed-apk-android.
             minifyEnabled true
             shrinkResources true
             signingConfig signingConfigs.release
diff --git a/package-lock.json b/package-lock.json
index baa5cde..05c81a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "GasPrices",
-  "version": "0.0.1",
+  "name": "gas-prices",
+  "version": "0.0.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "GasPrices",
-      "version": "0.0.1",
+      "name": "gas-prices",
+      "version": "0.0.2",
       "dependencies": {
         "@react-native-async-storage/async-storage": "^1.21.0",
         "@react-native-community/geolocation": "^3.1.0",
diff --git a/package.json b/package.json
index deee27d..9b8a1cb 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "gas-prices",
-  "version": "0.0.2",
-  "versionCode": 8,
+  "version": "0.0.3",
+  "versionCode": 9,
   "private": true,
   "scripts": {
-    "android": "react-native run-android",
+    "android": "react-native run-android --variant=debug",
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "start": "react-native start",
diff --git a/src/services/updateApp.service.ts b/src/services/updateApp.service.ts
new file mode 100644
index 0000000..fafd493
--- /dev/null
+++ b/src/services/updateApp.service.ts
@@ -0,0 +1,18 @@
+import {HOST} from '@env';
+
+const updateApp = async (setVersion: (value: any) => void) => {
+  const pj = require('../../package.json');
+  const body = {version: pj.version};
+  const res = await fetch(`${HOST}/update`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify(body),
+  });
+  if (!res.ok) throw Error('Error on osrm services');
+  const resolve = await res.json();
+  setVersion(resolve);
+};
+
+export default updateApp;