Skip to content

Commit 9320d93

Browse files
ZanzyTHEbarZanzyTHEbar
committed
refactor: cleaning up the code base a little
- fix spelling errors - clean up some code structure
1 parent 4f4c171 commit 9320d93

File tree

13 files changed

+41
-25
lines changed

13 files changed

+41
-25
lines changed

‎GUI/ETVR/ETVR.code-workspace ‎ETVR.code-workspace

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
22
"folders": [
33
{
4-
"path": "."
4+
"name": "ETVR GUI",
5+
"path": "./GUI/ETVR"
56
},
67
{
7-
"path": "../assets"
8+
"name": "ETVR Assets",
9+
"path": "./GUI/assets"
810
}
911
],
1012
"settings": {
@@ -72,4 +74,4 @@
7274
"vorbis"
7375
]
7476
}
75-
}
77+
}

‎GUI/ETVR/src-tauri/src/main.rs

+15-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use tauri::{
1919
use log::{debug, error, info, warn};
2020
use serde::{Deserialize, Serialize};
2121
//use tauri_plugin_store;
22-
use tauri_plugin_window_state::{AppHandleExt, StateFlags};
22+
use tauri_plugin_window_state::{AppHandleExt, StateFlags, WindowExt};
2323
use whoami::username;
2424
use zip_extract::ZipExtractError;
2525

@@ -175,6 +175,18 @@ async fn handle_save_window_state<R: tauri::Runtime>(
175175
Ok(())
176176
}
177177

178+
#[tauri::command]
179+
async fn handle_load_window_state<R: tauri::Runtime>(
180+
app: tauri::AppHandle<R>,
181+
window: tauri::Window<R>,
182+
) -> Result<(), String> {
183+
window
184+
.restore_state(StateFlags::all())
185+
.expect("[Window State]: Failed to restore window state");
186+
187+
Ok(())
188+
}
189+
178190
fn main() {
179191
let quit = CustomMenuItem::new("quit".to_string(), "Quit");
180192
let hide = CustomMenuItem::new("hide".to_string(), "Hide");
@@ -203,7 +215,8 @@ fn main() {
203215
get_user,
204216
do_rest_request,
205217
unzip_archive,
206-
handle_save_window_state
218+
handle_save_window_state,
219+
handle_load_window_state
207220
])
208221
// allow only one instance and propagate args and cwd to existing instance
209222
.plugin(tauri_plugin_single_instance::init(|app, args, cwd| {

‎GUI/ETVR/src/components/AppSettings/Button/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { classNames } from '@src/utils'
21
import { createMemo, createSignal } from 'solid-js'
2+
import { classNames } from '@src/utils'
33

44
export interface IProps {
55
styles?: string

‎GUI/ETVR/src/components/AppSettings/FilterParameters/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import { For } from 'solid-js'
12
import RangeInput from '@components/RangeInput'
23
import { RANGE_INPUT_FORMAT_APP_SETTINGS } from '@src/static/types/enums'
3-
import { For } from 'solid-js'
44

55
export interface IProps {
66
onChange: (format: string, value: number) => void

‎GUI/ETVR/src/components/AppSettings/GeneralSettings/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import icons from '@assets/images'
21
import Button from '../Button'
2+
import icons from '@assets/images'
33
import '../index.css'
44

55
export interface IProps {

‎GUI/ETVR/src/components/AppSettings/OscSettings/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Input } from '@components/Input'
33
export interface IProps {
44
onChangeAddress: (value: string) => void
55
onChangeOSCPort: (value: string) => void
6-
onChangeOSCReciverPort: (value: string) => void
6+
onChangeOSCReceiverPort: (value: string) => void
77
onChangeOSCRecenterPort: (value: string) => void
88
onChangeOSCRecalibrateAddress: (value: string) => void
99
}
@@ -39,7 +39,7 @@ const OscSettings = (props: IProps) => {
3939
<div>
4040
<Input
4141
onChange={(value) => {
42-
props.onChangeOSCReciverPort(value)
42+
props.onChangeOSCReceiverPort(value)
4343
}}
4444
placeholder="9001"
4545
header="OSC receiver port"

‎GUI/ETVR/src/components/AppSettings/TrackingAlghoritmSettings/index.tsx ‎GUI/ETVR/src/components/AppSettings/TrackingAlgorithmSettings/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export interface IProps {
44
onClick: () => void
55
}
66

7-
const TrackingAlghoritmSettings = (props: IProps) => {
7+
const TrackingAlgorithmSettings = (props: IProps) => {
88
return (
99
<div class="flex flex-col justify-end w-full m-auto">
1010
<div>
@@ -29,4 +29,4 @@ const TrackingAlghoritmSettings = (props: IProps) => {
2929
)
3030
}
3131

32-
export default TrackingAlghoritmSettings
32+
export default TrackingAlgorithmSettings

‎GUI/ETVR/src/components/RangeInput/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { BULLET_POSITION_ADJUSTMENT, getBulletPosition } from '@src/utils'
21
import { createEffect, createSignal, onCleanup } from 'solid-js'
32
import { useEventListener } from 'solidjs-use'
3+
import { BULLET_POSITION_ADJUSTMENT, getBulletPosition } from '@src/utils'
44
import './styles.css'
55

66
export interface IProps {

‎GUI/ETVR/src/pages/appSettings/index.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ const AppSettingsPage = () => {
1212
return (
1313
<div class="flex justify-center items-center content-center flex-col pt-[100px] text-white">
1414
<AppSettings
15-
onClickFlipLeftXAxis={() => {
16-
console.log('onClickFlipLeftXAxis')
17-
}}
15+
onClickFlipLeftXAxis={() => console.log('onClickFlipLeftXAxis')}
1816
onClickFlipRightXAxis={() => {
1917
console.log('onClickFlipRightXAxis')
2018
}}
@@ -39,8 +37,8 @@ const AppSettingsPage = () => {
3937
onChangeOSCPort={() => {
4038
console.log('onChangeOSCPort')
4139
}}
42-
onChangeOSCReciverPort={() => {
43-
console.log('onChangeOSCReciverPort')
40+
onChangeOSCReceiverPort={() => {
41+
console.log('onChangeOSCReceiverPort')
4442
}}
4543
onChangeOSCRecenterPort={() => {
4644
console.log('onChangeOSCRecenterPort')

‎GUI/ETVR/src/store/app/settings/settings.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { ENotificationAction } from '@static/types/enums'
21
import { createMemo } from 'solid-js'
32
import { createStore, produce } from 'solid-js/store'
3+
import { ENotificationAction } from '@static/types/enums'
44

55
export interface IAppSettingsStore {
66
enableNotificationsSounds: boolean

‎GUI/ETVR/src/utils/hooks/app/index.ts

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ export const handleAppBoot = () => {
3434
localStorage.setItem('settings', JSON.stringify(config))
3535
})
3636
.catch((e) => console.error(e))
37+
38+
// check if the window state is saved and restore it if it is
39+
3740
invoke('handle_save_window_state').then(() => {
3841
console.log('[App Boot]: saved window state')
3942
})

‎GUI/ETVR/src/views/AppSettings/index.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import FilterParameters from '@components/AppSettings/FilterParameters'
22
import GeneralSettings from '@components/AppSettings/GeneralSettings'
33
import OscSettings from '@components/AppSettings/OscSettings'
4-
import TrackingAlghoritmSettings from '@components/AppSettings/TrackingAlghoritmSettings'
4+
import TrackingAlgorithmSettings from '@components/AppSettings/TrackingAlgorithmSettings'
55
import { RANGE_INPUT_FORMAT_APP_SETTINGS } from '@src/static/types/enums'
66

77
export interface IProps {
@@ -14,7 +14,7 @@ export interface IProps {
1414
onChange: (format: string, value: number) => void
1515
onChangeAddress: (value: string) => void
1616
onChangeOSCPort: (value: string) => void
17-
onChangeOSCReciverPort: (value: string) => void
17+
onChangeOSCReceiverPort: (value: string) => void
1818
onChangeOSCRecenterPort: (value: string) => void
1919
onChangeOSCRecalibrateAddress: (value: string) => void
2020
}
@@ -42,7 +42,7 @@ const AppSettings = (props: IProps) => {
4242
/>
4343
</div>
4444
<div class="w-full flex justify-center align-center flex-col pb-12">
45-
<TrackingAlghoritmSettings onClick={() => props.onClickBlobFallback()} />
45+
<TrackingAlgorithmSettings onClick={() => props.onClickBlobFallback()} />
4646
</div>
4747
<div class="w-full pb-12">
4848
<FilterParameters
@@ -59,8 +59,8 @@ const AppSettings = (props: IProps) => {
5959
onChangeOSCPort={(value) => {
6060
props.onChangeOSCPort(value)
6161
}}
62-
onChangeOSCReciverPort={(value) => {
63-
props.onChangeOSCReciverPort(value)
62+
onChangeOSCReceiverPort={(value) => {
63+
props.onChangeOSCReceiverPort(value)
6464
}}
6565
onChangeOSCRecenterPort={(value) => {
6666
props.onChangeOSCRecenterPort(value)

‎GUI/ETVR/src/views/Home/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { createSignal, For } from 'solid-js'
12
import icons from '@assets/images'
23
import Camera from '@components/Camera'
34
import CreateCamera from '@components/Camera/CreateCamera'
@@ -7,7 +8,6 @@ import List from '@components/List/List'
78
import ListHeader from '@components/List/ListHeader/ListHeader'
89
import { POPOVER_ID } from '@static/types/enums'
910
import { ICamera } from '@store/camera/camera'
10-
import { createSignal, For } from 'solid-js'
1111
import './index.css'
1212

1313
export interface IProps {

0 commit comments

Comments
 (0)