Skip to content

Commit 1db6f29

Browse files
committed
Resolves theme bug in all users list field under settings
1 parent 97d2633 commit 1db6f29

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

lib/Components/user_list.dart

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import 'package:flutter/material.dart';
66
class UsersListView extends StatelessWidget {
77
final List<CurrentUserDetailModel> usersList;
88
final String currentUsername;
9-
final int index;
9+
final int indexColour;
1010
const UsersListView({
1111
Key? key,
1212
required this.usersList,
1313
required this.currentUsername,
14-
required this.index,
14+
required this.indexColour,
1515
}) : super(key: key);
1616

1717
@override
@@ -25,10 +25,10 @@ class UsersListView extends StatelessWidget {
2525
height: 50.0,
2626
padding: EdgeInsets.symmetric(vertical: 5),
2727
decoration: BoxDecoration(
28-
color: ThemeProvider.theme(index).primaryColorLight,
28+
color: ThemeProvider.theme(indexColour).primaryColorLight,
2929
borderRadius: BorderRadius.circular(8),
3030
border: Border.all(
31-
color: ThemeProvider.theme(index).primaryColor,
31+
color: ThemeProvider.theme(indexColour).primaryColor,
3232
width: 1.0,
3333
),
3434
),
@@ -39,26 +39,29 @@ class UsersListView extends StatelessWidget {
3939
Text(
4040
usersList[index].username,
4141
style: TextStyle(
42-
color:
43-
ThemeProvider.theme(index).textTheme.bodyLarge?.color,
42+
color: ThemeProvider.theme(indexColour)
43+
.textTheme
44+
.bodyLarge
45+
?.color,
4446
),
4547
),
4648
Spacer(),
4749
(usersList[index].username == currentUsername)
4850
? Container(
4951
decoration: BoxDecoration(
50-
color: ThemeProvider.theme(index).highlightColor,
52+
color:
53+
ThemeProvider.theme(indexColour).highlightColor,
5154
borderRadius: BorderRadius.circular(20),
5255
),
5356
child: Padding(
5457
padding: const EdgeInsets.symmetric(
5558
horizontal: 6.0,
56-
vertical: 4.0,
59+
vertical: 3.0,
5760
),
5861
child: Text(
5962
'Current User',
6063
style: TextStyle(
61-
color: ThemeProvider.theme(index).primaryColor),
64+
color: ThemeProvider.theme(1).primaryColor),
6265
),
6366
),
6467
)

lib/Pages/settings_screen.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ class AuthenticationSection extends StatelessWidget {
655655
UsersListView(
656656
usersList: usersList,
657657
currentUsername: currentUsername,
658-
index: index,
658+
indexColour: index,
659659
),
660660
SizedBox(height: 25),
661661
SText(text: 'Add User', index: index),

0 commit comments

Comments
 (0)