File tree Expand file tree Collapse file tree 7 files changed +295
-157
lines changed Expand file tree Collapse file tree 7 files changed +295
-157
lines changed Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ class _HomePageState extends State<HomePage>
8686 label: const Text ('Change password' ),
8787 icon: const Icon (Icons .lock_outline),
8888 style: ElevatedButton .styleFrom (
89- backgroundColor: Theme .of (context).backgroundColor ,
89+ backgroundColor: Theme .of (context).colorScheme.surface ,
9090 ),
9191 ),
9292 ),
@@ -99,7 +99,7 @@ class _HomePageState extends State<HomePage>
9999 label: const Text ('Logout' ),
100100 icon: const Icon (Icons .exit_to_app),
101101 style: ElevatedButton .styleFrom (
102- backgroundColor: Theme .of (context).backgroundColor ,
102+ backgroundColor: Theme .of (context).colorScheme.surface ,
103103 ),
104104 ),
105105 ),
@@ -111,7 +111,7 @@ class _HomePageState extends State<HomePage>
111111 'Flutter auth BLoC pattern RxDart' ,
112112 style: Theme .of (context)
113113 .textTheme
114- .subtitle1 !
114+ .titleMedium !
115115 .copyWith (fontSize: 16 ),
116116 ),
117117 ),
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ class HomeUserProfile extends StatelessWidget {
8282 const SizedBox (height: 4 ),
8383 Text (
8484 'Error' ,
85- style: themeData.textTheme.subtitle2 ! .copyWith (fontSize: 12 ),
85+ style: themeData.textTheme.titleSmall ! .copyWith (fontSize: 12 ),
8686 ),
8787 ],
8888 ),
@@ -140,7 +140,7 @@ class HomeUserProfile extends StatelessWidget {
140140 Expanded (
141141 child: Text (
142142 'Logging out...' ,
143- style: Theme .of (context).textTheme.subtitle1 ,
143+ style: Theme .of (context).textTheme.titleMedium ,
144144 textAlign: TextAlign .center,
145145 ),
146146 ),
@@ -170,7 +170,7 @@ class ImageUploadingWidget extends StatelessWidget {
170170 const SizedBox (height: 8 ),
171171 Text (
172172 'Uploading' ,
173- style: Theme .of (context).textTheme.overline ,
173+ style: Theme .of (context).textTheme.labelSmall ,
174174 textAlign: TextAlign .center,
175175 ),
176176 ],
Original file line number Diff line number Diff line change @@ -243,7 +243,7 @@ class _MyLoginPageState extends State<LoginPage>
243243 FocusScope .of (context).unfocus ();
244244 loginBloc.submitLogin ();
245245 },
246- color: Theme .of (context).backgroundColor ,
246+ color: Theme .of (context).colorScheme.surface ,
247247 splashColor: Theme .of (context).colorScheme.secondary,
248248 child: const Text (
249249 'LOGIN' ,
Original file line number Diff line number Diff line change @@ -98,9 +98,9 @@ class _RegisterPageState extends State<RegisterPage>
9898 color: Colors .transparent,
9999 width: double .infinity,
100100 height: kToolbarHeight,
101- child: Row (
101+ child: const Row (
102102 crossAxisAlignment: CrossAxisAlignment .center,
103- children: const [
103+ children: [
104104 BackButton (color: Colors .white),
105105 ],
106106 ),
@@ -235,7 +235,7 @@ class _RegisterPageState extends State<RegisterPage>
235235 FocusScope .of (context).unfocus ();
236236 registerBloc.submitRegister ();
237237 },
238- color: Theme .of (context).backgroundColor ,
238+ color: Theme .of (context).colorScheme.surface ,
239239 splashColor: Theme .of (context).colorScheme.secondary,
240240 child: const Text (
241241 'REGISTER' ,
Original file line number Diff line number Diff line change @@ -157,12 +157,12 @@ class _InputTokenAndResetPasswordPageState
157157 },
158158 );
159159
160- final overlayColor = MaterialStateProperty .resolveWith ((states) {
161- if (states.contains (MaterialState .hovered)) {
160+ final overlayColor = WidgetStateProperty .resolveWith ((states) {
161+ if (states.contains (WidgetState .hovered)) {
162162 return Theme .of (context).colorScheme.secondary.withOpacity (0.5 );
163163 }
164- if (states.contains (MaterialState .focused) ||
165- states.contains (MaterialState .pressed)) {
164+ if (states.contains (WidgetState .focused) ||
165+ states.contains (WidgetState .pressed)) {
166166 return Theme .of (context).colorScheme.secondary.withOpacity (0.8 );
167167 }
168168 return null ;
Original file line number Diff line number Diff line change @@ -91,12 +91,12 @@ class _SendEmailPageState extends State<SendEmailPage>
9191 },
9292 );
9393
94- final overlayColor = MaterialStateProperty .resolveWith ((states) {
95- if (states.contains (MaterialState .hovered)) {
94+ final overlayColor = WidgetStateProperty .resolveWith ((states) {
95+ if (states.contains (WidgetState .hovered)) {
9696 return Theme .of (context).colorScheme.secondary.withOpacity (0.5 );
9797 }
98- if (states.contains (MaterialState .focused) ||
99- states.contains (MaterialState .pressed)) {
98+ if (states.contains (WidgetState .focused) ||
99+ states.contains (WidgetState .pressed)) {
100100 return Theme .of (context).colorScheme.secondary.withOpacity (0.8 );
101101 }
102102 return null ;
You can’t perform that action at this time.
0 commit comments