chore: merge stating v3.1.0

Author: sudoDeznit

.eslintrc.js

@@ -1,14 +1,14 @@
 module.exports = {
-  root: true,
-  extends: '@react-native-community',
-  rules: {
-    indent: ['warn', 4, { SwitchCase: 1 }],
-    // semi: ['off', 'always'], // recommend on and always
-    'no-control-regex': 'off',
-    'comma-dangle': ['warn', 'never'], // recommend always
-    'no-undef': 'off',
-    'react-native/no-inline-styles': 'off' // recommend turning on
-    // 'prettier/prettier': 'off',
-    // quotes: ['off', 'double'] // recommend on and backtick
-  }
+    root: true,
+    extends: '@react-native-community',
+    rules: {
+        // indent: ['warn', 4, { SwitchCase: 1 }],
+        // semi: ['off', 'always'], // recommend on and always
+        'no-control-regex': 'off',
+        'comma-dangle': ['warn', 'never'], // recommend always
+        'no-undef': 'off',
+        'react-native/no-inline-styles': 'off' // recommend turning on
+        // 'prettier/prettier': 'off',
+        // quotes: ['off', 'double'] // recommend on and backtick
+    }
 };

.gitignore

@@ -67,5 +67,5 @@ buck-out/
 # Android Build
 /android/app/build
 
-android/
+# android/
 *.hprof

actions/images_action.js

@@ -8,6 +8,7 @@ import {
     DESELECT_ALL_IMAGES,
     INCREMENT_SELECTED,
     REMOVE_TAG_FROM_IMAGE,
+    TOGGLE_PICKED_UP,
     TOGGLE_SELECTING,
     TOGGLE_SELECTED_IMAGES,
     URL
@@ -164,6 +165,17 @@ export const removeTagFromImage = data => {
     };
 };
 
+/**
+ * toggles picked_up status on an image based on id
+ * @param id
+ */
+export const togglePickedUp = id => {
+    return {
+        type: TOGGLE_PICKED_UP,
+        payload: id
+    };
+};
+
 /**
  * Toggle if the user wants to Select images for deletion
  */

actions/litter_actions.js

