GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-01-23 18:44:10 +01:00
Code Issues Projects Releases Wiki Activity

feat: Minor button design changes

Browse Source
This commit is contained in:
Christian Pauly 2021-05-30 12:25:29 +02:00
parent 035d045d30
commit 34b8751328
5 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/themes.dart
View File

@ -71,7 +71,6 @@ abstract class FluffyThemes {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: AppConfig.primaryColor, primary: AppConfig.primaryColor,
onPrimary: Colors.white, onPrimary: Colors.white,
elevation: 7,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
), ),
@ -171,7 +170,6 @@ abstract class FluffyThemes {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: AppConfig.primaryColor, primary: AppConfig.primaryColor,
onPrimary: Colors.white, onPrimary: Colors.white,
elevation: 7,
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderRadius: BorderRadius.circular(AppConfig.borderRadius),
), ),

5
lib/pages/views/homeserver_picker_view.dart
View File

@ -69,10 +69,7 @@ class HomeserverPickerView extends StatelessWidget {
: controller.checkHomeserverAction, : controller.checkHomeserverAction,
child: controller.isLoading child: controller.isLoading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(L10n.of(context).connect),
L10n.of(context).connect,
style: TextStyle(color: Colors.white, fontSize: 16),
),
), ),
), ),
), ),

8
lib/pages/views/login_view.dart
View File

@ -67,7 +67,8 @@ class LoginView extends StatelessWidget {
: Icons.visibility_outlined), : Icons.visibility_outlined),
onPressed: controller.toggleShowPassword, onPressed: controller.toggleShowPassword,
), ),
labelText: L10n.of(context).password), labelText: L10n.of(context).password,
),
), ),
), ),
SizedBox(height: 12), SizedBox(height: 12),
@ -81,10 +82,7 @@ class LoginView extends StatelessWidget {
: () => controller.login(context), : () => controller.login(context),
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(L10n.of(context).login),
L10n.of(context).login,
style: TextStyle(color: Colors.white, fontSize: 16),
),
), ),
), ),
), ),

5
lib/pages/views/sign_up_password_view.dart
View File

@ -72,10 +72,7 @@ class SignUpPasswordView extends StatelessWidget {
controller.loading ? null : controller.signUpAction, controller.loading ? null : controller.signUpAction,
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(L10n.of(context).createAccountNow),
L10n.of(context).createAccountNow,
style: TextStyle(color: Colors.white, fontSize: 16),
),
), ),
), ),
), ),

15
lib/pages/views/sign_up_view.dart
View File

@ -61,7 +61,13 @@ class SignUpView extends StatelessWidget {
? null ? null
: [AutofillHints.newUsername], : [AutofillHints.newUsername],
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: Icon(Icons.account_circle_outlined), prefixIcon: Padding(
padding: const EdgeInsets.only(
left: 12.0,
right: 22,
),
child: Icon(Icons.account_circle_outlined),
),
hintText: L10n.of(context).username, hintText: L10n.of(context).username,
errorText: controller.usernameError, errorText: controller.usernameError,
labelText: L10n.of(context).chooseAUsername, labelText: L10n.of(context).chooseAUsername,
@ -107,11 +113,7 @@ class SignUpView extends StatelessWidget {
controller.loading ? null : controller.signUpAction, controller.loading ? null : controller.signUpAction,
child: controller.loading child: controller.loading
? LinearProgressIndicator() ? LinearProgressIndicator()
: Text( : Text(L10n.of(context).signUp),
L10n.of(context).signUp,
style: TextStyle(
color: Colors.white, fontSize: 16),
),
), ),
), ),
), ),
@ -144,7 +146,6 @@ class SignUpView extends StatelessWidget {
primary: Theme.of(context).secondaryHeaderColor, primary: Theme.of(context).secondaryHeaderColor,
onPrimary: onPrimary:
Theme.of(context).textTheme.bodyText1.color, Theme.of(context).textTheme.bodyText1.color,
//elevation: 1,
), ),
onPressed: () => context.vRouter.push('/login'), onPressed: () => context.vRouter.push('/login'),
child: Text(L10n.of(context).login), child: Text(L10n.of(context).login),