Fix: Revert Vite addition + Apps now have correct themes #997

Mycroft-Studios · 2023-04-26T23:11:48Z

Adding vite, completely broke the phone.
Apps also didnt seem to follow the themes correctly - text would be pure black, on dark mode.

Before:

After:

Pull Request Checklist:

Have you followed the guidelines in our Contributing document and Code of Conduct?
[x ] Have you checked to ensure there aren't other open Pull Requests for the same update/change?
[x ] Have you built and tested NPWD in-game after the relevant change?

@itschip @LiamDormon

This reverts commit 9d536fa.

This reverts commit efe70fd.

AvarianKnight

Only real issue I see is using phone_name instead of phoneName

apps/phone/src/apps/camera/components/NewPhotoButton.tsx

apps/phone/src/apps/contacts/components/views/ContactInfo.tsx

apps/phone/src/apps/dialer/components/views/DialerHistory.tsx

apps/phone/src/apps/match/components/views/ProfileEditor.tsx

Mycroft-Studios · 2023-04-27T13:06:20Z

Only real issue I see is using phone_name instead of phoneName

Fixed :)

AvarianKnight

LGTM will wait on chips review though before merge :)

jfrader · 2023-05-05T06:04:55Z

apps/phone/src/apps/contacts/components/List/SearchContacts.tsx

@@ -19,10 +19,10 @@ export const SearchContacts: React.FC = () => {

  return (
    <div className="w-full py-2 px-4">
-      <div className="flex items-center justify-start space-x-2 rounded-md bg-gray-200 px-2 dark:bg-neutral-800">
+      <div className="flex items-center justify-start bg-neutral-200 dark:bg-neutral-800 rounded-md px-2 space-x-2">


why tailwind ... ACK REJECTED

jk LGTM

Yes, that's what happens when you revert broken commits 😅

jfrader · 2023-05-05T06:05:15Z

apps/phone/src/apps/settings/components/SettingItem.tsx

@@ -43,6 +45,7 @@ interface SoundItemProps {
  icon: JSX.Element;
  tooltip: string;
  onPreviewClicked: any;
+  theme: any;


jfrader · 2023-05-05T06:05:23Z

apps/phone/src/apps/settings/components/SettingItem.tsx

@@ -110,6 +116,7 @@ interface SettingSwitchProps {
  onClick: any;
  icon: JSX.Element;
  secondary: string;
+  theme: any;


jfrader · 2023-05-05T06:05:54Z

apps/phone/src/apps/settings/components/SettingsApp.tsx

@@ -163,7 +163,7 @@ export const SettingsApp: React.FC = () => {

  const [openMenu, closeMenu, ContextMenu, isMenuOpen] = useContextMenu();
  const classes = useStyles();
-
+  const theme = useTheme();


Why passing theme as prop EVERYWHRE instead of using useTheme when needed?

Except, I am using it when needed....
Anywhere i put it, it's required for the phone to work correctly with themes

jfrader · 2023-05-05T06:06:33Z

packages/ui/package.json

@@ -8,7 +8,7 @@
  "types": "dist/index.d.ts",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev:old": "tsup src/index.ts --watch --dts --format esm,cjs"


Yes, that's what happens when you revert broken commits 😅

jfrader · 2023-05-05T06:07:47Z

I'm bored and miss npwd sometimes 💋

itschip · 2023-05-08T14:54:13Z

apps/phone/src/os/apps/hooks/useApps.tsx

@@ -8,6 +8,7 @@ import { useSettingsValue } from '../../../apps/settings/hooks/useSettings';
 import { IconSetObject } from '@typings/settings';
 import { useRecoilValue } from 'recoil';
 import { phoneState } from '@os/phone/hooks/state';
+import { extname } from 'path';


itschip · 2023-05-08T14:56:40Z

@Mycroft-Studios looks like lockfile is outdated from the CI. Try installing deps locally, and see if you'll get any changes locally. If not just delete, generate it, and then push the changes.

Mycroft-Studios · 2023-05-08T14:57:57Z

@Mycroft-Studios looks like lockfile is outdated from the CI. Try installing deps locally, and see if you'll get any changes locally. If not just delete, generate it, and then push the changes.

will do :)

TonybynMp4 · 2023-05-24T13:51:23Z

@Mycroft-Studios looks like lockfile is outdated from the CI. Try installing deps locally, and see if you'll get any changes locally. If not just delete, generate it, and then push the changes.

will do :)

do 🔫

GlitchOo · 2023-05-24T14:20:24Z

Should be updated in PR #1004

Mycroft-Studios added 13 commits April 26, 2023 04:21

Revert "fix(apps): fix outdir for phone"

08d5d96

This reverts commit 9d536fa.

Revert "Add vite to npwd (project-error#990)"

fe17906

This reverts commit efe70fd.

fix: Add fixes from Vite commit

eaf2a1b

tweak: add better theme settings

1eb3912

fix(twitter): wrong theme styling

6b72f33

fix(Settings App): Use Correct Theme settings

53b0093

tweak(light theme): better blue colour

d450011

fix(Notes App): Correct Styling

b0829b3

fix(DialerHistory): correct theming

09c54ff

fix(Messages): correct theming

e42cadc

fix(match/ProfileEditor): correct styling

569dffd

fix(camera): correct styling

679076f

fix(marketplace): correct styling

a150ceb

AvarianKnight requested changes Apr 27, 2023

View reviewed changes

formatting: replace snake_case with camelCase

e17cfa4

AvarianKnight requested a review from itschip April 27, 2023 15:03

AvarianKnight approved these changes Apr 28, 2023

View reviewed changes

jfrader reviewed May 5, 2023

View reviewed changes

itschip approved these changes May 8, 2023

View reviewed changes

This was referenced May 23, 2023

Fix Build and Native Error caused by KvpService #1002

Closed

Patches Master Build & Other Additions #1004

Merged

itschip merged commit 134372c into project-error:master May 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Revert Vite addition + Apps now have correct themes #997

Fix: Revert Vite addition + Apps now have correct themes #997

Mycroft-Studios commented Apr 26, 2023 •

edited

Loading

AvarianKnight left a comment

Mycroft-Studios commented Apr 27, 2023

AvarianKnight left a comment

jfrader May 5, 2023

Mycroft-Studios May 5, 2023

jfrader May 5, 2023

Mycroft-Studios May 5, 2023

jfrader May 5, 2023

jfrader May 5, 2023 •

edited

Loading

Mycroft-Studios May 5, 2023

jfrader May 5, 2023

Mycroft-Studios May 5, 2023

jfrader commented May 5, 2023

itschip May 8, 2023

itschip commented May 8, 2023

Mycroft-Studios commented May 8, 2023

TonybynMp4 commented May 24, 2023

GlitchOo commented May 24, 2023

Fix: Revert Vite addition + Apps now have correct themes #997

Fix: Revert Vite addition + Apps now have correct themes #997

Conversation

Mycroft-Studios commented Apr 26, 2023 • edited Loading

AvarianKnight left a comment

Choose a reason for hiding this comment

Mycroft-Studios commented Apr 27, 2023

AvarianKnight left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jfrader May 5, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jfrader commented May 5, 2023

Choose a reason for hiding this comment

itschip commented May 8, 2023

Mycroft-Studios commented May 8, 2023

TonybynMp4 commented May 24, 2023

GlitchOo commented May 24, 2023

Mycroft-Studios commented Apr 26, 2023 •

edited

Loading

jfrader May 5, 2023 •

edited

Loading