Autofleet · dorshay6 · Jan 30, 2023 · Feb 1, 2023 · Feb 1, 2023 · Feb 1, 2023
diff --git a/.github/workflows/CODEOWNERS b/.github/workflows/CODEOWNERS
@@ -0,0 +1,9 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+#
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+* @Autofleet/code-reviewers
+/examples/client/Locomotion/package.json @Autofleet/code-reviewers
+/examples/client/Locomotion/ @Autofleet/dev-team
diff --git a/.github/workflows/app_test.yml b/.github/workflows/app_test.yml
@@ -28,4 +28,4 @@ jobs:
 
  - run: npm run linter
 
- - run: npm run ts
+ - run: npm run ts || echo "Warning! npm run ts failed." 
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ examples/client/Locomotion/android/app/*.json
 examples/client/Locomotion/fastlane/report.xml
 examples/client/Locomotion/fastlane/README.md
 examples/client/Locomotion/bucket
+.vscode/
diff --git a/examples/client/Locomotion/.env.sample b/examples/client/Locomotion/.env.sample
@@ -10,3 +10,4 @@ DEFAULT_LONGITUDE=
 STRIPE_PUBLISHER_KEY=
 DONT_USE_STATIONS=
 OPERATION_ID=
+LANGUAGE_FILES_STORAGE=
diff --git a/examples/client/Locomotion/.gitignore b/examples/client/Locomotion/.gitignore
@@ -127,4 +127,7 @@ typings/
 
 watchmanScript.sh
 
-*.tsbuildinfo
+*.tsbuildinfo
+
+# vscode
+**/.vscode
diff --git a/examples/client/Locomotion/.ruby-version b/examples/client/Locomotion/.ruby-version
@@ -1 +1 @@
-2.7.4
+3.2.2
diff --git a/examples/client/Locomotion/Gemfile b/examples/client/Locomotion/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby File.read(File.join(__dir__, ".ruby-version")).strip
 
 gem 'cocoapods', '~> 1.11', '>= 1.11.2'
diff --git a/examples/client/Locomotion/Gemfile.lock b/examples/client/Locomotion/Gemfile.lock
@@ -1,41 +1,40 @@
 GEM
  remote: https://rubygems.org/
  specs:
- CFPropertyList (3.0.5)
+ CFPropertyList (3.0.6)
  rexml
- activesupport (6.1.5)
+ activesupport (7.0.7)
  concurrent-ruby (~> 1.0, >= 1.0.2)
  i18n (>= 1.6, < 2)
  minitest (>= 5.1)
  tzinfo (~> 2.0)
- zeitwerk (~> 2.3)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.5)
+ public_suffix (>= 2.0.2, < 6.0)
  algoliasearch (1.27.5)
  httpclient (~> 2.8, >= 2.8.3)
  json (>= 1.5.1)
  atomos (0.1.3)
  claide (1.1.0)
- cocoapods (1.11.3)
+ cocoapods (1.12.1)
  addressable (~> 2.8)
  claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.11.3)
+ cocoapods-core (= 1.12.1)
  cocoapods-deintegrate (>= 1.0.3, < 2.0)
- cocoapods-downloader (>= 1.4.0, < 2.0)
+ cocoapods-downloader (>= 1.6.0, < 2.0)
  cocoapods-plugins (>= 1.0.0, < 2.0)
  cocoapods-search (>= 1.0.0, < 2.0)
- cocoapods-trunk (>= 1.4.0, < 2.0)
+ cocoapods-trunk (>= 1.6.0, < 2.0)
  cocoapods-try (>= 1.1.0, < 2.0)
  colored2 (~> 3.1)
  escape (~> 0.0.4)
  fourflusher (>= 2.3.0, < 3.0)
  gh_inspector (~> 1.0)
  molinillo (~> 0.8.0)
  nap (~> 1.0)
- ruby-macho (>= 1.0, < 3.0)
+ ruby-macho (>= 2.3.0, < 3.0)
  xcodeproj (>= 1.21.0, < 2.0)
- cocoapods-core (1.11.3)
- activesupport (>= 5.0, < 7)
+ cocoapods-core (1.12.1)
+ activesupport (>= 5.0, < 8)
  addressable (~> 2.8)
  algoliasearch (~> 1.0)
  concurrent-ruby (~> 1.1)
@@ -54,38 +53,37 @@ GEM
  netrc (~> 0.11)
  cocoapods-try (1.2.0)
  colored2 (3.1.2)
- concurrent-ruby (1.1.10)
+ concurrent-ruby (1.2.2)
  escape (0.0.4)
- ethon (0.15.0)
+ ethon (0.16.0)
  ffi (>= 1.15.0)
  ffi (1.15.5)
  fourflusher (2.3.1)
  fuzzy_match (2.0.4)
  gh_inspector (1.1.3)
  httpclient (2.8.3)
- i18n (1.10.0)
+ i18n (1.14.1)
  concurrent-ruby (~> 1.0)
- json (2.6.1)
- minitest (5.15.0)
+ json (2.6.3)
+ minitest (5.19.0)
  molinillo (0.8.0)
  nanaimo (0.3.0)
  nap (1.1.0)
  netrc (0.11.0)
  public_suffix (4.0.7)
