Merge branch 'main' into feature/offering

polito · Oct 11, 2023 · 446530b · 446530b
2 parents 9f2816b + 161a4d7
commit 446530b
Show file tree

Hide file tree

Showing 39 changed files with 1,093 additions and 316 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
       android:name=".MainApplication"

diff --git a/android/app/src/main/java/it/polito/students/MainActivity.java b/android/app/src/main/java/it/polito/students/MainActivity.java
@@ -7,6 +7,11 @@
 
 public class MainActivity extends ReactActivity {
 
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+      super.onCreate(null);
+  }
+
 //    @Override
 //    public void onConfigurationChanged(Configuration newConfig) {
 //        super.onConfigurationChanged(newConfig);

diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -8,12 +8,25 @@
     "title": "Agenda",
     "weeklyLayout": "Weekly layout"
   },
+  "bookingScreen": {
+    "barCodeTitle": "Barcode",
+    "cancelBooking": "Cancel booking",
+    "cancelBookingText": "Are you sure you want to cancel this booking?",
+    "cancelFeedback": "Booking canceled",
+    "checkIn": "Check-in",
+    "checkInFeedback": "Check in done!",
+    "checkLocationErrorFeedback": "You are not in the right place to check in the booking",
+    "locationType": {
+      "place": "Place",
+      "virtualPlace": "Link virtual place"
+    }
+  },
   "bookingsScreen": {
+    "emptyState": "You have no active bookings",
+    "newBooking": "New booking",
+    "sectionTitle": "Active",
     "title": "Bookings"
   },
-  "bookingScreen": {
-    "cancelFeedback": "Booking canceled"
-  },
   "colors": {
     "amber": "Amber",
     "blue": "Blue",
@@ -44,7 +57,6 @@
     },
     "faculty": "Faculty",
     "agent": "Agent",
-    "close": "Close",
     "all": "All",
     "department": "Department",
     "location": "Location",
@@ -63,6 +75,7 @@
     "cancel": "Cancel",
     "classroomsNotSpecified": "Classroom not specified",
     "cleanCourseFiles": "Remove all course files",
+    "close": "Close",
     "color": "Color",
     "comingSoon": "Coming soon",
     "confirm": "Confirm",
@@ -93,6 +106,8 @@
     "elementCount": "Element {{count}} of {{total}}",
     "email": "Email",
     "en": "English",
+    "enableLocationPermissionFeedback": "Enable location permission to complete the operation",
+    "enableLocationServiceFeedback": "Enable location service to complete the operation",
     "endRefresh": "Refresh completed",
     "error": "Error",
     "event": "Event",
@@ -125,13 +140,14 @@
     "minutes": "Minutes",
     "newItems": "New item",
     "newItems_plural": "New items",
+    "noInternet": "You are offline, some features may not be available",
     "notice": "Notice",
     "notice_plural": "Notices",
     "notifications": "Notifications",
-    "noInternet": "You are offline, some features may not be available",
     "of": "Of",
     "ok": "Ok",
     "open": "Open",
+    "openSettings": "Open settings",
     "openSource": "Open Source",
     "openedStatus": {
       "false": "Closed",
@@ -154,6 +170,7 @@
     "retract": "Retract",
     "roleCollaborator": "Collaborator",
     "roleHolder": "Holder",
+    "search": "Search",
     "selectAnOption": "Please select an option",
     "services": "Services",
     "somethingWentWrong": "Something went wrong, try again later",
@@ -181,15 +198,15 @@
     "visualization": "Visualization"
   },
   "contactsScreen": {
-    "title": "Contacts",
-    "emptyState": "No people found",
-    "search": "Search people",
-    "recentSearches": "Recent searches",
-    "recentSearch": "Recent search",
     "cancelRecentSearch": "Remove",
     "cancelRecentSearchText": "Remove recent search",
     "clearSearch": "Clear search",
-    "clearSearches": "Clear searches"
+    "clearSearches": "Clear searches",
+    "emptyState": "No people found",
+    "recentSearch": "Recent search",
+    "recentSearches": "Recent searches",
+    "search": "Search people",
+    "title": "Contacts"
   },
   "offeringScreen": {
     "title": "Offering",
@@ -313,7 +330,8 @@
     "fileDownloadFailed": "The download failed. Please try again later."
   },
   "courseVirtualClassroomScreen": {
-    "title": "Virtual classroom"
+    "title": "Virtual classroom",
+    "liveCta": "Join live streaming"
   },
   "coursesScreen": {
     "emptyState": "No courses available",
@@ -338,12 +356,12 @@
   },
   "examRequestScreen": {
     "error": "Fill in the text field before proceeding with the request",
-    "title": "You can ask the college chairman to take the exam before the actual delivery of the course",
-    "placeholder": "Explain why you need to take the exam early"
+    "placeholder": "Explain why you need to take the exam early",
+    "title": "You can ask the college chairman to take the exam before the actual delivery of the course"
   },
   "examScreen": {
-    "bookingEndsAt": "Booking ends on",
     "bookedCount": "Booked students",
+    "bookingEndsAt": "Booking ends on",
     "ctaBook": "Book exam",
     "ctaBookSuccess": "Exam booked",
     "ctaCancel": "Cancel booking",
@@ -399,7 +417,6 @@
     "authnError": "Authentication error",
     "authnErrorDescription": "The credentials you provided may be wrong.",
     "cta": "Login",
-    "ctaSuccessMessage": "Logged in",
     "forgotYourPassword": "Forgot your password?",
     "hidePassword": "Hide password",
     "passwordLabel": "Password",
@@ -410,19 +427,19 @@
     "usernameLabel": "Student ID",
     "usernameLabelAccessibility": "Enter your username here"
   },
