Switch to older version of WebView
This commit is contained in:
parent
48314fc1b6
commit
cdd814cdbd
|
@ -44,7 +44,7 @@ android {
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "io.ente.photos"
|
applicationId "io.ente.photos"
|
||||||
minSdkVersion 18
|
minSdkVersion 19
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode flutterVersionCode.toInteger()
|
versionCode flutterVersionCode.toInteger()
|
||||||
versionName flutterVersionName
|
versionName flutterVersionName
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:archive/archive_io.dart';
|
import 'package:archive/archive_io.dart';
|
||||||
import 'package:crisp/crisp.dart';
|
// import 'package:crisp/crisp.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_email_sender/flutter_email_sender.dart';
|
import 'package:flutter_email_sender/flutter_email_sender.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
@ -58,20 +58,20 @@ class SupportSectionWidget extends StatelessWidget {
|
||||||
},
|
},
|
||||||
child: SettingsTextItem(text: "email", icon: Icons.navigate_next),
|
child: SettingsTextItem(text: "email", icon: Icons.navigate_next),
|
||||||
),
|
),
|
||||||
Divider(height: 4),
|
// Divider(height: 4),
|
||||||
GestureDetector(
|
// GestureDetector(
|
||||||
behavior: HitTestBehavior.translucent,
|
// behavior: HitTestBehavior.translucent,
|
||||||
onTap: () async {
|
// onTap: () async {
|
||||||
Navigator.of(context).push(
|
// Navigator.of(context).push(
|
||||||
MaterialPageRoute(
|
// MaterialPageRoute(
|
||||||
builder: (BuildContext context) {
|
// builder: (BuildContext context) {
|
||||||
return CrispChatPage();
|
// return CrispChatPage();
|
||||||
},
|
// },
|
||||||
),
|
// ),
|
||||||
);
|
// );
|
||||||
},
|
// },
|
||||||
child: SettingsTextItem(text: "chat", icon: Icons.navigate_next),
|
// child: SettingsTextItem(text: "chat", icon: Icons.navigate_next),
|
||||||
),
|
// ),
|
||||||
Divider(height: 4),
|
Divider(height: 4),
|
||||||
GestureDetector(
|
GestureDetector(
|
||||||
behavior: HitTestBehavior.translucent,
|
behavior: HitTestBehavior.translucent,
|
||||||
|
@ -115,18 +115,18 @@ class CrispChatPage extends StatefulWidget {
|
||||||
|
|
||||||
class _CrispChatPageState extends State<CrispChatPage> {
|
class _CrispChatPageState extends State<CrispChatPage> {
|
||||||
static const websiteID = "86d56ea2-68a2-43f9-8acb-95e06dee42e8";
|
static const websiteID = "86d56ea2-68a2-43f9-8acb-95e06dee42e8";
|
||||||
CrispMain _crisp;
|
// CrispMain _crisp;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
_crisp = CrispMain(
|
// _crisp = CrispMain(
|
||||||
websiteId: websiteID,
|
// websiteId: websiteID,
|
||||||
);
|
// );
|
||||||
_crisp.register(
|
// _crisp.register(
|
||||||
user: CrispUser(
|
// user: CrispUser(
|
||||||
email: Configuration.instance.getEmail(),
|
// email: Configuration.instance.getEmail(),
|
||||||
),
|
// ),
|
||||||
);
|
// );
|
||||||
super.initState();
|
super.initState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,10 +136,7 @@ class _CrispChatPageState extends State<CrispChatPage> {
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: Text("support chat"),
|
title: Text("support chat"),
|
||||||
),
|
),
|
||||||
body: CrispView(
|
body: Center(child: Text("unavailable")),
|
||||||
crispMain: _crisp,
|
|
||||||
loadingWidget: loadWidget,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
|
||||||
import 'package:photos/ui/loading_widget.dart';
|
import 'package:photos/ui/loading_widget.dart';
|
||||||
|
import 'package:webview_flutter/webview_flutter.dart';
|
||||||
|
|
||||||
class WebPage extends StatefulWidget {
|
class WebPage extends StatefulWidget {
|
||||||
final String title;
|
final String title;
|
||||||
|
@ -15,6 +17,12 @@ class WebPage extends StatefulWidget {
|
||||||
class _WebPageState extends State<WebPage> {
|
class _WebPageState extends State<WebPage> {
|
||||||
bool _hasLoadedPage = false;
|
bool _hasLoadedPage = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
|
@ -22,9 +30,10 @@ class _WebPageState extends State<WebPage> {
|
||||||
title: Text(widget.title),
|
title: Text(widget.title),
|
||||||
actions: [_hasLoadedPage ? Container() : loadWidget],
|
actions: [_hasLoadedPage ? Container() : loadWidget],
|
||||||
),
|
),
|
||||||
body: InAppWebView(
|
body: WebView(
|
||||||
initialUrlRequest: URLRequest(url: Uri.parse(widget.url)),
|
initialUrl: widget.url,
|
||||||
onLoadStop: (c, url) {
|
javascriptMode: JavascriptMode.unrestricted,
|
||||||
|
onPageFinished: (url) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_hasLoadedPage = true;
|
_hasLoadedPage = true;
|
||||||
});
|
});
|
||||||
|
|
21
pubspec.lock
21
pubspec.lock
|
@ -134,13 +134,6 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.4.0"
|
version: "4.4.0"
|
||||||
crisp:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: crisp
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.1.4"
|
|
||||||
crypto:
|
crypto:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -244,13 +237,6 @@ packages:
|
||||||
relative: true
|
relative: true
|
||||||
source: path
|
source: path
|
||||||
version: "0.7.0"
|
version: "0.7.0"
|
||||||
flutter_inappwebview:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: flutter_inappwebview
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "5.3.2"
|
|
||||||
flutter_keyboard_visibility:
|
flutter_keyboard_visibility:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -945,6 +931,13 @@ packages:
|
||||||
url: "https://pub.dartlang.org"
|
url: "https://pub.dartlang.org"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.2.0"
|
version: "0.2.0"
|
||||||
|
webview_flutter:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: webview_flutter
|
||||||
|
url: "https://pub.dartlang.org"
|
||||||
|
source: hosted
|
||||||
|
version: "2.0.7"
|
||||||
win32:
|
win32:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -54,7 +54,7 @@ dependencies:
|
||||||
computer: ^1.0.2
|
computer: ^1.0.2
|
||||||
flutter_secure_storage: ^4.2.0
|
flutter_secure_storage: ^4.2.0
|
||||||
uni_links: ^0.5.1
|
uni_links: ^0.5.1
|
||||||
crisp: ^0.1.3
|
# crisp: ^0.1.3
|
||||||
flutter_sodium: ^0.2.0
|
flutter_sodium: ^0.2.0
|
||||||
pedantic: ^1.9.2
|
pedantic: ^1.9.2
|
||||||
page_transition: "^1.1.7+2"
|
page_transition: "^1.1.7+2"
|
||||||
|
@ -66,7 +66,7 @@ dependencies:
|
||||||
path: thirdparty/in_app_purchase
|
path: thirdparty/in_app_purchase
|
||||||
expansion_card: ^0.1.0
|
expansion_card: ^0.1.0
|
||||||
flutter_password_strength: ^0.1.6
|
flutter_password_strength: ^0.1.6
|
||||||
flutter_inappwebview: ^5.3.2
|
webview_flutter: ^2.0.7
|
||||||
background_fetch: ^0.7.2
|
background_fetch: ^0.7.2
|
||||||
# flutter_inapp_purchase: ^3.0.1
|
# flutter_inapp_purchase: ^3.0.1
|
||||||
google_nav_bar: ^5.0.5
|
google_nav_bar: ^5.0.5
|
||||||
|
|
Loading…
Reference in a new issue