feat: build on IOS and Android" (#475)

* feat: build on IOS and Android" * fix: color on icons"
SocialGouv · Jul 20, 2023 · d5b416c · d5b416c
1 parent ea9a07a
commit d5b416c
Show file tree

Hide file tree

Showing 9 changed files with 2,363 additions and 41 deletions.
diff --git a/tumeplayMobile/android/.settings/org.eclipse.buildship.core.prefs b/tumeplayMobile/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,4 +1,4 @@
-arguments=
+arguments=--init-script /var/folders/3m/fs7nmmj56x9fr431r8hy8wzr0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/3m/fs7nmmj56x9fr431r8hy8wzr0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)

diff --git a/tumeplayMobile/android/app/build.gradle b/tumeplayMobile/android/app/build.gradle
@@ -135,8 +135,8 @@ android {
         applicationId "com.tumeplaymobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 68
-        versionName "1.48"
+        versionCode 75
+        versionName "1.55"
         Properties properties = new Properties()
         properties.load(project.rootProject.file('local.properties').newDataInputStream())
         manifestPlaceholders = [GOOGLE_MAP_API: "${properties.getProperty('GOOGLE_MAPS_API_KEY')}"]

diff --git a/tumeplayMobile/android/app/src/main/AndroidManifest.xml b/tumeplayMobile/android/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
 
       <activity
         android:name=".MainActivity"
+        android:exported="true"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"

diff --git a/tumeplayMobile/android/app/src/main/assets/index.android.bundle b/tumeplayMobile/android/app/src/main/assets/index.android.bundle
diff --git a/tumeplayMobile/android/build.gradle b/tumeplayMobile/android/build.gradle
@@ -4,23 +4,36 @@ buildscript {
     ext {
         buildToolsVersion = "30.0.2"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "21.4.7075529"
+        kotlinVersion = '1.6.21'
+        RNNKotlinVersion = kotlinVersion
     }
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.0.3')
+        classpath('com.android.tools.build:gradle:7.4.2')
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.0"
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
     }
 }
 
 allprojects {
+
+    def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+
+    configurations.all {
+        resolutionStrategy {
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+        }
+    }
+
     repositories {
         maven { url 'https://jitpack.io' }
         jcenter()

diff --git a/tumeplayMobile/android/gradle/wrapper/gradle-wrapper.properties b/tumeplayMobile/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Jul 19 09:22:19 CEST 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/tumeplayMobile/ios/tumeplayMobile.xcodeproj/project.pbxproj b/tumeplayMobile/ios/tumeplayMobile.xcodeproj/project.pbxproj
@@ -22,19 +22,6 @@
 		D4D6DBF5277231D6000D59E7 /* Montserrat-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A648F3C04A2D45FDA2FBB924 /* Montserrat-Medium.ttf */; };
 		D4D6DC1927736328000D59E7 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D4D6DC1827736328000D59E7 /* Launch Screen.storyboard */; };
 		EA79DFD78671415EA5CBC473 /* Montserrat-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B45F0CBDD49940198D57CA71 /* Montserrat-ExtraBold.ttf */; };
