lpitault/application-amicale
1
0
Forkuj 0
sforkowany z vergnet/application-amicale
Kod Zgłoszenia Oczekujące zmiany Wydania Wiki Aktywność

Change mascot popup key

Przeglądaj źródła 
This will ensure old users will still see the popups, even if they dismissed the old banners.
This commit is contained in:
Arnaud Vergnet 2020-08-14 17:45:49 +02:00
rodzic faea54487a
commit 2bcbe36f2f
10 zmienionych plików z 31 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

36
src/managers/AsyncStorageManager.js
Wyświetl plik

@ -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: {

4
src/screens/Amicale/Equipment/EquipmentListScreen.js
Wyświetl plik

@ -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});

6
src/screens/Amicale/LoginScreen.js
Wyświetl plik

@ -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();

4
src/screens/Amicale/VoteScreen.js
Wyświetl plik

@ -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});

2
src/screens/Game/screens/GameStartScreen.js
Wyświetl plik

@ -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"

2
src/screens/Home/HomeScreen.js
Wyświetl plik

@ -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"

2
src/screens/Planex/PlanexScreen.js
Wyświetl plik

@ -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"

2
src/screens/Planning/PlanningScreen.js
Wyświetl plik

@ -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"

2
src/screens/Proxiwash/ProxiwashScreen.js
Wyświetl plik

@ -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"

2
src/screens/Services/ServicesScreen.js
Wyświetl plik

@ -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"