yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS interface improvements

Browse Source
This commit is contained in:
Yegor Vialov
2020-02-12 22:42:43 +00:00
parent 6695756727
commit 6e448d3458
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pages/main/main.page.dart
View File

@ -871,10 +871,10 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
primary: false,
bottomNavigationBar: bottomBar,
body: Container(
color: Colors.white,
color: Colors.blue,
)
);
} else if (ConnectionManager().settingsLoaded && ConnectionManager().useWebView) {
} else if (ConnectionManager().settingsLoaded && ConnectionManager().useWebView && !_showLoginButton) {
return WillPopScope(
child: Scaffold(
primary: true,
@ -890,10 +890,6 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
Logger.d("[MainWebView] Page started: $url");
if (url.contains(ConnectionManager()._domain)) {
_loadJSInterface();
} else if (url.contains("htcmd://show-settings")) {
Navigator.of(context).pushNamed("/connection-settings").then((_) {
_mainWebViewController.goBack();
});
}
},
gestureNavigationEnabled: true,
@ -902,6 +898,13 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
() => new EagerGestureRecognizer(),
),
].toSet(),
javascriptChannels: {
new JavascriptChannel(name: 'HAClient', onMessageReceived: (JavascriptMessage message) {
if (message.message == "show-settings") {
Navigator.of(context).pushNamed("/connection-settings");
}
})
}
)
),
onWillPop: () {