Introduce Sandy Welcome Screen
Summary:
Per title
~~Note: `useStore.tsx` is copied from D23783500 (e7fdd8332d). This should be merged correctly in case the diff is landed before.~~
Reviewed By: mweststrate
Differential Revision: D23784302
fbshipit-source-id: adb5678c1b2614e3af4278889529c3fa79335bef
This commit is contained in:
committed by
Facebook GitHub Bot
parent
93c897820b
commit
bfe76e54fe
@@ -45,6 +45,7 @@ export type Settings = {
|
|||||||
};
|
};
|
||||||
enableSandy: boolean;
|
enableSandy: boolean;
|
||||||
darkMode: boolean;
|
darkMode: boolean;
|
||||||
|
showWelcomeAtStartup: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type Action =
|
export type Action =
|
||||||
@@ -79,6 +80,7 @@ const initialState: Settings = {
|
|||||||
},
|
},
|
||||||
enableSandy: false,
|
enableSandy: false,
|
||||||
darkMode: false,
|
darkMode: false,
|
||||||
|
showWelcomeAtStartup: true,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function reducer(
|
export default function reducer(
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import {useDispatch, useStore} from '../utils/useStore';
|
|||||||
import {toggleLeftSidebarVisible} from '../reducers/application';
|
import {toggleLeftSidebarVisible} from '../reducers/application';
|
||||||
import {theme} from './theme';
|
import {theme} from './theme';
|
||||||
import SettingsSheet from '../chrome/SettingsSheet';
|
import SettingsSheet from '../chrome/SettingsSheet';
|
||||||
|
import WelcomeScreen from './WelcomeScreen';
|
||||||
|
|
||||||
const LeftRailContainer = styled(FlexColumn)({
|
const LeftRailContainer = styled(FlexColumn)({
|
||||||
background: theme.backgroundDefault,
|
background: theme.backgroundDefault,
|
||||||
@@ -119,11 +120,7 @@ export function LeftRail() {
|
|||||||
small
|
small
|
||||||
title="Setup Doctor"
|
title="Setup Doctor"
|
||||||
/>
|
/>
|
||||||
<LeftRailButton
|
<WelcomeScreenButton />
|
||||||
icon={<QuestionCircleOutlined />}
|
|
||||||
small
|
|
||||||
title="Help / Start Screen"
|
|
||||||
/>
|
|
||||||
<ShowSettingsButton />
|
<ShowSettingsButton />
|
||||||
<LeftRailButton
|
<LeftRailButton
|
||||||
icon={<BugOutlined />}
|
icon={<BugOutlined />}
|
||||||
@@ -180,3 +177,32 @@ function ShowSettingsButton() {
|
|||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function WelcomeScreenButton() {
|
||||||
|
const settings = useStore((state) => state.settingsState);
|
||||||
|
const showWelcomeScreenAtStartup = settings.showWelcomeAtStartup;
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const [visible, setVisible] = useState(showWelcomeScreenAtStartup);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<LeftRailButton
|
||||||
|
icon={<QuestionCircleOutlined />}
|
||||||
|
small
|
||||||
|
title="Help / Start Screen"
|
||||||
|
onClick={() => setVisible(true)}
|
||||||
|
/>
|
||||||
|
<WelcomeScreen
|
||||||
|
visible={visible}
|
||||||
|
onClose={() => setVisible(false)}
|
||||||
|
showAtStartup={showWelcomeScreenAtStartup}
|
||||||
|
onCheck={(value) =>
|
||||||
|
dispatch({
|
||||||
|
type: 'UPDATE_SETTINGS',
|
||||||
|
payload: {...settings, showWelcomeAtStartup: value},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
159
desktop/app/src/sandy-chrome/WelcomeScreen.tsx
Normal file
159
desktop/app/src/sandy-chrome/WelcomeScreen.tsx
Normal file
@@ -0,0 +1,159 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*
|
||||||
|
* @format
|
||||||
|
*/
|
||||||
|
|
||||||
|
import React, {cloneElement} from 'react';
|
||||||
|
import {styled, FlexRow, FlexColumn} from 'flipper';
|
||||||
|
import {Modal, Button, Image, Checkbox, Space, Typography} from 'antd';
|
||||||
|
import {
|
||||||
|
RocketOutlined,
|
||||||
|
AppstoreAddOutlined,
|
||||||
|
CodeOutlined,
|
||||||
|
BugOutlined,
|
||||||
|
} from '@ant-design/icons';
|
||||||
|
import {theme} from './theme';
|
||||||
|
|
||||||
|
const {Text, Title} = Typography;
|
||||||
|
|
||||||
|
import constants from '../fb-stubs/constants';
|
||||||
|
import isProduction from '../utils/isProduction';
|
||||||
|
import isHeadless from '../utils/isHeadless';
|
||||||
|
const {shell, remote} = !isHeadless()
|
||||||
|
? require('electron')
|
||||||
|
: {shell: undefined, remote: undefined};
|
||||||
|
|
||||||
|
const RowContainer = styled(FlexRow)({
|
||||||
|
alignItems: 'flex-start',
|
||||||
|
padding: `${theme.space.small}px`,
|
||||||
|
cursor: 'pointer',
|
||||||
|
'&:hover, &:focus, &:active': {
|
||||||
|
backgroundColor: theme.backgroundTransparentHover,
|
||||||
|
borderRadius: theme.borderRadius,
|
||||||
|
textDecoration: 'none',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
function Row(props: {
|
||||||
|
icon: React.ReactElement;
|
||||||
|
title: string;
|
||||||
|
subtitle: string;
|
||||||
|
onClick?: () => void;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<RowContainer onClick={props.onClick}>
|
||||||
|
<Space size="middle">
|
||||||
|
{cloneElement(props.icon, {
|
||||||
|
style: {fontSize: 36, color: theme.primaryColor},
|
||||||
|
})}
|
||||||
|
<FlexColumn>
|
||||||
|
<Title level={3} style={{color: theme.primaryColor}}>
|
||||||
|
{props.title}
|
||||||
|
</Title>
|
||||||
|
<Text type="secondary">{props.subtitle}</Text>
|
||||||
|
</FlexColumn>
|
||||||
|
</Space>
|
||||||
|
</RowContainer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const FooterContainer = styled(FlexRow)({
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
alignItems: 'center',
|
||||||
|
});
|
||||||
|
|
||||||
|
function WelcomeFooter({
|
||||||
|
onClose,
|
||||||
|
checked,
|
||||||
|
onCheck,
|
||||||
|
}: {
|
||||||
|
onClose: () => void;
|
||||||
|
checked: boolean;
|
||||||
|
onCheck: (value: boolean) => void;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<FooterContainer>
|
||||||
|
<Checkbox checked={checked} onChange={(e) => onCheck(e.target.checked)}>
|
||||||
|
<Text style={{fontSize: theme.fontSize.smallBody}}>
|
||||||
|
Show this when app opens (or use ? icon on left)
|
||||||
|
</Text>
|
||||||
|
</Checkbox>
|
||||||
|
<Button type="primary" onClick={onClose}>
|
||||||
|
Close
|
||||||
|
</Button>
|
||||||
|
</FooterContainer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const openExternal = (url: string) => () => shell && shell.openExternal(url);
|
||||||
|
|
||||||
|
export default function WelcomeScreen({
|
||||||
|
visible,
|
||||||
|
onClose,
|
||||||
|
showAtStartup,
|
||||||
|
onCheck,
|
||||||
|
}: {
|
||||||
|
visible: boolean;
|
||||||
|
onClose: () => void;
|
||||||
|
showAtStartup: boolean;
|
||||||
|
onCheck: (value: boolean) => void;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<Modal
|
||||||
|
closable={false}
|
||||||
|
visible={visible}
|
||||||
|
footer={
|
||||||
|
<WelcomeFooter
|
||||||
|
onClose={onClose}
|
||||||
|
checked={showAtStartup}
|
||||||
|
onCheck={onCheck}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
onCancel={onClose}>
|
||||||
|
<Space
|
||||||
|
direction="vertical"
|
||||||
|
size="middle"
|
||||||
|
style={{width: '100%', padding: '32px', alignItems: 'center'}}>
|
||||||
|
<Image width={125} height={125} src="./icon.png" preview={false} />
|
||||||
|
<Title level={1}>Welcome to Flipper</Title>
|
||||||
|
<Text style={{color: theme.textColorPlaceholder}}>
|
||||||
|
{isProduction() && remote
|
||||||
|
? `Version ${remote.app.getVersion()}`
|
||||||
|
: 'Development Mode'}
|
||||||
|
</Text>
|
||||||
|
</Space>
|
||||||
|
<Space direction="vertical" size="large" style={{width: '100%'}}>
|
||||||
|
<Row
|
||||||
|
icon={<RocketOutlined />}
|
||||||
|
title="Using Flipper"
|
||||||
|
subtitle="Learn how Flipper can help you debug your App"
|
||||||
|
onClick={openExternal('https://fbflipper.com/docs/features/index')}
|
||||||
|
/>
|
||||||
|
<Row
|
||||||
|
icon={<AppstoreAddOutlined />}
|
||||||
|
title="Create Your Own Plugin"
|
||||||
|
subtitle="Get started with these pointers"
|
||||||
|
onClick={openExternal('https://fbflipper.com/docs/tutorial/intro')}
|
||||||
|
/>
|
||||||
|
<Row
|
||||||
|
icon={<CodeOutlined />}
|
||||||
|
title="Add Flipper Support to Your App"
|
||||||
|
subtitle="Get started with these pointers"
|
||||||
|
onClick={openExternal(
|
||||||
|
'https://fbflipper.com/docs/getting-started/index',
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<Row
|
||||||
|
icon={<BugOutlined />}
|
||||||
|
title="Contributing and Feedback"
|
||||||
|
subtitle="Report issues and help us improve Flipper"
|
||||||
|
onClick={openExternal(constants.FEEDBACK_GROUP_LINK)}
|
||||||
|
/>
|
||||||
|
</Space>
|
||||||
|
</Modal>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -29,4 +29,7 @@ export const theme = {
|
|||||||
middle: 16,
|
middle: 16,
|
||||||
large: 24,
|
large: 24,
|
||||||
} as const,
|
} as const,
|
||||||
|
fontSize: {
|
||||||
|
smallBody: '12px',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user