v1.7 Release (#456)

* Bump to 1.7 * resolves #411 notifications screen: changed the separator from being | to ~ * Resolves #329 * Resolves #335 - Initial version of support for Questionnaire Plugin * Resolves #304 * Resolves #304 * Resolves #417 * Resolves #407 - Reintroduce Hans PR #438 * Resolves #424 - Reintroduces Hans PR #438 * Temporarily remove Sentry (see #438) * Significant UI fixes (#442) Resolves #259 * Manually fix security vulnerabilities in dependencies * Resolves #408 - specify utc() when displaying date (view mode) per DatePicker fields * Sprint 26 (#446) * Adding missing icons to fields Adding missing icons to fields on contact details, edit and new screens. * FAB action colors giving the fab actions a different color to help quickly identify each action. * Add initial comment icon * reformatting Icon code for consitency * fix icon from user to users for group edit screen on the group edit screen it used incorrectly a singular icon for group name instead of the group icon. And minor code cleanup. * Add new group icons Group name and Group type * import status icon; remformatted code identations * Adding status icons to contacts and group screens * resolves #259 and adds colors to icons * styling for addIcons & removeIcons * added icon for milestone Added around lines 3014 and 3100 the icon "Octicons" incon named "milestone". * added fieldsIcons style fieldsIcons: { height: 20, width: 20, }, * minor sizing adjustments to the icons * Resolve #407 * Resolves #424 * refinements to remove code conflicts * fix for church_start_date bad alignment * Resolve #405 Co-authored-by: Mike Allbutt <[email protected]> Co-authored-by: Zachary McCoy <[email protected]> * Resolves #403 - Group FAB button \(temporarily Comments only until D.T is ready with Activities) * Resolves #447 - case-insensitive comment authorship check * Icons and UIX adjustments (#449) * group date icons using fonts replaced the icons to use fonts * Swapping icons & adjusting spacings assigned_to and subassigned now use the same icons as the website; contact relation icon better represents what the field relats to; * FAB icon bottom padding Increased so that the FAB does not block the last items on the screen. * Include support for Serbian, Slovenian, and Croatian languages; updates to existing languages files * Include new languages in Moment to handle TZ; update language labels * Ui comments - edit and delete for contacts and groups (#451) * Reduced icon sizes & aligned vertically * Modifying the Delete & Edit buttons * Re-inserted the "editComment" and "deleteComment" lines * "delete" added to the language files added "delete" and used the existing text from the "deleteComment" translation - becuase it should be the same. * Fix some RTL layouts on Contact Details * RTL - fixes for text that was incorrectly aligning to the left and not right (#453) * aligned text to right if RTL URL and username field now align right when RTL is set. This also address an issue with #372 by reducing the height of the DT logo. * aligned text in connections fields * added this.props.isRTL to various fields * aligning fields in group record * aligning the lists The text of list items now correctly align to the left or right, depending on the language direction. * Fix text layout issue for iOS, and accomodate for "notch" per logo * minor design adjustments (#454) * Resolves #455 - Do not show FAB button in Edit Mode Co-authored-by: Mike Allbutt <[email protected]> Co-authored-by: Hans Rasch <[email protected]> Co-authored-by: MexSurfer <[email protected]>
DiscipleTools · Sep 20, 2020 · ab3bf0c · ab3bf0c
1 parent 680b604
commit ab3bf0c
Show file tree

Hide file tree

Showing 48 changed files with 7,477 additions and 5,136 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -7,18 +7,18 @@ on:
       - development
 jobs:
   publish:
-    name: CI/CD 
+    name: CI/CD
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-node@v1
         with:
           node-version: 12.x
-      - uses: microsoft/variable-substitution@v1
-        with:
-          files: './app.json'
-        env:
-          expo.hooks.postPublish.0.config.authToken: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      #- uses: microsoft/variable-substitution@v1
+      #  with:
+      #    files: './app.json'
+      #  env:
+      #    expo.hooks.postPublish.0.config.authToken: ${{ secrets.SENTRY_AUTH_TOKEN }}
       - uses: microsoft/variable-substitution@v1
         with:
           files: './google-services.json'

diff --git a/App.js b/App.js
@@ -8,8 +8,8 @@ import * as Font from 'expo-font';
 import { Asset } from 'expo-asset';
 import { Provider } from 'react-redux';
 import { PersistGate } from 'redux-persist/integration/react';
-import Reactotron from 'reactotron-react-native';
-import * as Sentry from 'sentry-expo';
+//import Reactotron from 'reactotron-react-native';
+//import * as Sentry from 'sentry-expo';
 
 import AppNavigator from './navigation/AppNavigator';
 import { store, persistor } from './store/store';
@@ -19,11 +19,11 @@ import sharedTools from './shared';
 
 import { setNetworkConnectivity } from './store/actions/networkConnectivity.actions';
 
-Sentry.init({
+/*Sentry.init({
   dsn: 'https://[email protected]/5356329',
   enableInExpoDevelopment: true,
   debug: true,
-});
+});*/
 
 // Styles
 const styles = StyleSheet.create({
@@ -59,9 +59,9 @@ class App extends React.Component {
       // If Reactotron gets no connection, this is the solution that worked for me (cairocoder01: 2019-08-15)
       // https://github.com/expo/expo-cli/issues/153#issuecomment-358925525
       // May need to then run this before `npm start`: `adb reverse tcp:9090 tcp:9090`
-      Reactotron.configure() // controls connection & communication settings
-        .useReactNative() // add all built-in react native plugins
-        .connect(); // let's connect!
+      //Reactotron.configure() // controls connection & communication settings
+      //  .useReactNative() // add all built-in react native plugins
+      //  .connect(); // let's connect!
     }
 
     // Handle notifications that are received or selected while the app

diff --git a/app.json b/app.json
@@ -4,7 +4,7 @@
     "slug": "discipletoolsapp",
     "privacy": "public",
     "platforms": ["ios", "android"],
-    "version": "1.6.0",
+    "version": "1.7.0",
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "splash": {
@@ -23,20 +23,8 @@
     "android": {
       "package": "tools.disciple.app",
       "googleServicesFile": "./google-services.json",
-      "versionCode": 160
+      "versionCode": 170
     },
-    "description": "",
-    "hooks": {
-      "postPublish": [
-        {
-          "file": "sentry-expo/upload-sourcemaps",
-          "config": {
-            "organization": "Disciple Tools",
-            "project": "DT Mobile",
-            "authToken": ""
-          }
-        }
-      ]
-    }
+    "description": ""
   }
 }
diff --git a/constants/Colors.js b/constants/Colors.js
@@ -4,6 +4,12 @@ const tintColorRGBA = 'rgba(54,93,134,1)';
 const grayLight = '#eeeeee';
 const gray = '#cccccc';
 const grayDark = '#666666';
+const colorYes = '#2ABE1E';
+const colorNo = '#C70039';
+const colorWait = tintColor;
+const addRemoveIcons = tintColor;
+const addIcons = 'green';
+const removeIcons = 'red';
 
 export default {
   primary: tintColor,
@@ -18,6 +24,8 @@ export default {
   tabIconDefault: gray,
   tabIconSelected: tintColor,
   tabBar: '#fefefe',
+  headerTintColor: '#FFFFFF',
+  onPressIcons: '#FFFFFF',
   successBackground: 'rgba(229, 229, 229, 0.85)',
   sucessText: '#000',
   errorBackground: 'rgba(228, 132, 129, 0.85)',
@@ -26,4 +34,15 @@ export default {
   warningText: '#ffa0aa',
   noticeBackground: tintColor,
   noticeText: '#fff',
+  colorYes: '#2ABE1E',
+  colorNo: '#C70039',
+  colorWait: tintColor,
+  addRemoveIcons: tintColor,
+  addIcons: 'green',
+  removeIcons: 'red',
+  button: tintColor,
+  buttonText: '#FFFFFF',
+  dialogButton: '#FFFFFF',
+  buttonDelete: '#d9534f',
+  iconDelete: '#d9534f',
 };
diff --git a/languages/ar.json b/languages/ar.json
@@ -16,6 +16,7 @@
     "writeYourCommentNoteHere": "اكتب تعليقك أو ملاحظتك هنا",
     "requiredField": "حقل مطلوب",
     "edit": "تغيير",
+    "delete": "حذف",
     "cancel": "إلغاء",
     "save": "حفظ",
     "online": "متصل بالأنترنت",
@@ -25,13 +26,9 @@
     "membersActivity": "أفراد",
     "moreFields": "المزيد من الحقول",
     "nameRequired": "الاسم مطلوب",
-    "close": "قريب"
-  },
-  "appRestart": {
-    "message": "سيتم إعادة تشغيل التطبيق لتطبيق التكوين التالي:",
-    "button": "حسنا",
-    "textDirection": "اتجاه النص",
-    "selectedLanguage": "اللغة المختارة"
+    "close": "قريب",
+    "editComment": "تعديل",
+    "deleteComment": "حذف"
   },
   "loginScreen": {
     "domain": {
@@ -71,15 +68,15 @@
     "rememberPassword": "تذكر كلمة المرور",
     "rememberPasswordActive": "تمكين تسجيل الدخول باستمرار",
     "rememberPasswordInactive": "حافظ على تسجيل الدخول معطلة",
-    "remove": "إزالة رمز PIN",
-    "set": "قم بتعيين رمز PIN",
+    "remove": "إزالة",
+    "set": "جلس",
     "pinCode": "كود PIN",
-    "enterPin": "أدخل رمز PIN",
+    "enterPin": "أدخل رقم التعريف الشخصي",
     "setPin": "قم بتعيين رقم تعريف شخصي جديد",
-    "incorrectPin": "رمز PIN غير صحيح",
-    "savedPinCode": "تم حفظ رمز PIN بنجاح!",
-    "removedPinCode": "تمت إزالة رمز PIN بنجاح!",
-    "close": "أغلق"
+    "incorrectPin": "رقم التعريف الشخصي غير صحيح",
+    "savedPinCode": "تم حفظ رمز PIN بنجاح",
+    "removedPinCode": "تمت إزالة رمز PIN بنجاح",
+    "close": "قريب"
   },
   "contactDetailScreen": {
     "addNewContact": "إضافة جهة اتصال جديدة",
@@ -121,6 +118,11 @@
     "groupName": {
       "label": "أسم المجموعة",
       "error": "مطلوب اسم"
+    },
+    "fab": {
+      "quick_button_meeting_scheduled": "جدول الاجتماع",
+      "quick_button_meeting_postponed": "تم تأجيل الاجتماع",
+      "quick_button_meeting_complete": "اكتمل الاجتماع"
     }
   },
   "notificationsScreen": {
@@ -137,5 +139,11 @@
     "noGroupPlacheHolder": "لا توجد أي مجموعات متاحة حاليًا.",
     "noGroupPlacheHolder1": "ربما كانت هناك مشكلة في الحصول عليها من موقعك. اسحب لأسفل لمحاولة التحديث والمحاولة مرة أخرى.",
     "noGroupPlacheHolderOffline": "أنت غير متصل حاليًا. تأكد من اتصالك بشبكة wifi أو بيانات الجوال من أجل التحديث والحصول على مجموعاتك."
+  },
+  "appRestart": {
+    "message": "سيتم إعادة تشغيل التطبيق لتطبيق التكوين التالي:",
+    "button": "حسنا",
+    "textDirection": "اتجاه النص",
+    "selectedLanguage": "اللغة المختارة"
   }
 }
diff --git a/languages/bn.json b/languages/bn.json
@@ -16,6 +16,7 @@
     "writeYourCommentNoteHere": "আপনার মন্তব্য বা নোট এখানে লিখুন",
     "requiredField": "প্রয়োজনীয় ক্ষেত্র",
     "edit": "সম্পাদন করা",
+    "delete": "মুছে ফেলা",
     "cancel": "বাতিল",
     "save": "সংরক্ষণ করুন",
     "online": "অনলাইন",
@@ -25,13 +26,9 @@
     "membersActivity": "সদস্য",
     "moreFields": "আরও ক্ষেত্র",
     "nameRequired": "নাম (প্রয়োজন",
-    "close": "ঘনিষ্ঠ"
-  },
-  "appRestart": {
-    "message": "নিম্নলিখিত কনফিগারেশন প্রয়োগ করার জন্য অ্যাপ্লিকেশনটি আবার শুরু হবে:",
-    "button": "ঠিক আছে",
-    "textDirection": "লেখার দিকবিন্যাস",
-    "selectedLanguage": "নির্বাচিত ভাষা"
+    "close": "ঘনিষ্ঠ",
+    "editComment": "সম্পাদনা করুন",
+    "deleteComment": "মুছে ফেলা"
   },
   "loginScreen": {
     "domain": {
@@ -71,15 +68,15 @@
     "rememberPassword": "পাসওয়ার্ড মনে",
     "rememberPasswordActive": "সক্ষম থাকা লগ ইন করুন",
     "rememberPasswordInactive": "লগ ইন অক্ষম রাখুন",
-    "remove": "পিন কোড সরান",
-    "set": "পিন কোড সেট করুন",
+    "remove": "অপসারণ",
+    "set": "সেট",
     "pinCode": "পিনকোড",
-    "enterPin": "পিন কোড প্রবেশ করান",
+    "enterPin": "পিন প্রবেশ করান",
     "setPin": "নতুন পিন সেট করুন",
-    "incorrectPin": "ভুল পিন কোড",
-    "savedPinCode": "পিন কোড সফলভাবে সংরক্ষণ করা হয়েছে!",
-    "removedPinCode": "পিন কোড সফলভাবে সরানো হয়েছে!",
-    "close": "ঘনিষ্ঠ"
+    "incorrectPin": "ভুল পিন",
+    "savedPinCode": "পিন কোড সাফল্যের সাথে সংরক্ষিত হয়েছে",
+    "removedPinCode": "পিন কোড সফলভাবে সরানো হয়েছে",
+    "close": "বন্ধ"
   },
   "contactDetailScreen": {
     "addNewContact": "নতুন পরিচিতি যোগ করুন",
@@ -121,6 +118,11 @@
     "groupName": {
       "label": "দলের নাম",
       "error": "নাম প্রয়োজন"
+    },
+    "fab": {
+      "quick_button_meeting_scheduled": "সভা নির্ধারিত",
+      "quick_button_meeting_postponed": "সভা স্থগিত",
+      "quick_button_meeting_complete": "সভা সম্পূর্ণ"
     }
   },
   "notificationsScreen": {
@@ -137,5 +139,11 @@
     "noGroupPlacheHolder": "বর্তমানে কোনও গোষ্ঠী উপলব্ধ নেই।",
     "noGroupPlacheHolder1": "আপনার সাইট থেকে এগুলি পেতে কোনও সমস্যা হতে পারে। রিফ্রেশ করার চেষ্টা করতে নীচে টানুন এবং আবার চেষ্টা করুন।",
     "noGroupPlacheHolderOffline": "আপনি বর্তমানে অফলাইন আপনার গ্রুপগুলি রিফ্রেশ করার জন্য আপনি ওয়াইফাই বা মোবাইল ডেটার সাথে সংযুক্ত আছেন তা নিশ্চিত করুন।"
+  },
+  "appRestart": {
+    "message": "নিম্নলিখিত কনফিগারেশন প্রয়োগ করার জন্য অ্যাপ্লিকেশনটি পুনরায় শুরু হবে:",
+    "button": "ঠিক আছে",
+    "textDirection": "লেখার দিকবিন্যাস",
+    "selectedLanguage": "নির্বাচিত ভাষা"
   }
 }
diff --git a/languages/en.json b/languages/en.json
@@ -16,22 +16,19 @@
     "writeYourCommentNoteHere": "Write your comment or note here",
     "requiredField": "Required field",
     "edit": "Edit",
+    "delete": "Delete",
     "cancel": "Cancel",
     "save": "Save",
     "online": "Online",
-    "offline": "offline",
+    "offline": "Offline",
     "language": "Language",
     "search": "Search",
     "membersActivity": "Members",
     "moreFields": "More Fields",
     "nameRequired": "Name required",
-    "close": "Close"
-  },
-  "appRestart": {
-    "message": "The application will be restarted to apply the following configuration:",
-    "button": "Ok",
-    "textDirection": "Text direction",
-    "selectedLanguage": "Selected language"
+    "close": "Close",
+    "editComment": "Edit",
+    "deleteComment": "Delete"
   },
   "loginScreen": {
     "domain": {
@@ -121,6 +118,11 @@
     "groupName": {
       "label": "Group Name",
       "error": "Name is required"
+    },
+    "fab": {
+      "quick_button_meeting_scheduled": "Meeting Scheduled",
+      "quick_button_meeting_postponed": "Meeting Postponed",
+      "quick_button_meeting_complete": "Meeting Complete"
     }
   },
   "notificationsScreen": {
@@ -137,5 +139,11 @@
     "noGroupPlacheHolder": "There are not any groups currently available.",
     "noGroupPlacheHolder1": "There may have been a problem getting them from your site. Drag down to try to refresh and try again.",
     "noGroupPlacheHolderOffline": "You are currently offline. Ensure you are connected to wifi or mobile data in order to refresh and get your groups."
+  },
+  "appRestart": {
+    "message": "The application will be restarted to apply the following configuration:",
+    "button": "Ok",
+    "textDirection": "Text direction",
+    "selectedLanguage": "Selected language"
   }
 }
diff --git a/languages/es.json b/languages/es.json
@@ -16,6 +16,7 @@
     "writeYourCommentNoteHere": "Escriba su comentario o nota aquí",
     "requiredField": "Campo requerido",
     "edit": "Editar",
+    "delete": "Eliminar",
     "cancel": "Cancelar",
     "save": "Guardar",
     "online": "En línea",
@@ -25,13 +26,9 @@
     "membersActivity": "Miembros",
     "moreFields": "Más Campos",
     "nameRequired": "Nombre requerido",
-    "close": "Cerrar"
-  },
-  "appRestart": {
-    "message": "La aplicación sera reiniciada para aplicar la siguiente configuración:",
-    "button": "De acuerdo",
-    "textDirection": "Dirección del texto",
-    "selectedLanguage": "Lenguaje seleccionado"
+    "close": "Cerrar",
+    "editComment": "Editar",
+    "deleteComment": "Eliminar"
   },
   "loginScreen": {
     "domain": {
@@ -121,6 +118,11 @@
     "groupName": {
       "label": "Nombre del Grupo",
       "error": "El nombre es requerido"
+    },
+    "fab": {
+      "quick_button_meeting_scheduled": "Reunión Programada",
+      "quick_button_meeting_postponed": "Reunión Pospuso",
+      "quick_button_meeting_complete": "Reunión Completa"
     }
   },
   "notificationsScreen": {
@@ -137,5 +139,11 @@
     "noGroupPlacheHolder": "No hay grupos disponibles actualmente.",
     "noGroupPlacheHolder1": "Es posible que haya habido un problema para obtenerlos de su sitio. Arrastre hacia abajo para intentar actualizar e intente nuevamente.",
     "noGroupPlacheHolderOffline": "Actualmente estás desconectado. Asegúrese de estar conectado a wifi o datos móviles para actualizar y obtener sus grupos."
+  },
+  "appRestart": {
+    "message": "La aplicación sera reiniciada para aplicar la siguiente configuración:",
+    "button": "De acuerdo",
+    "textDirection": "Dirección del texto",
+    "selectedLanguage": "Lenguaje seleccionado"
   }
 }