v3.2.4 - removed camera temporarily

xlcrr · xlcrr · commit 8df45accda02 · 2022-06-25T12:29:07.000+01:00
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -136,8 +136,8 @@ android {
         applicationId "com.geotech.openlittermap"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 32 // increment this
-        versionName "3.2.3"
+        versionCode 33 // increment this
+        versionName "3.2.4"
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
     }
diff --git a/android/app/release/app-release.aab b/android/app/release/app-release.aab
diff --git a/assets/langs/en/leftpage.json b/assets/langs/en/leftpage.json
@@ -14,7 +14,7 @@
     "thank-you": "Thank you!!!",
     "you-have-uploaded": "You have uploaded {count} photos",
     "close": "Close",
-    "take-photo": "Take a photo or select from gallery",
+    "take-photo": "Take a photo and select it from the gallery",
     "no-images": "No images to upload",
     "camera": "Camera"
 }
diff --git a/ios/openlittermap.xcodeproj/project.pbxproj b/ios/openlittermap.xcodeproj/project.pbxproj
@@ -925,7 +925,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = QWDQLVZP87;
 				INFOPLIST_FILE = openlittermap/Info.plist;
@@ -934,7 +934,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.3;
+				MARKETING_VERSION = 3.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -958,15 +958,15 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 46;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = QWDQLVZP87;
 				INFOPLIST_FILE = openlittermap/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.3;
+				MARKETING_VERSION = 3.2.4;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package-lock.json b/package-lock.json
diff --git a/routes/tabRoutes.js b/routes/tabRoutes.js
@@ -101,11 +101,11 @@ const TabRoutes = ({ navigation }) => (
                 }
             }}>
             <Tab.Screen name="HOME" component={HomeScreen} />
-            <Tab.Screen
-                name="CAMERA"
-                component={CameraScreen}
-                options={{ unmountOnBlur: true }}
-            />
+            {/*<Tab.Screen*/}
+            {/*    name="CAMERA"*/}
+            {/*    component={CameraScreen}*/}
+            {/*    options={{ unmountOnBlur: true }}*/}
+            {/*/>*/}
             <Tab.Screen name="TEAM" component={TeamStack} />
             <Tab.Screen name="GLOBAL_DATA" component={GlobalDataScreen} />
 
diff --git a/screens/setting/SettingsScreen.js b/screens/setting/SettingsScreen.js
@@ -132,6 +132,16 @@ class SettingsScreen extends Component {
                                         }
                                     ]
                                 },
+                                {
+                                    title: 'settings.picked-up',
+                                    data: [
+                                        {
+                                            id: 11,
+                                            key: 'picked-up',
+                                            title: 'settings.litter-picked-up'
+                                        }
+                                    ]
+                                },
                                 {
                                     title: 'settings.privacy',
                                     data: [
@@ -170,16 +180,6 @@ class SettingsScreen extends Component {
                                                 'settings.show-username-createdby'
                                         }
                                     ]
-                                },
-                                {
-                                    title: 'settings.picked-up',
-                                    data: [
-                                        {
-                                            id: 11,
-                                            key: 'picked-up',
-                                            title: 'settings.litter-picked-up'
-                                        }
-                                    ]
                                 }
                                 // Temp commented out. This feature will be fixed in a future release.
                                 // {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"thank-you": "Thank you!!!",`
`15`	`15`	`"you-have-uploaded": "You have uploaded {count} photos",`
`16`	`16`	`"close": "Close",`
`17`		`- "take-photo": "Take a photo or select from gallery",`
	`17`	`+ "take-photo": "Take a photo and select it from the gallery",`
`18`	`18`	`"no-images": "No images to upload",`
`19`	`19`	`"camera": "Camera"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,16 @@ class SettingsScreen extends Component {`
`132`	`132`	`}`
`133`	`133`	`]`
`134`	`134`	`},`
	`135`	`+ {`
	`136`	`+ title: 'settings.picked-up',`
	`137`	`+ data: [`
	`138`	`+ {`
	`139`	`+ id: 11,`
	`140`	`+ key: 'picked-up',`
	`141`	`+ title: 'settings.litter-picked-up'`
	`142`	`+ }`
	`143`	`+ ]`
	`144`	`+ },`
`135`	`145`	`{`
`136`	`146`	`title: 'settings.privacy',`
`137`	`147`	`data: [`
`@@ -170,16 +180,6 @@ class SettingsScreen extends Component {`
`170`	`180`	`'settings.show-username-createdby'`
`171`	`181`	`}`
`172`	`182`	`]`
`173`		`- },`
`174`		`- {`
`175`		`- title: 'settings.picked-up',`
`176`		`- data: [`
`177`		`- {`
`178`		`- id: 11,`
`179`		`- key: 'picked-up',`
`180`		`- title: 'settings.litter-picked-up'`
`181`		`- }`
`182`		`- ]`
`183`	`183`	`}`
`184`	`184`	`// Temp commented out. This feature will be fixed in a future release.`
`185`	`185`	`// {`