dev/fix-news #2

Merged
Mr.Jebelli merged 8 commits from dev/fix-news into master 2025-07-16 11:59:01 +00:00
4 changed files with 32 additions and 6 deletions
Showing only changes of commit 424226fe6f - Show all commits

BIN
build.zip Normal file

Binary file not shown.

View File

@ -10,6 +10,7 @@ import 'package:didvan/config/theme_data.dart';
import 'package:didvan/firebase_options.dart'; import 'package:didvan/firebase_options.dart';
import 'package:didvan/models/notification_message.dart'; import 'package:didvan/models/notification_message.dart';
import 'package:didvan/models/requests/news.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/media.dart';
import 'package:didvan/providers/theme.dart'; import 'package:didvan/providers/theme.dart';
import 'package:didvan/providers/user.dart'; import 'package:didvan/providers/user.dart';
@ -137,6 +138,20 @@ class _DidvanState extends State<Didvan> with WidgetsBindingObserver {
navigatorKey.currentState?.pushNamed(path); navigatorKey.currentState?.pushNamed(path);
} }
} }
if (mounted) {
String path = uri.path;
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)},
);
}
} else {
navigatorKey.currentState?.pushNamed(path);
}
}
} }
@override @override

View File

@ -135,20 +135,24 @@ class _SplashState extends State<Splash> {
await ServerDataProvider.getData(); await ServerDataProvider.getData();
} }
final String destinationRoute = print("token route is $token");
token == null ? Routes.authenticaion : Routes.home; String extractedPath = initialURI?.path.toString() == '/' ? Routes.home : initialURI?.path.toString() ?? Routes.home;
dynamic routeArguments = final String destinationRoute = token == null ? Routes.authenticaion : extractedPath;
token == null ? {'isResetPassword': false} : {'showDialogs': true}; dynamic routeArguments = token == null ? {'isResetPassword': false} : {'showDialogs': true};
if (destinationRoute == Routes.home && initialURI != null) {
if (destinationRoute == Routes.home) {
print("destination route was home and init uri is $initialURI");
(routeArguments as Map)['deepLinkUri'] = initialURI; (routeArguments as Map)['deepLinkUri'] = initialURI;
initialURI = null; initialURI = null;
} }
if(destinationRoute == Routes.authenticaion){ if(destinationRoute == Routes.authenticaion){
print("destination route is auth route");
routeArguments = false; routeArguments = false;
} }
print("destination route: $destinationRoute, route args: $routeArguments");
await navigatorKey.currentState!.pushReplacementNamed( await navigatorKey.currentState!.pushReplacementNamed(
destinationRoute, destinationRoute,
arguments: routeArguments, arguments: routeArguments,

View File

@ -1,2 +1,9 @@
update_js: update_js:
cp ./lib/assets/js/main.js ./build/flutter_assets/lib/assets/js/main.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