Compare commits
2 commits
300558ac56
...
4d0df7a5b7
| Author | SHA1 | Date | |
|---|---|---|---|
|
4d0df7a5b7 | ||
|
|
b8e7272d2c |
11 changed files with 401 additions and 412 deletions
|
|
@ -22,7 +22,7 @@ import {TouchableRipple, useTheme} from 'react-native-paper';
|
|||
import {Dimensions, Image, View} from 'react-native';
|
||||
|
||||
type PropsType = {
|
||||
image: string;
|
||||
image?: string | number;
|
||||
isActive: boolean;
|
||||
onPress: () => void;
|
||||
};
|
||||
|
|
@ -51,13 +51,17 @@ function DashboardEditPreviewItem(props: PropsType) {
|
|||
width: itemSize,
|
||||
height: itemSize,
|
||||
}}>
|
||||
<Image
|
||||
source={{uri: props.image}}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
}}
|
||||
/>
|
||||
{props.image ? (
|
||||
<Image
|
||||
source={
|
||||
typeof props.image === 'string' ? {uri: props.image} : props.image
|
||||
}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
</View>
|
||||
</TouchableRipple>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -21,36 +21,22 @@ import * as React from 'react';
|
|||
import {Animated} from 'react-native';
|
||||
import {withTheme} from 'react-native-paper';
|
||||
import {Collapsible} from 'react-navigation-collapsible';
|
||||
import {StackNavigationProp} from '@react-navigation/stack';
|
||||
import TabIcon from './TabIcon';
|
||||
import TabHomeIcon from './TabHomeIcon';
|
||||
import {BottomTabBarProps} from '@react-navigation/bottom-tabs';
|
||||
import {NavigationState} from '@react-navigation/native';
|
||||
import {
|
||||
PartialState,
|
||||
Route,
|
||||
} from '@react-navigation/routers/lib/typescript/src/types';
|
||||
|
||||
type RouteType = {
|
||||
name: string;
|
||||
key: string;
|
||||
params: {collapsible: Collapsible};
|
||||
state: {
|
||||
index: number;
|
||||
routes: Array<RouteType>;
|
||||
};
|
||||
type RouteType = Route<string> & {
|
||||
state?: NavigationState | PartialState<NavigationState>;
|
||||
};
|
||||
|
||||
type PropsType = {
|
||||
state: {
|
||||
index: number;
|
||||
routes: Array<RouteType>;
|
||||
};
|
||||
descriptors: {
|
||||
[key: string]: {
|
||||
options: {
|
||||
tabBarLabel: string;
|
||||
title: string;
|
||||
};
|
||||
};
|
||||
};
|
||||
navigation: StackNavigationProp<any>;
|
||||
interface PropsType extends BottomTabBarProps {
|
||||
theme: ReactNativePaper.Theme;
|
||||
};
|
||||
}
|
||||
|
||||
type StateType = {
|
||||
translateY: any;
|
||||
|
|
@ -164,7 +150,7 @@ class CustomTabBar extends React.Component<PropsType, StateType> {
|
|||
onLongPress={onLongPress}
|
||||
icon={this.getTabBarIcon(route, isFocused)}
|
||||
color={color}
|
||||
label={label}
|
||||
label={label as string}
|
||||
focused={isFocused}
|
||||
extraData={state.index > index}
|
||||
key={route.key}
|
||||
|
|
@ -193,9 +179,12 @@ class CustomTabBar extends React.Component<PropsType, StateType> {
|
|||
if (isFocused) {
|
||||
const stackState = route.state;
|
||||
const stackRoute =
|
||||
stackState != null ? stackState.routes[stackState.index] : null;
|
||||
const params: {collapsible: Collapsible} | null =
|
||||
stackRoute != null ? stackRoute.params : null;
|
||||
stackState && stackState.index
|
||||
? stackState.routes[stackState.index]
|
||||
: null;
|
||||
const params: {collapsible: Collapsible} | null | undefined = stackRoute
|
||||
? (stackRoute.params as {collapsible: Collapsible})
|
||||
: null;
|
||||
const collapsible = params != null ? params.collapsible : null;
|
||||
if (collapsible != null) {
|
||||
this.setState({
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@
|
|||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
import * as React from 'react';
|
||||
import {createStackNavigator, TransitionPresets} from '@react-navigation/stack';
|
||||
import i18n from 'i18n-js';
|
||||
|
|
@ -40,18 +38,63 @@ import ClubListScreen from '../screens/Amicale/Clubs/ClubListScreen';
|
|||
import ClubAboutScreen from '../screens/Amicale/Clubs/ClubAboutScreen';
|
||||
import ClubDisplayScreen from '../screens/Amicale/Clubs/ClubDisplayScreen';
|
||||
import {
|
||||
createScreenCollapsibleStack,
|
||||
CreateScreenCollapsibleStack,
|
||||
getWebsiteStack,
|
||||
} from '../utils/CollapsibleUtils';
|
||||
import BugReportScreen from '../screens/Other/FeedbackScreen';
|
||||
import WebsiteScreen from '../screens/Services/WebsiteScreen';
|
||||
import EquipmentScreen from '../screens/Amicale/Equipment/EquipmentListScreen';
|
||||
import EquipmentScreen, {
|
||||
DeviceType,
|
||||
} from '../screens/Amicale/Equipment/EquipmentListScreen';
|
||||
import EquipmentLendScreen from '../screens/Amicale/Equipment/EquipmentRentScreen';
|
||||
import EquipmentConfirmScreen from '../screens/Amicale/Equipment/EquipmentConfirmScreen';
|
||||
import DashboardEditScreen from '../screens/Other/Settings/DashboardEditScreen';
|
||||
import GameStartScreen from '../screens/Game/screens/GameStartScreen';
|
||||
import ImageGalleryScreen from '../screens/Media/ImageGalleryScreen';
|
||||
|
||||
export enum MainRoutes {
|
||||
Main = 'main',
|
||||
Gallery = 'gallery',
|
||||
Settings = 'settings',
|
||||
DashboardEdit = 'dashboard-edit',
|
||||
About = 'about',
|
||||
Dependencies = 'dependencies',
|
||||
Debug = 'debug',
|
||||
GameStart = 'game-start',
|
||||
GameMain = 'game-main',
|
||||
Login = 'login',
|
||||
SelfMenu = 'self-menu',
|
||||
Proximo = 'proximo',
|
||||
ProximoList = 'proximo-list',
|
||||
ProximoAbout = 'proximo-about',
|
||||
Profile = 'profile',
|
||||
ClubList = 'club-list',
|
||||
ClubInformation = 'club-information',
|
||||
ClubAbout = 'club-about',
|
||||
EquipmentList = 'equipment-list',
|
||||
EquipmentRent = 'equipment-rent',
|
||||
EquipmentConfirm = 'equipment-confirm',
|
||||
Vote = 'vote',
|
||||
Feedback = 'feedback',
|
||||
}
|
||||
|
||||
type DefaultParams = {[key in MainRoutes]: object | undefined};
|
||||
|
||||
export interface FullParamsList extends DefaultParams {
|
||||
login: {nextScreen: string};
|
||||
'equipment-confirm': {
|
||||
item?: DeviceType;
|
||||
dates: [string, string];
|
||||
};
|
||||
'equipment-rent': {item?: DeviceType};
|
||||
gallery: {images: Array<{url: string}>};
|
||||
}
|
||||
|
||||
// Don't know why but TS is complaining without this
|
||||
// See: https://stackoverflow.com/questions/63652687/interface-does-not-satisfy-the-constraint-recordstring-object-undefined
|
||||
export type MainStackParamsList = FullParamsList &
|
||||
Record<string, object | undefined>;
|
||||
|
||||
const modalTransition =
|
||||
Platform.OS === 'ios'
|
||||
? TransitionPresets.ModalPresentationIOS
|
||||
|
|
@ -63,19 +106,17 @@ const defaultScreenOptions = {
|
|||
...TransitionPresets.SlideFromRightIOS,
|
||||
};
|
||||
|
||||
const MainStack = createStackNavigator();
|
||||
const MainStack = createStackNavigator<MainStackParamsList>();
|
||||
|
||||
function MainStackComponent(props: {
|
||||
createTabNavigator: () => React.Node,
|
||||
}): React.Node {
|
||||
function MainStackComponent(props: {createTabNavigator: () => JSX.Element}) {
|
||||
const {createTabNavigator} = props;
|
||||
return (
|
||||
<MainStack.Navigator
|
||||
initialRouteName="main"
|
||||
initialRouteName={MainRoutes.Main}
|
||||
headerMode="screen"
|
||||
screenOptions={defaultScreenOptions}>
|
||||
<MainStack.Screen
|
||||
name="main"
|
||||
name={MainRoutes.Main}
|
||||
component={createTabNavigator}
|
||||
options={{
|
||||
headerShown: false,
|
||||
|
|
@ -83,62 +124,62 @@ function MainStackComponent(props: {
|
|||
}}
|
||||
/>
|
||||
<MainStack.Screen
|
||||
name="gallery"
|
||||
name={MainRoutes.Gallery}
|
||||
component={ImageGalleryScreen}
|
||||
options={{
|
||||
headerShown: false,
|
||||
...modalTransition,
|
||||
}}
|
||||
/>
|
||||
{createScreenCollapsibleStack(
|
||||
'settings',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Settings,
|
||||
MainStack,
|
||||
SettingsScreen,
|
||||
i18n.t('screens.settings.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'dashboard-edit',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.DashboardEdit,
|
||||
MainStack,
|
||||
DashboardEditScreen,
|
||||
i18n.t('screens.settings.dashboardEdit.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'about',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.About,
|
||||
MainStack,
|
||||
AboutScreen,
|
||||
i18n.t('screens.about.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'dependencies',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Dependencies,
|
||||
MainStack,
|
||||
AboutDependenciesScreen,
|
||||
i18n.t('screens.about.libs'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'debug',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Debug,
|
||||
MainStack,
|
||||
DebugScreen,
|
||||
i18n.t('screens.about.debug'),
|
||||
)}
|
||||
|
||||
{createScreenCollapsibleStack(
|
||||
'game-start',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.GameStart,
|
||||
MainStack,
|
||||
GameStartScreen,
|
||||
i18n.t('screens.game.title'),
|
||||
true,
|
||||
null,
|
||||
undefined,
|
||||
'transparent',
|
||||
)}
|
||||
<MainStack.Screen
|
||||
name="game-main"
|
||||
name={MainRoutes.GameMain}
|
||||
component={GameMainScreen}
|
||||
options={{
|
||||
title: i18n.t('screens.game.title'),
|
||||
}}
|
||||
/>
|
||||
{createScreenCollapsibleStack(
|
||||
'login',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Login,
|
||||
MainStack,
|
||||
LoginScreen,
|
||||
i18n.t('screens.login.title'),
|
||||
|
|
@ -148,26 +189,26 @@ function MainStackComponent(props: {
|
|||
)}
|
||||
{getWebsiteStack('website', MainStack, WebsiteScreen, '')}
|
||||
|
||||
{createScreenCollapsibleStack(
|
||||
'self-menu',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.SelfMenu,
|
||||
MainStack,
|
||||
SelfMenuScreen,
|
||||
i18n.t('screens.menu.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'proximo',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Proximo,
|
||||
MainStack,
|
||||
ProximoMainScreen,
|
||||
i18n.t('screens.proximo.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'proximo-list',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.ProximoList,
|
||||
MainStack,
|
||||
ProximoListScreen,
|
||||
i18n.t('screens.proximo.articleList'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'proximo-about',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.ProximoAbout,
|
||||
MainStack,
|
||||
ProximoAboutScreen,
|
||||
i18n.t('screens.proximo.title'),
|
||||
|
|
@ -175,60 +216,60 @@ function MainStackComponent(props: {
|
|||
{...modalTransition},
|
||||
)}
|
||||
|
||||
{createScreenCollapsibleStack(
|
||||
'profile',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Profile,
|
||||
MainStack,
|
||||
ProfileScreen,
|
||||
i18n.t('screens.profile.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'club-list',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.ClubList,
|
||||
MainStack,
|
||||
ClubListScreen,
|
||||
i18n.t('screens.clubs.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'club-information',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.ClubInformation,
|
||||
MainStack,
|
||||
ClubDisplayScreen,
|
||||
i18n.t('screens.clubs.details'),
|
||||
true,
|
||||
{...modalTransition},
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'club-about',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.ClubAbout,
|
||||
MainStack,
|
||||
ClubAboutScreen,
|
||||
i18n.t('screens.clubs.title'),
|
||||
true,
|
||||
{...modalTransition},
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'equipment-list',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.EquipmentList,
|
||||
MainStack,
|
||||
EquipmentScreen,
|
||||
i18n.t('screens.equipment.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'equipment-rent',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.EquipmentRent,
|
||||
MainStack,
|
||||
EquipmentLendScreen,
|
||||
i18n.t('screens.equipment.book'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'equipment-confirm',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.EquipmentConfirm,
|
||||
MainStack,
|
||||
EquipmentConfirmScreen,
|
||||
i18n.t('screens.equipment.confirm'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'vote',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Vote,
|
||||
MainStack,
|
||||
VoteScreen,
|
||||
i18n.t('screens.vote.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
'feedback',
|
||||
{CreateScreenCollapsibleStack(
|
||||
MainRoutes.Feedback,
|
||||
MainStack,
|
||||
BugReportScreen,
|
||||
i18n.t('screens.feedback.title'),
|
||||
|
|
@ -238,25 +279,10 @@ function MainStackComponent(props: {
|
|||
}
|
||||
|
||||
type PropsType = {
|
||||
defaultHomeRoute: string | null,
|
||||
// eslint-disable-next-line flowtype/no-weak-types
|
||||
defaultHomeData: {[key: string]: string},
|
||||
defaultHomeRoute: string | null;
|
||||
defaultHomeData: {[key: string]: string};
|
||||
};
|
||||
|
||||
export default class MainNavigator extends React.Component<PropsType> {
|
||||
createTabNavigator: () => React.Node;
|
||||
|
||||
constructor(props: PropsType) {
|
||||
super(props);
|
||||
this.createTabNavigator = (): React.Node => (
|
||||
<TabNavigator
|
||||
defaultHomeRoute={props.defaultHomeRoute}
|
||||
defaultHomeData={props.defaultHomeData}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
render(): React.Node {
|
||||
return <MainStackComponent createTabNavigator={this.createTabNavigator} />;
|
||||
}
|
||||
export default function MainNavigator(props: PropsType) {
|
||||
return <MainStackComponent createTabNavigator={() => TabNavigator(props)} />;
|
||||
}
|
||||
|
|
@ -17,8 +17,6 @@
|
|||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
import * as React from 'react';
|
||||
import {createStackNavigator, TransitionPresets} from '@react-navigation/stack';
|
||||
import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
|
||||
|
|
@ -44,7 +42,7 @@ import WebsitesHomeScreen from '../screens/Services/ServicesScreen';
|
|||
import ServicesSectionScreen from '../screens/Services/ServicesSectionScreen';
|
||||
import AmicaleContactScreen from '../screens/Amicale/AmicaleContactScreen';
|
||||
import {
|
||||
createScreenCollapsibleStack,
|
||||
CreateScreenCollapsibleStack,
|
||||
getWebsiteStack,
|
||||
} from '../utils/CollapsibleUtils';
|
||||
import Mascot, {MASCOT_STYLE} from '../components/Mascot/Mascot';
|
||||
|
|
@ -62,25 +60,25 @@ const defaultScreenOptions = {
|
|||
|
||||
const ServicesStack = createStackNavigator();
|
||||
|
||||
function ServicesStackComponent(): React.Node {
|
||||
function ServicesStackComponent() {
|
||||
return (
|
||||
<ServicesStack.Navigator
|
||||
initialRouteName="index"
|
||||
headerMode="screen"
|
||||
screenOptions={defaultScreenOptions}>
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'index',
|
||||
ServicesStack,
|
||||
WebsitesHomeScreen,
|
||||
i18n.t('screens.services.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'services-section',
|
||||
ServicesStack,
|
||||
ServicesSectionScreen,
|
||||
'SECTION',
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'amicale-contact',
|
||||
ServicesStack,
|
||||
AmicaleContactScreen,
|
||||
|
|
@ -92,19 +90,19 @@ function ServicesStackComponent(): React.Node {
|
|||
|
||||
const ProxiwashStack = createStackNavigator();
|
||||
|
||||
function ProxiwashStackComponent(): React.Node {
|
||||
function ProxiwashStackComponent() {
|
||||
return (
|
||||
<ProxiwashStack.Navigator
|
||||
initialRouteName="index"
|
||||
headerMode="screen"
|
||||
screenOptions={defaultScreenOptions}>
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'index',
|
||||
ProxiwashStack,
|
||||
ProxiwashScreen,
|
||||
i18n.t('screens.proxiwash.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'proxiwash-about',
|
||||
ProxiwashStack,
|
||||
ProxiwashAboutScreen,
|
||||
|
|
@ -116,7 +114,7 @@ function ProxiwashStackComponent(): React.Node {
|
|||
|
||||
const PlanningStack = createStackNavigator();
|
||||
|
||||
function PlanningStackComponent(): React.Node {
|
||||
function PlanningStackComponent() {
|
||||
return (
|
||||
<PlanningStack.Navigator
|
||||
initialRouteName="index"
|
||||
|
|
@ -127,7 +125,7 @@ function PlanningStackComponent(): React.Node {
|
|||
component={PlanningScreen}
|
||||
options={{title: i18n.t('screens.planning.title')}}
|
||||
/>
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'planning-information',
|
||||
PlanningStack,
|
||||
PlanningDisplayScreen,
|
||||
|
|
@ -142,10 +140,11 @@ const HomeStack = createStackNavigator();
|
|||
function HomeStackComponent(
|
||||
initialRoute: string | null,
|
||||
defaultData: {[key: string]: string},
|
||||
): React.Node {
|
||||
) {
|
||||
let params;
|
||||
if (initialRoute != null)
|
||||
if (initialRoute != null) {
|
||||
params = {data: defaultData, nextScreen: initialRoute, shouldOpen: true};
|
||||
}
|
||||
const {colors} = useTheme();
|
||||
return (
|
||||
<HomeStack.Navigator
|
||||
|
|
@ -161,7 +160,7 @@ function HomeStackComponent(
|
|||
headerStyle: {
|
||||
backgroundColor: colors.surface,
|
||||
},
|
||||
headerTitle: (): React.Node => (
|
||||
headerTitle: () => (
|
||||
<View style={{flexDirection: 'row'}}>
|
||||
<Mascot
|
||||
style={{
|
||||
|
|
@ -203,19 +202,19 @@ function HomeStackComponent(
|
|||
options={{title: i18n.t('screens.scanner.title')}}
|
||||
/>
|
||||
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'club-information',
|
||||
HomeStack,
|
||||
ClubDisplayScreen,
|
||||
i18n.t('screens.clubs.details'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'feed-information',
|
||||
HomeStack,
|
||||
FeedItemScreen,
|
||||
i18n.t('screens.home.feed'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'planning-information',
|
||||
HomeStack,
|
||||
PlanningDisplayScreen,
|
||||
|
|
@ -227,7 +226,7 @@ function HomeStackComponent(
|
|||
|
||||
const PlanexStack = createStackNavigator();
|
||||
|
||||
function PlanexStackComponent(): React.Node {
|
||||
function PlanexStackComponent() {
|
||||
return (
|
||||
<PlanexStack.Navigator
|
||||
initialRouteName="index"
|
||||
|
|
@ -239,7 +238,7 @@ function PlanexStackComponent(): React.Node {
|
|||
PlanexScreen,
|
||||
i18n.t('screens.planex.title'),
|
||||
)}
|
||||
{createScreenCollapsibleStack(
|
||||
{CreateScreenCollapsibleStack(
|
||||
'group-select',
|
||||
PlanexStack,
|
||||
GroupSelectionScreen,
|
||||
|
|
@ -252,60 +251,49 @@ function PlanexStackComponent(): React.Node {
|
|||
const Tab = createBottomTabNavigator();
|
||||
|
||||
type PropsType = {
|
||||
defaultHomeRoute: string | null,
|
||||
defaultHomeData: {[key: string]: string},
|
||||
defaultHomeRoute: string | null;
|
||||
defaultHomeData: {[key: string]: string};
|
||||
};
|
||||
|
||||
export default class TabNavigator extends React.Component<PropsType> {
|
||||
createHomeStackComponent: () => React.Node;
|
||||
|
||||
defaultRoute: string;
|
||||
|
||||
constructor(props: PropsType) {
|
||||
super(props);
|
||||
if (props.defaultHomeRoute != null) this.defaultRoute = 'home';
|
||||
else
|
||||
this.defaultRoute = AsyncStorageManager.getString(
|
||||
AsyncStorageManager.PREFERENCES.defaultStartScreen.key,
|
||||
).toLowerCase();
|
||||
this.createHomeStackComponent = (): React.Node =>
|
||||
HomeStackComponent(props.defaultHomeRoute, props.defaultHomeData);
|
||||
export default function TabNavigator(props: PropsType) {
|
||||
let defaultRoute = 'home';
|
||||
if (!props.defaultHomeRoute) {
|
||||
defaultRoute = AsyncStorageManager.getString(
|
||||
AsyncStorageManager.PREFERENCES.defaultStartScreen.key,
|
||||
).toLowerCase();
|
||||
}
|
||||
const createHomeStackComponent = () =>
|
||||
HomeStackComponent(props.defaultHomeRoute, props.defaultHomeData);
|
||||
|
||||
render(): React.Node {
|
||||
return (
|
||||
<Tab.Navigator
|
||||
initialRouteName={this.defaultRoute}
|
||||
// eslint-disable-next-line react/jsx-props-no-spreading
|
||||
tabBar={(props: {...}): React.Node => <CustomTabBar {...props} />}>
|
||||
<Tab.Screen
|
||||
name="services"
|
||||
option
|
||||
component={ServicesStackComponent}
|
||||
options={{title: i18n.t('screens.services.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="proxiwash"
|
||||
component={ProxiwashStackComponent}
|
||||
options={{title: i18n.t('screens.proxiwash.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="home"
|
||||
component={this.createHomeStackComponent}
|
||||
options={{title: i18n.t('screens.home.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="planning"
|
||||
component={PlanningStackComponent}
|
||||
options={{title: i18n.t('screens.planning.title')}}
|
||||
/>
|
||||
|
||||
<Tab.Screen
|
||||
name="planex"
|
||||
component={PlanexStackComponent}
|
||||
options={{title: i18n.t('screens.planex.title')}}
|
||||
/>
|
||||
</Tab.Navigator>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<Tab.Navigator
|
||||
initialRouteName={defaultRoute}
|
||||
tabBar={(tabProps) => <CustomTabBar {...tabProps} />}>
|
||||
<Tab.Screen
|
||||
name="services"
|
||||
component={ServicesStackComponent}
|
||||
options={{title: i18n.t('screens.services.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="proxiwash"
|
||||
component={ProxiwashStackComponent}
|
||||
options={{title: i18n.t('screens.proxiwash.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="home"
|
||||
component={createHomeStackComponent}
|
||||
options={{title: i18n.t('screens.home.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="planning"
|
||||
component={PlanningStackComponent}
|
||||
options={{title: i18n.t('screens.planning.title')}}
|
||||
/>
|
||||
<Tab.Screen
|
||||
name="planex"
|
||||
component={PlanexStackComponent}
|
||||
options={{title: i18n.t('screens.planex.title')}}
|
||||
/>
|
||||
</Tab.Navigator>
|
||||
);
|
||||
}
|
||||
|
|
@ -50,11 +50,11 @@ const LIST_ITEM_HEIGHT = 64;
|
|||
/**
|
||||
* Class defining a screen showing the list of libraries used by the app, taken from package.json
|
||||
*/
|
||||
export default class AboutDependenciesScreen extends React.Component<null> {
|
||||
export default class AboutDependenciesScreen extends React.Component<{}> {
|
||||
data: Array<ListItemType>;
|
||||
|
||||
constructor() {
|
||||
super(null);
|
||||
super({});
|
||||
this.data = generateListFromObject(packageJson.dependencies);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,12 +34,12 @@ type DatasetItemType = {
|
|||
/**
|
||||
* Class defining a planning event information page.
|
||||
*/
|
||||
class AmicaleContactScreen extends React.Component<null> {
|
||||
class AmicaleContactScreen extends React.Component<{}> {
|
||||
// Dataset containing information about contacts
|
||||
CONTACT_DATASET: Array<DatasetItemType>;
|
||||
|
||||
constructor() {
|
||||
super(null);
|
||||
super({});
|
||||
this.CONTACT_DATASET = [
|
||||
{
|
||||
name: i18n.t('screens.amicaleAbout.roles.interSchools'),
|
||||
|
|
|
|||
|
|
@ -1,179 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2019 - 2020 Arnaud Vergnet.
|
||||
*
|
||||
* This file is part of Campus INSAT.
|
||||
*
|
||||
* Campus INSAT is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Campus INSAT is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
import * as React from 'react';
|
||||
import {Avatar, Button, Card, Paragraph, withTheme} from 'react-native-paper';
|
||||
import i18n from 'i18n-js';
|
||||
import {Linking, View} from 'react-native';
|
||||
import CollapsibleScrollView from '../../components/Collapsible/CollapsibleScrollView';
|
||||
import type {CardTitleIconPropsType} from '../../constants/PaperStyles';
|
||||
|
||||
const links = {
|
||||
bugsGit: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/',
|
||||
trello: 'https://trello.com/b/RMej49Uq/application-campus-insa',
|
||||
facebook: 'https://www.facebook.com/campus.insat',
|
||||
feedbackMail: `mailto:app@amicale-insat.fr?subject=[FEEDBACK] Application CAMPUS
|
||||
&body=Coucou Arnaud j'ai du feedback\n\n\n\nBien cordialement.`,
|
||||
feedbackDiscord: 'https://discord.gg/W8MeTec',
|
||||
};
|
||||
|
||||
class FeedbackScreen extends React.Component<null> {
|
||||
/**
|
||||
* Gets link buttons
|
||||
*
|
||||
* @returns {*}
|
||||
*/
|
||||
static getButtons(isFeedback: boolean): React.Node {
|
||||
return (
|
||||
<Card.Actions
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
}}>
|
||||
{isFeedback ? (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
flexDirection: 'row',
|
||||
width: '100%',
|
||||
}}>
|
||||
<Button
|
||||
icon="email"
|
||||
mode="contained"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.feedbackMail);
|
||||
}}>
|
||||
MAIL
|
||||
</Button>
|
||||
<Button
|
||||
icon="facebook"
|
||||
mode="contained"
|
||||
color="#2e88fe"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.facebook);
|
||||
}}>
|
||||
Facebook
|
||||
</Button>
|
||||
<Button
|
||||
icon="discord"
|
||||
mode="contained"
|
||||
color="#7289da"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.feedbackDiscord);
|
||||
}}>
|
||||
Discord
|
||||
</Button>
|
||||
</View>
|
||||
) : (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
flexDirection: 'row',
|
||||
width: '100%',
|
||||
}}>
|
||||
<Button
|
||||
icon="git"
|
||||
mode="contained"
|
||||
color="#609927"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.bugsGit);
|
||||
}}>
|
||||
GITETUD
|
||||
</Button>
|
||||
<Button
|
||||
icon="calendar"
|
||||
mode="contained"
|
||||
color="#026AA7"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.trello);
|
||||
}}>
|
||||
TRELLO
|
||||
</Button>
|
||||
</View>
|
||||
)}
|
||||
</Card.Actions>
|
||||
);
|
||||
}
|
||||
|
||||
render(): React.Node {
|
||||
return (
|
||||
<CollapsibleScrollView style={{padding: 5}}>
|
||||
<Card>
|
||||
<Card.Title
|
||||
title={i18n.t('screens.feedback.feedback')}
|
||||
subtitle={i18n.t('screens.feedback.feedbackSubtitle')}
|
||||
left={(iconProps: CardTitleIconPropsType): React.Node => (
|
||||
<Avatar.Icon size={iconProps.size} icon="comment" />
|
||||
)}
|
||||
/>
|
||||
<Card.Content>
|
||||
<Paragraph>
|
||||
{i18n.t('screens.feedback.feedbackDescription')}
|
||||
</Paragraph>
|
||||
</Card.Content>
|
||||
{FeedbackScreen.getButtons(true)}
|
||||
<Card.Title
|
||||
title={i18n.t('screens.feedback.contribute')}
|
||||
subtitle={i18n.t('screens.feedback.contributeSubtitle')}
|
||||
left={(iconProps: CardTitleIconPropsType): React.Node => (
|
||||
<Avatar.Icon size={iconProps.size} icon="handshake" />
|
||||
)}
|
||||
/>
|
||||
<Card.Content>
|
||||
<Paragraph>
|
||||
{i18n.t('screens.feedback.contributeDescription')}
|
||||
</Paragraph>
|
||||
</Card.Content>
|
||||
{FeedbackScreen.getButtons(false)}
|
||||
</Card>
|
||||
</CollapsibleScrollView>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default withTheme(FeedbackScreen);
|
||||
169
src/screens/Other/FeedbackScreen.tsx
Normal file
169
src/screens/Other/FeedbackScreen.tsx
Normal file
|
|
@ -0,0 +1,169 @@
|
|||
/*
|
||||
* Copyright (c) 2019 - 2020 Arnaud Vergnet.
|
||||
*
|
||||
* This file is part of Campus INSAT.
|
||||
*
|
||||
* Campus INSAT is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Campus INSAT is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import * as React from 'react';
|
||||
import {Avatar, Button, Card, Paragraph, withTheme} from 'react-native-paper';
|
||||
import i18n from 'i18n-js';
|
||||
import {Linking, View} from 'react-native';
|
||||
import CollapsibleScrollView from '../../components/Collapsible/CollapsibleScrollView';
|
||||
|
||||
const links = {
|
||||
bugsGit: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/',
|
||||
trello: 'https://trello.com/b/RMej49Uq/application-campus-insa',
|
||||
facebook: 'https://www.facebook.com/campus.insat',
|
||||
feedbackMail: `mailto:app@amicale-insat.fr?subject=[FEEDBACK] Application CAMPUS
|
||||
&body=Coucou Arnaud j'ai du feedback\n\n\n\nBien cordialement.`,
|
||||
feedbackDiscord: 'https://discord.gg/W8MeTec',
|
||||
};
|
||||
|
||||
function getButtons(isFeedback: boolean) {
|
||||
return (
|
||||
<Card.Actions
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
}}>
|
||||
{isFeedback ? (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
flexDirection: 'row',
|
||||
width: '100%',
|
||||
}}>
|
||||
<Button
|
||||
icon="email"
|
||||
mode="contained"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.feedbackMail);
|
||||
}}>
|
||||
MAIL
|
||||
</Button>
|
||||
<Button
|
||||
icon="facebook"
|
||||
mode="contained"
|
||||
color="#2e88fe"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.facebook);
|
||||
}}>
|
||||
Facebook
|
||||
</Button>
|
||||
<Button
|
||||
icon="discord"
|
||||
mode="contained"
|
||||
color="#7289da"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.feedbackDiscord);
|
||||
}}>
|
||||
Discord
|
||||
</Button>
|
||||
</View>
|
||||
) : (
|
||||
<View
|
||||
style={{
|
||||
flex: 1,
|
||||
flexWrap: 'wrap',
|
||||
flexDirection: 'row',
|
||||
width: '100%',
|
||||
}}>
|
||||
<Button
|
||||
icon="git"
|
||||
mode="contained"
|
||||
color="#609927"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.bugsGit);
|
||||
}}>
|
||||
GITETUD
|
||||
</Button>
|
||||
<Button
|
||||
icon="calendar"
|
||||
mode="contained"
|
||||
color="#026AA7"
|
||||
style={{
|
||||
marginLeft: 'auto',
|
||||
marginRight: 'auto',
|
||||
marginTop: 5,
|
||||
}}
|
||||
onPress={() => {
|
||||
Linking.openURL(links.trello);
|
||||
}}>
|
||||
TRELLO
|
||||
</Button>
|
||||
</View>
|
||||
)}
|
||||
</Card.Actions>
|
||||
);
|
||||
}
|
||||
|
||||
function FeedbackScreen() {
|
||||
return (
|
||||
<CollapsibleScrollView style={{padding: 5}}>
|
||||
<Card>
|
||||
<Card.Title
|
||||
title={i18n.t('screens.feedback.feedback')}
|
||||
subtitle={i18n.t('screens.feedback.feedbackSubtitle')}
|
||||
left={(iconProps) => (
|
||||
<Avatar.Icon size={iconProps.size} icon="comment" />
|
||||
)}
|
||||
/>
|
||||
<Card.Content>
|
||||
<Paragraph>
|
||||
{i18n.t('screens.feedback.feedbackDescription')}
|
||||
</Paragraph>
|
||||
</Card.Content>
|
||||
{getButtons(true)}
|
||||
<Card.Title
|
||||
title={i18n.t('screens.feedback.contribute')}
|
||||
subtitle={i18n.t('screens.feedback.contributeSubtitle')}
|
||||
left={(iconProps) => (
|
||||
<Avatar.Icon size={iconProps.size} icon="handshake" />
|
||||
)}
|
||||
/>
|
||||
<Card.Content>
|
||||
<Paragraph>
|
||||
{i18n.t('screens.feedback.contributeDescription')}
|
||||
</Paragraph>
|
||||
</Card.Content>
|
||||
{getButtons(false)}
|
||||
</Card>
|
||||
</CollapsibleScrollView>
|
||||
);
|
||||
}
|
||||
|
||||
export default withTheme(FeedbackScreen);
|
||||
|
|
@ -17,11 +17,9 @@
|
|||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
import * as React from 'react';
|
||||
import {StackNavigationProp} from '@react-navigation/stack';
|
||||
import {Button, Card, Paragraph, withTheme} from 'react-native-paper';
|
||||
import {Button, Card, Paragraph} from 'react-native-paper';
|
||||
import {FlatList} from 'react-native';
|
||||
import {View} from 'react-native-animatable';
|
||||
import i18n from 'i18n-js';
|
||||
|
|
@ -30,20 +28,19 @@ import type {
|
|||
ServiceItemType,
|
||||
} from '../../../managers/ServicesManager';
|
||||
import DashboardManager from '../../../managers/DashboardManager';
|
||||
import DashboardItem from '../../../components/Home/EventDashboardItem';
|
||||
import DashboardEditAccordion from '../../../components/Lists/DashboardEdit/DashboardEditAccordion';
|
||||
import DashboardEditPreviewItem from '../../../components/Lists/DashboardEdit/DashboardEditPreviewItem';
|
||||
import AsyncStorageManager from '../../../managers/AsyncStorageManager';
|
||||
import CollapsibleFlatList from '../../../components/Collapsible/CollapsibleFlatList';
|
||||
|
||||
type PropsType = {
|
||||
navigation: StackNavigationProp,
|
||||
navigation: StackNavigationProp<any>;
|
||||
};
|
||||
|
||||
type StateType = {
|
||||
currentDashboard: Array<ServiceItemType | null>,
|
||||
currentDashboardIdList: Array<string>,
|
||||
activeItem: number,
|
||||
currentDashboard: Array<ServiceItemType | null>;
|
||||
currentDashboardIdList: Array<string>;
|
||||
activeItem: number;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -75,13 +72,13 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
item,
|
||||
index,
|
||||
}: {
|
||||
item: DashboardItem,
|
||||
index: number,
|
||||
}): React.Node => {
|
||||
item: ServiceItemType | null;
|
||||
index: number;
|
||||
}) => {
|
||||
const {activeItem} = this.state;
|
||||
return (
|
||||
<DashboardEditPreviewItem
|
||||
image={item.image}
|
||||
image={item?.image}
|
||||
onPress={() => {
|
||||
this.setState({activeItem: index});
|
||||
}}
|
||||
|
|
@ -90,7 +87,7 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
);
|
||||
};
|
||||
|
||||
getDashboard(content: Array<DashboardItem>): React.Node {
|
||||
getDashboard(content: Array<ServiceItemType | null>) {
|
||||
return (
|
||||
<FlatList
|
||||
data={content}
|
||||
|
|
@ -106,7 +103,7 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
);
|
||||
}
|
||||
|
||||
getRenderItem = ({item}: {item: ServiceCategoryType}): React.Node => {
|
||||
getRenderItem = ({item}: {item: ServiceCategoryType}) => {
|
||||
const {currentDashboardIdList} = this.state;
|
||||
return (
|
||||
<DashboardEditAccordion
|
||||
|
|
@ -117,7 +114,7 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
);
|
||||
};
|
||||
|
||||
getListHeader(): React.Node {
|
||||
getListHeader() {
|
||||
const {currentDashboard} = this.state;
|
||||
return (
|
||||
<Card style={{margin: 5}}>
|
||||
|
|
@ -170,7 +167,7 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
);
|
||||
};
|
||||
|
||||
render(): React.Node {
|
||||
render() {
|
||||
return (
|
||||
<CollapsibleFlatList
|
||||
data={this.content}
|
||||
|
|
@ -182,4 +179,4 @@ class DashboardEditScreen extends React.Component<PropsType, StateType> {
|
|||
}
|
||||
}
|
||||
|
||||
export default withTheme(DashboardEditScreen);
|
||||
export default DashboardEditScreen;
|
||||
|
|
@ -17,8 +17,6 @@
|
|||
* along with Campus INSAT. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
import * as React from 'react';
|
||||
import {View} from 'react-native';
|
||||
import i18n from 'i18n-js';
|
||||
|
|
@ -32,24 +30,22 @@ import {
|
|||
} from 'react-native-paper';
|
||||
import {Appearance} from 'react-native-appearance';
|
||||
import {StackNavigationProp} from '@react-navigation/stack';
|
||||
import type {CustomThemeType} from '../../../managers/ThemeManager';
|
||||
import ThemeManager from '../../../managers/ThemeManager';
|
||||
import AsyncStorageManager from '../../../managers/AsyncStorageManager';
|
||||
import CustomSlider from '../../../components/Overrides/CustomSlider';
|
||||
import CollapsibleScrollView from '../../../components/Collapsible/CollapsibleScrollView';
|
||||
import type {ListIconPropsType} from '../../../constants/PaperStyles';
|
||||
|
||||
type PropsType = {
|
||||
navigation: StackNavigationProp,
|
||||
theme: CustomThemeType,
|
||||
navigation: StackNavigationProp<any>;
|
||||
theme: ReactNativePaper.Theme;
|
||||
};
|
||||
|
||||
type StateType = {
|
||||
nightMode: boolean,
|
||||
nightModeFollowSystem: boolean,
|
||||
startScreenPickerSelected: string,
|
||||
selectedWash: string,
|
||||
isDebugUnlocked: boolean,
|
||||
nightMode: boolean;
|
||||
nightModeFollowSystem: boolean;
|
||||
startScreenPickerSelected: string;
|
||||
selectedWash: string;
|
||||
isDebugUnlocked: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -61,14 +57,15 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
/**
|
||||
* Loads user preferences into state
|
||||
*/
|
||||
constructor() {
|
||||
super();
|
||||
constructor(props: PropsType) {
|
||||
super(props);
|
||||
const notifReminder = AsyncStorageManager.getString(
|
||||
AsyncStorageManager.PREFERENCES.proxiwashNotifications.key,
|
||||
);
|
||||
this.savedNotificationReminder = parseInt(notifReminder, 10);
|
||||
if (Number.isNaN(this.savedNotificationReminder))
|
||||
if (Number.isNaN(this.savedNotificationReminder)) {
|
||||
this.savedNotificationReminder = 0;
|
||||
}
|
||||
|
||||
this.state = {
|
||||
nightMode: ThemeManager.getNightMode(),
|
||||
|
|
@ -120,7 +117,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
*
|
||||
* @returns {React.Node}
|
||||
*/
|
||||
getProxiwashNotifPicker(): React.Node {
|
||||
getProxiwashNotifPicker() {
|
||||
const {theme} = this.props;
|
||||
return (
|
||||
<CustomSlider
|
||||
|
|
@ -141,7 +138,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
*
|
||||
* @returns {React.Node}
|
||||
*/
|
||||
getProxiwashChangePicker(): React.Node {
|
||||
getProxiwashChangePicker() {
|
||||
const {selectedWash} = this.state;
|
||||
return (
|
||||
<RadioButton.Group
|
||||
|
|
@ -164,7 +161,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
*
|
||||
* @returns {React.Node}
|
||||
*/
|
||||
getStartScreenPicker(): React.Node {
|
||||
getStartScreenPicker() {
|
||||
const {startScreenPickerSelected} = this.state;
|
||||
return (
|
||||
<ToggleButton.Row
|
||||
|
|
@ -220,17 +217,15 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
title: string,
|
||||
subtitle: string,
|
||||
state: boolean,
|
||||
): React.Node {
|
||||
) {
|
||||
return (
|
||||
<List.Item
|
||||
title={title}
|
||||
description={subtitle}
|
||||
left={(props: ListIconPropsType): React.Node => (
|
||||
left={(props) => (
|
||||
<List.Icon color={props.color} style={props.style} icon={icon} />
|
||||
)}
|
||||
right={(): React.Node => (
|
||||
<Switch value={state} onValueChange={onPressCallback} />
|
||||
)}
|
||||
right={() => <Switch value={state} onValueChange={onPressCallback} />}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
@ -241,7 +236,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
title: string,
|
||||
subtitle: string,
|
||||
onLongPress?: () => void,
|
||||
): React.Node {
|
||||
) {
|
||||
const {navigation} = this.props;
|
||||
return (
|
||||
<List.Item
|
||||
|
|
@ -250,10 +245,10 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
onPress={() => {
|
||||
navigation.navigate(route);
|
||||
}}
|
||||
left={(props: ListIconPropsType): React.Node => (
|
||||
left={(props) => (
|
||||
<List.Icon color={props.color} style={props.style} icon={icon} />
|
||||
)}
|
||||
right={(props: ListIconPropsType): React.Node => (
|
||||
right={(props) => (
|
||||
<List.Icon
|
||||
color={props.color}
|
||||
style={props.style}
|
||||
|
|
@ -291,7 +286,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
);
|
||||
};
|
||||
|
||||
render(): React.Node {
|
||||
render() {
|
||||
const {nightModeFollowSystem, nightMode, isDebugUnlocked} = this.state;
|
||||
return (
|
||||
<CollapsibleScrollView>
|
||||
|
|
@ -322,7 +317,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
<List.Item
|
||||
title={i18n.t('screens.settings.startScreen')}
|
||||
description={i18n.t('screens.settings.startScreenSub')}
|
||||
left={(props: ListIconPropsType): React.Node => (
|
||||
left={(props) => (
|
||||
<List.Icon
|
||||
color={props.color}
|
||||
style={props.style}
|
||||
|
|
@ -345,7 +340,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
<List.Item
|
||||
title={i18n.t('screens.settings.proxiwashNotifReminder')}
|
||||
description={i18n.t('screens.settings.proxiwashNotifReminderSub')}
|
||||
left={(props: ListIconPropsType): React.Node => (
|
||||
left={(props) => (
|
||||
<List.Icon
|
||||
color={props.color}
|
||||
style={props.style}
|
||||
|
|
@ -359,7 +354,7 @@ class SettingsScreen extends React.Component<PropsType, StateType> {
|
|||
<List.Item
|
||||
title={i18n.t('screens.settings.proxiwashChangeWash')}
|
||||
description={i18n.t('screens.settings.proxiwashChangeWashSub')}
|
||||
left={(props: ListIconPropsType): React.Node => (
|
||||
left={(props) => (
|
||||
<List.Icon
|
||||
color={props.color}
|
||||
style={props.style}
|
||||
|
|
@ -21,7 +21,7 @@ import * as React from 'react';
|
|||
import {useTheme} from 'react-native-paper';
|
||||
import {createCollapsibleStack} from 'react-navigation-collapsible';
|
||||
import StackNavigator, {StackNavigationOptions} from '@react-navigation/stack';
|
||||
import {StackNavigationState} from '@react-navigation/native';
|
||||
import {StackNavigationState, TypedNavigator} from '@react-navigation/native';
|
||||
import {StackNavigationEventMap} from '@react-navigation/stack/lib/typescript/src/types';
|
||||
|
||||
type StackNavigatorType = import('@react-navigation/native').TypedNavigator<
|
||||
|
|
@ -50,7 +50,7 @@ type StackNavigatorType = import('@react-navigation/native').TypedNavigator<
|
|||
*/
|
||||
export function CreateScreenCollapsibleStack(
|
||||
name: string,
|
||||
Stack: StackNavigatorType,
|
||||
Stack: TypedNavigator<any, any, any, any, any>,
|
||||
component: React.ComponentType<any>,
|
||||
title: string,
|
||||
useNativeDriver: boolean = true,
|
||||
|
|
@ -91,7 +91,7 @@ export function CreateScreenCollapsibleStack(
|
|||
*/
|
||||
export function getWebsiteStack(
|
||||
name: string,
|
||||
Stack: StackNavigatorType,
|
||||
Stack: TypedNavigator<any, any, any, any, any>,
|
||||
component: React.ComponentType<any>,
|
||||
title: string,
|
||||
) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue