Merge pull request #2884 from ChildMindInstitute/local_notifications

Local notifications

.gitignore

@@ -64,3 +64,4 @@ android/app/src/main/assets/index.android.bundle.meta
 # Bundle artifact
 *.jsbundle
 
+.vscode/*

CHANGELOG.md

@@ -4,6 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.21.60] - 2022-11-28
+- Bugfixes: 2541, 1781, Local notifications
+
 ## [0.21.59] - 2022-10-31
 - Bugfixes: 2842 (fix for iOS), 2834, 1064 
 

README.md

@@ -1,4 +1,4 @@
-# MindLogger 0.21.59
+# MindLogger 0.21.60
 
 _Note: v0.1 is deprecated as of June 12, 2019._
 

android/app/build.gradle

@@ -130,8 +130,8 @@ android {
         applicationId "lab.childmindinstitute.data"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 614
-        versionName "0.21.59"
+        versionCode 615
+        versionName "0.21.60"
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
     }

android/app/proguard-rules.pro

@@ -9,4 +9,5 @@
 
 # Add any project specific keep options here:
 -keep class io.invertase.firebase.** { *; }
+-keep class com.transistorsoft.rnbackgroundfetch.HeadlessTask { *; }
 -dontwarn io.invertase.firebase.**

android/build.gradle

@@ -40,6 +40,10 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
+        maven {
+            // react-native-background-fetch
+            url("${project(':react-native-background-fetch').projectDir}/libs")
+        }
 
         google()
         jcenter()

app/components/ActivityList/index.js

@@ -16,7 +16,7 @@ import {
   finishedEventsSelector,
 } from '../../state/app/app.selectors';
 import { activityAccessSelector } from '../../state/applets/applets.selectors';
-import { getSchedules, setReminder, cancelReminder } from '../../state/applets/applets.thunks';
+import { getSchedules } from '../../state/applets/applets.thunks';
 import { syncUploadQueue } from '../../state/app/app.thunks';
 import { setUpdatedTime, setAppStatus, setConnection } from '../../state/app/app.actions';
 import { setActivityFlows } from '../../state/activityFlows/activityFlows.actions';
@@ -35,8 +35,6 @@ const ActivityList = ({
   syncUploadQueue,
   appStatus,
   setConnection,
-  setReminder,
-  cancelReminder,
   scheduleUpdated,
   isConnected,
   setScheduleUpdated,
@@ -71,8 +69,6 @@ const ActivityList = ({
 
   const handleConnectivityChange = (connection) => {
     if (connection.isConnected) {
-      cancelReminder();
-
       if (!isConnected && !currentConnection) {
         currentConnection = true;
         setConnection(true);
@@ -81,7 +77,6 @@ const ActivityList = ({
     } else {
       currentConnection = false;
       setConnection(false);
-      setReminder();
     }
   }
 
@@ -148,7 +143,7 @@ const ActivityList = ({
         <ActivityListItem
           disabled={activity.status === 'scheduled' && !activity.event.data.timeout.access}
           onPress={() => onPressActivity(activity)}
-          onLongPress={() => onLongPressActivity(activity)}
+          //onLongPress={() => onLongPressActivity(activity)}
           activity={activity}
           applet={applet}
           orderIndex={orderIndex || {}}
@@ -159,7 +154,7 @@ const ActivityList = ({
       {prizeActivity && (
         <ActivityListItem
           onPress={() => onPressActivity(prizeActivity)}
-          onLongPress={() => onLongPressActivity(prizeActivity)}
+          //onLongPress={() => onLongPressActivity(prizeActivity)}
           activity={prizeActivity}
         />
       )}
@@ -184,9 +179,7 @@ ActivityList.propTypes = {
   setScheduleUpdated: PropTypes.func.isRequired,
   isConnected: PropTypes.bool.isRequired,
   scheduleUpdated: PropTypes.bool.isRequired,
-  syncUploadQueue: PropTypes.func.isRequired,
-  setReminder: PropTypes.func.isRequired,
-  cancelReminder: PropTypes.func.isRequired,
+  syncUploadQueue: PropTypes.func.isRequired
 };
 
 const mapStateToProps = (state) => {
@@ -213,8 +206,6 @@ const mapDispatchToProps = {
   setConnection,
   setScheduleUpdated,
   syncUploadQueue,
-  setReminder,
-  cancelReminder,
   setActivities,
 };