+  "messageScreen": {
+    "backTitle": "Archive",
+    "sender": "Sender",
+    "title": "Message"
+  },
   "messagesScreen": {
-    "title": "Messages archive",
-    "unreadMessages": "Message ({{read}} of {{total}})",
-    "readNext": "Read next",
+    "empty": "You have no messages",
     "end": "End",
+    "readNext": "Read next",
     "sentAt": "Sent at",
-    "youHaveUnreadMessages": "You have {{total}} unread messages",
-    "empty": "You have no messages"
-  },
-  "messageScreen": {
-    "title": "Message",
-    "backTitle": "Archive",
-    "sender": "Sender"
+    "title": "Messages archive",
+    "unreadMessages": "Message ({{read}} of {{total}})",
+    "youHaveUnreadMessages": "You have {{total}} unread messages"
   },
   "messagingView": {
     "pickFile": "Pick file",

diff --git a/assets/translations/it.json b/assets/translations/it.json
@@ -8,12 +8,25 @@
     "title": "Agenda",
     "weeklyLayout": "Layout settimanale"
   },
+  "bookingScreen": {
+    "barCodeTitle": "Barcode",
+    "cancelBooking": "Annulla prenotazione",
+    "cancelBookingText": "Sei sicuro di voler annullare la prenotazione?",
+    "cancelFeedback": "Prenoazione annullata",
+    "checkIn": "Check-in",
+    "checkInFeedback": "Check in eseguito!",
+    "checkLocationErrorFeedback": "Sei troppo distante per effettuare il check-in della prenotazione",
+    "locationType": {
+      "place": "Luogo",
+      "virtualPlace": "Link sportello virtuale"
+    }
+  },
   "bookingsScreen": {
+    "emptyState": "Non hai prenotazioni attive",
+    "newBooking": "Nuova prenotazione",
+    "sectionTitle": "Attive",
     "title": "Prenotazioni"
   },
