Skip to content

Commit 0aacdd5

Browse files
ReStartQReStartQ
committed
1.4.7
1 parent 0aaca90 commit 0aacdd5

File tree

13 files changed

+200
-72
lines changed

13 files changed

+200
-72
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changes
22

3+
## 1.4.7
4+
5+
- Redesigned the season search menu. The year select is now an input to allow for easier entry. Moved the search bar to the bottom. Colors were changed in the season search menu for the inputs and search.
6+
- Tooltips for top sidebar are now outlined blue to be a similar style with the rest of the app.
7+
38
## 1.4.6
49

510
- Advanced anime window now shows an info icon w/ tooltip showing number of episodes aired for currently releasing anime.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ You can download the app [here](https://github.com/ReStartQ/AniCour/releases). C
4949

5050
1. Download the setup file from the latest release and install it on your computer.
5151
2. The setup file is labeled as AniCour-Setup-x.x.x.exe, where x denotes a number for the version.
52-
<br/> **Ex: AniCour-Setup-1.4.6.exe**
52+
<br/> **Ex: AniCour-Setup-1.4.7.exe**
5353
3. When you run the exe file, Windows will give a message like below because there is no code signing certificate, click on "More info" <p align="center"><a href="#"><img src="https://github.com/ReStartQ/anicour/blob/main/images/help/AniCourNoCodeSigningInitial.png" alt="Hello" /></a></p>
5454
4. A new option will appear, "Run anyway". Click on it. <p align="center"><a href="#"><img src="https://github.com/ReStartQ/anicour/blob/main/images/help/AniCourNoCodeSigning.png" alt="Hello" /></a></p>
5555
5. The installer menu will open up to allow you to install it on your computer. <p align="center"><a href="#"><img src="https://github.com/ReStartQ/anicour/blob/main/images/help/AniCourInstallationMenu2.png" alt="Hello" /></a></p>

‎release/app/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎release/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "anicour",
3-
"version": "1.4.6",
3+
"version": "1.4.7",
44
"description": "Anime, Manga, and Light Novel Tracker Desktop Application for Windows. A fast and interactive way for AniList users to track and manage their anime/manga lists. ",
55
"license": "GPL-3.0",
66
"author": {

‎src/renderer/App.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ const Hello = () => {
480480
display: 'flex',
481481
ml: `${drawerWidth}px`,
482482
boxSizing: 'border-box',
483-
background: '#2E3B55', // original #2E3B55
483+
background: '#2E3B55', // original #2E3B55 #102a43 #486581
484484
}}
485485
>
486486
<Toolbar

‎src/renderer/components/app/etc/CustomTooltip1.tsx‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { styled } from '@mui/material';
2+
import Tooltip, { TooltipProps, tooltipClasses } from '@mui/material/Tooltip';
3+
4+
const HtmlTooltip = styled(({ className, ...props }: TooltipProps) => (
5+
// eslint-disable-next-line react/jsx-props-no-spreading
6+
<Tooltip {...props} classes={{ popper: className }} />
7+
))(({ theme }) => ({
8+
[`& .${tooltipClasses.tooltip}`]: {
9+
backgroundColor: '#0b0d0e',
10+
color: '#86b9db', // #86b9db
11+
fontSize: theme.typography.pxToRem(12),
12+
border: '1px solid #4383ce', // #4383ce
13+
},
14+
}));
15+
16+
export default HtmlTooltip;

‎src/renderer/components/app/news/NewsRefresh.tsx‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import RefreshIcon from '@mui/icons-material/Refresh';
2-
import { IconButton, ToggleButton, Tooltip } from '@mui/material';
2+
import { IconButton, ToggleButton, Tooltip, Typography } from '@mui/material';
33
import { useState } from 'react';
44
import { useNews } from 'renderer/context/NewsContext';
55
import { useNewsServiceType } from 'renderer/context/NewsServiceTypeContext';
66
import { useNewsQuery } from 'renderer/functions/NewsFunctions';
77
import isOnline from 'is-online';
8+
import HtmlTooltip from '../etc/CustomTooltip1';
89

910
export default function NewsRefresh({ props }: any) {
1011
const newsCards: any = useNews();
@@ -34,7 +35,16 @@ export default function NewsRefresh({ props }: any) {
3435
};
3536

3637
return (
37-
<Tooltip title="Refresh News" placement="top">
38+
<HtmlTooltip
39+
title={
40+
<>
41+
<Typography color="inherit" fontSize="14px">
42+
Refresh News
43+
</Typography>
44+
</>
45+
}
46+
placement="top"
47+
>
3848
<ToggleButton
3949
value="right"
4050
aria-label="right aligned"
@@ -43,6 +53,6 @@ export default function NewsRefresh({ props }: any) {
4353
>
4454
<RefreshIcon />
4555
</ToggleButton>
46-
</Tooltip>
56+
</HtmlTooltip>
4757
);
4858
}

‎src/renderer/components/app/search/FilterSelect.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import * as React from 'react';
2-
import IconButton from '@mui/material/IconButton';
32
import Menu from '@mui/material/Menu';
43
import MenuItem from '@mui/material/MenuItem';
54
import MoreVertIcon from '@mui/icons-material/MoreVert';
65
import FilterAltIcon from '@mui/icons-material/FilterAlt';
76
import FilterListIcon from '@mui/icons-material/FilterList';
87
import { useAtom } from 'jotai';
98
import { filterTypeAtom } from 'renderer/store';
10-
import { Box } from '@mui/material';
9+
import { Box, IconButton } from '@mui/material';
1110
import { useSidebarButton } from 'renderer/context/SidebarContext';
1211
import { Tooltip } from '@mui/joy';
1312
import { StyledMenu } from '../styled/StyledComponents';

‎src/renderer/components/app/seasons/SeasonSearch.tsx‎

Lines changed: 75 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import SearchIcon from '@mui/icons-material/Search';
2+
import { KeyboardArrowDown } from '@mui/icons-material';
23
import {
3-
Button,
44
FormControl,
5+
FormLabel,
6+
Input,
7+
Select,
8+
Option,
9+
Box,
10+
Button,
511
IconButton,
6-
InputLabel,
7-
NativeSelect,
8-
} from '@mui/material';
9-
import Box from '@mui/material/Box';
12+
} from '@mui/joy';
13+
import { InputLabel, NativeSelect, Typography } from '@mui/material';
1014
import { useState } from 'react';
1115
import { useSeasonInput } from 'renderer/context/SeasonInputContext';
1216

@@ -32,6 +36,7 @@ export default function SeasonSearch({ props }: any) {
3236
seasonInput.seasonInput[1],
3337
]);
3438
*/
39+
console.log('change');
3540
setMySeason(event.target.value);
3641
};
3742

