style: rename platform to bridge (#452)

* style: rename platform to bridge

* chore: tsc
This commit is contained in:
Baptiste Grob
2020-08-25 16:56:32 +02:00
committed by GitHub
parent b2511455dd
commit da78399567
11 changed files with 45 additions and 31 deletions

View File

@@ -1,7 +1,7 @@
'use strict';
declare const __VERSION__: string;
declare const __PLATFORM_WEB__: boolean;
declare const __WEB__: boolean;
import angular from 'angular';
import { configRoutes } from './routes';
@@ -51,22 +51,22 @@ import {
import { trusted } from './filters';
import { isDev } from './utils';
import { Platform, WebPlatform } from './services/platform';
import { Bridge, BrowserBridge } from './services/bridge';
if (__PLATFORM_WEB__) {
startApplication(new WebPlatform());
if (__WEB__) {
startApplication(new BrowserBridge());
} else {
(window as any).startApplication = startApplication;
}
function startApplication(platform: Platform) {
function startApplication(bridge: Bridge) {
angular.module('app', ['ngSanitize']);
// Config
angular
.module('app')
.config(configRoutes)
.constant('platform', platform)
.constant('bridge', bridge)
.constant('appVersion', __VERSION__);
// Controllers

View File

@@ -1,5 +1,5 @@
/** Platform-specific (i-e desktop/web) behavior is handled by a Platform object. */
export interface Platform {
/** Platform-specific (i-e Electron/browser) behavior is handled by a Bridge object. */
export interface Bridge {
getKeychainValue(): Promise<unknown>;
setKeychainValue(value: any): Promise<void>;
clearKeychainValue(): Promise<void>;
@@ -7,7 +7,7 @@ export interface Platform {
const KEYCHAIN_STORAGE_KEY = 'keychain';
export class WebPlatform implements Platform {
export class BrowserBridge implements Bridge {
async getKeychainValue(): Promise<unknown> {
const value = localStorage.getItem(KEYCHAIN_STORAGE_KEY);
if (value) {
@@ -21,4 +21,4 @@ export class WebPlatform implements Platform {
async clearKeychainValue(): Promise<void> {
localStorage.removeItem(KEYCHAIN_STORAGE_KEY);
}
}
}

View File

@@ -13,7 +13,7 @@ import {
import angular from 'angular';
import { getPlatformString } from '@/utils';
import { AlertService } from '@/services/alertService';
import { WebDeviceInterface } from '@/interface';
import { WebDeviceInterface } from '@/web_device_interface';
import {
DesktopManager,
LockManager,
@@ -26,7 +26,7 @@ import {
} from '@/services';
import { AppState } from '@/ui_models/app_state';
import { SNWebCrypto } from 'sncrypto/dist/sncrypto-web';
import { Platform } from '@/services/platform';
import { Bridge } from '@/services/bridge';
type WebServices = {
appState: AppState
@@ -56,13 +56,13 @@ export class WebApplication extends SNApplication {
$timeout: ng.ITimeoutService,
scope: ng.IScope,
onDeinit: (app: WebApplication) => void,
platform: Platform,
bridge: Bridge,
) {
const namespace = '';
const deviceInterface = new WebDeviceInterface(
namespace,
$timeout,
platform
bridge
);
super(
Environment.Web,

View File

@@ -11,7 +11,7 @@ import {
ThemeManager
} from '@/services';
import { AppState } from '@/ui_models/app_state';
import { Platform } from '@/services/platform';
import { Bridge } from '@/services/bridge';
type AppManagerChangeCallback = () => void
@@ -29,7 +29,7 @@ export class ApplicationGroup {
$compile: ng.ICompileService,
$rootScope: ng.IRootScopeService,
$timeout: ng.ITimeoutService,
private platform: Platform
private bridge: Bridge
) {
this.$compile = $compile;
this.$timeout = $timeout;
@@ -71,7 +71,7 @@ export class ApplicationGroup {
this.$timeout,
scope,
this.onApplicationDeinit,
this.platform
this.bridge
);
const appState = new AppState(
this.$rootScope,

View File

@@ -1,6 +1,6 @@
import { DeviceInterface, getGlobalScope, SNApplication } from 'snjs';
import { Database } from '@/database';
import { Platform } from './services/platform';
import { Bridge } from './services/bridge';
export class WebDeviceInterface extends DeviceInterface {
@@ -9,7 +9,7 @@ export class WebDeviceInterface extends DeviceInterface {
constructor(
namespace: string,
timeout: any,
private platform: Platform
private bridge: Bridge
) {
super(
namespace,
@@ -101,15 +101,15 @@ export class WebDeviceInterface extends DeviceInterface {
}
getKeychainValue(): Promise<unknown> {
return this.platform.getKeychainValue();
return this.bridge.getKeychainValue();
}
setKeychainValue(value: any) {
return this.platform.setKeychainValue(value);
return this.bridge.setKeychainValue(value);
}
clearKeychainValue() {
return this.platform.clearKeychainValue();
return this.bridge.clearKeychainValue();
}
openUrl(url: string) {