From 2bcbe36f2f9e846c707b8f7c5d2fa82f60a5bb01 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Fri, 14 Aug 2020 17:45:49 +0200
Subject: [PATCH] Change mascot popup key

This will ensure old users will still see the popups, even if they dismissed the old banners.
---
 src/managers/AsyncStorageManager.js           | 36 +++++++++----------
 .../Amicale/Equipment/EquipmentListScreen.js  |  4 +--
 src/screens/Amicale/LoginScreen.js            |  6 ++--
 src/screens/Amicale/VoteScreen.js             |  4 +--
 src/screens/Game/screens/GameStartScreen.js   |  2 +-
 src/screens/Home/HomeScreen.js                |  2 +-
 src/screens/Planex/PlanexScreen.js            |  2 +-
 src/screens/Planning/PlanningScreen.js        |  2 +-
 src/screens/Proxiwash/ProxiwashScreen.js      |  2 +-
 src/screens/Services/ServicesScreen.js        |  2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/managers/AsyncStorageManager.js b/src/managers/AsyncStorageManager.js
index fc38060..f5bc046 100644
--- a/src/managers/AsyncStorageManager.js
+++ b/src/managers/AsyncStorageManager.js
@@ -41,40 +41,40 @@ export default class AsyncStorageManager {
       key: 'defaultStartScreen',
       default: 'home',
     },
