Skip to content

minor button improvements #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MikaeldeVerdier wants to merge 1 commit into from
Closed

minor button improvements #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lib/screens/login/login_ui.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,18 +212,12 @@ class _LoginUIState extends State<LoginUI> with SingleTickerProviderStateMixin {
) {
final _loginButton = ScaleTransition(
scale: loginBtnAnimation as Animation<double>,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary,
),
child: TextButton(
key: Key("login_btn"),
onPressed: state is! LoginLoading ? _onLoginButtonPressed : null,
child: Text(
t.loginLogIn,
style: TextStyle(
color: Theme.of(context).colorScheme.onSecondary,
fontSize: 16
),
style: TextStyle(fontSize: 16),
)));
final _loadingIcon =
ScaleTransition(scale: loadingAnimation as Animation<double>, child: CircularProgressIndicator());
Expand Down
7 changes: 7 additions & 0 deletions lib/themes.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ final ThemeData themeFdark = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Colors.orange[700]!),
foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -177,6 +178,7 @@ final ThemeData themeN = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Colors.green[700]!),
foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -260,6 +262,7 @@ final ThemeData themePi = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Color.fromARGB(255, 245, 147, 35)),
foregroundColor: WidgetStateProperty.all<Color>(Colors.black),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -374,6 +377,7 @@ final ThemeData themeF = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Colors.orange[700]!),
foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -425,6 +429,7 @@ final ThemeData themeO = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(const Color.fromRGBO(191, 54, 12, 1)),
foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -480,6 +485,7 @@ final ThemeData themeD = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Color(0xFFF280A1)),
foregroundColor: WidgetStateProperty.all<Color>(Colors.white),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down Expand Up @@ -516,6 +522,7 @@ final ThemeData themeV = ThemeData(
style: ButtonStyle(
backgroundColor: WidgetStateProperty.all<Color>(Colors.blue[400]!),
foregroundColor: WidgetStateProperty.all<Color>(Colors.black),
overlayColor: WidgetStateProperty.all<Color>(Colors.white.withAlpha(26)),
),
),

Expand Down
23 changes: 3 additions & 20 deletions lib/widgets/forgotten_password.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,7 @@ class ForgottenPassword {
),
Padding(
padding: EdgeInsets.all(8.0),
child: Container(
width: 220.0,
child: Text(
contentText,
textAlign: TextAlign.center,
style: TextStyle(
//fontWeight: FontWeight.w600,
//color: Colors.black,
),
)),
child: Text(contentText),
),
Visibility(
visible: notClicked,
Expand All @@ -73,17 +64,9 @@ class ForgottenPassword {
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Stack(children: <Widget>[
ElevatedButton(
TextButton(
key: Key('submit_btn'),
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary),
child: Text(
t.resetSubmit,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Theme.of(context).colorScheme.onSecondary,
),
),
child: Text(t.resetSubmit),
onPressed: () {
setState(() {
resetController.text.isEmpty
Expand Down
Loading