Merge branch 'v2.17.1' into v2.17.0a

.detoxrc.js

@@ -6,7 +6,8 @@ module.exports = {
       config: "e2e/jest.config.js",
     },
     jest: {
-      setupTimeout: 120000,
+      setupTimeout: 900000,
+      teardownTimeout: 900000,
     },
   },
   apps: {
@@ -27,16 +28,16 @@ module.exports = {
     simulator: {
       type: "ios.simulator",
       device: {
-        type: "iPhone 14 Plus",
+        type: "iPhone 15 Pro",
       },
     },
   },
   configurations: {
-    "ios.sim.debug": {
+    "ios.debug": {
       device: "simulator",
       app: "ios.debug",
     },
-    "ios.sim.release": {
+    "ios.release": {
       device: "simulator",
       app: "ios.release",
     },

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,9 +6,6 @@ labels: ''
 assignees: ''
 
 ---
-**Is this an AR camera feature?**
-If so, please head to [react-native-inat-camera](https://github.com/inaturalist/react-native-inat-camera) library and fill out a feature request there.
-
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 

README.md

@@ -26,7 +26,7 @@
 2. Build locally to a device or simulator by running `npm run ios` or `npm run android`
 
 ## Manual Linking
-Most third-party libraries use autolinking as of [React Native 0.60.0](https://facebook.github.io/react-native/blog/2019/07/03/version-60#native-modules-are-now-autolinked). Any exceptions are listed in the `react-native.config.js` file. Currently, [react-native-inat-camera](https://github.com/inaturalist/react-native-inat-camera) on Android is manually linked.
+Most third-party libraries use autolinking as of [React Native 0.60.0](https://facebook.github.io/react-native/blog/2019/07/03/version-60#native-modules-are-now-autolinked). Any exceptions are listed in the `react-native.config.js` file.
 
 ## Tests
 We currently have three kinds of tests:

android/app/build.gradle

@@ -131,8 +131,6 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-inat-camera')
-
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("com.facebook.react:flipper-integration")    

android/app/src/main/AndroidManifest.xml

@@ -10,11 +10,10 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29"/> 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <!-- the following permissions replaces READ_EXTERNAL_STORAGE in Android 13 -->
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
 
     <application
       android:name="org.inaturalist.seek.MainApplication"

android/app/src/main/java/org/inaturalist/seek/MainApplication.kt

@@ -12,16 +12,13 @@ import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.flipper.ReactNativeFlipper
 import com.facebook.soloader.SoLoader
 
-import org.inaturalist.inatcamera.nativecamera.INatCameraViewPackage
-
 class MainApplication : Application(), ReactApplication {
 
   override val reactNativeHost: ReactNativeHost =
     object : DefaultReactNativeHost(this) {
       override fun getPackages(): List<ReactPackage> =
           PackageList(this).packages.apply {
             // Packages that cannot be autolinked yet can be added manually here, for example:
-            add(INatCameraViewPackage())
           }
 
       override fun getJSMainModuleName(): String = "index"

android/settings.gradle

@@ -1,8 +1,6 @@
 rootProject.name = 'Seek'
 include ':@react-native-camera-roll_camera-roll'
 project(':@react-native-camera-roll_camera-roll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-camera-roll/camera-roll/android')
-include ':react-native-inat-camera'
-project(':react-native-inat-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-inat-camera/android')
 include ':react-native-check-app-install'
 project(':react-native-check-app-install').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-check-app-install/android')
 include ':RNSendIntentModule', ':app'

assets/icons.ts

@@ -65,7 +65,8 @@ const icons: Icons = {
   iNat_valueprop_bullet_2: require( "./icons/icon-cv-green.webp" ),
   iNat_valueprop_bullet_3: require( "./icons/icon-obs-green.webp" ),
   iNat_valueprop_bullet_4: require( "./icons/icon-person-green.webp" ),
-  noProfilePhoto: require( "./icons/img-inatlogin-nophoto.webp" )
+  noProfilePhoto: require( "./icons/img-inatlogin-nophoto.webp" ),
+  gallery: require( "./icons/icon-gallery.webp" )
 };
 
 export default icons;

components/About/AboutScreen.js

@@ -37,7 +37,7 @@ const AboutScreen = (): Node => {
         <Image source={logos.iNat} />
         <View style={viewStyles.marginSmall} />
         <StyledText style={[baseTextStyles.bodyBold, textStyles.boldText]}>{i18n.t( "about.seek_designed_by" )}</StyledText>
-        <StyledText style={[baseTextStyles.body, textStyles.text]}>{i18n.t( "about.inat_team_credits_4" )}</StyledText>
+        <StyledText style={[baseTextStyles.body, textStyles.text]}>{i18n.t( "about.inat_team_credits_5" )}</StyledText>
         <View style={viewStyles.marginSmall} />
         <StyledText style={[baseTextStyles.body, textStyles.text]}>{i18n.t( "about.support_from" )}</StyledText>
         <View style={viewStyles.block} />

components/Camera/ARCamera/ARCamera.js

@@ -34,7 +34,10 @@ import {
   rotatePhotoPatch,
   rotationTempPhotoPatch
 } from "../../../utility/visionCameraPatches";
-import { checkCameraPermissions, checkSavePermissions } from "../../../utility/androidHelpers.android";
+import {
+  checkCameraPermissions,
+  checkSavePermissions
+} from "../../../utility/androidHelpers.android";
 import { savePostingSuccess } from "../../../utility/loginHelpers";
 import { dirModel, dirTaxonomy } from "../../../utility/dirStorage";
 import { createTimestamp } from "../../../utility/dateHelpers";
@@ -457,6 +460,7 @@ const ARCamera = ( ): Node => {
             takePicture={takePicture}
             cameraLoaded={cameraLoaded.value}
             filterByTaxonId={filterByTaxonId}
+            setIsActive={setIsActive}
           />
         )
       }

components/Camera/ARCamera/ARCameraHeader.tsx

@@ -22,27 +22,21 @@ interface Prediction {
 }
 
 interface Props {
-  ranks: {
-    [key: string]: {
-      taxon_id: number;
-      name: string;
-    }[];
-  };
   prediction: Prediction;
 }
 
-const ARCameraHeader = ( { ranks, prediction }: Props ) => {
+const ARCameraHeader = ( { prediction }: Props ) => {
   const { isLandscape } = useAppOrientation( );
-  const rankToRender = ranks ? Object.keys( ranks )[0] || null : prediction?.rank || null;
+  const rankToRender = prediction?.rank || null;
   const [commonName, setCommonName] = useState<string | void | null>( null );
   const settings = useFetchUserSettings( );
   const scientificNames = settings?.scientificNames;
   const showScientificName = scientificNames || !commonName;
 
-  let id = null;
+  let id: number | null = null;
 
   if ( rankToRender && !scientificNames ) {
-    id = ranks ? ranks[rankToRender][0].taxon_id : prediction?.taxon_id;
+    id = prediction?.taxon_id;
   } else {
     id = null;
   }
@@ -107,11 +101,11 @@ const ARCameraHeader = ( { ranks, prediction }: Props ) => {
     return null;
   };
 
-  const scientificName = ranks ? ranks[rankToRender][0].name : prediction?.name;
+  const scientificName = prediction?.name;
   return (
     <View style={viewStyles.header}>
-      {( ( ranks || prediction ) && rankToRender ) && (
-        <View style={setTaxonomicRankBubbleColor( )}>
+      {( prediction && rankToRender ) && (
+        <View testID="headerPrediction" style={setTaxonomicRankBubbleColor( )}>
           <View style={viewStyles.greenButton}>
             <GreenRectangle
               text={i18n.t( rankDict[rankToRender] )}