Merge branch 'dev' of https://github.com/refilc/naplo into dev

This commit is contained in:
zypherift
2024-05-01 22:58:31 +02:00
20 changed files with 492 additions and 137 deletions

View File

@@ -34,7 +34,7 @@ class NavbarItem extends StatelessWidget {
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
color: active
? Theme.of(context).colorScheme.secondary.withOpacity(.2)
? Theme.of(context).colorScheme.tertiary.withOpacity(.2)
: null,
borderRadius: BorderRadius.circular(14.0),
),

View File

@@ -30,7 +30,7 @@ class AccountView extends StatelessWidget {
AccountTile(
profileImage: ProfileImage(
name: _firstName,
backgroundColor: Theme.of(context).colorScheme.secondary,
backgroundColor: Theme.of(context).colorScheme.tertiary,
role: user.role,
),
name: SelectableText(

View File

@@ -136,7 +136,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: account.picture,
backgroundColor: Theme.of(context)
.colorScheme
.secondary, //!settings.presentationMode
.tertiary, //!settings.presentationMode
//? ColorUtils.stringToColor(account.name)
//: Theme.of(context).colorScheme.secondary,
),
@@ -322,7 +322,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: user.picture,
backgroundColor: Theme.of(context)
.colorScheme
.secondary, //!settings.presentationMode
.tertiary, //!settings.presentationMode
//? ColorUtils.stringToColor(user.displayName ?? "?")
//: Theme.of(context).colorScheme.secondary,
),