Skip to content

Commit fb7a781

Browse files
Akshatji800Akshatji800
authored
Merge pull request #141 from amitamrutiya2210/issue-140-fix-theme-lightmode
Issue 140 fix some colors in lightmode theme
2 parents 14e45e8 + 4d94052 commit fb7a781

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

‎lib/Components/filter_by_status.dart‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
7474
child: Center(
7575
child: Text(torrentLength,
7676
style: TextStyle(
77-
color: Colors.black45,
77+
color: ThemeProvider.theme.primaryColorLight,
7878
fontFamily: 'Montserrat',
7979
fontSize: 15,
8080
fontWeight: FontWeight.bold)),
@@ -144,7 +144,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
144144
.toString()
145145
: '0',
146146
style: TextStyle(
147-
color: Colors.black45,
147+
color: ThemeProvider.theme.primaryColorLight,
148148
fontFamily: 'Montserrat',
149149
fontSize: 15,
150150
fontWeight: FontWeight.bold)),
@@ -213,7 +213,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
213213
? filterModel.mapStatus['seeding'].toString()
214214
: '0',
215215
style: TextStyle(
216-
color: Colors.black45,
216+
color: ThemeProvider.theme.primaryColorLight,
217217
fontFamily: 'Montserrat',
218218
fontSize: 15,
219219
fontWeight: FontWeight.bold)),
@@ -282,7 +282,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
282282
? filterModel.mapStatus['complete'].toString()
283283
: '0',
284284
style: TextStyle(
285-
color: Colors.black45,
285+
color: ThemeProvider.theme.primaryColorLight,
286286
fontFamily: 'Montserrat',
287287
fontSize: 15,
288288
fontWeight: FontWeight.bold)),
@@ -351,7 +351,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
351351
? filterModel.mapStatus['stopped'].toString()
352352
: '0',
353353
style: TextStyle(
354-
color: Colors.black45,
354+
color: ThemeProvider.theme.primaryColorLight,
355355
fontFamily: 'Montserrat',
356356
fontSize: 15,
357357
fontWeight: FontWeight.bold)),
@@ -420,7 +420,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
420420
? filterModel.mapStatus['active'].toString()
421421
: '0',
422422
style: TextStyle(
423-
color: Colors.black45,
423+
color: ThemeProvider.theme.primaryColorLight,
424424
fontFamily: 'Montserrat',
425425
fontSize: 15,
426426
fontWeight: FontWeight.bold)),
@@ -489,7 +489,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
489489
? filterModel.mapStatus['inactive'].toString()
490490
: '0',
491491
style: TextStyle(
492-
color: Colors.black45,
492+
color: ThemeProvider.theme.primaryColorLight,
493493
fontFamily: 'Montserrat',
494494
fontSize: 15,
495495
fontWeight: FontWeight.bold)),
@@ -558,7 +558,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
558558
? filterModel.mapStatus['error'].toString()
559559
: '0',
560560
style: TextStyle(
561-
color: Colors.black45,
561+
color: ThemeProvider.theme.primaryColorLight,
562562
fontFamily: 'Montserrat',
563563
fontSize: 15,
564564
fontWeight: FontWeight.bold)),
@@ -621,7 +621,7 @@ class _FilterByStatusState extends State<FilterByStatus> {
621621
child: Center(
622622
child: Text(torrentLength,
623623
style: TextStyle(
624-
color: Colors.black45,
624+
color: ThemeProvider.theme.primaryColorLight,
625625
fontFamily: 'Montserrat',
626626
fontSize: 15,
627627
fontWeight: FontWeight.bold)),
@@ -686,7 +686,8 @@ class _FilterByStatusState extends State<FilterByStatus> {
686686
.toList()[index]]
687687
.toString(),
688688
style: TextStyle(
689-
color: Colors.black45,
689+
color: ThemeProvider
690+
.theme.primaryColorLight,
690691
fontFamily: 'Montserrat',
691692
fontSize: 15,
692693
fontWeight: FontWeight.bold)),

‎lib/Components/notification_popup_dialogue_container.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Widget notificationPopupDialogueContainer({required BuildContext context}) {
5555
child: Text(
5656
'Clear All',
5757
style: TextStyle(
58-
color: Colors.white60,
58+
color: ThemeProvider.theme.textTheme.bodyText1?.color,
5959
),
6060
),
6161
)
@@ -103,7 +103,7 @@ class NotificationListTile extends StatelessWidget {
103103
Text(
104104
DateTime.fromMillisecondsSinceEpoch(model.ts).toString(),
105105
textAlign: TextAlign.left,
106-
style: TextStyle(fontSize: 12, color: Colors.white38),
106+
style: TextStyle(fontSize: 12, color: Colors.grey[500]),
107107
),
108108
SizedBox(
109109
height: 4,

‎lib/Components/torrent_tile.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class _TorrentTileState extends State<TorrentTile> {
3737
),
3838
isScrollControlled: true,
3939
context: context,
40-
backgroundColor: ThemeProvider.theme.backgroundColor,
40+
backgroundColor: ThemeProvider.theme.scaffoldBackgroundColor,
4141
builder: (context) {
4242
return DeleteTorrentSheet(
4343
torrent: widget.model,

‎lib/Pages/torrent_content_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class _TorrentContentScreenState extends State<TorrentContentScreen> {
122122
},
123123
),
124124
PopupMenuButton<String>(
125-
color: ThemeProvider.theme.backgroundColor,
125+
color: ThemeProvider.theme.primaryColorLight,
126126
icon: Icon(
127127
Icons.more_vert,
128128
color: ThemeProvider.theme.textTheme.bodyText1?.color,

0 commit comments

Comments
 (0)