Mr.Rahmani
/
didvan-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request 'dev/fix-news' (#2) from dev/fix-news into master 

Reviewed-on: #2
This commit is contained in:
Mr.Jebelli 2025-07-16 11:58:58 +00:00
parent 86913a973b f14be3879d
commit 0aec835d8a
21 changed files with 465 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}"
}
]
}

BIN
build.zip Normal file
View File

Binary file not shown.

70
lib/main.dart
View File

@ -1,3 +1,5 @@
// lib/main.dart
// ignore_for_file: deprecated_member_use
import 'dart:async';
@ -7,6 +9,8 @@ import 'package:bot_toast/bot_toast.dart';
import 'package:didvan/config/theme_data.dart';
import 'package:didvan/firebase_options.dart';
import 'package:didvan/models/notification_message.dart';
import 'package:didvan/models/requests/news.dart';
import 'package:didvan/models/requests/radar.dart';
import 'package:didvan/providers/media.dart';
import 'package:didvan/providers/theme.dart';
import 'package:didvan/providers/user.dart';
@ -32,13 +36,11 @@ import 'package:home_widget/home_widget.dart';
import 'package:provider/provider.dart';
import 'package:flutter_downloader/flutter_downloader.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
// پکیج جدید برای Deep Linking
import 'package:app_links/app_links.dart';
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
import 'services/network/request.dart';
// متغیر استاتیک برای نگهداری لینک اولیه
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
Uri? initialURI;
@pragma('vm:entry-point')
@ -49,6 +51,8 @@ Future<void> _backgroundCallbackHomeWidget(Uri? uri) async {
}
void main() async {
runZonedGuarded(
() async {
WidgetsFlutterBinding.ensureInitialized();
try {
if (!kIsWeb) {
@ -57,18 +61,14 @@ void main() async {
await NotificationService.initializeNotification();
try {
if (Platform.isAndroid) {
await FlutterDownloader.initialize(
debug: true,
ignoreSsl: true
);
await FlutterDownloader.initialize(debug: true, ignoreSsl: true);
}
} catch (e) {
e.printError();
}
}
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform);
await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
await FirebaseApi().initNotification();
} catch (e) {
debugPrint(e.toString());
@ -76,13 +76,17 @@ void main() async {
await SentryFlutter.init(
(options) {
options.dsn =
'https://a4cfcaa7d67471240d295c25c968d91d@o4508585857384448.ingest.de.sentry.io/4508585886548048';
options.dsn = 'https://a4cfcaa7d67471240d295c25c968d91d@o4508585857384448.ingest.de.sentry.io/4508585886548048';
options.tracesSampleRate = 1.0;
options.profilesSampleRate = 1.0;
},
appRunner: () => runApp(const Didvan()),
);
},
(error, stack) {
Sentry.captureException(error, stackTrace: stack);
},
);
}
class Didvan extends StatefulWidget {
@ -100,41 +104,57 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
// مقداردهی اولیه و گوش دادن به لینک‌ها در اینجا انجام می‌شود
_initDeepLinks();
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
_linkSubscription?.cancel(); // لغو کردن subscription
_linkSubscription?.cancel();
if (MediaService.currentPodcast != null) {
MediaService.audioPlayer.dispose();
}
super.dispose();
}
/// منطق جدید برای مدیریت لینک‌ها با app_links
Future<void> _initDeepLinks() async {
_appLinks = AppLinks();
// لینک اولیه را فقط در متغیر ذخیره می‌کنیم
initialURI = await _appLinks.getInitialLink();
// به لینک‌های جدید زمانی که اپلیکیشن باز است گوش می‌دهیم
_linkSubscription = _appLinks.uriLinkStream.listen((uri) {
_navigateTo(uri);
});
}
/// تابع کمکی برای ناوبری
void _navigateTo(Uri uri) {
if (mounted) {
String path = uri.path;
if (uri.fragment.isNotEmpty) {
path = "/${uri.fragment}";
final Map<String, String> params = uri.queryParameters;
final String? token = params['token'];
if (token != null) {
//todo: this didnt work
print("DEBUG: received token in url, token: $token, path: $path");
RequestService.token = token;
}
if (path.startsWith('/news/')) {
final id = path.split('/news/').last;
if (id.isNotEmpty) {
navigatorKey.currentState?.pushNamed(
Routes.newsDetails,
arguments: {'id': int.parse(id), 'args': const NewsRequestArgs(page: 0)},
);
}
} else if (path.startsWith('/radar/')) {
final id = path.split('/radar/').last;
if (id.isNotEmpty) {
navigatorKey.currentState?.pushNamed(
Routes.radarDetails,
arguments: {'id': int.parse(id), 'args': const RadarRequestArgs(page: 0)},
);
}
}
navigatorKey.currentState?.pushNamed(path);
}
}
@ -143,11 +163,9 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
if (!kIsWeb) {
if (state == AppLifecycleState.resumed) {
var r = await HomeWidget.getWidgetData("cRoute", defaultValue: '');
if (r!.toString() != Routes.splash) {
if (r.toString() != Routes.splash) {
await HomeWidgetRepository.decideWhereToGo();
NotificationMessage? data = HomeWidgetRepository.data;
if (data != null) {
await HomeWidgetRepository.decideWhereToGoNotif();
}

13
lib/services/network/request.dart
View File

@ -1,3 +1,5 @@
// lib/services/network/request.dart
// ignore_for_file: empty_catches
import 'dart:convert';
@ -15,7 +17,7 @@ import 'package:mime/mime.dart';
import 'package:permission_handler/permission_handler.dart';
class RequestService {
static late String token;
static String? token; // Made token nullable
int? statusCode;
dynamic data(String s) {
@ -48,12 +50,9 @@ class RequestService {
}) {
if (body != null) _requestBody = body;
if (requestHeaders != null) _headers.addAll(requestHeaders);
if (useAutherization) _headers.addAll({'Authorization': 'Bearer $token'});
// if (kDebugMode) {
// try {
// print('Authorization : Bearer $token');
// } catch (e) {}
// }
if (useAutherization && token != null) { // Check if token is not null
_headers.addAll({'Authorization': 'Bearer $token'});
}
if (body != null) _requestBody = body;
}

1
lib/views/authentication/authentication.dart
View File

@ -42,7 +42,6 @@ class _AuthenticationState extends State<Authentication> {
@override
Widget build(BuildContext context) {
return Scaffold(
resizeToAvoidBottomInset: false,
body: Consumer<AuthenticationState>(
builder: (context, state, child) => WillPopScope(
onWillPop: () async {

3
lib/views/authentication/widgets/authentication_layout.dart
View File

@ -49,7 +49,8 @@ class AuthenticationLayout extends StatelessWidget {
SliverPadding(
padding: const EdgeInsets.symmetric(horizontal: 20),
sliver: SliverFillRemaining(
hasScrollBody: false,
hasScrollBody: true,
fillOverscroll: true,
child: Column(
children: [
for (var i = 0; i < children.length; i++) children[i],

15
lib/views/customize_category/customize_category_state.dart
View File

@ -24,6 +24,7 @@ class CustomizeCategoryState extends CoreProvier {
Future<void> getFavourites() async {
appState = AppState.busy;
update();
final service = RequestService(
RequestHelper.favourites(),
@ -31,13 +32,19 @@ class CustomizeCategoryState extends CoreProvier {
await service.httpGet();
if (service.isSuccess) {
faves.clear();
final favourites = service.data('types');
for (var i = 0; i < favourites.length; i++) {
faves.add(FavoritesResponse.fromJson(favourites[i]));
final favouritesData = service.data('types');
if (favouritesData is List) {
for (var i = 0; i < favouritesData.length; i++) {
faves.add(FavoritesResponse.fromJson(favouritesData[i]));
}
}
// اضافه کردن مستقیم بخش فرصت و تهدید
faves.add(FavoritesResponse(id: 999, name: 'فرصت و تهدید', selected: false));
selectedFavIds.clear();
for (var element in faves) {
if (element.selected!) {
if (element.selected == true) {
selectedFavIds.add(element.id!);
}
}

23
lib/views/customize_category/favorites_step.dart
View File

@ -78,7 +78,9 @@ class _FavoritesStepState extends State<FavoritesStep> {
asset: Assets.emptyChat,
title: 'اولین نظر را بنویسید...',
),
builder: (context, state, index) => Center(
builder: (context, state, index) => Column(
children: [
Center(
child: Container(
height: 48,
decoration: BoxDecoration(
@ -86,13 +88,13 @@ class _FavoritesStepState extends State<FavoritesStep> {
border: Border.all(
width: 1,
color: state.faves[index].selected!
? Theme.of(context)
.colorScheme
.focusedBorder
: Theme.of(context).colorScheme.cardBorder),
? Theme.of(context).colorScheme.focusedBorder
: Theme.of(context).colorScheme.cardBorder
),
color: state.faves[index].selected!
? Theme.of(context).colorScheme.focused
: Theme.of(context).colorScheme.cardBorder),
: Theme.of(context).colorScheme.cardBorder
),
child: CustomizeCategoryCheckbox(
title: state.faves[index].name!,
value: state.faves[index].selected,
@ -100,7 +102,14 @@ class _FavoritesStepState extends State<FavoritesStep> {
onChanged: (val) {
state.changeSelected(
index, state.faves, state.selectedFavIds);
})),
}
)
),
),
// Add extra bottom padding for the last item
if (index == state.faves.length - 1)
const SizedBox(height: 80),
],
),
),
),

7
lib/views/home/home.dart
View File

@ -142,9 +142,10 @@ class _HomeState extends State<Home>
@override
void initState() {
if (widget.showDialogs ?? false) {
_showDialog(context);
}
// Remove dialog showing logic to prevent welcome popups
// if (widget.showDialogs ?? false) {
// _showDialog(context);
// }
final state = context.read<HomeState>();
DesignConfig.updateSystemUiOverlayStyle();

5
lib/views/home/home_state.dart
View File

@ -82,6 +82,7 @@ class HomeState extends CoreProvier {
);
await service.httpGet();
if (service.isSuccess) {
print("DEBUG : Homestate is succes");
lastPage = service.result['lastPage'];
results.addAll(
List<OverviewData>.from(
@ -94,12 +95,14 @@ class HomeState extends CoreProvier {
appState = AppState.idle;
return;
}
print("DEBUG : Homestate is NOT succes");
appState = AppState.failed;
}
Future<void> searchAll({required int page}) async {
this.page = page;
if (page == 1) {
print("DEBUG : serach is busy");
results.clear();
appState = AppState.busy;
}
@ -115,6 +118,7 @@ class HomeState extends CoreProvier {
);
await service.httpGet();
if (service.isSuccess) {
print("DEBUG : HTTPget Home is succes");
lastPage = service.result['lastPage'];
unreadCount = service.result['unread'] ?? unreadCount;
results.addAll(
@ -128,6 +132,7 @@ class HomeState extends CoreProvier {
appState = AppState.idle;
return;
}
print("DEBUG : Homestate is faild");
appState = AppState.failed;
}

26
lib/views/home/main/main_page.dart
View File

@ -33,22 +33,36 @@ class MainPage extends StatefulWidget {
class _MainPageState extends State<MainPage> {
@override
void initState() {
super.initState();
print("DEBUG: _MainPageState initstate called");
WidgetsBinding.instance.addPostFrameCallback((_) {
print("DEBUG: addPostFrameCallback called");
context.read<MainPageState>().init();
});
super.initState();
}
@override
Widget build(BuildContext context) {
print("DEBUG: _MainPageState build called");
return StateHandler<MainPageState>(
onRetry: context.read<MainPageState>().init,
onRetry: () => {
print("DEBUG: _MainPageState onRetry called"),
context.read<MainPageState>().init
},
state: context.watch<MainPageState>(),
builder: (context, state) => ListView(
builder: (context, state) {
print("DEBUG: FutureBuilder waiting");
print("DEBUG: FutureBuilder state.stories.isNotEmpty: ${state.stories.isNotEmpty}");
print("DEBUG: FutureBuilder state.content: ${state.content!.lists}");
print("DEBUG: FutureBuilder state.content != null: ${state.content != null}");
print("DEBUG: FutureBuilder state.content!.lists.isNotEmpty: ${state.content!.lists.isNotEmpty}");
return ListView(
padding: const EdgeInsets.symmetric(vertical: 16),
children: [
if (state.stories.isNotEmpty) StorySection(stories: state.stories),
const SizedBox(height: 12),
const MainPageMainContent(),
Builder(builder: (context) {
final List<Widget> pageContent = [];
if (state.content != null && state.content!.lists.isNotEmpty) {
@ -118,10 +132,12 @@ class _MainPageState extends State<MainPage> {
}
}
}
print("DEBUG: FutureBuilder error");
return Column(children: pageContent);
}),
],
),
);
},
);
}
}
@ -289,7 +305,6 @@ class _MainPageSection extends StatelessWidget {
return const SizedBox();
}
// This condition handles the "Soha" module, which should not display the Opportunity/Threat module.
if (list.type == 'delphi') {
return Column(
children: [
@ -299,7 +314,6 @@ class _MainPageSection extends StatelessWidget {
);
}
// For all other modules, display as before.
return Column(
children: [
_buildSectionHeader(context, icon),

13
lib/views/home/main/main_page_state.dart
View File

@ -24,12 +24,19 @@ class MainPageState extends CoreProvier {
List<SwotItem> swotItems = [];
Future<void> _getMainPageContent() async {
print("DEBUG: _getMainPageContent started");
final service = RequestService(RequestHelper.mainPageContent);
await service.httpGet();
if (service.isSuccess) {
print("DEBUG: _getMainPageContent success");
content = MainPageContent.fromJson(service.result);
print("DEBUG: _getMainPageContent service.result: ${service.result}");
unread = service.result['unread'];
print("DEBUG: __getMainPageContent unread: $unread, content: $content");
notifyListeners();
} else {
print("DEBUG: _getMainPageContent failed state");
notifyListeners();
throw Exception('Failed to load main page content');
}
}
@ -43,14 +50,14 @@ class MainPageState extends CoreProvier {
try {
swotItems = await SwotService.fetchSwotItems();
} catch (e) {
print(e);
}
}
Future<void> _fetchStories() async {
try {
stories = await StoryService.getStories();
print("Fetched ${stories.length} stories.");
// print("Fetched ${stories.length} stories.");
} catch (e) {
stories = [];
debugPrint("Could not fetch stories: $e");
@ -58,6 +65,7 @@ class MainPageState extends CoreProvier {
}
void init() {
print("DEBUG: MainPageState init called");
Future.delayed(Duration.zero, () async {
appState = AppState.busy;
try {
@ -71,6 +79,7 @@ class MainPageState extends CoreProvier {
appState = AppState.failed;
}
});
_getMainPageContent();
}
void markChangeHandler(String type, int id, bool value) {

3
lib/views/news/news_details/news_details.dart
View File

@ -42,7 +42,8 @@ class _NewsDetailsState extends State<NewsDetails> {
return Scaffold(
body: Consumer<NewsDetailsState>(
builder: (context, state, child) => StateHandler<NewsDetailsState>(
onRetry: () => state.getNewsDetails(state.currentNews.id),
onRetry: () =>
state.getNewsDetails(widget.pageData['id']),
state: state,
builder: (context, state) => Stack(
children: [

38
lib/views/news/news_details/news_details_state.dart
View File

@ -17,6 +17,7 @@ class NewsDetailsState extends CoreProvier {
int _trackingTimerCounter = 0;
bool isFetchingNewItem = false;
final List<int> relatedQueue = [];
bool _isRequestInProgress = false;
int _currentIndex = 0;
int get currentIndex => _currentIndex;
@ -25,15 +26,33 @@ class NewsDetailsState extends CoreProvier {
NewsDetailsData get currentNews => news[_currentIndex]!;
Future<void> getNewsDetails(int id, {bool? isForward}) async {
// Prevent duplicate requests
if (_isRequestInProgress) {
return;
}
_isRequestInProgress = true;
// Set loading state
if (isForward == null) {
appState = AppState.busy;
} else {
isFetchingNewItem = true;
notifyListeners();
}
try {
// Wait for token to be ready
if (RequestService.token == null || RequestService.token!.isEmpty) {
await Future.delayed(const Duration(milliseconds: 500));
if (RequestService.token == null || RequestService.token!.isEmpty) {
throw Exception('Token not available');
}
}
final service = RequestService(RequestHelper.newsDetails(id, args));
await service.httpGet();
_handleTracking(sendRequest: isForward != null);
if (service.isSuccess) {
final result = service.result;
final newsItem = NewsDetailsData.fromJson(result['news']);
@ -41,6 +60,8 @@ class NewsDetailsState extends CoreProvier {
news.add(newsItem);
initialIndex = 0;
appState = AppState.idle;
isFetchingNewItem = false;
_isRequestInProgress = false;
return;
}
NewsDetailsData? prevNews;
@ -77,10 +98,23 @@ class NewsDetailsState extends CoreProvier {
getRelatedContents();
}
appState = AppState.idle;
return;
}
} else {
isFetchingNewItem = false;
if (isForward == null) {
appState = AppState.failed;
} else {
notifyListeners();
}
}
} catch (e) {
print('Error fetching news details: $e');
isFetchingNewItem = false;
if (isForward == null) {
appState = AppState.failed;
}
notifyListeners();
} finally {
_isRequestInProgress = false;
}
}

3
lib/views/profile/general_settings/settings.dart
View File

@ -56,7 +56,8 @@ class _GeneralSettingsState extends State<GeneralSettings> {
appBarData: AppBarData(hasBack: true, title: 'تنظیمات'),
children: [
DidvanCard(
child: MenuOption(
child:
MenuOption(
title: 'زمان دریافت اعلان',
onTap: () => Navigator.of(context).pushNamed(
Routes.notificationTime,

82
lib/views/profile/profile.dart
View File

@ -94,47 +94,47 @@ class _ProfilePageState extends State<ProfilePage> {
padding: const EdgeInsets.only(right: 8.0, top: 8),
child: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(
vertical: 12.0),
child: MenuOption(
title: 'زمان دریافت اعلان',
onTap: () =>
Navigator.of(context).pushNamed(
Routes.notificationTime,
arguments: {
"fromFav": false,
'onTimeChanged': () => Future.delayed(
Duration.zero,
() => state.getTime(),
)
},
),
icon: DidvanIcons.notification_regular,
suffix: state.time,
// suffix: 'از${DateTimeUtils.normalizeTimeDuration(
// Duration(minutes: state.notificationTimeRange[0]),
// )} تا ${DateTimeUtils.normalizeTimeDuration(
// Duration(minutes: state.notificationTimeRange[1]),
// )}',
),
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 12.0),
child: MenuOption(
title: 'شخصی سازی محتوا',
onTap: () => Navigator.of(context)
.pushNamed(Routes.favouritesStep,
arguments: {"toTimer": false}),
icon: DidvanIcons.note_regular,
// suffix: 'از${DateTimeUtils.normalizeTimeDuration(
// Duration(minutes: state.notificationTimeRange[0]),
// )} تا ${DateTimeUtils.normalizeTimeDuration(
// Duration(minutes: state.notificationTimeRange[1]),
// )}',
),
),
// Padding(
// padding: const EdgeInsets.symmetric(
// vertical: 12.0),
// child: MenuOption(
// title: 'زمان دریافت اعلان',
// onTap: () =>
// Navigator.of(context).pushNamed(
// Routes.notificationTime,
// arguments: {
// "fromFav": false,
// 'onTimeChanged': () => Future.delayed(
// Duration.zero,
// () => state.getTime(),
// )
// },
// ),
// icon: DidvanIcons.notification_regular,
// suffix: state.time,
// // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
// // Duration(minutes: state.notificationTimeRange[0]),
// // )} تا ${DateTimeUtils.normalizeTimeDuration(
// // Duration(minutes: state.notificationTimeRange[1]),
// // )}',
// ),
// ),
// Padding(
// padding: const EdgeInsets.symmetric(
// vertical: 12.0),
// child: MenuOption(
// title: 'شخصی سازی محتوا',
// onTap: () => Navigator.of(context)
// .pushNamed(Routes.favouritesStep,
// arguments: {"toTimer": false}),
// icon: DidvanIcons.note_regular,
// // suffix: 'از${DateTimeUtils.normalizeTimeDuration(
// // Duration(minutes: state.notificationTimeRange[0]),
// // )} تا ${DateTimeUtils.normalizeTimeDuration(
// // Duration(minutes: state.notificationTimeRange[1]),
// // )}',
// ),
// ),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 12.0),

39
lib/views/radar/radar_details/radar_details_state.dart
View File

@ -18,6 +18,7 @@ class RadarDetailsState extends CoreProvier {
bool isFetchingNewItem = false;
final List<int> relatedQueue = [];
bool openComments = false;
bool _isRequestInProgress = false;
int _currentIndex = 0;
int get currentIndex => _currentIndex;
@ -31,15 +32,33 @@ class RadarDetailsState extends CoreProvier {
}
Future<void> getRadarDetails(int id, {bool? isForward}) async {
// Prevent duplicate requests
if (_isRequestInProgress) {
return;
}
_isRequestInProgress = true;
// Set loading state
if (isForward == null) {
appState = AppState.busy;
} else {
isFetchingNewItem = true;
notifyListeners();
}
try {
// Wait for token to be ready
if (RequestService.token == null || RequestService.token!.isEmpty) {
await Future.delayed(const Duration(milliseconds: 500));
if (RequestService.token == null || RequestService.token!.isEmpty) {
throw Exception('Token not available');
}
}
final service = RequestService(RequestHelper.radarDetails(id, args));
await service.httpGet();
_handleTracking(sendRequest: isForward != null);
if (service.isSuccess) {
final result = service.result;
final radar = RadarDetailsData.fromJson(result['radar']);
@ -47,6 +66,8 @@ class RadarDetailsState extends CoreProvier {
radars.add(radar);
initialIndex = 0;
appState = AppState.idle;
isFetchingNewItem = false;
_isRequestInProgress = false;
return;
}
@ -86,11 +107,23 @@ class RadarDetailsState extends CoreProvier {
getRelatedContents();
}
appState = AppState.idle;
return;
}
//why? total page state shouldn't die!
} else {
isFetchingNewItem = false;
if (isForward == null) {
appState = AppState.failed;
} else {
notifyListeners();
}
}
} catch (e) {
print('Error fetching radar details: $e');
isFetchingNewItem = false;
if (isForward == null) {
appState = AppState.failed;
}
notifyListeners();
} finally {
_isRequestInProgress = false;
}
}

37
lib/views/splash/splash.dart
View File

@ -87,7 +87,9 @@ class _SplashState extends State<Splash> {
Future<void> _initialize(ThemeProvider themeProvider,
UserProvider userProvider, MediaProvider mediaProvider) async {
try {
print("checking if is in browser");
if (kIsWeb) {
print("detected browser");
html.window.onBeforeUnload.listen((event) {
StorageService.webStorage
.removeWhere((key, value) => key == 'image-cache');
@ -103,20 +105,22 @@ class _SplashState extends State<Splash> {
await AppInitializer.setupServices(navigatorKey.currentContext!);
final String? token = await userProvider.setAndGetToken();
print("detected token as $token");
if (token != null) {
RequestService.token = token;
if (!kIsWeb) {
await mediaProvider.getDownloadsList();
}
RequestService.token = token;
final result = await userProvider.getUserInfo();
if (!result) {
print("no results were returned for user info");
try {
StorageService.delete(key: 'token');
} catch (e) {
print("error in case of no user info result: $e");
// catch
}
@ -127,28 +131,33 @@ class _SplashState extends State<Splash> {
return;
}
print("got results for user info: $result");
await ServerDataProvider.getData();
}
// --- بخش اصلاح شده ---
// ابتدا بررسی می‌کنیم که کاربر باید به کدام صفحه اصلی برود
final String destinationRoute = token == null ? Routes.authenticaion : Routes.home;
final dynamic routeArguments = token == null ? false : {'showDialogs': true};
print("token route is $token");
String extractedPath = initialURI?.path.toString() == '/' ? Routes.home : initialURI?.path.toString() ?? Routes.home;
final String destinationRoute = token == null ? Routes.authenticaion : extractedPath;
// Set showDialogs to false to prevent welcome popups
dynamic routeArguments = token == null ? {'isResetPassword': false} : {'showDialogs': false};
// اگر لینک ورودی وجود داشت، آن را به عنوان آرگومان به صفحه Home می‌فرستیم
if (destinationRoute == Routes.home && initialURI != null) {
(routeArguments as Map)['deepLinkUri'] = initialURI;
initialURI = null; // لینک را مصرف می‌کنیم تا دوباره استفاده نشود
if (destinationRoute == Routes.home) {
print("destination route was home and init uri is $initialURI");
// (routeArguments as Map)['deepLinkUri'] = initialURI;
initialURI = null;
}
// در نهایت به مسیر تعیین شده می‌رویم
if(destinationRoute == Routes.authenticaion){
print("destination route is auth route");
routeArguments = false;
}
print("destination route: $destinationRoute, route args: $routeArguments");
await navigatorKey.currentState!.pushReplacementNamed(
destinationRoute,
arguments: routeArguments,
);
// --- پایان بخش اصلاح شده ---
} catch (e) {
setState(() {
_errorOccured = true;

19
lib/views/webview/web_view.dart
View File

@ -26,12 +26,14 @@ class _WebViewState extends State<WebView> {
};
void _onProgress(int progress) {
print('🌐 WebView loading progress: $progress%'); // Add logging
setState(() {
this.progress = progress;
});
}
void _onPageFinished(String url) async {
print('✅ WebView finished loading: $url'); // Add logging
await Future.delayed(const Duration(seconds: 2));
setState(() {
if (progress == 100) loading = false;
@ -40,21 +42,24 @@ class _WebViewState extends State<WebView> {
@override
void initState() {
print('🔄 Initializing WebView with URL: ${widget.src}'); // Add logging
controller = WebViewController()
..setJavaScriptMode(JavaScriptMode.unrestricted)
..setNavigationDelegate(
NavigationDelegate(
onProgress: _onProgress,
onPageStarted: (String url) {},
onPageStarted: (String url) {
print('▶️ WebView started loading: $url'); // Add logging
},
onPageFinished: _onPageFinished,
onHttpError: (HttpResponseError error) {},
onHttpError: (HttpResponseError error) {
// print('❌ WebView HTTP error: ${error.statusCode} on ${error.url}'); // Add logging
},
onWebResourceError: (WebResourceError error) {
// navigatorKey.currentState!.pop();
// print('❌ WebView resource error: ${error.description} on ${error.failingUrl}'); // Add logging
},
onNavigationRequest: (NavigationRequest request) {
// if (request.url.startsWith('https://www.youtube.com/')) {
// return NavigationDecision.prevent;
// }
print('🔀 WebView navigation request to: ${request.url}'); // Add logging
return NavigationDecision.navigate;
},
),
@ -77,7 +82,7 @@ class _WebViewState extends State<WebView> {
child: Scaffold(
appBar: AppBar(
title: const DidvanText(
'بازگشت به دیدوان',
'بازگشت',
),
leading: const BackButton(),
),

2
lib/views/widgets/didvan/text_field.dart
View File

@ -109,7 +109,7 @@ class _DidvanTextFieldState extends State<DidvanTextField> {
? TextDirection.ltr
: TextDirection.rtl,
child: Padding(
padding: const EdgeInsets.fromLTRB(kIsWeb?8:8,kIsWeb?4:8,kIsWeb?8:0,kIsWeb?0:8),
padding: const EdgeInsets.fromLTRB(kIsWeb?8:4,kIsWeb?4:4,kIsWeb?8:0,kIsWeb?0:8),
child: Center(
child: TextFormField(
inputFormatters: <TextInputFormatter>[

7
makefile
View File

@ -1,2 +1,9 @@
update_js:
cp ./lib/assets/js/main.js ./build/flutter_assets/lib/assets/js/main.js
zip_web:
powershell Compress-Archive -Path build\web\* -DestinationPath build.zip -Force
build_web:
flutter build web