Merge pull request #190 from simde-utc/release/v1.0.0

Release v1.0.0
simde-utc · Aug 20, 2019 · 41b6922 · 41b6922
2 parents 45f10d4 + ba81767
commit 41b6922
Show file tree

Hide file tree

Showing 24 changed files with 567 additions and 219 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         compileSdkVersion = 29
         targetSdkVersion = 29
         supportLibVersion = "28.0.0"
-        versionCode = 3
-        versionName = "0.2.0"
+        versionCode = 4
+        versionName = "1.0.0"
     }
     repositories {
         google()

diff --git a/app.json b/app.json
@@ -6,6 +6,7 @@
     "owner": "BDE-UTC",
     "privacy": "public",
     "sdkVersion": "34.0.0",
+    "version": "0.2.0",
     "githubUrl": "https://github.com/simde-utc/payutc-mobile",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -18,7 +19,7 @@
       "fallbackToCacheTimeout": 0
     },
     "assetBundlePatterns": [
-      "**/*"
+      "*/"
     ],
     "ios": {
       "bundleIdentifier": "fr.utc.assos.payutc",
@@ -36,6 +37,6 @@
   },
   "displayName": "PayUTC",
   "name": "PayUTC",
-  "versionCode": 3,
-  "versionName": "0.2.0"
-}
+  "versionCode": 4,
+  "versionName": "1.0.0"
+}
diff --git a/assets/changelogs/en.json b/assets/changelogs/en.json
@@ -1,4 +1,32 @@
 [
+	{
+		"version": "v1.0.0",
+		"data": [
+			"Official release of the application !",
+			{
+				"title": "News",
+				"data": [
+					"Add a profile screen to show all user data"
+				]
+			},
+			{
+				"title": "Changes",
+				"data": [
+					"Harmonize the Settings screen"
+				]
+			},
+			{
+				"title": "Fixed bugs",
+				"data": [
+					"It was impossible to build under iOS",
+					"The balance was available if equals to 0",
+					"The last transaction did not show",
+					"Persistant data after log out has been fixed",
+					"Documents could be shown in the wrong encoding"
+				]
+			}
+		]
+	},
 	{
 		"version": "v0.2.0",
 		"data": [

diff --git a/assets/changelogs/fr.json b/assets/changelogs/fr.json
@@ -1,4 +1,32 @@
 [
+	{
+		"version": "v1.0.0",
+		"data": [
+			"Sortie officielle de l'application !",
+			{
+				"title": "Nouveautés",
+				"data": [
+					"Ajout d'une page profil pour afficher les données utilisateurs"
+				]
+			},
+			{
+				"title": "Modifications",
+				"data": [
+					"Harmonisation de la page Paramètres"
+				]
+			},
+			{
+				"title": "Problèmes réglés",
+				"data": [
+					"Il était impossible de générer l'application sous iOS",
+					"Le solde était indisponible si égal à 0",
+					"La dernière transaction ne s'affichait pas",
+					"Persistance des données à la déconnexion corrigée",
+					"Les documents pouvaient être affichés mal encodés"
+				]
+			}
+		]
+	},
 	{
 		"version": "v0.2.0",
 		"data": [

diff --git a/assets/scripts/set_version.js b/assets/scripts/set_version.js
@@ -20,6 +20,12 @@ replace({
 		files: 'app.json',
 		from: /"versionName": "[0-9a-zA-Z._-]+"/,
 		to: `"versionName": "${newVersion}"`,
+	}).then(() => {
+		replace({
+			files: 'app.json',
+			from: /"version": \d+/,
+			to: `"version": ${currentVersionCode + 1}`,
+		});
 	});
 });
 

diff --git a/config.example.js b/config.example.js
@@ -22,6 +22,9 @@ export const CAS_URL = '';
 // PayUTC API url.
 export const PAYUTC_API_URL = '';
 
+// PayUTC API version.
+export const PAYUTC_VERSION = '';
+
 // PayUTC refill callback url.
 export const PAYUTC_CALLBACK_URL = '';
 
@@ -71,6 +74,7 @@ export default {
 	GITHUB_API_URL,
 	CAS_URL,
 	PAYUTC_API_URL,
+	PAYUTC_VERSION,
 	PAYUTC_KEY,
 	PAYUTC_CALLBACK_URL,
 	PAYUTC_SYSTEM_ID,

diff --git a/ios/PayUTC/Info.plist b/ios/PayUTC/Info.plist
@@ -16,8 +16,8 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleVersion</key><string>3</string>
-	<key>CFBundleShortVersionString</key><string>0.2.0</string>
+	<key>CFBundleVersion</key><string>4</string>
+	<key>CFBundleShortVersionString</key><string>1.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/src/components/Document.js b/src/components/Document.js
@@ -0,0 +1,21 @@
+/**
+ * @author Samy Nastuzzi <[email protected]>
+ *
+ * @copyright Copyright (c) 2019, SiMDE-UTC
+ * @license GPL-3.0
+ */
+
+import React from 'react';
+import { WebView } from 'react-native';
+
+export default function Document({ document, lang }) {
+	return (
+		<WebView
+			style={{ backgroundColor: 'transparent' }}
+			source={{
+				html: `<!DOCTYPE html><html lang="${lang ||
+					'en'}"><head><meta charset="utf-8"/></head><body><p style='font-family: sans-serif; text-align: justify; white-space: pre-wrap;'>${document}</p></body></html>`,
+			}}
+		/>
+	);
+}
diff --git a/src/components/Home/Balance.js b/src/components/Home/Balance.js
@@ -36,6 +36,8 @@ export default class Balance extends React.Component {
 	}
 
 	renderDetails(loading, name, amount) {
+		const { isCreditConsistent } = this.props;
+
 		if (loading) {
 			return (
 				<View style={{ flex: 1 }}>
@@ -77,7 +79,7 @@ export default class Balance extends React.Component {
 				<Text style={{ fontSize: 14, fontWeight: 'bold', color: colors.secondary }}>
 					{t('your_balance', { name })}
 				</Text>
-				{amount ? (
+				{isCreditConsistent ? (
 					<Text style={{ fontSize: 65, fontWeight: 'bold', color: colors.primary, lineHeight: 70 }}>
 						{floatToEuro(amount)}
 					</Text>

diff --git a/src/components/Paragraphe.js b/src/components/Paragraphe.js
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { View, Text } from 'react-native';
+import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
 import BlockTemplate from './BlockTemplate';
 import colors from '../styles/colors';
 
@@ -15,30 +16,50 @@ export default function Paragraphe({
 	titleColor,
 	description,
 	descriptionColor,
+	style,
 	onPress,
+	link,
 	children,
 }) {
 	return (
-		<BlockTemplate roundedTop roundedBottom shadow onPress={onPress}>
-			<View style={{ flex: 1, flexDirection: 'column' }}>
-				<Text
-					style={{
-						fontSize: 16,
-						fontWeight: 'bold',
-						color: titleColor || colors.secondary,
-					}}
-				>
-					{title}
-				</Text>
-				<Text
-					style={{
-						fontSize: 13,
-						color: descriptionColor || colors.secondary,
-					}}
-				>
-					{description}
-				</Text>
-				{children}
+		<BlockTemplate roundedTop roundedBottom shadow onPress={onPress} style={style}>
+			<View
+				style={{
+					flex: 1,
+					flexDirection: 'row',
+					flexWrap: 'wrap',
+					justifyContent: 'space-between',
+					alignItems: 'center',
+				}}
+			>
+				<View style={{ flex: 1, flexDirection: 'column' }}>
+					<Text
+						style={{
+							fontSize: 16,
+							fontWeight: 'bold',
+							color: titleColor || colors.secondary,
+						}}
+					>
+						{title}
+					</Text>
+					<Text
+						style={{
+							fontSize: 13,
+							color: descriptionColor || colors.secondary,
+						}}
+					>
+						{description}
+					</Text>
+					{children}
+				</View>
+				{link ? (
+					<FontAwesomeIcon
+						icon={['fas', 'angle-right']}
+						size={20}
+						color={titleColor || colors.secondary}
+						style={{ marginLeft: 10 }}
+					/>
+				) : null}
 			</View>
 		</BlockTemplate>
 	);

diff --git a/src/components/TitleParams.js b/src/components/TitleParams.js
@@ -23,7 +23,7 @@ export default class TitleParams extends React.Component {
 	}
 
 	render() {
-		const { title, settingText, style, children } = this.props;
+		const { title, settingText, icon, style, children } = this.props;
 		const { show } = this.state;
 
 		return (
@@ -64,7 +64,11 @@ export default class TitleParams extends React.Component {
 							>
 								{settingText}
 							</Text>
-							<FontAwesomeIcon icon={['fas', 'sliders-h']} size={14} color={colors.secondary} />
+							<FontAwesomeIcon
+								icon={['fas', icon || 'sliders-h']}
+								size={14}
+								color={colors.secondary}
+							/>
 						</View>
 					</BlockTemplate>
 				</BlockTemplate>

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -147,16 +147,11 @@
 		"Settings": {
 			"title": "Settings",
 			"lang": "Application language :",
-			"lock": "Lock the badge",
-			"locking": "Locking the badge...",
-			"unlocking": "Unlocking the badge...",
-			"lock_info": "When the badge is locked, it can no more be used to pay.",
-			"lock_error": "Impossible to lock the badge.",
-			"unlock_error": "Impossible to unlock the badge.",
-			"sign_out": "Disconnect",
 			"about": "About",
 			"contact_us": "Contact us",
 			"mail_body": "Hello ! \n\nFirst of all, thank you for this application !\n\n",
+			"profile": "My account",
+			"profile_desc": "Account information, badge locking and signing out."
 		},
 		"About": {
 			"title": "About",
@@ -233,6 +228,16 @@
 			"accept": "I accept the terms",
 			"validated": "Accepted on %{date}",
 		},
+		"Profile": {
+			"title": "My account",
+			"lock": "Lock the badge",
+			"locking": "Locking the badge...",
+			"unlocking": "Unlocking the badge...",
+			"lock_info": "When the badge is locked, it can no more be used to pay.",
+			"lock_error": "Impossible to lock the badge.",
+			"unlock_error": "Impossible to unlock the badge.",
+			"sign_out": "Disconnect",
+		}
 	},
 
 	"words": {
@@ -249,9 +254,24 @@
 		"week": "a week",
 		"yesterday": "yesterday",
 		"show_since": "show all statistics since :",
-		"empty_list": "Not data to show :(",
-		"back": "Back",
-		"cancel": "Cancel"
+		"empty_list": "no data to show :(",
+		"back": "back",
+		"cancel": "cancel",
+		"admin": "admin",
+		"manager": "manager",
+		"staff": "staff",
+		"ext": "extern",
+		"cas": "CAS-UTC",
+		"firstname": "first name",
+		"lastname": "last name",
+		"email": "email",
+		"login": "login",
+		"type": "type",
+		"status": "status",
+		"adult": "adult",
+		"minor": "considered as minor",
+		"creation_date": "creation date",
+		"details": "details",
 	},
 
 	"navigation": {