mirror of
https://git.undefined-dev.fr/Blendman974/faceclaw.git
synced 2026-11-19 21:03:09 +00:00
Refactor (move some files around)
This commit is contained in:
1 parent
bcb162ecaf
commit
ef6cb3bf55
13 files changed
+10
-10
No files matched your search
+1
-1
@@ -1,2 +1,2 @@
|
||||
<Frame defaultPage="launch-page">
|
||||
<Frame defaultPage="phone-ui/launch-page">
|
||||
</Frame>
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,8 +1,8 @@
|
||||
import { Frame, Observable } from "@nativescript/core";
|
||||
|
||||
import { ensureBlePermissions } from "./g2/android-permissions";
|
||||
import { isValidMacAddress, loadDeviceAddresses, normalizeMacAddress, saveDeviceAddresses } from "./g2/device-addresses";
|
||||
import { buildAddressSet, DeviceDiscoveryBridge } from "./native/device-discovery";
|
||||
import { ensureBlePermissions } from "../g2/android-permissions";
|
||||
import { isValidMacAddress, loadDeviceAddresses, normalizeMacAddress, saveDeviceAddresses } from "../g2/device-addresses";
|
||||
import { buildAddressSet, DeviceDiscoveryBridge } from "../native/device-discovery";
|
||||
|
||||
type TextChangeArgs = { value?: string; object?: { text?: string } };
|
||||
|
||||
@@ -112,7 +112,7 @@ export class ConfigViewModel extends Observable {
|
||||
|
||||
onBackTap(): void {
|
||||
Frame.topmost()?.navigate({
|
||||
moduleName: "main-page",
|
||||
moduleName: "phone-ui/main-page",
|
||||
clearHistory: true,
|
||||
});
|
||||
}
|
||||
@@ -6,7 +6,7 @@ export function navigatingTo(args: EventData): void {
|
||||
const page = args.object as Page;
|
||||
page.on(Page.loadedEvent, () => {
|
||||
Frame.topmost()?.navigate({
|
||||
moduleName: hasCompletedOnboarding() ? "main-page" : "onboarding-page",
|
||||
moduleName: hasCompletedOnboarding() ? "phone-ui/main-page" : "phone-ui/onboarding-page",
|
||||
clearHistory: true,
|
||||
animated: false,
|
||||
});
|
||||
File renamed without changes.
@@ -1,6 +1,6 @@
|
||||
import { Color, EventData, isAndroid, Observable, Page, ScrollView, TextField } from '@nativescript/core'
|
||||
import { MainViewModel } from './main-view-model'
|
||||
import { dashboardController } from './g2/dashboard-controller'
|
||||
import { dashboardController } from '../g2/dashboard-controller'
|
||||
|
||||
const SETTINGS_TEXT_COLOR = new Color('#222222')
|
||||
const SETTINGS_BACKGROUND_COLOR = new Color('#ffffff')
|
||||
File renamed without changes.
@@ -1,5 +1,5 @@
|
||||
import { Frame, ImageSource, Observable, Screen } from "@nativescript/core";
|
||||
import { dashboardController, type TextSettingEditorKind } from "./g2/dashboard-controller";
|
||||
import { dashboardController, type TextSettingEditorKind } from "../g2/dashboard-controller";
|
||||
|
||||
export class MainViewModel extends Observable {
|
||||
private _status = "Disconnected.";
|
||||
@@ -247,7 +247,7 @@ export class MainViewModel extends Observable {
|
||||
|
||||
onConfigureTap(): void {
|
||||
if (!this.canRun) return;
|
||||
Frame.topmost()?.navigate("config-page");
|
||||
Frame.topmost()?.navigate("phone-ui/config-page");
|
||||
}
|
||||
|
||||
onToggleLogTap(): void {
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -69,7 +69,7 @@ export class OnboardingViewModel extends Observable {
|
||||
}
|
||||
setOnboardingCompleted(true);
|
||||
Frame.topmost()?.navigate({
|
||||
moduleName: "config-page",
|
||||
moduleName: "phone-ui/config-page",
|
||||
clearHistory: true,
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user