- rexml (3.2.5)
+ rexml (3.2.6)
  ruby-macho (2.5.1)
  typhoeus (1.4.0)
  ethon (>= 0.9.0)
- tzinfo (2.0.4)
+ tzinfo (2.0.6)
  concurrent-ruby (~> 1.0)
- xcodeproj (1.21.0)
+ xcodeproj (1.22.0)
  CFPropertyList (>= 2.3.3, < 4.0)
  atomos (~> 0.1.3)
  claide (>= 1.0.2, < 2.0)
  colored2 (~> 3.1)
  nanaimo (~> 0.3.0)
  rexml (~> 3.2.4)
- zeitwerk (2.5.4)
 
 PLATFORMS
  ruby
@@ -94,7 +92,7 @@ DEPENDENCIES
  cocoapods (~> 1.11, >= 1.11.2)
 
 RUBY VERSION
- ruby 2.7.4p191
+ ruby 3.2.2p53
 
 BUNDLED WITH
  2.2.27
diff --git a/examples/client/Locomotion/android/app/build.gradle b/examples/client/Locomotion/android/app/build.gradle
@@ -274,12 +274,19 @@ android {
 
 dependencies {
  implementation fileTree(dir: "libs", include: ["*.jar"])
- 
+
  implementation platform('com.google.firebase:firebase-bom:30.2.0')
 
  // When using the BoM, you don't specify versions in Firebase library dependencies
  implementation 'com.google.firebase:firebase-crashlytics'
- implementation 'com.google.firebase:firebase-analytics'
+ // implementation 'com.google.firebase:firebase-analytics'
+ implementation ("com.google.firebase:firebase-analytics") {
+ exclude module: "play-services-ads-identifier"
+ exclude module: "play-services-ads"
+ exclude module: "play-services-ads-lite"
+ exclude module: "play-services-measurement"
+ exclude module: "play-services-measurement-sdk"
+ }
 
  //noinspection GradleDynamicVersion
  implementation "com.facebook.react:react-native:+" // From node_modules
@@ -301,7 +308,6 @@ dependencies {
 
  implementation project(':react-native-linear-gradient')
  implementation 'com.google.android.material:material:1.6.0'
- implementation project(':react-native-mixpanel')
  if (enableHermes) {
  def hermesPath = "../../node_modules/hermes-engine/android/";
  debugImplementation files(hermesPath + "hermes-debug.aar")

diff --git a/examples/client/Locomotion/android/app/src/main/AndroidManifest.xml b/examples/client/Locomotion/android/app/src/main/AndroidManifest.xml
@@ -1,10 +1,11 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
  package="com.locomotion">
 
  <uses-permission android:name="android.permission.INTERNET" />
  <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove"/>
 
  <application
  android:name=".MainApplication"
@@ -31,6 +32,8 @@
  <meta-data
  android:name="com.google.android.geo.API_KEY"
  android:value="AIzaSyB-c9iBOz8CmNyynP74oH5RIFtdClfFlXw"/>
+ <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+ <meta-data android:name="google_analytics_default_allow_ad_personalization_signals" android:value="false" />
  <uses-library android:name="org.apache.http.legacy" android:required="false"/>
  </application>
  <queries>

diff --git a/examples/client/Locomotion/android/app/src/main/java/com/locomotion/MainApplication.java b/examples/client/Locomotion/android/app/src/main/java/com/locomotion/MainApplication.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.reactnativecommunity.netinfo.NetInfoPackage;
 import com.github.wumke.RNExitApp.RNExitAppPackage;
 import com.reactnativerestart.RestartPackage;
 import com.ocetnik.timer.BackgroundTimerPackage;
@@ -17,7 +18,6 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import com.BV.LinearGradient.LinearGradientPackage;
-import com.kevinejohn.RNMixpanel.*;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 import com.facebook.react.modules.i18nmanager.I18nUtil;

diff --git a/examples/client/Locomotion/android/build.gradle b/examples/client/Locomotion/android/build.gradle
@@ -6,9 +6,10 @@ buildscript {
  ext {
  buildToolsVersion = "31.0.0"
  minSdkVersion = 21
- compileSdkVersion = 31
- targetSdkVersion = 31
+ compileSdkVersion = 33
+ targetSdkVersion = 33
  supportLibVersion = "31.0.0"
+ kotlinVersion = "1.6.0"
 
  if (System.properties['os.arch'] == "aarch64") {
  // For M1 Users we need to use the NDK 24 which added support for aarch64

diff --git a/examples/client/Locomotion/android/settings.gradle b/examples/client/Locomotion/android/settings.gradle
@@ -1,4 +1,6 @@
 rootProject.name = 'Locomotion'
+include ':@react-native-community_netinfo'
+project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
 include ':react-native-exit-app'
 project(':react-native-exit-app').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-exit-app/android')
 include ':react-native-restart'
@@ -18,6 +20,3 @@ if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true")
 
 include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
-
-include ':react-native-mixpanel', ':app'
-project(':react-native-mixpanel').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-mixpanel/android')