@@ -42,23 +47,28 @@ export default function SeasonSearch({ props }: any) {
4247
event.target.value,
4348
]);
4449
*/
45-
setMyYear(event.target.value);
50+
console.log(`change year${event.target.value}`);
51+
if (event.target.value > currentYear + 1) {
52+
setMyYear(currentYear + 1);
53+
} else {
54+
setMyYear(event.target.value);
55+
}
4656
};
4757

4858
const handleOnClick = () => {
4959
if (
5060
mySeason !== seasonInput.seasonInput[0] ||
5161
myYear !== seasonInput.seasonInput[1]
5262
) {
53-
seasonInput.setSeasonInput([mySeason, myYear]);
63+
if (myYear < 1960) {
64+
setMyYear(currentYear);
65+
seasonInput.setSeasonInput([mySeason, currentYear]);
66+
} else {
67+
seasonInput.setSeasonInput([mySeason, myYear]);
68+
}
5469
}
5570
};
5671

57-
const handleKeyboard = (e: any) => {
58-
console.log(e.key);
59-
// e.preventDefault();
60-
};
61-
6272
return (
6373
<Box
6474
display="flex"
@@ -68,23 +78,30 @@ export default function SeasonSearch({ props }: any) {
6878
flexWrap="wrap"
6979
gap="10px"
7080
my="10px"
71-
ml="10px"
81+
mx="5px"
7282
>
73-
<FormControl sx={{ flexBasis: '42%' }}>
74-
<InputLabel
75-
variant="standard"
76-
htmlFor="uncontrolled-nativeSeasonSelect"
77-
>
78-
Season
79-
</InputLabel>
83+
<FormControl>
84+
<FormLabel>Season</FormLabel>
8085
<NativeSelect
8186
value={mySeason}
8287
inputProps={{
8388
name: 'Season',
8489
id: 'uncontrolled-nativeSeasonSelect',
8590
}}
91+
sx={{
92+
border: '1px solid #03a9f4',
93+
borderRadius: '5px',
94+
mt: '1px',
95+
pl: '10px',
96+
pr: '10px',
97+
color: ' #81d4fa',
98+
'&:hover': {
99+
backgroundColor: '#1F242F',
100+
},
101+
backgroundColor: '#0b0d0e',
102+
}}
103+
disableUnderline
86104
onChange={handleChange}
87-
onKeyDown={handleKeyboard}
88105
>
89106
<option value="WINTER" key="WINTER">
90107
Winter
@@ -100,41 +117,50 @@ export default function SeasonSearch({ props }: any) {
100117
</option>
101118
</NativeSelect>
102119
</FormControl>
103-
<FormControl sx={{ flexBasis: '30%' }}>
104-
<InputLabel variant="standard" htmlFor="uncontrolled-nativeYearSelect">
105-
Year
106-
</InputLabel>
107-
<NativeSelect
120+
<FormControl>
121+
<FormLabel>Year</FormLabel>
122+
<Input
123+
variant="outlined"
124+
color="primary"
125+
size="md"
126+
type="number"
108127
value={myYear}
109-
inputProps={{
110-
name: 'Year',
111-
id: 'uncontrolled-nativeYearSelect',
112-
}}
113128
onChange={handleChange2}
114-
onKeyDown={handleKeyboard}
115-
>
116-
{years.map((year: any) => {
117-
return (
118-
<option value={year} key={year}>
119-
{year}
120-
</option>
121-
);
122-
})}
123-
</NativeSelect>
129+
onKeyDown={(evt) =>
130+
['e', 'E', '+', '-', '.'].includes(evt.key) && evt.preventDefault()
131+
}
132+
sx={{ width: '90px' }}
133+
slotProps={{
134+
input: {
135+
pattern: '[0-9]',
136+
min: 1960,
137+
max: currentYear + 1,
138+
step: 1,
139+
},
140+
}}
141+
/>
124142
</FormControl>
125-
<IconButton
143+
<Button
144+
onClick={handleOnClick}
145+
size="sm"
146+
color="primary"
147+
fullWidth
126148
sx={{
127-
flexBasis: '15%',
149+
px: '2px',
150+
// height: '28px',
151+
// width: '28px',
152+
mx: '12px',
128153
alignSelf: 'flex-end',
129-
borderRadius: 1,
130-
backgroundColor: '#1873CC',
131-
':hover': { backgroundColor: 'dodgerblue' },
154+
mb: '2px',
155+
'&:hover': {
156+
backgroundColor: '#213963', // #1F242F
157+
},
158+
backgroundColor: '#142543',
132159
}}
133-
onClick={handleOnClick}
134-
size="small"
160+
variant="soft"
135161
>
136-
<SearchIcon fontSize="medium" />
137-
</IconButton>
162+
<Typography fontSize="16px">Search</Typography>
163+
</Button>
138164
</Box>
139165
);
140166
}

‎src/renderer/components/app/sidebar/FeatureButtonGroup.tsx‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import { useEffect, useState } from 'react';
22
import CachedIcon from '@mui/icons-material/Cached';
33
import SettingsIcon from '@mui/icons-material/Settings';
44
import HistoryIcon from '@mui/icons-material/History';
5-
import { ToggleButton, ToggleButtonGroup, Tooltip } from '@mui/material';
5+
import {
6+
ToggleButton,
7+
ToggleButtonGroup,
8+
Tooltip,
9+
Typography,
10+
} from '@mui/material';
611
import { useMainMediaList } from 'renderer/functions/MainMediaListFunctions';
712
import { useAniListToken } from 'renderer/context/services/AniListTokenContext';
813
import { useAniListUsername } from 'renderer/context/services/AniListUsernameContext';
@@ -18,6 +23,7 @@ import { useQueryClient } from '@tanstack/react-query';
1823
import { useAdvancedMedia } from 'renderer/context/advanced/AdvancedMediaContext';
1924
import { getTitle } from 'renderer/functions/view/TitlePreferenceFunctions';
2025
import { useTitle } from 'renderer/context/TitleContext';
26+
import HtmlTooltip from '../etc/CustomTooltip1';
2127

2228
export default function FeatureButtonGroup() {
2329
const myToken: any = useAniListToken();
@@ -83,7 +89,16 @@ export default function FeatureButtonGroup() {
8389
aria-label="text alignment"
8490
sx={{ flexBasis: '40%' }}
8591
>
86-
<Tooltip title="Sync" placement="top">
92+
<HtmlTooltip
93+
title={
94+
<>
95+
<Typography color="inherit" fontSize="14px">
96+
Sync
97+
</Typography>
98+
</>
99+
}
100+
placement="top"
101+
>
87102
<ToggleButton
88103
value="center"
89104
aria-label="centered"
@@ -94,8 +109,17 @@ export default function FeatureButtonGroup() {
94109
>
95110
<CachedIcon />
96111
</ToggleButton>
97-
</Tooltip>
98-
<Tooltip title="Settings" placement="top">
112+
</HtmlTooltip>
113+
<HtmlTooltip
114+
title={
115+
<>
116+
<Typography color="inherit" fontSize="14px">
117+
Settings
118+
</Typography>
119+
</>
120+
}
121+
placement="top"
122+
>
99123
<ToggleButton
100124
value="left"
101125
aria-label="left aligned"
@@ -105,7 +129,7 @@ export default function FeatureButtonGroup() {
105129
>
106130
<SettingsIcon />
107131
</ToggleButton>
108-
</Tooltip>
132+
</HtmlTooltip>
109133
</ToggleButtonGroup>
110134
);
111135
}

0 commit comments

Comments
 (0)