Browse Source

fix flutter navigator when login

pull/18/head
Sun 5 years ago
parent
commit
8f45d47194
  1. 7
      lib/main.dart
  2. 3
      lib/pages/account_generate.dart
  3. 3
      lib/pages/account_restore.dart
  4. 2
      lib/pages/home.dart
  5. 5
      lib/security.dart

7
lib/main.dart

@ -11,6 +11,7 @@ import 'package:esse/security.dart'; @@ -11,6 +11,7 @@ import 'package:esse/security.dart';
import 'package:esse/rpc.dart';
import 'package:esse/provider.dart';
import 'package:esse/pages/home.dart';
import 'package:esse/apps/device/provider.dart';
import 'package:esse/apps/chat/provider.dart';
import 'package:esse/apps/assistant/provider.dart';
@ -63,7 +64,11 @@ class MyApp extends StatelessWidget { @@ -63,7 +64,11 @@ class MyApp extends StatelessWidget {
locale: options.locale,
localizationsDelegates: AppLocalizations.localizationsDelegates,
supportedLocales: AppLocalizations.supportedLocales,
home: SecurityPage(),
initialRoute: '/security',
routes: <String, WidgetBuilder>{
'/': (BuildContext context) => const HomePage(),
'/security': (BuildContext context) => const SecurityPage(),
},
);
}
}

3
lib/pages/account_generate.dart

@ -12,7 +12,6 @@ import 'package:esse/widgets/button_text.dart'; @@ -12,7 +12,6 @@ import 'package:esse/widgets/button_text.dart';
import 'package:esse/widgets/shadow_dialog.dart';
import 'package:esse/widgets/show_pin.dart';
import 'package:esse/widgets/select_avatar.dart';
import 'package:esse/pages/home.dart';
import 'package:esse/account.dart';
import 'package:esse/global.dart';
import 'package:esse/rpc.dart';
@ -104,7 +103,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> { @@ -104,7 +103,7 @@ class _AccountGeneratePageState extends State<AccountGeneratePage> {
Provider.of<ChatProvider>(context, listen: false).updateActived();
Provider.of<GroupChatProvider>(context, listen: false).updateActived();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (_) => HomePage()));
Navigator.of(context).pushNamedAndRemoveUntil('/', ModalRoute.withName('/'));
} else {
// TODO tostor error
print(res.error);

3
lib/pages/account_restore.dart

@ -8,7 +8,6 @@ import 'package:esse/widgets/button_text.dart'; @@ -8,7 +8,6 @@ import 'package:esse/widgets/button_text.dart';
import 'package:esse/widgets/shadow_dialog.dart';
import 'package:esse/widgets/show_pin.dart';
import 'package:esse/widgets/qr_scan.dart';
import 'package:esse/pages/home.dart';
import 'package:esse/account.dart';
import 'package:esse/global.dart';
import 'package:esse/rpc.dart';
@ -383,7 +382,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> { @@ -383,7 +382,7 @@ class _AccountRestorePageState extends State<AccountRestorePage> {
Provider.of<ChatProvider>(context, listen: false).updateActived();
Provider.of<GroupChatProvider>(context, listen: false).updateActived();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (_) => HomePage()));
Navigator.of(context).pushNamedAndRemoveUntil('/', ModalRoute.withName('/'));
} else {
// TODO tostor error
print(res.error);

2
lib/pages/home.dart

@ -469,7 +469,7 @@ class DrawerWidget extends StatelessWidget { @@ -469,7 +469,7 @@ class DrawerWidget extends StatelessWidget {
context.read<AccountProvider>().logout();
context.read<DeviceProvider>().clear();
context.read<ChatProvider>().clear();
Navigator.of(context).pushReplacementNamed('/');
Navigator.of(context).pushReplacementNamed('/security');
}),
SizedBox(height: 20.0),
],

5
lib/security.dart

@ -6,7 +6,6 @@ import 'package:esse/l10n/localizations.dart'; @@ -6,7 +6,6 @@ import 'package:esse/l10n/localizations.dart';
import 'package:esse/widgets/button_text.dart';
import 'package:esse/widgets/shadow_dialog.dart';
import 'package:esse/widgets/show_pin.dart';
import 'package:esse/pages/home.dart';
import 'package:esse/pages/account_generate.dart';
import 'package:esse/pages/account_restore.dart';
import 'package:esse/utils/logined_cache.dart';
@ -170,7 +169,7 @@ class _SecurityPageState extends State<SecurityPage> { @@ -170,7 +169,7 @@ class _SecurityPageState extends State<SecurityPage> {
Provider.of<ChatProvider>(context, listen: false).updateActived();
Provider.of<GroupChatProvider>(context, listen: false).updateActived();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (_) => HomePage()));
Navigator.of(context).pushNamedAndRemoveUntil('/', ModalRoute.withName('/'));
return;
} else {
// TODO tostor error
@ -221,7 +220,7 @@ class _SecurityPageState extends State<SecurityPage> { @@ -221,7 +220,7 @@ class _SecurityPageState extends State<SecurityPage> {
Provider.of<ChatProvider>(context, listen: false).updateActived();
Provider.of<GroupChatProvider>(context, listen: false).updateActived();
Navigator.pushReplacement(context, MaterialPageRoute(builder: (_) => HomePage()));
Navigator.of(context).pushNamedAndRemoveUntil('/', ModalRoute.withName('/'));
} else {
// TODO tostor error
print(res.error);

Loading…
Cancel
Save