-    servicesShowBanner: {
-      key: 'servicesShowBanner',
+    servicesShowMascot: {
+      key: 'servicesShowMascot',
       default: '1',
     },
-    proxiwashShowBanner: {
-      key: 'proxiwashShowBanner',
+    proxiwashShowMascot: {
+      key: 'proxiwashShowMascot',
       default: '1',
     },
-    homeShowBanner: {
-      key: 'homeShowBanner',
+    homeShowMascot: {
+      key: 'homeShowMascot',
       default: '1',
     },
-    eventsShowBanner: {
-      key: 'eventsShowBanner',
+    eventsShowMascot: {
+      key: 'eventsShowMascot',
       default: '1',
     },
-    planexShowBanner: {
-      key: 'planexShowBanner',
+    planexShowMascot: {
+      key: 'planexShowMascot',
       default: '1',
     },
-    loginShowBanner: {
-      key: 'loginShowBanner',
+    loginShowMascot: {
+      key: 'loginShowMascot',
       default: '1',
     },
-    voteShowBanner: {
-      key: 'voteShowBanner',
+    voteShowMascot: {
+      key: 'voteShowMascot',
       default: '1',
     },
-    equipmentShowBanner: {
-      key: 'equipmentShowBanner',
+    equipmentShowMascot: {
+      key: 'equipmentShowMascot',
       default: '1',
     },
-    gameStartShowBanner: {
-      key: 'gameStartShowBanner',
+    gameStartMascot: {
+      key: 'gameStartMascot',
       default: '1',
     },
     proxiwashWatchedMachines: {
diff --git a/src/screens/Amicale/Equipment/EquipmentListScreen.js b/src/screens/Amicale/Equipment/EquipmentListScreen.js
index ed91b12..118d860 100644
--- a/src/screens/Amicale/Equipment/EquipmentListScreen.js
+++ b/src/screens/Amicale/Equipment/EquipmentListScreen.js
@@ -49,7 +49,7 @@ class EquipmentListScreen extends React.Component<PropsType, StateType> {
     super(props);
     this.state = {
       mascotDialogVisible: AsyncStorageManager.getBool(
-        AsyncStorageManager.PREFERENCES.equipmentShowBanner.key,
+        AsyncStorageManager.PREFERENCES.equipmentShowMascot.key,
       ),
     };
     this.canRefresh = false;
@@ -141,7 +141,7 @@ class EquipmentListScreen extends React.Component<PropsType, StateType> {
 
   hideMascotDialog = () => {
     AsyncStorageManager.set(
-      AsyncStorageManager.PREFERENCES.equipmentShowBanner.key,
+      AsyncStorageManager.PREFERENCES.equipmentShowMascot.key,
       false,
     );
     this.setState({mascotDialogVisible: false});
diff --git a/src/screens/Amicale/LoginScreen.js b/src/screens/Amicale/LoginScreen.js
index d7fa50c..9a23715 100644
--- a/src/screens/Amicale/LoginScreen.js
+++ b/src/screens/Amicale/LoginScreen.js
@@ -91,7 +91,7 @@ class LoginScreen extends React.Component<PropsType, StateType> {
       dialogVisible: false,
       dialogError: 0,
       mascotDialogVisible: AsyncStorageManager.getBool(
-        AsyncStorageManager.PREFERENCES.loginShowBanner.key,
+        AsyncStorageManager.PREFERENCES.loginShowMascot.key,
       ),
     };
   }
@@ -293,7 +293,7 @@ class LoginScreen extends React.Component<PropsType, StateType> {
 
   hideMascotDialog = () => {
     AsyncStorageManager.set(
-      AsyncStorageManager.PREFERENCES.loginShowBanner.key,
+      AsyncStorageManager.PREFERENCES.loginShowMascot.key,
       false,
     );
     this.setState({mascotDialogVisible: false});
@@ -327,7 +327,7 @@ class LoginScreen extends React.Component<PropsType, StateType> {
     const {navigation} = this.props;
     // Do not show the home login banner again
     AsyncStorageManager.set(
-      AsyncStorageManager.PREFERENCES.homeShowBanner.key,
+      AsyncStorageManager.PREFERENCES.homeShowMascot.key,
       false,
     );
     if (this.nextScreen == null) navigation.goBack();
diff --git a/src/screens/Amicale/VoteScreen.js b/src/screens/Amicale/VoteScreen.js
index 817984d..6b11828 100644
--- a/src/screens/Amicale/VoteScreen.js
+++ b/src/screens/Amicale/VoteScreen.js
@@ -127,7 +127,7 @@ export default class VoteScreen extends React.Component<PropsType, StateType> {
     this.state = {
       hasVoted: false,
       mascotDialogVisible: AsyncStorageManager.getBool(
-        AsyncStorageManager.PREFERENCES.voteShowBanner.key,
+        AsyncStorageManager.PREFERENCES.voteShowMascot.key,
       ),
     };
     this.hasVoted = false;
@@ -309,7 +309,7 @@ export default class VoteScreen extends React.Component<PropsType, StateType> {
 
   hideMascotDialog = () => {
     AsyncStorageManager.set(
-      AsyncStorageManager.PREFERENCES.voteShowBanner.key,
+      AsyncStorageManager.PREFERENCES.voteShowMascot.key,
       false,
     );
     this.setState({mascotDialogVisible: false});
diff --git a/src/screens/Game/screens/GameStartScreen.js b/src/screens/Game/screens/GameStartScreen.js
index f80ba60..7e2ab61 100644
--- a/src/screens/Game/screens/GameStartScreen.js
+++ b/src/screens/Game/screens/GameStartScreen.js
@@ -420,7 +420,7 @@ class GameStartScreen extends React.Component<PropsType> {
           <CollapsibleScrollView>
             {this.getMainContent()}
             <MascotPopup
-              prefKey={AsyncStorageManager.PREFERENCES.gameStartShowBanner.key}
+              prefKey={AsyncStorageManager.PREFERENCES.gameStartMascot.key}
               title={i18n.t('screens.game.mascotDialog.title')}
               message={i18n.t('screens.game.mascotDialog.message')}
               icon="gamepad-variant"
diff --git a/src/screens/Home/HomeScreen.js b/src/screens/Home/HomeScreen.js
index 972529c..3ce42d7 100644
--- a/src/screens/Home/HomeScreen.js
+++ b/src/screens/Home/HomeScreen.js
@@ -488,7 +488,7 @@ class HomeScreen extends React.Component<PropsType, StateType> {
         </View>
         {!this.isLoggedIn ? (
           <MascotPopup
-            prefKey={AsyncStorageManager.PREFERENCES.homeShowBanner.key}
+            prefKey={AsyncStorageManager.PREFERENCES.homeShowMascot.key}
             title={i18n.t('screens.home.mascotDialog.title')}
             message={i18n.t('screens.home.mascotDialog.message')}
             icon="human-greeting"
diff --git a/src/screens/Planex/PlanexScreen.js b/src/screens/Planex/PlanexScreen.js
index 5e2b6c6..f8b9321 100644
--- a/src/screens/Planex/PlanexScreen.js
+++ b/src/screens/Planex/PlanexScreen.js
@@ -361,7 +361,7 @@ class PlanexScreen extends React.Component<PropsType, StateType> {
           AsyncStorageManager.PREFERENCES.defaultStartScreen.key,
         ).toLowerCase() !== 'planex' ? (
           <MascotPopup
-            prefKey={AsyncStorageManager.PREFERENCES.planexShowBanner.key}
+            prefKey={AsyncStorageManager.PREFERENCES.planexShowMascot.key}
             title={i18n.t('screens.planex.mascotDialog.title')}
             message={i18n.t('screens.planex.mascotDialog.message')}
             icon="emoticon-kiss"
diff --git a/src/screens/Planning/PlanningScreen.js b/src/screens/Planning/PlanningScreen.js
index dded013..94eeb31 100644
--- a/src/screens/Planning/PlanningScreen.js
+++ b/src/screens/Planning/PlanningScreen.js
@@ -262,7 +262,7 @@ class PlanningScreen extends React.Component<PropsType, StateType> {
           onRef={this.onAgendaRef}
         />
         <MascotPopup
-          prefKey={AsyncStorageManager.PREFERENCES.eventsShowBanner.key}
+          prefKey={AsyncStorageManager.PREFERENCES.eventsShowMascot.key}
           title={i18n.t('screens.planning.mascotDialog.title')}
           message={i18n.t('screens.planning.mascotDialog.message')}
           icon="party-popper"
diff --git a/src/screens/Proxiwash/ProxiwashScreen.js b/src/screens/Proxiwash/ProxiwashScreen.js
index 2cbb3c7..a6f21c1 100644
--- a/src/screens/Proxiwash/ProxiwashScreen.js
+++ b/src/screens/Proxiwash/ProxiwashScreen.js
@@ -457,7 +457,7 @@ class ProxiwashScreen extends React.Component<PropsType, StateType> {
           />
         </View>
         <MascotPopup
-          prefKey={AsyncStorageManager.PREFERENCES.proxiwashShowBanner.key}
+          prefKey={AsyncStorageManager.PREFERENCES.proxiwashShowMascot.key}
           title={i18n.t('screens.proxiwash.mascotDialog.title')}
           message={i18n.t('screens.proxiwash.mascotDialog.message')}
           icon="information"
diff --git a/src/screens/Services/ServicesScreen.js b/src/screens/Services/ServicesScreen.js
index c8081a5..ed370da 100644
--- a/src/screens/Services/ServicesScreen.js
+++ b/src/screens/Services/ServicesScreen.js
@@ -139,7 +139,7 @@ class ServicesScreen extends React.Component<PropsType> {
           hasTab
         />
         <MascotPopup
-          prefKey={AsyncStorageManager.PREFERENCES.servicesShowBanner.key}
+          prefKey={AsyncStorageManager.PREFERENCES.servicesShowMascot.key}
           title={i18n.t('screens.services.mascotDialog.title')}
           message={i18n.t('screens.services.mascotDialog.message')}
           icon="cloud-question"