Merge pull request #245 from simde-utc/develop

Release v1.2.0

App.js

@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { StatusBar, YellowBox } from 'react-native';
+import { StatusBar, YellowBox, StyleSheet, Text, Platform } from 'react-native';
 import { createAppContainer, createSwitchNavigator, SafeAreaView } from 'react-navigation';
 import { Provider, connect } from 'react-redux';
 import SpinnerOverlay from 'react-native-loading-spinner-overlay';
@@ -18,6 +18,23 @@ import AuthNavigator from './src/navigations/Auth/AuthNavigator';
 import store from './src/redux/store';
 import colors from './src/styles/colors';
 
+const styles = StyleSheet.create({
+	defaultFontFamily: {
+		fontFamily: 'Roboto',
+	},
+});
+
+// Bug: https://github.com/simde-utc/payutc-mobile/issues/226
+if (Platform.OS === 'android') {
+	const oldRender = Text.render;
+	Text.render = function render(...args) {
+		const origin = oldRender.call(this, ...args);
+		return React.cloneElement(origin, {
+			style: [styles.defaultFontFamily, origin.props.style],
+		});
+	};
+}
+
 const AppNavigator = createSwitchNavigator(
 	{
 		Loading: AppLoader,

android/app/src/main/AndroidManifest.xml

@@ -2,25 +2,7 @@
     package="fr.utc.assos.simde.payutc">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <!-- Useless permissions
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    -->
+    <!--<uses-permission android:name="android.permission.USE_FINGERPRINT" />-->
 
     <application
       android:name=".MainApplication"

android/app/src/main/java/fr/utc/assos/simde/payutc/generated/BasePackageList.java

@@ -10,6 +10,7 @@ public List<Package> getPackageList() {
         new expo.modules.constants.ConstantsPackage(),
         new expo.modules.filesystem.FileSystemPackage(),
         new expo.modules.font.FontLoaderPackage(),
+        new expo.modules.haptics.HapticsPackage(),
         new expo.modules.keepawake.KeepAwakePackage(),
         new expo.modules.lineargradient.LinearGradientPackage(),
         new expo.modules.location.LocationPackage(),

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         compileSdkVersion = 29
         targetSdkVersion = 29
         supportLibVersion = "28.0.0"
-        versionCode = 8
-        versionName = "1.1.3"
+        versionCode = 9
+        versionName = "1.2.0"
     }
     repositories {
         google()

app.json

@@ -37,6 +37,6 @@
   },
   "displayName": "PayUTC",
   "name": "PayUTC",
-  "versionCode": 8,
-  "versionName": "1.1.3"
+  "versionCode": 9,
+  "versionName": "1.2.0"
 }

assets/changelogs/en.json

@@ -1,4 +1,35 @@
 [
+	{
+		"version": "v1.2.0",
+		"data": [
+			{
+				"title": "News",
+				"data": [
+					"Add spanish translation",
+					"Add modal for information",
+					"Add PayUTC terms for new users",
+					"Add haptic feedbacks",
+					"Ask for participation for translation"
+				]
+			},
+			{
+				"title": "Changes",
+				"data": [
+					"Change confirmation popup"
+				]
+			},
+			{
+				"title": "Fixed bugs",
+				"data": [
+					"Indicate to non-contributors all limitations",
+					"Fix NaN issue during refills",
+					"Fix Android permissions",
+					"Fix Oppo/One Plus text issue",
+					"Use iOS Webkit"
+				]
+			}
+		]
+	},
 	{
 		"version": "v1.1.3",
 		"data": [

assets/changelogs/fr.json

@@ -1,4 +1,35 @@
 [
+	{
+		"version": "v1.2.0",
+		"data": [
+			{
+				"title": "Nouveautés",
+				"data": [
+					"Ajout de la traduction espagnol",
+					"Ajout de popups d'information",
+					"Ajout des termes PayUTC pour les nouvös",
+					"Ajout des retours haptiques",
+					"Propose la participation à la traduction de l'app"
+				]
+			},
+			{
+				"title": "Modifications",
+				"data": [
+					"Changement du popup de notification"
+				]
+			},
+			{
+				"title": "Problèmes réglés",
+				"data": [
+					"Indique aux non cotisants les contraintes",
+					"Corrige le bug de rechargements 'NaN'",
+					"Corrige les permissions Android",
+					"Corrige le texte sur Oppo/One Plus",
+					"Utilise le Webkit iOS"
+				]
+			}
+		]
+	},
 	{
 		"version": "v1.1.3",
 		"data": [

ios/PayUTC.xcodeproj/project.pbxproj

@@ -69,6 +69,7 @@
 		90F895B4F1254612BCB9F961 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
 		BD821FA6AD5EA36B9594A2CE /* Pods-PayUTCTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PayUTCTests.release.xcconfig"; path = "Target Support Files/Pods-PayUTCTests/Pods-PayUTCTests.release.xcconfig"; sourceTree = "<group>"; };
 		C3FC2AA9B0E84D83A688C2AA /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
+		CD2B0178233E13D7002CFAAD /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		CD9725F5230EF47C004FAA3F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		CD9725F6230EF495004FAA3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		CD9725F7230EF548004FAA3F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
@@ -279,10 +280,12 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				Base,
 				fr,
 				en,
 				"zh-Hans",
+				es,
 			);
 			mainGroup = 83CBB9F61A601CBA00E9B192;
 			productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
@@ -494,6 +497,7 @@
 				CD9725F5230EF47C004FAA3F /* fr */,
 				CD9725F6230EF495004FAA3F /* en */,
 				CD9725F7230EF548004FAA3F /* zh-Hans */,
+				CD2B0178233E13D7002CFAAD /* es */,
 			);
 			name = LaunchScreen.xib;
 			path = PayUTC;

ios/PayUTC/Info.plist

@@ -16,10 +16,12 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>CFBundleShortVersionString</key><string>1.1.3</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
-	<key>CFBundleVersion</key><string>8</string>
+	<key>CFBundleVersion</key>
+	<string>9</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

ios/PayUTC/es.lproj/LaunchScreen.strings

@@ -0,0 +1 @@
+

package.json

@@ -25,17 +25,20 @@
     "@fortawesome/react-native-fontawesome": "^0.1.0",
     "expo": "^34.0.1",
     "expo-file-system": "^6.0.2",
+    "expo-haptics": "^6.0.0",
     "i18n-js": "^3.3.0",
     "react": "16.8.3",
     "react-dom": "^16.8.6",
     "react-native": "0.59.10",
     "react-native-gesture-handler": "^1.3.0",
     "react-native-keyboard-aware-scroll-view": "^0.8.0",
     "react-native-loading-spinner-overlay": "^1.0.1",
+    "react-native-modalbox": "^1.7.1",
     "react-native-reanimated": "~1.1.0",
     "react-native-svg": "~9.5.1",
     "react-native-unimodules": "~0.5.2",
     "react-native-vector-icons": "^6.6.0",
+    "react-native-version-number": "^0.3.6",
     "react-native-web": "^0.11.4",
     "react-navigation": "^3.11.1",
     "react-redux": "^7.1.0",

src/components/AmountForm.js

@@ -8,6 +8,7 @@
 
 import React from 'react';
 import { Text, View } from 'react-native';
+import * as Haptics from 'expo-haptics';
 import colors from '../styles/colors';
 import BlockTemplate from './BlockTemplate';
 import AmountInput from './Home/AmountInput';
@@ -51,7 +52,10 @@ export default class AmountForm extends React.Component {
 					shadow
 					borderForAndroid
 					key={shortcut}
-					onPress={() => this.onChange(shortcut.toString())}
+					onPress={() => {
+						Haptics.selectionAsync().catch();
+						this.onChange(shortcut.toString());
+					}}
 				>
 					<Text style={{ fontSize: 16, fontWeight: 'bold', color: colors.secondary }}>
 						{shortcut} €

src/components/Document.js

@@ -12,6 +12,7 @@ export default function Document({ document, lang }) {
 	return (
 		<WebView
 			style={{ backgroundColor: 'transparent' }}
+			useWebKit
 			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>`,