@@ -19,7 +19,7 @@ import {
 /**
  * Change the category of litter eg Smoking, Alcohol
  */
-export const changeCategory = (id) => {
+export const changeCategory = id => {
     return {
         type: CHANGE_CATEGORY,
         payload: id
@@ -29,7 +29,7 @@ export const changeCategory = (id) => {
 /**
  * Change the item of litter in a category eg butts, lighters
  */
-export const changeItem = (item) => {
+export const changeItem = item => {
     return {
         type: CHANGE_ITEM,
         payload: item
@@ -39,7 +39,7 @@ export const changeItem = (item) => {
 /**
  * Change Quantity of litter
  */
-export const changeQ = (q) => {
+export const changeQ = q => {
     return {
         type: CHANGE_Q,
         payload: q
@@ -51,9 +51,15 @@ export const changeQ = (q) => {
  * picker wheel rotated status == True
  * after tag is added satus set to false
  *
+ * If quantityChanged is true -- then while clicking Add Tag button
+ * the quantilty value currently in PICKER is added to tag
+ *
+ * else if quantityChanged is false -- then while clicking Add Tag button
+ * quantity currently on TAG + 1 is added on tag.
+ *
  * @param {boolean} boolValue
  */
-export const changeQuantiyStatus = (boolValue) => {
+export const changeQuantityStatus = boolValue => {
     return {
         type: CHANGE_QUANTITY_STATUS,
         payload: boolValue
@@ -65,7 +71,7 @@ export const changeQuantiyStatus = (boolValue) => {
  *
  * Needs to be extracted to Redux as the number of web-photos changes when 1 is submitted
  */
-export const swiperIndexChanged = (index) => {
+export const swiperIndexChanged = index => {
     return {
         type: CHANGE_SWIPER_INDEX,
         payload: index
@@ -98,7 +104,7 @@ export const resetLitterTags = () => {
  * Content to show in LitterPicker modal
  * @show allTags
  */
-export const showAllTags = (bool) => {
+export const showAllTags = bool => {
     return {
         type: SHOW_ALL_TAGS,
         payload: bool
@@ -108,7 +114,7 @@ export const showAllTags = (bool) => {
 /**
  * Open / Close the modal on LitterPicker.js
  */
-export const setLitterPickerModal = (bool) => {
+export const setLitterPickerModal = bool => {
     return {
         type: SHOW_INNER_MODAL,
         payload: bool
@@ -127,7 +133,7 @@ export const toggleSwitch = () => {
 /**
  *
  */
-export const updatePreviousTags = (tags) => {
+export const updatePreviousTags = tags => {
     return {
         type: UPDATE_PREVIOUS_TAGS,
         payload: tags
@@ -137,7 +143,7 @@ export const updatePreviousTags = (tags) => {
 /**
  * Capture the X positions of the tags when they are added / change
  */
-export const updateTagXPosition = (data) => {
+export const updateTagXPosition = data => {
     return {
         type: UPDATE_TAGS_X_POS,
         payload: data

actions/types.js

@@ -40,6 +40,7 @@ export const DELETE_SELECTED_IMAGES = 'DELETE_SELECTED_IMAGES';
 export const DESELECT_ALL_IMAGES = 'DESELECT_ALL_IMAGES';
 export const INCREMENT_SELECTED = 'INCREMENT_SELECTED';
 export const REMOVE_TAG_FROM_IMAGE = 'REMOVE_TAG_FROM_IMAGE';
+export const TOGGLE_PICKED_UP = 'TOGGLE_PICKED_UP';
 export const TOGGLE_SELECTING = 'TOGGLE_SELECTING';
 export const TOGGLE_SELECTED_IMAGES = 'TOGGLE_SELECTED_IMAGES';
 

assets/langs/ar/tag.json

@@ -5,5 +5,11 @@
     "suggested-tags": "الوسوم المقترحة",
     "alert": "تنبيه",
     "still-there": "المخلفات مازالت موجودة",
-    "picked-up": "تم التقاط المخلفات"
-}
+    "picked-up": "تم التقاط المخلفات",
+    "litter-status": "حالة القمامة",
+    "picked-thumb": "👍🏻 التقطت",
+    "not-picked-thumb": "👎🏻 لم تلتقط",
+    "delete-message": "هل أنت متأكد أنك تريد حذف هذه الصورة ؟",
+    "cancel": "يلغي",
+    "delete": "نعم ، احذف"
+}

assets/langs/de/tag.json

@@ -5,5 +5,11 @@
     "suggested-tags": "Vorgestellter Tag",
     "alert": "Warnung",
     "still-there": "Der Abfall ist immernoch dort",
-    "picked-up": "Der Abfall ist weggenommen"
-}
+    "picked-up": "Der Abfall ist weggenommen",
+    "litter-status": "Wurfstatus",
+    "picked-thumb": "Abgeholt 👍🏻",
+    "not-picked-thumb": "Nicht abgeholt 👎🏻",
+    "delete-message": "Möchten Sie dieses Bild wirklich löschen?",
+    "cancel": "Abbrechen",
+    "delete": "Ja, löschen"
+}

assets/langs/en/tag.json

@@ -5,5 +5,11 @@
     "suggested-tags": "Suggested Tags",
     "alert": "Alert",
     "still-there": "The Litter is still there",
-    "picked-up": "The Litter has been picked up"
-}
+    "picked-up": "The Litter has been picked up",
+    "litter-status": "Litter Status",
+    "picked-thumb": "Picked up 👍🏻",
+    "not-picked-thumb": "Not picked up 👎🏻",
+    "delete-message": "Are you sure you want to delete this image ?",
+    "cancel": "Cancel",
+    "delete": "Yes, Delete"
+}

assets/langs/es/tag.json

@@ -5,5 +5,11 @@
     "suggested-tags": "Etiquetas sugeridas",
     "alert": "Alerta",
     "still-there": "¡La basura sigue ahí!",
-    "picked-up": "¡La basura ha sido recogida!"
-}
+    "picked-up": "¡La basura ha sido recogida!",
+    "litter-status": "Estado de la camada",
+    "picked-thumb": "Recogido 👍🏻",
+    "not-picked-thumb": "No recogido 👎🏻",
+    "delete-message": "Estás seguro de que deseas eliminar esta imagen?",
+    "cancel": "Cancelar",
+    "delete": "Sí, eliminar"
+}

assets/langs/fr/tag.json

@@ -5,5 +5,11 @@
     "suggested-tags": "Etiquettes suggérées",
     "alert": "Alerte",
     "still-there": "Les déchets sont toujours là",
-    "picked-up": "Les déchets ont été collectés"
-}
+    "picked-up": "Les déchets ont été collectés",
+    "litter-status": "Statut de la portée",
+    "picked-thumb": "Ramassé 👍🏻",
+    "not-picked-thumb": "Non ramassé 👎🏻",
+    "delete-message": "Êtes-vous sûr de vouloir supprimer cette image ?",
+    "cancel": "Annuler",
+    "delete": "Oui, supprimer"
+}