Removed `webview_flutter` dependency and related imports, replaced `openInWebView` with `launchUrlString` in various files.
This commit is contained in:
parent
2f1472e0c7
commit
99965816f1
|
|
@ -1,9 +1,8 @@
|
||||||
import 'package:didvan/models/notification_message.dart';
|
import 'package:didvan/models/notification_message.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
|
||||||
import 'package:firebase_messaging/firebase_messaging.dart';
|
|
||||||
import 'package:flutter/cupertino.dart';
|
import 'package:flutter/cupertino.dart';
|
||||||
import 'package:home_widget/home_widget.dart';
|
import 'package:home_widget/home_widget.dart';
|
||||||
import 'package:persian_number_utility/persian_number_utility.dart';
|
import 'package:persian_number_utility/persian_number_utility.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
// import 'package:url_launcher/url_launcher_string.dart';
|
// import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
import '../../main.dart';
|
import '../../main.dart';
|
||||||
|
|
@ -90,7 +89,7 @@ class HomeWidgetRepository {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (data.link!.startsWith('http')) {
|
if (data.link!.startsWith('http')) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'${data.link}',
|
'${data.link}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
@ -219,7 +218,7 @@ class HomeWidgetRepository {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (data.link!.startsWith('http')) {
|
if (data.link!.startsWith('http')) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'${data.link}',
|
'${data.link}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
@ -227,9 +226,7 @@ class HomeWidgetRepository {
|
||||||
}
|
}
|
||||||
if (route.isNotEmpty) {
|
if (route.isNotEmpty) {
|
||||||
navigatorKey.currentState!.pushNamed(route, arguments: args);
|
navigatorKey.currentState!.pushNamed(route, arguments: args);
|
||||||
print("Push: $route");
|
|
||||||
}
|
}
|
||||||
print("Push: empty");
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,19 +13,6 @@ import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
|
||||||
|
|
||||||
enum LaunchMode { inAppWebView }
|
|
||||||
|
|
||||||
void openInWebView(String src, {dynamic mode}) async {
|
|
||||||
if (kIsWeb) {
|
|
||||||
if (!await launchUrl(Uri.parse(src))) {
|
|
||||||
throw Exception('Could not launch $src');
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
navigatorKey.currentState!.pushNamed(Routes.web, arguments: src);
|
|
||||||
}
|
|
||||||
|
|
||||||
class AppInitializer {
|
class AppInitializer {
|
||||||
static String? fcmToken;
|
static String? fcmToken;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
|
||||||
import 'package:didvan/views/authentication/authentication_state.dart';
|
import 'package:didvan/views/authentication/authentication_state.dart';
|
||||||
import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
|
import 'package:didvan/views/authentication/widgets/authentication_layout.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/button.dart';
|
import 'package:didvan/views/widgets/didvan/button.dart';
|
||||||
|
|
@ -7,6 +6,7 @@ import 'package:didvan/views/widgets/didvan/text_field.dart';
|
||||||
import 'package:flutter/gestures.dart';
|
import 'package:flutter/gestures.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
// import 'package:url_launcher/url_launcher.dart';
|
// import 'package:url_launcher/url_launcher.dart';
|
||||||
|
|
||||||
class UsernameInput extends StatefulWidget {
|
class UsernameInput extends StatefulWidget {
|
||||||
|
|
@ -79,7 +79,7 @@ class _UsernameInputState extends State<UsernameInput> {
|
||||||
.bodySmall!
|
.bodySmall!
|
||||||
.copyWith(color: Theme.of(context).colorScheme.primary),
|
.copyWith(color: Theme.of(context).colorScheme.primary),
|
||||||
recognizer: TapGestureRecognizer()
|
recognizer: TapGestureRecognizer()
|
||||||
..onTap = () => openInWebView(
|
..onTap = () => launchUrlString(
|
||||||
'https://didvan.app/terms-of-use#conditions',
|
'https://didvan.app/terms-of-use#conditions',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
@ -91,7 +91,7 @@ class _UsernameInputState extends State<UsernameInput> {
|
||||||
.bodySmall!
|
.bodySmall!
|
||||||
.copyWith(color: Theme.of(context).colorScheme.primary),
|
.copyWith(color: Theme.of(context).colorScheme.primary),
|
||||||
recognizer: TapGestureRecognizer()
|
recognizer: TapGestureRecognizer()
|
||||||
..onTap = () => openInWebView(
|
..onTap = () => launchUrlString(
|
||||||
'https://didvan.app/terms-of-use#privacy',
|
'https://didvan.app/terms-of-use#privacy',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ import 'package:didvan/config/theme_data.dart';
|
||||||
import 'package:didvan/constants/app_icons.dart';
|
import 'package:didvan/constants/app_icons.dart';
|
||||||
import 'package:didvan/models/home_page_content/home_page_list.dart';
|
import 'package:didvan/models/home_page_content/home_page_list.dart';
|
||||||
import 'package:didvan/routes/routes.dart';
|
import 'package:didvan/routes/routes.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
|
||||||
import 'package:didvan/views/home/main/main_page_state.dart';
|
import 'package:didvan/views/home/main/main_page_state.dart';
|
||||||
import 'package:didvan/views/home/main/widgets/banner.dart';
|
import 'package:didvan/views/home/main/widgets/banner.dart';
|
||||||
import 'package:didvan/views/home/main/widgets/general_item.dart';
|
import 'package:didvan/views/home/main/widgets/general_item.dart';
|
||||||
|
|
@ -15,6 +14,7 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
// import 'package:url_launcher/url_launcher_string.dart';
|
// import 'package:url_launcher/url_launcher_string.dart';
|
||||||
import 'package:didvan/services/network/request.dart';
|
import 'package:didvan/services/network/request.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class MainPage extends StatefulWidget {
|
class MainPage extends StatefulWidget {
|
||||||
const MainPage({super.key});
|
const MainPage({super.key});
|
||||||
|
|
@ -126,7 +126,7 @@ class _MainPageSection extends StatelessWidget {
|
||||||
|
|
||||||
void _moreHandler(BuildContext context) {
|
void _moreHandler(BuildContext context) {
|
||||||
if (list.link.startsWith('http')) {
|
if (list.link.startsWith('http')) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'${list.link}?accessToken=${RequestService.token}',
|
'${list.link}?accessToken=${RequestService.token}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,10 @@ import 'package:didvan/models/requests/news.dart';
|
||||||
import 'package:didvan/models/requests/radar.dart';
|
import 'package:didvan/models/requests/radar.dart';
|
||||||
import 'package:didvan/providers/core.dart';
|
import 'package:didvan/providers/core.dart';
|
||||||
import 'package:didvan/routes/routes.dart';
|
import 'package:didvan/routes/routes.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
|
||||||
import 'package:didvan/services/network/request.dart';
|
import 'package:didvan/services/network/request.dart';
|
||||||
import 'package:didvan/services/network/request_helper.dart';
|
import 'package:didvan/services/network/request_helper.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
// import 'package:url_launcher/url_launcher_string.dart';
|
// import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class MainPageState extends CoreProvier {
|
class MainPageState extends CoreProvier {
|
||||||
|
|
@ -99,7 +99,7 @@ class MainPageState extends CoreProvier {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (link.startsWith('http')) {
|
if (link.startsWith('http')) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'$link?accessToken=${RequestService.token}',
|
'$link?accessToken=${RequestService.token}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
|
||||||
import 'package:didvan/utils/action_sheet.dart';
|
import 'package:didvan/utils/action_sheet.dart';
|
||||||
import 'package:didvan/views/home/main/main_page_state.dart';
|
import 'package:didvan/views/home/main/main_page_state.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/slider.dart';
|
import 'package:didvan/views/widgets/didvan/slider.dart';
|
||||||
import 'package:didvan/views/widgets/skeleton_image.dart';
|
import 'package:didvan/views/widgets/skeleton_image.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
// import 'package:url_launcher/url_launcher_string.dart';
|
// import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class MainPageBanner extends StatelessWidget {
|
class MainPageBanner extends StatelessWidget {
|
||||||
|
|
@ -23,7 +23,7 @@ class MainPageBanner extends StatelessWidget {
|
||||||
onTap: () => item.link == null || item.link!.isEmpty
|
onTap: () => item.link == null || item.link!.isEmpty
|
||||||
? ActionSheetUtils(context)
|
? ActionSheetUtils(context)
|
||||||
.openInteractiveViewer(context, item.image, false)
|
.openInteractiveViewer(context, item.image, false)
|
||||||
: openInWebView(item.link!, mode: LaunchMode.inAppWebView),
|
: launchUrlString(item.link!, mode: LaunchMode.inAppWebView),
|
||||||
child: SkeletonImage(
|
child: SkeletonImage(
|
||||||
imageUrl: item.image,
|
imageUrl: item.image,
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ import 'package:didvan/views/widgets/skeleton_image.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:persian_number_utility/persian_number_utility.dart';
|
import 'package:persian_number_utility/persian_number_utility.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class SearchResultItem extends StatelessWidget {
|
class SearchResultItem extends StatelessWidget {
|
||||||
final OverviewData item;
|
final OverviewData item;
|
||||||
|
|
@ -90,7 +90,7 @@ class SearchResultItem extends StatelessWidget {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (_targetPageRouteName == null && item.link != null) {
|
if (_targetPageRouteName == null && item.link != null) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'${item.link!}?accessToken=${RequestService.token}',
|
'${item.link!}?accessToken=${RequestService.token}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@ import 'package:didvan/views/widgets/didvan/text.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class MainCategories extends StatelessWidget {
|
class MainCategories extends StatelessWidget {
|
||||||
const MainCategories({super.key});
|
const MainCategories({super.key});
|
||||||
|
|
||||||
void _onTap(String link, BuildContext context) {
|
void _onTap(String link, BuildContext context) {
|
||||||
if (link.startsWith('http')) {
|
if (link.startsWith('http')) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'$link?accessToken=${RequestService.token}',
|
'$link?accessToken=${RequestService.token}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ import 'package:didvan/views/widgets/state_handlers/state_handler.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_html/flutter_html.dart';
|
import 'package:flutter_html/flutter_html.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class StudioDetailsWidget extends StatelessWidget {
|
class StudioDetailsWidget extends StatelessWidget {
|
||||||
final void Function(int id, bool value) onMarkChanged;
|
final void Function(int id, bool value) onMarkChanged;
|
||||||
|
|
@ -65,7 +65,7 @@ class StudioDetailsWidget extends StatelessWidget {
|
||||||
key: ValueKey(state.studio.id),
|
key: ValueKey(state.studio.id),
|
||||||
data: state.studio.description,
|
data: state.studio.description,
|
||||||
onAnchorTap: (href, _, __) =>
|
onAnchorTap: (href, _, __) =>
|
||||||
openInWebView(href!),
|
launchUrlString(href!),
|
||||||
style: {
|
style: {
|
||||||
'*': Style(
|
'*': Style(
|
||||||
direction: TextDirection.rtl,
|
direction: TextDirection.rtl,
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ import 'package:didvan/views/widgets/state_handlers/state_handler.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_svg/svg.dart';
|
import 'package:flutter_svg/svg.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class ProfilePage extends StatefulWidget {
|
class ProfilePage extends StatefulWidget {
|
||||||
const ProfilePage({Key? key}) : super(key: key);
|
const ProfilePage({Key? key}) : super(key: key);
|
||||||
|
|
@ -222,7 +222,7 @@ class _ProfilePageState extends State<ProfilePage> {
|
||||||
icon: DidvanIcons.info_circle_regular,
|
icon: DidvanIcons.info_circle_regular,
|
||||||
title: 'معرفی دیدوان',
|
title: 'معرفی دیدوان',
|
||||||
onTap: () =>
|
onTap: () =>
|
||||||
openInWebView('https://didvan.app/#info'),
|
launchUrlString('https://didvan.app/#info'),
|
||||||
),
|
),
|
||||||
const DidvanDivider(),
|
const DidvanDivider(),
|
||||||
MenuOption(
|
MenuOption(
|
||||||
|
|
@ -338,7 +338,7 @@ class _ProfilePageState extends State<ProfilePage> {
|
||||||
MenuOption(
|
MenuOption(
|
||||||
icon: DidvanIcons.alert_regular,
|
icon: DidvanIcons.alert_regular,
|
||||||
title: 'حریم خصوصی',
|
title: 'حریم خصوصی',
|
||||||
onTap: () => openInWebView(
|
onTap: () => launchUrlString(
|
||||||
'https://didvan.app/terms-of-use#privacy',
|
'https://didvan.app/terms-of-use#privacy',
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
import 'package:didvan/constants/assets.dart';
|
import 'package:didvan/constants/assets.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/text.dart';
|
import 'package:didvan/views/widgets/didvan/text.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:webview_flutter/webview_flutter.dart';
|
// import 'package:webview_flutter/webview_flutter.dart';
|
||||||
|
|
||||||
class WebView extends StatefulWidget {
|
class WebView extends StatefulWidget {
|
||||||
final String src;
|
final String src;
|
||||||
|
|
@ -14,75 +14,78 @@ class WebView extends StatefulWidget {
|
||||||
}
|
}
|
||||||
|
|
||||||
class _WebViewState extends State<WebView> {
|
class _WebViewState extends State<WebView> {
|
||||||
late WebViewController controller;
|
// late WebViewController controller;
|
||||||
bool loading = true;
|
bool loading = true;
|
||||||
int progress = 0;
|
int progress = 0;
|
||||||
@override
|
|
||||||
void initState() {
|
// @override
|
||||||
controller = WebViewController()
|
// void initState() {
|
||||||
..setJavaScriptMode(JavaScriptMode.unrestricted)
|
// controller = WebViewController()
|
||||||
..setNavigationDelegate(
|
// ..setJavaScriptMode(JavaScriptMode.unrestricted)
|
||||||
NavigationDelegate(
|
// ..setNavigationDelegate(
|
||||||
onProgress: (int progress) {
|
// NavigationDelegate(
|
||||||
// Update loading bar.
|
// onProgress: (int progress) {
|
||||||
setState(() {
|
// // Update loading bar.
|
||||||
this.progress = progress;
|
// setState(() {
|
||||||
});
|
// this.progress = progress;
|
||||||
},
|
// });
|
||||||
onPageStarted: (String url) {},
|
// },
|
||||||
onPageFinished: (String url) async {
|
// onPageStarted: (String url) {},
|
||||||
await Future.delayed(const Duration(seconds: 2));
|
// onPageFinished: (String url) async {
|
||||||
setState(() {
|
// await Future.delayed(const Duration(seconds: 2));
|
||||||
if (progress == 100) loading = false;
|
// setState(() {
|
||||||
});
|
// if (progress == 100) loading = false;
|
||||||
},
|
// });
|
||||||
onHttpError: (HttpResponseError error) {},
|
// },
|
||||||
onWebResourceError: (WebResourceError error) {
|
// onHttpError: (HttpResponseError error) {},
|
||||||
// navigatorKey.currentState!.pop();
|
// onWebResourceError: (WebResourceError error) {
|
||||||
},
|
// // navigatorKey.currentState!.pop();
|
||||||
onNavigationRequest: (NavigationRequest request) {
|
// },
|
||||||
// if (request.url.startsWith('https://www.youtube.com/')) {
|
// onNavigationRequest: (NavigationRequest request) {
|
||||||
// return NavigationDecision.prevent;
|
// // if (request.url.startsWith('https://www.youtube.com/')) {
|
||||||
// }
|
// // return NavigationDecision.prevent;
|
||||||
return NavigationDecision.navigate;
|
// // }
|
||||||
},
|
// return NavigationDecision.navigate;
|
||||||
),
|
// },
|
||||||
)
|
// ),
|
||||||
..loadRequest(Uri.parse(widget.src));
|
// )
|
||||||
super.initState();
|
// ..loadRequest(Uri.parse(widget.src));
|
||||||
}
|
// super.initState();
|
||||||
|
// }
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return WillPopScope(
|
return WillPopScope(
|
||||||
onWillPop: () async {
|
onWillPop: () async {
|
||||||
if (await controller.canGoBack()) {
|
// if (await controller.canGoBack()) {
|
||||||
await controller.goBack();
|
// await controller.goBack();
|
||||||
return false;
|
// return false;
|
||||||
} else {
|
// } else {
|
||||||
return true;
|
return true;
|
||||||
}
|
// }
|
||||||
},
|
},
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
title: const Padding(
|
title: const Padding(
|
||||||
padding: EdgeInsets.only(top: 12.0),
|
padding: EdgeInsets.only(top: 12.0),
|
||||||
child: DidvanText(
|
child: DidvanText(
|
||||||
'بازگشت به دیدوان',
|
'بازگشت به دیدوان',
|
||||||
fontSize: 18,
|
fontSize: 18,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
|
toolbarHeight: 32,
|
||||||
),
|
),
|
||||||
toolbarHeight: 32,
|
body:
|
||||||
),
|
// loading
|
||||||
body: loading
|
// ?
|
||||||
? Center(
|
Center(
|
||||||
child: Image.asset(
|
child: Image.asset(
|
||||||
Assets.loadingAnimation,
|
Assets.loadingAnimation,
|
||||||
width: 60,
|
width: 60,
|
||||||
height: 60,
|
height: 60,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
: WebViewWidget(controller: controller),
|
// : WebViewWidget(controller: controller),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ import 'package:didvan/views/widgets/item_title.dart';
|
||||||
import 'package:didvan/views/widgets/skeleton_image.dart';
|
import 'package:didvan/views/widgets/skeleton_image.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_html/flutter_html.dart';
|
import 'package:flutter_html/flutter_html.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class DidvanPageView extends StatefulWidget {
|
class DidvanPageView extends StatefulWidget {
|
||||||
final List items;
|
final List items;
|
||||||
|
|
@ -310,7 +310,7 @@ class _DidvanPageViewState extends State<DidvanPageView> {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
openInWebView(href);
|
launchUrlString(href, mode: LaunchMode.inAppWebView);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
style: {
|
style: {
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:persian_number_utility/persian_number_utility.dart';
|
import 'package:persian_number_utility/persian_number_utility.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
import 'package:didvan/services/app_initalizer.dart';
|
import 'package:didvan/services/app_initalizer.dart';
|
||||||
|
import 'package:url_launcher/url_launcher_string.dart';
|
||||||
|
|
||||||
class MultitypeOverview extends StatelessWidget {
|
class MultitypeOverview extends StatelessWidget {
|
||||||
final OverviewData item;
|
final OverviewData item;
|
||||||
|
|
@ -106,7 +107,7 @@ class MultitypeOverview extends StatelessWidget {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (_targetPageRouteName == null && item.link != null) {
|
if (_targetPageRouteName == null && item.link != null) {
|
||||||
openInWebView(
|
launchUrlString(
|
||||||
'${item.link!}?accessToken=${RequestService.token}',
|
'${item.link!}?accessToken=${RequestService.token}',
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
|
|
|
||||||
32
pubspec.lock
32
pubspec.lock
|
|
@ -1314,38 +1314,6 @@ packages:
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.5.1"
|
version: "0.5.1"
|
||||||
webview_flutter:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: webview_flutter
|
|
||||||
sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "4.8.0"
|
|
||||||
webview_flutter_android:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: webview_flutter_android
|
|
||||||
sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "3.16.3"
|
|
||||||
webview_flutter_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: webview_flutter_platform_interface
|
|
||||||
sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "2.10.0"
|
|
||||||
webview_flutter_wkwebview:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: webview_flutter_wkwebview
|
|
||||||
sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0"
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "3.13.1"
|
|
||||||
win32:
|
win32:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
||||||
|
|
@ -57,12 +57,12 @@ dependencies:
|
||||||
bot_toast: ^4.0.1
|
bot_toast: ^4.0.1
|
||||||
flutter_secure_storage: ^8.0.0
|
flutter_secure_storage: ^8.0.0
|
||||||
flutter_html: ^3.0.0-alpha.2
|
flutter_html: ^3.0.0-alpha.2
|
||||||
# url_launcher: ^6.0.18
|
url_launcher: ^6.0.18
|
||||||
audio_video_progress_bar: ^2.0.0
|
audio_video_progress_bar: ^2.0.0
|
||||||
image_cropper: ^1.5.0
|
image_cropper: ^1.5.0
|
||||||
firebase_core: ^3.1.0
|
firebase_core: ^3.1.0
|
||||||
firebase_messaging: ^15.0.1
|
firebase_messaging: ^15.0.1
|
||||||
webview_flutter: ^4.8.0
|
# webview_flutter: ^4.8.0
|
||||||
expandable_bottom_sheet: ^1.1.1+1
|
expandable_bottom_sheet: ^1.1.1+1
|
||||||
permission_handler: ^11.0.0
|
permission_handler: ^11.0.0
|
||||||
# better_player:
|
# better_player:
|
||||||
|
|
@ -92,7 +92,7 @@ dependencies:
|
||||||
mime: ^1.0.2
|
mime: ^1.0.2
|
||||||
path: any
|
path: any
|
||||||
flutter_cache_manager: any
|
flutter_cache_manager: any
|
||||||
url_launcher: ^6.3.0
|
# url_launcher: ^6.3.0
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue