Skip to content

Consistent use of the word "percent" around the splash screen #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joeyballentine merged 1 commit into from
Jan 14, 2023
Merged

Consistent use of the word "percent" around the splash screen #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/renderer/components/chaiNNerLogo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface chaiNNerLogoProps {
percent?: number;
}

export const ChaiNNerLogo = memo(({ size = 1024, percent = 1 }: chaiNNerLogoProps) => (
export const ChaiNNerLogo = memo(({ size = 1024, percent = 100 }: chaiNNerLogoProps) => (
<Box
boxSize={size}
display="block"
Expand Down Expand Up @@ -74,7 +74,7 @@ export const ChaiNNerLogo = memo(({ size = 1024, percent = 1 }: chaiNNerLogoProp
strokeWidth: '24px',
stroke: 'var(--chakra-colors-red-600)',
strokeDasharray: 100,
strokeDashoffset: 100 * (1 - percent),
strokeDashoffset: 100 - percent,
transition: 'stroke-dashoffset ease-in-out 0.25s',
}}
/>
Expand Down
17 changes: 7 additions & 10 deletions src/renderer/splash.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,14 @@ const Splash = memo(() => {
const { t } = useTranslation();

const [status, setStatus] = useState(t('splash.loading', 'Loading...'));
const [progressPercentage, setProgressPercentage] = useState(0);
const [overallProgressPercentage, setOverallProgressPercentage] = useState(0);
const [showProgressBar, setShowProgressBar] = useState(false);
const [statusProgress, setStatusProgress] = useState<null | number>(null);
const [overallProgress, setOverallProgress] = useState(0);

// Register event listeners
useEffect(() => {
ipcRenderer.on('splash-setup-progress', (event, progress) => {
setOverallProgressPercentage(progress.totalProgress);

setShowProgressBar(progress.statusProgress > 0);
setProgressPercentage(progress.statusProgress);
setOverallProgress(progress.totalProgress);
setStatusProgress(progress.statusProgress > 0 ? progress.statusProgress : null);

if (progress.status) {
setStatus(progress.status);
Expand All @@ -44,7 +41,7 @@ const Splash = memo(() => {
>
<Center>
<ChaiNNerLogo
percent={overallProgressPercentage}
percent={overallProgress * 100}
size={256}
/>
</Center>
Expand All @@ -63,11 +60,11 @@ const Splash = memo(() => {
{status}
</Text>
</Center>
{showProgressBar && (
{statusProgress !== null && (
<Center>
<Progress
hasStripe
value={progressPercentage}
value={statusProgress * 100}
w="350px"
/>
</Center>
Expand Down