fix: login screen not using safearea and no dialog bg-color found on light mode in AdaptivePopupMenuButton

This commit is contained in:
Kingkor Roy Tirtho 2022-08-07 22:24:45 +06:00
parent 615d5ce901
commit 92bc611c5e
3 changed files with 55 additions and 48 deletions

View File

@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotube/components/Login/LoginForm.dart'; import 'package:spotube/components/Login/LoginForm.dart';
import 'package:spotube/components/Shared/Hyperlink.dart';
import 'package:spotube/components/Shared/LinkText.dart';
import 'package:spotube/components/Shared/PageWindowTitleBar.dart'; import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
import 'package:spotube/hooks/useBreakpoints.dart'; import 'package:spotube/hooks/useBreakpoints.dart';
import 'package:spotube/models/Logger.dart'; import 'package:spotube/models/Logger.dart';
@ -18,7 +16,8 @@ class Login extends HookConsumerWidget {
final textTheme = Theme.of(context).textTheme; final textTheme = Theme.of(context).textTheme;
return Scaffold( return SafeArea(
child: Scaffold(
appBar: const PageWindowTitleBar(leading: BackButton()), appBar: const PageWindowTitleBar(leading: BackButton()),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Center( child: Center(
@ -64,6 +63,7 @@ class Login extends HookConsumerWidget {
), ),
), ),
), ),
),
); );
} }
} }

View File

@ -213,10 +213,17 @@ class Settings extends HookConsumerWidget {
), ),
), ),
if (auth.isAnonymous) if (auth.isAnonymous)
ListTile( AdaptiveListTile(
leading: const Icon(Icons.login_rounded), leading: Icon(
title: const Text("Login with your Spotify account"), Icons.login_rounded,
horizontalTitleGap: 10, color: Theme.of(context).primaryColor,
),
title: Text(
"Login with your Spotify account",
style: TextStyle(
color: Theme.of(context).primaryColor,
),
),
trailing: ElevatedButton( trailing: ElevatedButton(
child: Text("Connect with Spotify".toUpperCase()), child: Text("Connect with Spotify".toUpperCase()),
onPressed: () { onPressed: () {

View File

@ -83,7 +83,7 @@ class AdaptiveActions extends HookWidget {
.toList(), .toList(),
); );
}, },
backgroundColor: Theme.of(context).dialogTheme.backgroundColor!, backgroundColor: Theme.of(context).cardColor,
); );
}, },
); );