chore: cleanup

This commit is contained in:
Nathan Walker
2020-07-23 15:16:17 -07:00
parent 1e6fccf272
commit 47aa03a950
20 changed files with 103 additions and 119 deletions

View File

@@ -3,9 +3,58 @@ import * as appModule from '../application';
const MIN_TABLET_PIXELS = 600;
export module platformNames {
export const android = 'Android';
export const ios = 'iOS';
export const platformNames = {
android: 'Android',
ios: 'iOS',
};
class MainScreen {
private _metrics: android.util.DisplayMetrics;
private reinitMetrics(): void {
if (!this._metrics) {
this._metrics = new android.util.DisplayMetrics();
}
this.initMetrics();
}
private initMetrics(): void {
const nativeApp = <android.app.Application>appModule.getNativeApplication();
nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
}
private get metrics(): android.util.DisplayMetrics {
if (!this._metrics) {
// NOTE: This will be memory leak but we MainScreen is singleton
appModule.on('cssChanged', this.reinitMetrics, this);
appModule.on(appModule.orientationChangedEvent, this.reinitMetrics, this);
this._metrics = new android.util.DisplayMetrics();
this.initMetrics();
}
return this._metrics;
}
get widthPixels(): number {
return this.metrics.widthPixels;
}
get heightPixels(): number {
return this.metrics.heightPixels;
}
get scale(): number {
return this.metrics.density;
}
get widthDIPs(): number {
return this.metrics.widthPixels / this.metrics.density;
}
get heightDIPs(): number {
return this.metrics.heightPixels / this.metrics.density;
}
}
export class Screen {
static mainScreen = new MainScreen();
}
class DeviceRef {
@@ -56,7 +105,7 @@ class DeviceRef {
get deviceType(): 'Phone' | 'Tablet' {
if (!this._deviceType) {
const dips = Math.min(screen.mainScreen.widthPixels, screen.mainScreen.heightPixels) / screen.mainScreen.scale;
const dips = Math.min(Screen.mainScreen.widthPixels, Screen.mainScreen.heightPixels) / Screen.mainScreen.scale;
// If the device has more than 600 dips it is considered to be a tablet.
if (dips >= MIN_TABLET_PIXELS) {
this._deviceType = 'Tablet';
@@ -94,56 +143,7 @@ class DeviceRef {
}
}
class MainScreen {
private _metrics: android.util.DisplayMetrics;
private reinitMetrics(): void {
if (!this._metrics) {
this._metrics = new android.util.DisplayMetrics();
}
this.initMetrics();
}
private initMetrics(): void {
const nativeApp = <android.app.Application>appModule.getNativeApplication();
nativeApp.getSystemService(android.content.Context.WINDOW_SERVICE).getDefaultDisplay().getRealMetrics(this._metrics);
}
private get metrics(): android.util.DisplayMetrics {
if (!this._metrics) {
// NOTE: This will be memory leak but we MainScreen is singleton
appModule.on('cssChanged', this.reinitMetrics, this);
appModule.on(appModule.orientationChangedEvent, this.reinitMetrics, this);
this._metrics = new android.util.DisplayMetrics();
this.initMetrics();
}
return this._metrics;
}
get widthPixels(): number {
return this.metrics.widthPixels;
}
get heightPixels(): number {
return this.metrics.heightPixels;
}
get scale(): number {
return this.metrics.density;
}
get widthDIPs(): number {
return this.metrics.widthPixels / this.metrics.density;
}
get heightDIPs(): number {
return this.metrics.heightPixels / this.metrics.density;
}
}
export const Device = new DeviceRef();
export module screen {
export const mainScreen = new MainScreen();
}
export const isAndroid = true;
export const isIOS = false;

View File

@@ -17,10 +17,10 @@ export const isIOS: boolean;
/*
* Enum holding platform names.
*/
export module platformNames {
export const android: string;
export const ios: string;
}
export const platformNames: {
android: string;
ios: string;
};
/*
* An object containing device specific information.
@@ -114,11 +114,11 @@ export interface ScreenMetrics {
/**
* An object describing general information about a display.
*/
export module screen {
export class Screen {
/**
* Gets information about the main screen of the current device.
*/
export const mainScreen: ScreenMetrics;
static mainScreen: ScreenMetrics;
}
/**

View File

@@ -1,9 +1,9 @@
/* tslint:disable:class-name */
export module platformNames {
export const android = 'Android';
export const ios = 'iOS';
}
export const platformNames = {
android: 'Android',
ios: 'iOS',
};
class DeviceRef {
private _model: string;
@@ -119,8 +119,8 @@ class MainScreen {
export const Device = new DeviceRef();
export module screen {
export const mainScreen = new MainScreen();
export class Screen {
static mainScreen = new MainScreen();
}
export const isIOS = true;