diff --git a/lib/pages/notice.dart b/lib/pages/notice.dart index 0476a65..d3aad2d 100644 --- a/lib/pages/notice.dart +++ b/lib/pages/notice.dart @@ -69,29 +69,27 @@ class _NotificationPageState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Opacity( - opacity: 0, - child: IconButton( - icon: const Icon(Icons.filter_list), - onPressed: () { - _showFilterDialog(); - }, + Expanded( + child: Align( + alignment: Alignment.centerLeft, + child: Text( + '選択されたフィルター: $_selectedFilter', + style: const TextStyle(fontSize: 14, color: Colors.grey), + ), ), ), - const Text( - "通知", - style: TextStyle( - fontSize: 16, + Expanded( + child: Align( + alignment: Alignment.centerRight, + child: IconButton( + icon: const Icon(Icons.filter_list), + onPressed: () { + _showFilterDialog(); + }, + ), ), ), - IconButton( - icon: const Icon(Icons.filter_list), - onPressed: () { - _showFilterDialog(); - }, - ), ], ), const Divider( @@ -99,15 +97,6 @@ class _NotificationPageState extends State { thickness: 1, color: Colors.grey, ), - Row( - mainAxisAlignment: MainAxisAlignment.end, - children: [ - Text( - '選択されたフィルター: $_selectedFilter', - style: const TextStyle(fontSize: 12, color: Colors.grey), - ), - ], - ), const Card( color: Color(0xFFF4F6FF), child: Padding( diff --git a/lib/pages/password_forget.dart b/lib/pages/password_forget.dart index b3efd82..dedca50 100644 --- a/lib/pages/password_forget.dart +++ b/lib/pages/password_forget.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:sysdev_suretti/pages/login.dart'; +import 'package:sysdev_suretti/pages/new_password.dart'; class PasswordForgetPage extends StatefulWidget { const PasswordForgetPage({super.key}); @@ -27,6 +28,9 @@ class _PasswordForgetPageState extends State { ScaffoldMessenger.of(context).showSnackBar( const SnackBar(content: Text("認証メールを送信しました。")), ); + Navigator.of(context).push(MaterialPageRoute(builder: (context) { + return const NewPasswordPage(); + })); } }); }