-  "bookingScreen": {
-    "cancelFeedback": "Prenoazione annullata"
-  },
   "colors": {
     "amber": "Ambra",
     "blue": "Blu",
@@ -94,6 +107,8 @@
     "elementCount": "Elemento {{count}} di {{total}}",
     "email": "Email",
     "en": "Inglese",
+    "enableLocationPermissionFeedback": "Abilita il servizio di geolocalizzazione",
+    "enableLocationServiceFeedback": "Attiva la geolocalizzazione per completare l'operazione",
     "endRefresh": "Caricamento terminato",
     "error": "Errore",
     "event": "Evento",
@@ -126,13 +141,14 @@
     "minutes": "Minuti",
     "newItems": "Nuovo elemento",
     "newItems_plural": "Nuovi elementi",
+    "noInternet": "Sei offline, alcune funzionalità potrebbero non essere disponibili",
     "notice": "Avviso",
     "notice_plural": "Avvisi",
     "notifications": "Notifiche",
-    "noInternet": "Sei offline, alcune funzionalità potrebbero non essere disponibili",
     "of": "Su",
     "ok": "Ok",
     "open": "Apri",
+    "openSettings": "Apri impostazioni",
     "openSource": "Open Source",
     "openedStatus": {
       "false": "Chiuso",
@@ -182,15 +198,15 @@
     "visualization": "Visualizzazione"
   },
   "contactsScreen": {
-    "title": "Contatti",
-    "emptyState": "Nessun contatto trovato",
-    "search": "Cerca contatti",
-    "recentSearches": "Ricerche recenti",
-    "recentSearch": "Ricerca recente",
     "cancelRecentSearch": "Rimuovi",
     "cancelRecentSearchText": "Rimuovi ricerca recente",
     "clearSearch": "Cancella ricerca",
-    "clearSearches": "Cancella ricerche"
+    "clearSearches": "Cancella ricerche",
+    "emptyState": "Nessun contatto trovato",
+    "recentSearch": "Ricerca recente",
+    "recentSearches": "Ricerche recenti",
+    "search": "Cerca contatti",
+    "title": "Contatti"
   },
   "offeringScreen": {
     "title": "Offerta formativa",
@@ -314,7 +330,8 @@
     "fileDownloadFailed": "C'è stato un errore durante il download del file. Riprova più tardi."
   },
   "courseVirtualClassroomScreen": {
-    "title": "Virtual classroom"
+    "title": "Virtual classroom",
+    "liveCta": "Collegati alla diretta"
   },
   "coursesScreen": {
     "emptyState": "Non ci sono corsi",
@@ -339,12 +356,12 @@
   },
   "examRequestScreen": {
     "error": "Compila il campo di testo prima di procedere con la richiesta",
-    "title": "Puoi chiedere al coordinatore del collegio di sostenere l'esame prima dell'effettiva erogazione del corso",
-    "placeholder": "Inserisci qui le motivazioni della richiesta di sostenere l'esame anticipatamente"
+    "placeholder": "Inserisci qui le motivazioni della richiesta di sostenere l'esame anticipatamente",
+    "title": "Puoi chiedere al coordinatore del collegio di sostenere l'esame prima dell'effettiva erogazione del corso"
   },
   "examScreen": {
-    "bookingEndsAt": "Prenotazione entro il",
     "bookedCount": "Studenti prenotati",
+    "bookingEndsAt": "Prenotazione entro il",
     "ctaBook": "Prenota appello",
     "ctaBookSuccess": "Appello prenotato",
     "ctaCancel": "Annulla prenotazione",
@@ -410,19 +427,19 @@
     "usernameLabel": "Matricola",
     "usernameLabelAccessibility": "Inserisci qui il tuo username"
   },
+  "messageScreen": {
+    "backTitle": "Archivio",
+    "sender": "Mittente",
+    "title": "Messaggio"
+  },
   "messagesScreen": {
-    "title": "Archivio messaggi",
-    "unreadMessages": "Messaggio ({{read}} di {{total}})",
-    "readNext": "Leggi il prossimo",
+    "empty": "Non ci sono messaggi",
     "end": "Fine",
+    "readNext": "Leggi il prossimo",
     "sentAt": "Inviato il",
-    "youHaveUnreadMessages": "Hai {{total}} messaggi non letti",
-    "empty": "Non ci sono messaggi"
-  },
-  "messageScreen": {
-    "title": "Messaggio",
-    "backTitle": "Archivio",
-    "sender": "Mittente"
+    "title": "Archivio messaggi",
+    "unreadMessages": "Messaggio ({{read}} di {{total}})",
+    "youHaveUnreadMessages": "Hai {{total}} messaggi non letti"
   },
   "messagingView": {
     "pickFile": "Scegli un file",

diff --git a/ios/Podfile b/ios/Podfile
@@ -68,6 +68,13 @@ target 'students' do
       end
     end
 
+    # NOTE: Change IPHONEOS_DEPLOYMENT_TARGET to 12.4.
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
+      end
+    end
+
     installer.pods_project.targets.each do |target|
       if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
         target.build_configurations.each do |config|

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -377,6 +377,8 @@ PODS:
     - React-Core
   - react-native-document-picker (8.1.3):
     - React-Core
+  - react-native-geolocation (3.1.0):
+    - React-Core
   - react-native-html-to-pdf (0.12.0):
     - React-Core
   - react-native-menu (0.7.3):
@@ -584,6 +586,7 @@ DEPENDENCIES:
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - react-native-document-picker (from `../node_modules/react-native-document-picker`)
+  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - react-native-html-to-pdf (from `../node_modules/react-native-html-to-pdf`)
   - "react-native-menu (from `../node_modules/@react-native-menu/menu`)"
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -692,6 +695,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/blur"
   react-native-document-picker:
     :path: "../node_modules/react-native-document-picker"
+  react-native-geolocation:
+    :path: "../node_modules/@react-native-community/geolocation"
   react-native-html-to-pdf:
     :path: "../node_modules/react-native-html-to-pdf"
   react-native-menu:
@@ -801,6 +806,7 @@ SPEC CHECKSUMS:
   react-native-blob-util: 4ec16cc21bfc8de8f0ddfd2c81ada00f8c34b646
   react-native-blur: 50c9feabacbc5f49b61337ebc32192c6be7ec3c3
   react-native-document-picker: 958e2bc82e128be69055be261aeac8d872c8d34c
+  react-native-geolocation: ef66fb798d96284c6043f0b16c15d9d1d4955db4
   react-native-html-to-pdf: 4c5c6e26819fe202971061594058877aa9b25265
   react-native-menu: 9d7d6f819cc7fa14a15cf86888c53f3240d86f1b
   react-native-netinfo: 6ac9bcc7c88dc51717bda3484eb99093acb755e0
@@ -843,6 +849,6 @@ SPEC CHECKSUMS:
   Yoga: 5b0304b3dbef2b52e078052138e23a19c7dacaef
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 5837a6025c6042666ee6190d3f2db640d7bfe133
+PODFILE CHECKSUM: 32f0f2e14a5758866a477e768725138610ebf80e
 
 COCOAPODS: 1.12.1