From eeb32682005acd760159f1e34ed4fec470a9555b Mon Sep 17 00:00:00 2001 From: itschip Date: Sat, 13 Jan 2024 12:59:07 +0100 Subject: [PATCH] tweak(phone/os): icon changse --- apps/phone/src/os/apps/config/apps.tsx | 2 +- .../os/apps/icons/material/app/TWITTER.tsx | 14 +------ .../os/apps/icons/material/svg/TWITTER.tsx | 14 +------ apps/phone/src/ui/components/AppIcon.tsx | 8 ++-- apps/phone/src/ui/components/ContextMenu.tsx | 42 ++++++++++--------- 5 files changed, 33 insertions(+), 47 deletions(-) diff --git a/apps/phone/src/os/apps/config/apps.tsx b/apps/phone/src/os/apps/config/apps.tsx index eab6a7799..bc382a5ef 100644 --- a/apps/phone/src/os/apps/config/apps.tsx +++ b/apps/phone/src/os/apps/config/apps.tsx @@ -34,7 +34,7 @@ import { SvgIconProps, Theme } from '@mui/material'; import { INotificationIcon } from '@os/notifications/providers/NotificationsProvider'; import { BrowserApp } from '@apps/browser/components/BrowserApp'; import { MatchApp } from '@apps/match/components/MatchApp'; -import LifeInvaderContainer from '@apps/twitter/components/LifeInvaderContainer'; +import LifeInvaderContainer from '@apps/twitter/components/TwitterContainer'; import { IPhoneSettings } from '@typings/settings'; import { i18n } from 'i18next'; import { diff --git a/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx b/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx index 60be4f968..9b5f9159e 100644 --- a/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx +++ b/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx @@ -1,18 +1,8 @@ import React from 'react'; -import { Twitter } from '@mui/icons-material'; +import { Twitter } from 'lucide-react'; const TwitterIcon: React.FC = () => ( - - - - - - - - - + ); export default TwitterIcon; diff --git a/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx b/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx index dc911aaa6..b0556b37f 100644 --- a/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx +++ b/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx @@ -1,18 +1,8 @@ import React from 'react'; -import { Twitter } from '@mui/icons-material'; +import { Twitter } from 'lucide-react'; const TwitterIcon: React.FC = () => ( - - - - - - - - - + ) export default TwitterIcon; diff --git a/apps/phone/src/ui/components/AppIcon.tsx b/apps/phone/src/ui/components/AppIcon.tsx index 69ef6c8e5..4fbd5f91a 100644 --- a/apps/phone/src/ui/components/AppIcon.tsx +++ b/apps/phone/src/ui/components/AppIcon.tsx @@ -15,7 +15,9 @@ const useStyles = makeStyles( }, avatar: { '&:hover': { - backgroundColor: ({ backgroundColor }) => darken(backgroundColor, 0.1), + background: ({ backgroundColor }) => { + return `linear-gradient(45deg, ${darken(backgroundColor, 0.25)} 10%, ${backgroundColor} 90%)`; + }, }, background: ({ backgroundColor }) => { return `linear-gradient(45deg, ${darken(backgroundColor, 0.2)} 20%, ${backgroundColor} 90%)`; @@ -66,7 +68,7 @@ export const AppIcon: React.FC = ({ }); return ( - + ); }; diff --git a/apps/phone/src/ui/components/ContextMenu.tsx b/apps/phone/src/ui/components/ContextMenu.tsx index bd20ca254..56ce31802 100644 --- a/apps/phone/src/ui/components/ContextMenu.tsx +++ b/apps/phone/src/ui/components/ContextMenu.tsx @@ -35,27 +35,30 @@ export const ContextMenu: React.FC = ({ mountOnEnter unmountOnExit > -
+
-

{settingLabel}

-
- - {_options.map((option) => ( - { - option.onClick(e, option); - onClose(); - }} - /> - /* + + {_options.map((option) => ( + { + option.onClick(e, option); + onClose(); + }} + /> + /* = ({ {option.icon && {option.icon}} */ - ))} - + ))} + +
);