Skip to content

Commit

Permalink
feat(apps/phone): new icons
Browse files Browse the repository at this point in the history
  • Loading branch information
itschip committed Dec 7, 2023
1 parent 82164b3 commit 79b2273
Show file tree
Hide file tree
Showing 17 changed files with 52 additions and 46 deletions.
3 changes: 2 additions & 1 deletion apps/phone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"i18next": "^20.6.1",
"jest": "^27.4.7",
"jsonschema": "^1.4.0",
"lucide-react": "^0.125.0",
"lucide-react": "^0.294.0",
"non.geist": "^1.0.1",
"notistack": "3.0.0-alpha.7",
"parse-path": "^7.0.0",
"parse-url": "^5.0.7",
Expand Down
10 changes: 4 additions & 6 deletions apps/phone/src/apps/dialer/components/DialerNavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import PhoneIcon from '@mui/icons-material/Phone';
import PersonIcon from '@mui/icons-material/Person';
import HistoryIcon from '@mui/icons-material/History';
import { useTranslation } from 'react-i18next';
import { Contact, History, Phone } from 'lucide-react';

const useStyles = makeStyles((theme: Theme) => ({
root: {
Expand All @@ -31,26 +32,23 @@ const DialerNavBar: React.FC = () => {
return (
<BottomNavigation value={page} onChange={handleChange} showLabels className={classes.root}>
<BottomNavigationAction
label={t('DIALER.NAVBAR_HISTORY')}
value="/phone"
component={NavLink}
icon={<HistoryIcon />}
icon={<History />}
to="/phone"
/>
<BottomNavigationAction
label={t('DIALER.NAVBAR_DIAL')}
value="/phone/dial"
color="secondary"
component={NavLink}
icon={<PhoneIcon />}
icon={<Phone />}
to="/phone/dial"
/>
<BottomNavigationAction
label={t('DIALER.NAVBAR_CONTACTS')}
value="/phone/contacts"
color="secondary"
component={NavLink}
icon={<PersonIcon />}
icon={<Contact />}
to="/phone/contacts"
/>
</BottomNavigation>
Expand Down
3 changes: 0 additions & 3 deletions apps/phone/src/config/ThemeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { ThemeOptions } from '@mui/material';
// Configure all of the phone's default themes here.
export const PhoneThemes: Record<string, ThemeOptions> = {
'taso-dark': {
typography: {
fontFamily: "'SegoeUI', 'Roboto', 'Arial', sans-serif",
},
components: {
MuiDivider: {
styleOverrides: {
Expand Down
20 changes: 10 additions & 10 deletions apps/phone/src/main.css
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800&display=swap');
@import url('non.geist');

@tailwind base;
@tailwind components;
@tailwind utilities;

body {
font-family: 'Inter', sans-serif;
font-size: 20px;
margin: 0;
padding: 0;
width: 100vw;
height: 100vh;
overflow: hidden;
font-family: 'Geist Variable', sans-serif;
font-size: 20px;
margin: 0;
padding: 0;
width: 100vw;
height: 100vh;
overflow: hidden;
}

code {
font-family: 'Inter', sans-serif;
font-family: 'Geist Variable', sans-serif;
}

a,
a:visited,
a:hover,
a:active {
text-decoration: none;
text-decoration: none;
}
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/BROWSER.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Language } from '@mui/icons-material';
import { ChromeIcon } from 'lucide-react';

const BrowserIcon = () => <Language fontSize="large" />;
const BrowserIcon = () => <ChromeIcon size={30}/>;

export default BrowserIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/CALCULATOR.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { CalculatorIcon } from '../../../../../apps/calculator/components/CalculatorIcon';
import { Calculator as LCalc } from 'lucide-react';

const Calculator: React.FC = () => <CalculatorIcon fontSize="large" />;
const Calculator: React.FC = () =><LCalc size={30} />;

export default Calculator;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/CAMERA.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { CameraAlt } from '@mui/icons-material';
import { Camera as LCamera } from 'lucide-react';

const Camera: React.FC = () => <CameraAlt fontSize="large" />;
const Camera: React.FC = () => <LCamera size={30} />;

export default Camera;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/CONTACTS.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Contacts } from '@mui/icons-material';
import { BookUser } from 'lucide-react';

const ContactIcon: React.FC = () => <Contacts fontSize="large" />;
const ContactIcon: React.FC = () => <BookUser size={30} />;

export default ContactIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/DIALER.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Phone } from '@mui/icons-material';
import { Phone } from 'lucide-react';

const DialerIcon: React.FC = () => <Phone fontSize="large" />;
const DialerIcon: React.FC = () => <Phone size={30} />;

export default DialerIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/MARKETPLACE.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { MonetizationOn } from '@mui/icons-material';
import { Store } from 'lucide-react';

const MarketplaceIcon: React.FC = () => <MonetizationOn fontSize="large" />;
const MarketplaceIcon: React.FC = () => <Store size={30}/>

export default MarketplaceIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/MATCH.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Favorite } from '@mui/icons-material';
import { HeartHandshake } from 'lucide-react';

const MatchIcon: React.FC = () => <Favorite fontSize="large" />;
const MatchIcon: React.FC = () => <HeartHandshake size={30} />

export default MatchIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/MESSAGES.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Message } from '@mui/icons-material';
import { MessageSquare } from 'lucide-react';

const MessagesIcon: React.FC = () => <Message fontSize="large" />;
const MessagesIcon: React.FC = () => <MessageSquare size={30} />;

export default MessagesIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/NOTES.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import StickyNote from '../misc/StickyNote';
import { StickyNote } from 'lucide-react';

const NotesIcon: React.FC = () => <StickyNote fontSize="large" />;
const NotesIcon: React.FC = () => <StickyNote size={30} />

export default NotesIcon;
4 changes: 2 additions & 2 deletions apps/phone/src/os/apps/icons/material/app/SETTINGS.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Settings } from '@mui/icons-material';
import { Settings } from 'lucide-react';

const SettingsIcon: React.FC = () => <Settings fontSize="large" />;
const SettingsIcon: React.FC = () => <Settings size={30} />;

export default SettingsIcon;
2 changes: 0 additions & 2 deletions apps/phone/src/os/navigation-bar/components/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import React from 'react';
import { useHistory, useRouteMatch } from 'react-router-dom';
import { usePhone } from '@os/phone/hooks/usePhone';
//import { useNotifications } from '@os/notifications/hooks/useNotifications';
import { ChevronLeft, Circle, LayoutGrid } from 'lucide-react';

export const Navigation: React.FC = () => {
const history = useHistory();
const { isExact } = useRouteMatch('/');
const { closePhone } = usePhone();
//const { setBarUncollapsed } = useNotifications();

const handleGoBackInHistory = () => {
history.goBack();
Expand Down
5 changes: 5 additions & 0 deletions apps/phone/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,9 @@ module.exports = {
content: ['./src/**/*.{js,jsx,ts,tsx}'],
darkMode: 'class',
plugins: [],
extend: {
fontFamily: {
sans: ['var(--font-geist-sans)'],
},
},
};
15 changes: 11 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 79b2273

Please sign in to comment.