-		EDF8AE112A66A1A100E9D367 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7649F10EDFD64E9A80AEA6C3 /* AntDesign.ttf */; };
-		EDF8AE122A66A1A100E9D367 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BD8717A1252A47BBB6F09200 /* Entypo.ttf */; };
-		EDF8AE132A66A1A100E9D367 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A9DD7070522D4403B9B46D91 /* EvilIcons.ttf */; };
-		EDF8AE142A66A1A100E9D367 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A7F933900D04E85861B63D4 /* Feather.ttf */; };
-		EDF8AE152A66A1A100E9D367 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1A352F64258C4E4CA78C8756 /* FontAwesome.ttf */; };
-		EDF8AE162A66A1A100E9D367 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F033A891B877452A94D37BAE /* FontAwesome5_Brands.ttf */; };
-		EDF8AE172A66A1A100E9D367 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5D75D67687F343DA9D23D681 /* FontAwesome5_Regular.ttf */; };
-		EDF8AE182A66A1A100E9D367 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 419A9E7755D845BBBB52FDDD /* FontAwesome5_Solid.ttf */; };
-		EDF8AE192A66A1A100E9D367 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 84E6925AE21C4D14813CC922 /* Fontisto.ttf */; };
-		EDF8AE1A2A66A1A100E9D367 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D6A8CD454E1B412FB56FE0D9 /* Foundation.ttf */; };
-		EDF8AE1B2A66A1A100E9D367 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9677FF54ACB9419CA31773FB /* Ionicons.ttf */; };
-		EDF8AE1C2A66A1A100E9D367 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 38ADA9E4C64D4D289E2B233C /* MaterialCommunityIcons.ttf */; };
-		EDF8AE1D2A66A1A100E9D367 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ED8785EE35254126AADF5065 /* MaterialIcons.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -377,19 +364,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				EDF8AE112A66A1A100E9D367 /* AntDesign.ttf in Resources */,
-				EDF8AE122A66A1A100E9D367 /* Entypo.ttf in Resources */,
-				EDF8AE132A66A1A100E9D367 /* EvilIcons.ttf in Resources */,
-				EDF8AE142A66A1A100E9D367 /* Feather.ttf in Resources */,
-				EDF8AE152A66A1A100E9D367 /* FontAwesome.ttf in Resources */,
-				EDF8AE162A66A1A100E9D367 /* FontAwesome5_Brands.ttf in Resources */,
-				EDF8AE172A66A1A100E9D367 /* FontAwesome5_Regular.ttf in Resources */,
-				EDF8AE182A66A1A100E9D367 /* FontAwesome5_Solid.ttf in Resources */,
-				EDF8AE192A66A1A100E9D367 /* Fontisto.ttf in Resources */,
-				EDF8AE1A2A66A1A100E9D367 /* Foundation.ttf in Resources */,
-				EDF8AE1B2A66A1A100E9D367 /* Ionicons.ttf in Resources */,
-				EDF8AE1C2A66A1A100E9D367 /* MaterialCommunityIcons.ttf in Resources */,
-				EDF8AE1D2A66A1A100E9D367 /* MaterialIcons.ttf in Resources */,
 				D4D6DC1927736328000D59E7 /* Launch Screen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				882B38D593C5408D9DFE419E /* Montserrat-Bold.ttf in Resources */,
@@ -651,7 +625,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.56;
+				CURRENT_PROJECT_VERSION = 1.57;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = tumeplayMobile/Info.plist;
@@ -660,7 +634,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.24;
+				MARKETING_VERSION = 1.25;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -683,15 +657,15 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.56;
+				CURRENT_PROJECT_VERSION = 1.57;
 				DEVELOPMENT_TEAM = 76GBKHVK25;
 				INFOPLIST_FILE = tumeplayMobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.24;
+				MARKETING_VERSION = 1.25;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/tumeplayMobile/src/views/HomePage.js b/tumeplayMobile/src/views/HomePage.js
@@ -146,7 +146,7 @@ const HomePage = ({navigation}) => {
           onPress={() => {
             navigation.navigate('Search');
           }}>
-          <Icon name="search" size={30} />
+          <Icon name="search" color="#000" size={30} />
         </TouchableOpacity>
         <Title />
         <TouchableOpacity
@@ -156,7 +156,7 @@ const HomePage = ({navigation}) => {
               user: user,
             })
           }>
-          <Icon name="settings" size={30} />
+          <Icon name="settings" color="#000" size={30} />
         </TouchableOpacity>
         <LevelPointsIndicator
           style={styles.levelIndicator}

diff --git a/tumeplayMobile/src/views/Menu.js b/tumeplayMobile/src/views/Menu.js
@@ -28,7 +28,7 @@ const Menu = () => {
       <TouchableOpacity
         style={styles.button}
         onPress={() => navigation.goBack()}>
-        <Icon name="close" size={25} />
+        <Icon name="close" color="#000" size={25} />
         <Text>Fermer</Text>
       </TouchableOpacity>
       <SponsorCard navigation={navigation} />