diff --git a/app/app-root.xml b/app/app-root.xml
index 85ad5b73..db245a1c 100644
--- a/app/app-root.xml
+++ b/app/app-root.xml
@@ -1,2 +1,2 @@
-
+
diff --git a/app/config-page.ts b/app/phone-ui/config-page.ts
similarity index 100%
rename from app/config-page.ts
rename to app/phone-ui/config-page.ts
diff --git a/app/config-page.xml b/app/phone-ui/config-page.xml
similarity index 100%
rename from app/config-page.xml
rename to app/phone-ui/config-page.xml
diff --git a/app/config-view-model.ts b/app/phone-ui/config-view-model.ts
similarity index 94%
rename from app/config-view-model.ts
rename to app/phone-ui/config-view-model.ts
index de862dba..e72cb024 100644
--- a/app/config-view-model.ts
+++ b/app/phone-ui/config-view-model.ts
@@ -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,
});
}
diff --git a/app/launch-page.ts b/app/phone-ui/launch-page.ts
similarity index 78%
rename from app/launch-page.ts
rename to app/phone-ui/launch-page.ts
index b4ac4159..98eb1d42 100644
--- a/app/launch-page.ts
+++ b/app/phone-ui/launch-page.ts
@@ -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,
});
diff --git a/app/launch-page.xml b/app/phone-ui/launch-page.xml
similarity index 100%
rename from app/launch-page.xml
rename to app/phone-ui/launch-page.xml
diff --git a/app/main-page.ts b/app/phone-ui/main-page.ts
similarity index 98%
rename from app/main-page.ts
rename to app/phone-ui/main-page.ts
index 9de962bd..ecbece43 100644
--- a/app/main-page.ts
+++ b/app/phone-ui/main-page.ts
@@ -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')
diff --git a/app/main-page.xml b/app/phone-ui/main-page.xml
similarity index 100%
rename from app/main-page.xml
rename to app/phone-ui/main-page.xml
diff --git a/app/main-view-model.ts b/app/phone-ui/main-view-model.ts
similarity index 99%
rename from app/main-view-model.ts
rename to app/phone-ui/main-view-model.ts
index 7fcce888..87733e6a 100644
--- a/app/main-view-model.ts
+++ b/app/phone-ui/main-view-model.ts
@@ -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 {
diff --git a/app/onboarding-page.ts b/app/phone-ui/onboarding-page.ts
similarity index 100%
rename from app/onboarding-page.ts
rename to app/phone-ui/onboarding-page.ts
diff --git a/app/onboarding-page.xml b/app/phone-ui/onboarding-page.xml
similarity index 100%
rename from app/onboarding-page.xml
rename to app/phone-ui/onboarding-page.xml
diff --git a/app/onboarding-state.ts b/app/phone-ui/onboarding-state.ts
similarity index 100%
rename from app/onboarding-state.ts
rename to app/phone-ui/onboarding-state.ts
diff --git a/app/onboarding-view-model.ts b/app/phone-ui/onboarding-view-model.ts
similarity index 99%
rename from app/onboarding-view-model.ts
rename to app/phone-ui/onboarding-view-model.ts
index befe9950..9343d9c2 100644
--- a/app/onboarding-view-model.ts
+++ b/app/phone-ui/onboarding-view-model.ts
@@ -69,7 +69,7 @@ export class OnboardingViewModel extends Observable {
}
setOnboardingCompleted(true);
Frame.topmost()?.navigate({
- moduleName: "config-page",
+ moduleName: "phone-ui/config-page",
clearHistory: true,
});
}